Commit e71e60cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-5.19-2022-06-06' of git://git.infradead.org/users/hch/dma-mapping 

Pull dma-mapping fixes from Christoph Hellwig:

 - fix a regressin in setting swiotlb ->force_bounce (me)

 - make dma-debug less chatty (Rob Clark)

* tag 'dma-mapping-5.19-2022-06-06' of git://git.infradead.org/users/hch/dma-mapping:
  swiotlb: fix setting ->force_bounce
  dma-debug: make things less spammy under memory pressure
parents f2906aa8 e15db62b

kernel/dma/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static void add_dma_entry(struct dma_debug_entry *entry, unsigned long attrs) 


	rc = active_cacheline_insert(entry);

	if (rc == -ENOMEM) {

		pr_err("cacheline tracking ENOMEM, dma-debug disabled\n");

		pr_err_once("cacheline tracking ENOMEM, dma-debug disabled\n");

		global_disable = true;

	} else if (rc == -EEXIST && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)) {

		err_printk(entry->dev, entry,

kernel/dma/swiotlb.c

+6 −8
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ void __init swiotlb_update_mem_attributes(void) 
}



static void swiotlb_init_io_tlb_mem(struct io_tlb_mem *mem, phys_addr_t start,

				    unsigned long nslabs, bool late_alloc)

		unsigned long nslabs, unsigned int flags, bool late_alloc)

{

	void *vaddr = phys_to_virt(start);

	unsigned long bytes = nslabs << IO_TLB_SHIFT, i;
@@ -203,8 +203,7 @@ static void swiotlb_init_io_tlb_mem(struct io_tlb_mem *mem, phys_addr_t start, 
	mem->index = 0;

	mem->late_alloc = late_alloc;



	if (swiotlb_force_bounce)

		mem->force_bounce = true;

	mem->force_bounce = swiotlb_force_bounce || (flags & SWIOTLB_FORCE);



	spin_lock_init(&mem->lock);

	for (i = 0; i < mem->nslabs; i++) {
@@ -275,8 +274,7 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags, 
		panic("%s: Failed to allocate %zu bytes align=0x%lx\n",

		      __func__, alloc_size, PAGE_SIZE);



	swiotlb_init_io_tlb_mem(mem, __pa(tlb), nslabs, false);

	mem->force_bounce = flags & SWIOTLB_FORCE;

	swiotlb_init_io_tlb_mem(mem, __pa(tlb), nslabs, flags, false);



	if (flags & SWIOTLB_VERBOSE)

		swiotlb_print_info();
@@ -348,7 +346,7 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask, 


	set_memory_decrypted((unsigned long)vstart,

			     (nslabs << IO_TLB_SHIFT) >> PAGE_SHIFT);

	swiotlb_init_io_tlb_mem(mem, virt_to_phys(vstart), nslabs, true);

	swiotlb_init_io_tlb_mem(mem, virt_to_phys(vstart), nslabs, 0, true);



	swiotlb_print_info();

	return 0;
@@ -835,8 +833,8 @@ static int rmem_swiotlb_device_init(struct reserved_mem *rmem, 


		set_memory_decrypted((unsigned long)phys_to_virt(rmem->base),

				     rmem->size >> PAGE_SHIFT);

		swiotlb_init_io_tlb_mem(mem, rmem->base, nslabs, false);

		mem->force_bounce = true;

		swiotlb_init_io_tlb_mem(mem, rmem->base, nslabs, SWIOTLB_FORCE,

				false);

		mem->for_alloc = true;



		rmem->priv = mem;