[PATCH akpm v2] lib: test_sort: make it explicitly non-modular

[PATCH akpm v2] lib: test_sort: make it explicitly non-modular

[Paul Gortmaker]

The Kconfig currently controlling compilation of this code is:

     lib/Kconfig.debug:config TEST_SORT
     lib/Kconfig.debug:      bool "Array-based sort test"

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

Lets remove the couple traces of modular infrastructure use, so that
when reading the code there is no doubt it is builtin-only.

Since module_init translates to device_initcall in the non-modular
case, the init ordering becomes slightly earlier when we change it
to use subsys_initcall as done here.  However, since it is a self
contained test, this shouldn't be an issue and subsys_initcall
seems like a better fit for this particular case.

We also delete the MODULE_LICENSE tag since that information is now
contained at the top of the file in the comments.

Cc: Kostenzer Felix <fkostenzer@live.at>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

[v2: update for Arnd's commit that moved the code out into a
 separate file.]

 lib/test_sort.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/test_sort.c b/lib/test_sort.c
index d389c1cc2f6c..6bb2fd4a3e72 100644
--- a/lib/test_sort.c
+++ b/lib/test_sort.c
@@ -1,8 +1,11 @@
 #include <linux/sort.h>
 #include <linux/slab.h>
-#include <linux/module.h>
+#include <linux/init.h>
 
-/* a simple boot-time regression test */
+/*
+ * A simple boot-time regression test
+ * License: GPL
+ */
 
 #define TEST_LEN 1000
 
@@ -38,6 +41,4 @@ static int __init test_sort_init(void)
 	kfree(a);
 	return err;
 }
-
-module_init(test_sort_init);
-MODULE_LICENSE("GPL");
+subsys_initcall(test_sort_init);
-- 
2.11.0

Re: [PATCH akpm v2] lib: test_sort: make it explicitly non-modular

[Geert Uytterhoeven]

Hi Paul,

On Tue, Jan 24, 2017 at 11:56 PM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> The Kconfig currently controlling compilation of this code is:
>
>      lib/Kconfig.debug:config TEST_SORT
>      lib/Kconfig.debug:      bool "Array-based sort test"
>
> ...meaning that it currently is not being built as a module by anyone.
>
> Lets remove the couple traces of modular infrastructure use, so that
> when reading the code there is no doubt it is builtin-only.
>
> Since module_init translates to device_initcall in the non-modular
> case, the init ordering becomes slightly earlier when we change it
> to use subsys_initcall as done here.  However, since it is a self
> contained test, this shouldn't be an issue and subsys_initcall
> seems like a better fit for this particular case.
>
> We also delete the MODULE_LICENSE tag since that information is now
> contained at the top of the file in the comments.

Yeah, MODULE_LICENSE is too easy to grep for... :-(

> Cc: Kostenzer Felix <fkostenzer@live.at>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Can we please stop doing this?

It's very valuable to have modular tests, so you can run them just by
insmodding the test, instead of needing a separate kernel that runs them
at boot.

Will send a revert + modular enablement...

Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

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

Re: [PATCH akpm v2] lib: test_sort: make it explicitly non-modular

[Paul Gortmaker]

[Re: [PATCH akpm v2] lib: test_sort: make it explicitly non-modular] On 28/02/2017 (Tue 12:43) Geert Uytterhoeven wrote:

> Hi Paul,
> 
> On Tue, Jan 24, 2017 at 11:56 PM, Paul Gortmaker
> <paul.gortmaker@windriver.com> wrote:
> > The Kconfig currently controlling compilation of this code is:
> >
> >      lib/Kconfig.debug:config TEST_SORT
> >      lib/Kconfig.debug:      bool "Array-based sort test"
> >
> > ...meaning that it currently is not being built as a module by anyone.
> >
> > Lets remove the couple traces of modular infrastructure use, so that
> > when reading the code there is no doubt it is builtin-only.
> >
> > Since module_init translates to device_initcall in the non-modular
> > case, the init ordering becomes slightly earlier when we change it
> > to use subsys_initcall as done here.  However, since it is a self
> > contained test, this shouldn't be an issue and subsys_initcall
> > seems like a better fit for this particular case.
> >
> > We also delete the MODULE_LICENSE tag since that information is now
> > contained at the top of the file in the comments.
> 
> Yeah, MODULE_LICENSE is too easy to grep for... :-(
> 
> > Cc: Kostenzer Felix <fkostenzer@live.at>
> > Cc: Arnd Bergmann <arnd@arndb.de>
> > Cc: Andrew Morton <akpm@linux-foundation.org>
> > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> 
> Can we please stop doing this?
> 

As I've said many times, I have no problem with things being modular if
there is a use case for it to be so.  And it makes sense to have that
demand driven.

What I'm striving for is consistency between the Kconfig and the source
code, and I'll continue to work on that.

Thanks,
Paul.
--

> It's very valuable to have modular tests, so you can run them just by
> insmodding the test, instead of needing a separate kernel that runs them
> at boot.
> 
> Will send a revert + modular enablement...
> 
> Thanks!
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> 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