lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dma-debug: fix debugfs initialization order

Browse Source 
[ Upstream commit 173735c346c412d9f084825ecb04f24ada0e2986 ]

Due to link order, dma_debug_init is called before debugfs has a chance
to initialize (via debugfs_init which also happens in the core initcall
stage), so the directories for dma-debug are never created.

Decouple dma_debug_fs_init from dma_debug_init and defer its init until
core_initcall_sync (after debugfs has been initialized) while letting
dma-debug initialization occur as soon as possible to catch any early
mappings, as suggested in [1].

[1] https://lore.kernel.org/linux-iommu/YIgGa6yF%2Fadg8OSN@kroah.com/

Fixes: 15b28bbcd5 ("dma-debug: move initialization to common code")
Signed-off-by: Anthony Iliopoulos <ailiop@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Anthony Iliopoulos 2021-07-22 16:10:55 +02:00 committed by Greg Kroah-Hartman
parent 9315497b17
commit be09cbd6a3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/dma/debug.c
View File

@ -846,7 +846,7 @@ static int dump_show(struct seq_file *seq, void *v)
} }
DEFINE_SHOW_ATTRIBUTE(dump); DEFINE_SHOW_ATTRIBUTE(dump);
static void dma_debug_fs_init(void) static int __init dma_debug_fs_init(void)
{ {
struct dentry *dentry = debugfs_create_dir("dma-api", NULL); struct dentry *dentry = debugfs_create_dir("dma-api", NULL);
@ -859,7 +859,10 @@ static void dma_debug_fs_init(void)
debugfs_create_u32("nr_total_entries", 0444, dentry, &nr_total_entries); debugfs_create_u32("nr_total_entries", 0444, dentry, &nr_total_entries);
debugfs_create_file("driver_filter", 0644, dentry, NULL, &filter_fops); debugfs_create_file("driver_filter", 0644, dentry, NULL, &filter_fops);
debugfs_create_file("dump", 0444, dentry, NULL, &dump_fops); debugfs_create_file("dump", 0444, dentry, NULL, &dump_fops);
return 0;
} }
core_initcall_sync(dma_debug_fs_init);
static int device_dma_allocations(struct device *dev, struct dma_debug_entry **out_entry) static int device_dma_allocations(struct device *dev, struct dma_debug_entry **out_entry)
{ {
@ -944,8 +947,6 @@ static int dma_debug_init(void)
spin_lock_init(&dma_entry_hash[i].lock); spin_lock_init(&dma_entry_hash[i].lock);
} }
dma_debug_fs_init();
nr_pages = DIV_ROUND_UP(nr_prealloc_entries, DMA_DEBUG_DYNAMIC_ENTRIES); nr_pages = DIV_ROUND_UP(nr_prealloc_entries, DMA_DEBUG_DYNAMIC_ENTRIES);
for (i = 0; i < nr_pages; ++i) for (i = 0; i < nr_pages; ++i)
dma_debug_create_entries(GFP_KERNEL); dma_debug_create_entries(GFP_KERNEL);