Skip to content

Commit fdf09ab

Browse files
danieljordan10Jessica Yu
authored and
Jessica Yu
committed
module: statically initialize init section freeing data
Corentin hit the following workqueue warning when running with CRYPTO_MANAGER_EXTRA_TESTS: WARNING: CPU: 2 PID: 147 at kernel/workqueue.c:1473 __queue_work+0x3b8/0x3d0 Modules linked in: ghash_generic CPU: 2 PID: 147 Comm: modprobe Not tainted 5.6.0-rc1-next-20200214-00068-g166c9264f0b1-dirty #545 Hardware name: Pine H64 model A (DT) pc : __queue_work+0x3b8/0x3d0 Call trace: __queue_work+0x3b8/0x3d0 queue_work_on+0x6c/0x90 do_init_module+0x188/0x1f0 load_module+0x1d00/0x22b0 I wasn't able to reproduce on x86 or rpi 3b+. This is WARN_ON(!list_empty(&work->entry)) from __queue_work(), and it happens because the init_free_wq work item isn't initialized in time for a crypto test that requests the gcm module. Some crypto tests were recently moved earlier in boot as explained in commit c4741b2 ("crypto: run initcalls for generic implementations earlier"), which went into mainline less than two weeks before the Fixes commit. Avoid the warning by statically initializing init_free_wq and the corresponding llist. Link: https://lore.kernel.org/lkml/20200217204803.GA13479@Red/ Fixes: 1a7b7d9 ("modules: Use vmalloc special flag") Reported-by: Corentin Labbe <[email protected]> Tested-by: Corentin Labbe <[email protected]> Tested-on: sun50i-h6-pine-h64 Tested-on: imx8mn-ddr4-evk Tested-on: sun50i-a64-bananapi-m64 Reviewed-by: Eric Biggers <[email protected]> Signed-off-by: Daniel Jordan <[email protected]> Signed-off-by: Jessica Yu <[email protected]>
1 parent 14721ad commit fdf09ab

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

kernel/module.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@ EXPORT_SYMBOL_GPL(module_mutex);
9191
static LIST_HEAD(modules);
9292

9393
/* Work queue for freeing init sections in success case */
94-
static struct work_struct init_free_wq;
95-
static struct llist_head init_free_list;
94+
static void do_free_init(struct work_struct *w);
95+
static DECLARE_WORK(init_free_wq, do_free_init);
96+
static LLIST_HEAD(init_free_list);
9697

9798
#ifdef CONFIG_MODULES_TREE_LOOKUP
9899

@@ -3582,14 +3583,6 @@ static void do_free_init(struct work_struct *w)
35823583
}
35833584
}
35843585

3585-
static int __init modules_wq_init(void)
3586-
{
3587-
INIT_WORK(&init_free_wq, do_free_init);
3588-
init_llist_head(&init_free_list);
3589-
return 0;
3590-
}
3591-
module_init(modules_wq_init);
3592-
35933586
/*
35943587
* This is where the real work happens.
35953588
*

0 commit comments

Comments
 (0)