Skip to contentSkip to conversation

kernel: make rcu/tree_trace.c explicitly non-modular

PATCH Superseded Paul Gortmaker 3 participants 5 messages Aug 25, 2015 – Aug 26, 2015 RCU

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel: make rcu/tree_trace.c explicitly non-modular

The Kconfig currently controlling compilation of this code is:

init/Kconfig:config TREE_RCU_TRACE
init/Kconfig: def_bool RCU_TRACE && ( TREE_RCU || PREEMPT_RCU )

...meaning that it currently is not being built as a module by anyone.

Lets remove the modular code that is essentially orphaned, so that when reading the file there is no doubt it is builtin-only.

Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We could consider moving this to an earlier initcall if desired.

We don't replace module.h with init.h since the file already has that. We also delete the moduleparam.h include that is left over from commit 64db4cfff99c04cd5f550357edcc8780f96b54a2 (""Tree RCU": scalable classic RCU implementation") since it is not needed here either.

We leave some tags like MODULE_AUTHOR for documentation purposes.

Cc "Paul E. McKenney" <[email protected]>
Cc Josh Triplett <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Mathieu Desnoyers <[email protected]>
Cc Lai Jiangshan <[email protected]>
kernel/rcu/tree_trace.c +3 -11
index 6fc4c5ff3bb5..e8a0a11e8dd7 100644
@@ -33,9 +33,7 @@
 #include <linux/sched.h>
 #include <linux/atomic.h>
 #include <linux/bitops.h>
-#include <linux/module.h>
 #include <linux/completion.h>
-#include <linux/moduleparam.h>
 #include <linux/percpu.h>
 #include <linux/notifier.h>
 #include <linux/cpu.h>
@@ -487,16 +485,10 @@ free_out:
 	debugfs_remove_recursive(rcudir);
 	return 1;
 }
+device_initcall(rcutree_trace_init);
 
-static void __exit rcutree_trace_cleanup(void)
-{
-	debugfs_remove_recursive(rcudir);
-}
-
-
-module_init(rcutree_trace_init);
-module_exit(rcutree_trace_cleanup);
-
+/*
 MODULE_AUTHOR("Paul E. McKenney");
 MODULE_DESCRIPTION("Read-Copy Update tracing for hierarchical implementation");
 MODULE_LICENSE("GPL");
+*/
Signature · 1 line
2.5.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 19 lines · Paul Gortmaker

The Kconfig currently controlling compilation of this code is:

init/Kconfig:config TREE_RCU_TRACE
init/Kconfig: def_bool RCU_TRACE && ( TREE_RCU || PREEMPT_RCU )

...meaning that it currently is not being built as a module by anyone.

Lets remove the modular code that is essentially orphaned, so that when reading the file there is no doubt it is builtin-only.

Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We could consider moving this to an earlier initcall if desired.

We don't replace module.h with init.h since the file already has that. We also delete the moduleparam.h include that is left over from commit 64db4cfff99c04cd5f550357edcc8780f96b54a2 (""Tree RCU": scalable classic RCU implementation") since it is not needed here either.

Quoted 8 lines

We leave some tags like MODULE_AUTHOR for documentation purposes.

Cc "Paul E. McKenney" <[email protected]>
Cc Josh Triplett <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Mathieu Desnoyers <[email protected]>
Cc Lai Jiangshan <[email protected]>

Seems reasonable, though leaving the MODULE_* metadata commented out at the end seems odd. I'd suggest using the DESCRIPTION to update the comment at the top (which is actually outdated and needs s/classic/hierarchical/), dropping the MODULE_LICENSE (redundant with the license header), and changing "MODULE_AUTHOR" into an "Author:" under the copyright.

With that:

Quoted 37 lines
kernel/rcu/tree_trace.c +3 -11
index 6fc4c5ff3bb5..e8a0a11e8dd7 100644
@@ -33,9 +33,7 @@
 #include <linux/sched.h>
 #include <linux/atomic.h>
 #include <linux/bitops.h>
-#include <linux/module.h>
 #include <linux/completion.h>
-#include <linux/moduleparam.h>
 #include <linux/percpu.h>
 #include <linux/notifier.h>
 #include <linux/cpu.h>
@@ -487,16 +485,10 @@ free_out:
 	debugfs_remove_recursive(rcudir);
 	return 1;
 }
+device_initcall(rcutree_trace_init);
 
-static void __exit rcutree_trace_cleanup(void)
-{
-	debugfs_remove_recursive(rcudir);
-}
-
-
-module_init(rcutree_trace_init);
-module_exit(rcutree_trace_cleanup);
-
+/*
 MODULE_AUTHOR("Paul E. McKenney");
 MODULE_DESCRIPTION("Read-Copy Update tracing for hierarchical implementation");
 MODULE_LICENSE("GPL");
+*/
Signature · 1 line
2.5.0
#2 lore raw
Quoted 29 lines · [Re: [PATCH] kernel: make rcu/tree_trace.c explicitly non-modular] On…
Quoted 19 lines · Paul Gortmaker

The Kconfig currently controlling compilation of this code is:

init/Kconfig:config TREE_RCU_TRACE
init/Kconfig: def_bool RCU_TRACE && ( TREE_RCU || PREEMPT_RCU )

...meaning that it currently is not being built as a module by anyone.

Lets remove the modular code that is essentially orphaned, so that when reading the file there is no doubt it is builtin-only.

Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We could consider moving this to an earlier initcall if desired.

We don't replace module.h with init.h since the file already has that. We also delete the moduleparam.h include that is left over from commit 64db4cfff99c04cd5f550357edcc8780f96b54a2 (""Tree RCU": scalable classic RCU implementation") since it is not needed here either.

Quoted 8 lines

We leave some tags like MODULE_AUTHOR for documentation purposes.

Cc "Paul E. McKenney" <[email protected]>
Cc Josh Triplett <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Mathieu Desnoyers <[email protected]>
Cc Lai Jiangshan <[email protected]>
Quoted 2 lines

Seems reasonable, though leaving the MODULE_* metadata commented out at the end seems odd. I'd suggest using the DESCRIPTION to update the

That was largely driven by the desire to make as minimalist change as possible...

Quoted 4 lines

comment at the top (which is actually outdated and needs s/classic/hierarchical/), dropping the MODULE_LICENSE (redundant with the license header), and changing "MODULE_AUTHOR" into an "Author:" under the copyright.

...but I can also do it that way too; fine by me. I'll wait a bit to give Paul a chance to comment before resending, in case he also wants some changes.

P.
--

Quoted 41 lines

With that:

Quoted 37 lines
kernel/rcu/tree_trace.c +3 -11
index 6fc4c5ff3bb5..e8a0a11e8dd7 100644
@@ -33,9 +33,7 @@
 #include <linux/sched.h>
 #include <linux/atomic.h>
 #include <linux/bitops.h>
-#include <linux/module.h>
 #include <linux/completion.h>
-#include <linux/moduleparam.h>
 #include <linux/percpu.h>
 #include <linux/notifier.h>
 #include <linux/cpu.h>
@@ -487,16 +485,10 @@ free_out:
 	debugfs_remove_recursive(rcudir);
 	return 1;
 }
+device_initcall(rcutree_trace_init);
 
-static void __exit rcutree_trace_cleanup(void)
-{
-	debugfs_remove_recursive(rcudir);
-}
-
-
-module_init(rcutree_trace_init);
-module_exit(rcutree_trace_cleanup);
-
+/*
 MODULE_AUTHOR("Paul E. McKenney");
 MODULE_DESCRIPTION("Read-Copy Update tracing for hierarchical implementation");
 MODULE_LICENSE("GPL");
+*/
Signature · 1 line
2.5.0
#3 lore raw
Quoted 31 lines · Paul Gortmaker
Quoted 29 lines · [Re: [PATCH] kernel: make rcu/tree_trace.c explicitly non-modular] On…
Quoted 27 lines · Paul Gortmaker

The Kconfig currently controlling compilation of this code is:

init/Kconfig:config TREE_RCU_TRACE
init/Kconfig: def_bool RCU_TRACE && ( TREE_RCU || PREEMPT_RCU )

...meaning that it currently is not being built as a module by anyone.

Lets remove the modular code that is essentially orphaned, so that when reading the file there is no doubt it is builtin-only.

Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We could consider moving this to an earlier initcall if desired.

We don't replace module.h with init.h since the file already has that. We also delete the moduleparam.h include that is left over from commit 64db4cfff99c04cd5f550357edcc8780f96b54a2 (""Tree RCU": scalable classic RCU implementation") since it is not needed here either.

We leave some tags like MODULE_AUTHOR for documentation purposes.

Cc "Paul E. McKenney" <[email protected]>
Cc Josh Triplett <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Mathieu Desnoyers <[email protected]>
Cc Lai Jiangshan <[email protected]>
Quoted 5 lines
Quoted 2 lines

Seems reasonable, though leaving the MODULE_* metadata commented out at the end seems odd. I'd suggest using the DESCRIPTION to update the

That was largely driven by the desire to make as minimalist change as possible...

This would be for v4.4, so getting rid of the three "MODULE_*" lines at the end makes sense, as does moving any needed info to the comment block at the beginning of the file.

Quoted 8 lines
Quoted 4 lines

comment at the top (which is actually outdated and needs s/classic/hierarchical/), dropping the MODULE_LICENSE (redundant with the license header), and changing "MODULE_AUTHOR" into an "Author:" under the copyright.

...but I can also do it that way too; fine by me. I'll wait a bit to give Paul a chance to comment before resending, in case he also wants some changes.

The "classic" is indeed obsolete, may as well change it while we are at it. I was concerned about the THIS_MODULE instances, but this appears to be defined even for non-module builds, so should be OK.

So please do send a patch with the changes Josh called out.

Thanx, Paul

#4 lore raw
Quoted 35 lines · [Re: [PATCH] kernel: make rcu/tree_trace.c explicitly non-modular] On…
Quoted 34 lines · Paul Gortmaker
Quoted 31 lines · [Re: [PATCH] kernel: make rcu/tree_trace.c explicitly non-modular] On…
Quoted 19 lines · Paul Gortmaker

The Kconfig currently controlling compilation of this code is:

init/Kconfig:config TREE_RCU_TRACE
init/Kconfig: def_bool RCU_TRACE && ( TREE_RCU || PREEMPT_RCU )

...meaning that it currently is not being built as a module by anyone.

Lets remove the modular code that is essentially orphaned, so that when reading the file there is no doubt it is builtin-only.

Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We could consider moving this to an earlier initcall if desired.

We don't replace module.h with init.h since the file already has that. We also delete the moduleparam.h include that is left over from commit 64db4cfff99c04cd5f550357edcc8780f96b54a2 (""Tree RCU": scalable classic RCU implementation") since it is not needed here either.

Quoted 8 lines

We leave some tags like MODULE_AUTHOR for documentation purposes.

Cc "Paul E. McKenney" <[email protected]>
Cc Josh Triplett <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Mathieu Desnoyers <[email protected]>
Cc Lai Jiangshan <[email protected]>

Seems reasonable, though leaving the MODULE_* metadata commented out at the end seems odd. I'd suggest using the DESCRIPTION to update the

Quoted 6 lines
Quoted 2 lines

That was largely driven by the desire to make as minimalist change as possible...

This would be for v4.4, so getting rid of the three "MODULE_*" lines at the end makes sense, as does moving any needed info to the comment block at the beginning of the file.

OK, no problem.

Quoted 6 lines
Quoted 6 lines
Quoted 5 lines

comment at the top (which is actually outdated and needs s/classic/hierarchical/), dropping the MODULE_LICENSE (redundant with the license header), and changing "MODULE_AUTHOR" into an "Author:" under the copyright.

Quoted 7 lines
Quoted 3 lines

...but I can also do it that way too; fine by me. I'll wait a bit to give Paul a chance to comment before resending, in case he also wants some changes.

The "classic" is indeed obsolete, may as well change it while we are at it. I was concerned about the THIS_MODULE instances, but this appears to be defined even for non-module builds, so should be OK.

Ah, ye of little faith. I dealt with THIS_MODULE in f5016932, now over four years ago (gasp!)

Quoted 2 lines

So please do send a patch with the changes Josh called out.

Will do.

Thanks,
Paul.
--

Quoted 3 lines

Thanx, Paul