Skip to contentSkip to conversation

lib/test_bitops: Do the full test during module init

PATCH Superseded Geert Uytterhoeven 2 participants 3 messages Jul 6, 2020

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib/test_bitops: Do the full test during module init

Currently, the bitops test consists of two parts: one part is executed during module load, the second part during module unload. This is cumbersome for the user, as he has to perform two steps to execute all tests, and is different from most (all?) other tests.

Merge the two parts, so both are executed during module load.

---
 lib/test_bitops.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)
lib/test_bitops.c +8 -11
index ced25e3a779baf96..810ae6bc72fac5c3 100644
@@ -50,11 +50,11 @@ static unsigned long order_comb_long[][2] = {
 };
 #endif
 
-static int __init test_bitops_startup(void)
+static int __init test_bitops(void)
 {
-	int i;
+	int i, bit_set;
 
-	pr_warn("Loaded test module\n");
+	pr_info("Starting bitops test\n");
 	set_bit(BITOPS_4, g_bitmap);
 	set_bit(BITOPS_7, g_bitmap);
 	set_bit(BITOPS_11, g_bitmap);
@@ -81,12 +81,8 @@ static int __init test_bitops_startup(void)
 				       order_comb_long[i][0]);
 	}
 #endif
-	return 0;
-}
 
-static void __exit test_bitops_unstartup(void)
-{
-	int bit_set;
+	barrier();
 
 	clear_bit(BITOPS_4, g_bitmap);
 	clear_bit(BITOPS_7, g_bitmap);
@@ -98,11 +94,12 @@ static void __exit test_bitops_unstartup(void)
 	if (bit_set != BITOPS_LAST)
 		pr_err("ERROR: FOUND SET BIT %d\n", bit_set);
 
-	pr_warn("Unloaded test module\n");
+	pr_info("Completed bitops test\n");
+
+	return 0;
 }
 
-module_init(test_bitops_startup);
-module_exit(test_bitops_unstartup);
+module_init(test_bitops);
 
 MODULE_AUTHOR("Jesse Brandeburg <[email protected]>, Wei Yang <[email protected]>");
 MODULE_LICENSE("GPL");
Signature · 1 line
2.17.1
#1 lore raw
Quoted 7 lines · Geert Uytterhoeven

Currently, the bitops test consists of two parts: one part is executed during module load, the second part during module unload. This is cumbersome for the user, as he has to perform two steps to execute all tests, and is different from most (all?) other tests.

Merge the two parts, so both are executed during module load.

Does your change prevent you from unloading the module?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw

Hi Andy,

Quoted 9 lines · Andy Shevchenko
Quoted 6 lines · Geert Uytterhoeven

Currently, the bitops test consists of two parts: one part is executed during module load, the second part during module unload. This is cumbersome for the user, as he has to perform two steps to execute all tests, and is different from most (all?) other tests.

Merge the two parts, so both are executed during module load.

Does your change prevent you from unloading the module?

Good point, you need a dummy module_exit() for that. Stay tuned for v2.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds