Commit 62708b2b authored by Petr Tesarik's avatar Petr Tesarik Committed by Christoph Hellwig
Browse files

swiotlb: add a flag whether SWIOTLB is allowed to grow 



Add a config option (CONFIG_SWIOTLB_DYNAMIC) to enable or disable dynamic
allocation of additional bounce buffers.

If this option is set, mark the default SWIOTLB as able to grow and
restricted DMA pools as unable.

However, if the address of the default memory pool is explicitly queried,
make the default SWIOTLB also unable to grow. This is currently used to set
up PCI BAR movable regions on some Octeon MIPS boards which may not be able
to use a SWIOTLB pool elsewhere in physical memory. See octeon_pci_setup()
for more details.

If a remap function is specified, it must be also called on any dynamically
allocated pools, but there are some issues:

- The remap function may block, so it should not be called from an atomic
  context.
- There is no corresponding unremap() function if the memory pool is
  freed.
- The only in-tree implementation (xen_swiotlb_fixup) requires that the
  number of slots in the memory pool is a multiple of SWIOTLB_SEGSIZE.

Keep it simple for now and disable growing the SWIOTLB if a remap function
was specified.

Signed-off-by: default avatarPetr Tesarik <petr.tesarik.ext@huawei.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 158dbe9c

include/linux/swiotlb.h

+4 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ struct io_tlb_pool { 
 * @debugfs:	The dentry to debugfs.

 * @force_bounce: %true if swiotlb bouncing is forced

 * @for_alloc:  %true if the pool is used for memory allocation

 * @can_grow:	%true if more pools can be allocated dynamically.

 * @total_used:	The total number of slots in the pool that are currently used

 *		across all areas. Used only for calculating used_hiwater in

 *		debugfs.
@@ -112,6 +113,9 @@ struct io_tlb_mem { 
	struct dentry *debugfs;

	bool force_bounce;

	bool for_alloc;

#ifdef CONFIG_SWIOTLB_DYNAMIC

	bool can_grow;

#endif

#ifdef CONFIG_DEBUG_FS

	atomic_long_t total_used;

	atomic_long_t used_hiwater;

kernel/dma/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -90,6 +90,19 @@ config SWIOTLB 
	bool

	select NEED_DMA_MAP_STATE



config SWIOTLB_DYNAMIC

	bool "Dynamic allocation of DMA bounce buffers"

	default n

	depends on SWIOTLB

	help

	  This enables dynamic resizing of the software IO TLB. The kernel

	  starts with one memory pool at boot and it will allocate additional

	  pools as needed. To reduce run-time kernel memory requirements, you

	  may have to specify a smaller size of the initial pool using

	  "swiotlb=" on the kernel command line.



	  If unsure, say N.



config DMA_BOUNCE_UNALIGNED_KMALLOC

	bool

	depends on SWIOTLB

kernel/dma/swiotlb.c

+13 −0
Original line number Diff line number Diff line
@@ -330,6 +330,11 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags, 
	io_tlb_default_mem.force_bounce =

		swiotlb_force_bounce || (flags & SWIOTLB_FORCE);



#ifdef CONFIG_SWIOTLB_DYNAMIC

	if (!remap)

		io_tlb_default_mem.can_grow = true;

#endif



	if (!default_nareas)

		swiotlb_adjust_nareas(num_possible_cpus());
@@ -400,6 +405,11 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask, 


	io_tlb_default_mem.force_bounce = swiotlb_force_bounce;



#ifdef CONFIG_SWIOTLB_DYNAMIC

	if (!remap)

		io_tlb_default_mem.can_grow = true;

#endif



	if (!default_nareas)

		swiotlb_adjust_nareas(num_possible_cpus());
@@ -1073,6 +1083,9 @@ bool is_swiotlb_active(struct device *dev) 
 */

phys_addr_t default_swiotlb_base(void)

{

#ifdef CONFIG_SWIOTLB_DYNAMIC

	io_tlb_default_mem.can_grow = false;

#endif

	return io_tlb_default_mem.defpool.start;

}