Commit 5c850d31 authored by Tianyu Lan's avatar Tianyu Lan Committed by Christoph Hellwig
Browse files

swiotlb: fix passing local variable to debugfs_create_ulong() 



Debugfs node will be run-timely checked and so local variable
should be not passed to debugfs_create_ulong(). Fix it via
debugfs_create_file() to create io_tlb_used node and calculate
used io tlb number with fops_io_tlb_used attribute.

Fixes: 20347fca ("swiotlb: split up the global swiotlb lock")
Signed-off-by: default avatarTianyu Lan <tiala@microsoft.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 84197024

kernel/dma/swiotlb.c

+9 −3
Original line number Diff line number Diff line
@@ -912,17 +912,23 @@ bool is_swiotlb_active(struct device *dev) 
}

EXPORT_SYMBOL_GPL(is_swiotlb_active);



static int io_tlb_used_get(void *data, u64 *val)

{

	*val = mem_used(&io_tlb_default_mem);

	return 0;

}

DEFINE_DEBUGFS_ATTRIBUTE(fops_io_tlb_used, io_tlb_used_get, NULL, "%llu\n");



static void swiotlb_create_debugfs_files(struct io_tlb_mem *mem,

					 const char *dirname)

{

	unsigned long used = mem_used(mem);



	mem->debugfs = debugfs_create_dir(dirname, io_tlb_default_mem.debugfs);

	if (!mem->nslabs)

		return;



	debugfs_create_ulong("io_tlb_nslabs", 0400, mem->debugfs, &mem->nslabs);

	debugfs_create_ulong("io_tlb_used", 0400, mem->debugfs, &used);

	debugfs_create_file("io_tlb_used", 0400, mem->debugfs, NULL,

			&fops_io_tlb_used);

}



static int __init __maybe_unused swiotlb_create_default_debugfs(void)