[PATCH-next v2] net/ipv4: don't use module_init in non-modular gre_offload

[PATCH-next v2] net/ipv4: don't use module_init in non-modular gre_offload

[Paul Gortmaker]

Recent commit 438e38fadca2f6e57eeecc08326c8a95758594d4
("gre_offload: statically build GRE offloading support") added
new module_init/module_exit calls to the gre_offload.c file.

The file is obj-y and can't be anything other than built-in.
Currently it can never be built modular, so using module_init
as an alias for __initcall can be somewhat misleading.

Fix this up now, so that we can relocate module_init from
init.h into module.h in the future.  If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.  We also make the inclusion explicit.

Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups.  As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.

As for the module_exit, rather than replace it with __exitcall,
we simply remove it, since it appears only UML does anything
with those, and even for UML, there is no relevant cleanup
to be done here.

Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

v2: dump gre_offload_exit entirely as suggested by Eric.

 net/ipv4/gre_offload.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c
index 29512e3e7e7c..f1d32280cb54 100644
--- a/net/ipv4/gre_offload.c
+++ b/net/ipv4/gre_offload.c
@@ -11,6 +11,7 @@
  */
 
 #include <linux/skbuff.h>
+#include <linux/init.h>
 #include <net/protocol.h>
 #include <net/gre.h>
 
@@ -283,11 +284,4 @@ static int __init gre_offload_init(void)
 {
 	return inet_add_offload(&gre_offload, IPPROTO_GRE);
 }
-
-static void __exit gre_offload_exit(void)
-{
-	inet_del_offload(&gre_offload, IPPROTO_GRE);
-}
-
-module_init(gre_offload_init);
-module_exit(gre_offload_exit);
+device_initcall(gre_offload_init);
-- 
1.8.5.2

Re: [PATCH-next v2] net/ipv4: don't use module_init in non-modular gre_offload

[Eric Dumazet]

On Wed, 2014-01-15 at 11:19 -0500, Paul Gortmaker wrote:
> Recent commit 438e38fadca2f6e57eeecc08326c8a95758594d4
> ("gre_offload: statically build GRE offloading support") added
> new module_init/module_exit calls to the gre_offload.c file.
...
> Cc: Eric Dumazet <edumazet@google.com>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
> 
> v2: dump gre_offload_exit entirely as suggested by Eric.

Acked-by: Eric Dumazet <edumazet@google.com>

Thanks !

Re: [PATCH-next v2] net/ipv4: don't use module_init in non-modular gre_offload

[David Miller]

From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 16 Jan 2014 14:05:11 -0800

> On Wed, 2014-01-15 at 11:19 -0500, Paul Gortmaker wrote:
>> Recent commit 438e38fadca2f6e57eeecc08326c8a95758594d4
>> ("gre_offload: statically build GRE offloading support") added
>> new module_init/module_exit calls to the gre_offload.c file.
> ...
>> Cc: Eric Dumazet <edumazet@google.com>
>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
>> ---
>> 
>> v2: dump gre_offload_exit entirely as suggested by Eric.
> 
> Acked-by: Eric Dumazet <edumazet@google.com>

Applied, thank you.