* [PATCH net-next v2] net/smc: fix compile warning for smc_sysctl
@ 2022-03-03 8:40 Dust Li
2022-03-05 5:31 ` Jakub Kicinski
0 siblings, 1 reply; 3+ messages in thread
From: Dust Li @ 2022-03-03 8:40 UTC (permalink / raw)
To: Karsten Graul, Tony Lu, davem, kuba; +Cc: netdev, linux-s390, linux-rdma
kernel test robot reports multiple warning for smc_sysctl:
In file included from net/smc/smc_sysctl.c:17:
>> net/smc/smc_sysctl.h:23:5: warning: no previous prototype \
for function 'smc_sysctl_init' [-Wmissing-prototypes]
int smc_sysctl_init(void)
^
and
>> WARNING: modpost: vmlinux.o(.text+0x12ced2d): Section mismatch \
in reference from the function smc_sysctl_exit() to the variable
.init.data:smc_sysctl_ops
The function smc_sysctl_exit() references
the variable __initdata smc_sysctl_ops.
This is often because smc_sysctl_exit lacks a __initdata
annotation or the annotation of smc_sysctl_ops is wrong.
and
net/smc/smc_sysctl.c: In function 'smc_sysctl_init_net':
net/smc/smc_sysctl.c:47:17: error: 'struct netns_smc' has no member named 'smc_hdr'
47 | net->smc.smc_hdr = register_net_sysctl(net, "net/smc", table);
Since we don't need global sysctl initialization. To make things
clean and simple, remove the global pernet_operations and
smc_sysctl_{init|exit}. Call smc_sysctl_net_{init|exit} directly
from smc_net_{init|exit}.
Also initialized sysctl_autocorking_size if CONFIG_SYSCTL it not
set, this makes sure SMC autocorking is enabled by default if
CONFIG_SYSCTL is not set.
Fixes: 462791bbfa35 ("net/smc: add sysctl interface for SMC")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Dust Li <dust.li@linux.alibaba.com>
---
v2: 1. Removes pernet_operations and smc_sysctl_{init|exit}
2. Initialize sysctl_autocorking_size if CONFIG_SYSCTL not set
---
net/smc/Makefile | 3 ++-
net/smc/af_smc.c | 15 ++++++---------
net/smc/smc_sysctl.c | 19 ++-----------------
net/smc/smc_sysctl.h | 9 +++++----
4 files changed, 15 insertions(+), 31 deletions(-)
diff --git a/net/smc/Makefile b/net/smc/Makefile
index 640af9a39f9c..875efcd126a2 100644
--- a/net/smc/Makefile
+++ b/net/smc/Makefile
@@ -4,4 +4,5 @@ obj-$(CONFIG_SMC) += smc.o
obj-$(CONFIG_SMC_DIAG) += smc_diag.o
smc-y := af_smc.o smc_pnet.o smc_ib.o smc_clc.o smc_core.o smc_wr.o smc_llc.o
smc-y += smc_cdc.o smc_tx.o smc_rx.o smc_close.o smc_ism.o smc_netlink.o smc_stats.o
-smc-y += smc_tracepoint.o smc_sysctl.o
+smc-y += smc_tracepoint.o
+smc-$(CONFIG_SYSCTL) += smc_sysctl.o
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 6447607675fa..4ab17d35ca80 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -3173,11 +3173,17 @@ unsigned int smc_net_id;
static __net_init int smc_net_init(struct net *net)
{
+ int rc;
+
+ rc = smc_sysctl_net_init(net);
+ if (rc)
+ return rc;
return smc_pnet_net_init(net);
}
static void __net_exit smc_net_exit(struct net *net)
{
+ smc_sysctl_net_exit(net);
smc_pnet_net_exit(net);
}
@@ -3290,17 +3296,9 @@ static int __init smc_init(void)
goto out_sock;
}
- rc = smc_sysctl_init();
- if (rc) {
- pr_err("%s: sysctl_init fails with %d\n", __func__, rc);
- goto out_ulp;
- }
-
static_branch_enable(&tcp_have_smc);
return 0;
-out_ulp:
- tcp_unregister_ulp(&smc_ulp_ops);
out_sock:
sock_unregister(PF_SMC);
out_proto6:
@@ -3328,7 +3326,6 @@ static int __init smc_init(void)
static void __exit smc_exit(void)
{
static_branch_disable(&tcp_have_smc);
- smc_sysctl_exit();
tcp_unregister_ulp(&smc_ulp_ops);
sock_unregister(PF_SMC);
smc_core_exit();
diff --git a/net/smc/smc_sysctl.c b/net/smc/smc_sysctl.c
index 3b59876aaac9..c4a2ffb6deee 100644
--- a/net/smc/smc_sysctl.c
+++ b/net/smc/smc_sysctl.c
@@ -28,7 +28,7 @@ static struct ctl_table smc_table[] = {
{ }
};
-static __net_init int smc_sysctl_init_net(struct net *net)
+int smc_sysctl_net_init(struct net *net)
{
struct ctl_table *table;
@@ -59,22 +59,7 @@ static __net_init int smc_sysctl_init_net(struct net *net)
return -ENOMEM;
}
-static __net_exit void smc_sysctl_exit_net(struct net *net)
+void smc_sysctl_net_exit(struct net *net)
{
unregister_net_sysctl_table(net->smc.smc_hdr);
}
-
-static struct pernet_operations smc_sysctl_ops __net_initdata = {
- .init = smc_sysctl_init_net,
- .exit = smc_sysctl_exit_net,
-};
-
-int __init smc_sysctl_init(void)
-{
- return register_pernet_subsys(&smc_sysctl_ops);
-}
-
-void smc_sysctl_exit(void)
-{
- unregister_pernet_subsys(&smc_sysctl_ops);
-}
diff --git a/net/smc/smc_sysctl.h b/net/smc/smc_sysctl.h
index 49553ac236b6..66bd617e26ad 100644
--- a/net/smc/smc_sysctl.h
+++ b/net/smc/smc_sysctl.h
@@ -15,17 +15,18 @@
#ifdef CONFIG_SYSCTL
-int smc_sysctl_init(void);
-void smc_sysctl_exit(void);
+int smc_sysctl_net_init(struct net *net);
+void smc_sysctl_net_exit(struct net *net);
#else
-int smc_sysctl_init(void)
+static inline int smc_sysctl_net_init(struct net *net)
{
+ net->smc.sysctl_autocorking_size = SMC_AUTOCORKING_DEFAULT_SIZE;
return 0;
}
-void smc_sysctl_exit(void) { }
+static inline void smc_sysctl_net_exit(struct net *net) { }
#endif /* CONFIG_SYSCTL */
--
2.19.1.3.ge56e4f7
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v2] net/smc: fix compile warning for smc_sysctl
2022-03-03 8:40 [PATCH net-next v2] net/smc: fix compile warning for smc_sysctl Dust Li
@ 2022-03-05 5:31 ` Jakub Kicinski
2022-03-06 14:27 ` dust.li
0 siblings, 1 reply; 3+ messages in thread
From: Jakub Kicinski @ 2022-03-05 5:31 UTC (permalink / raw)
To: Dust Li; +Cc: Karsten Graul, Tony Lu, davem, netdev, linux-s390, linux-rdma
On Thu, 3 Mar 2022 16:40:06 +0800 Dust Li wrote:
> kernel test robot reports multiple warning for smc_sysctl:
>
> In file included from net/smc/smc_sysctl.c:17:
> >> net/smc/smc_sysctl.h:23:5: warning: no previous prototype \
> for function 'smc_sysctl_init' [-Wmissing-prototypes]
> int smc_sysctl_init(void)
> ^
> and
> >> WARNING: modpost: vmlinux.o(.text+0x12ced2d): Section mismatch \
> in reference from the function smc_sysctl_exit() to the variable
> .init.data:smc_sysctl_ops
> The function smc_sysctl_exit() references
> the variable __initdata smc_sysctl_ops.
> This is often because smc_sysctl_exit lacks a __initdata
> annotation or the annotation of smc_sysctl_ops is wrong.
>
> and
> net/smc/smc_sysctl.c: In function 'smc_sysctl_init_net':
> net/smc/smc_sysctl.c:47:17: error: 'struct netns_smc' has no member named 'smc_hdr'
> 47 | net->smc.smc_hdr = register_net_sysctl(net, "net/smc", table);
>
> Since we don't need global sysctl initialization. To make things
> clean and simple, remove the global pernet_operations and
> smc_sysctl_{init|exit}. Call smc_sysctl_net_{init|exit} directly
> from smc_net_{init|exit}.
>
> Also initialized sysctl_autocorking_size if CONFIG_SYSCTL it not
> set, this makes sure SMC autocorking is enabled by default if
> CONFIG_SYSCTL is not set.
I think that makes sense, one nit below.
> -static __net_init int smc_sysctl_init_net(struct net *net)
> +int smc_sysctl_net_init(struct net *net)
> {
> struct ctl_table *table;
>
> @@ -59,22 +59,7 @@ static __net_init int smc_sysctl_init_net(struct net *net)
> return -ENOMEM;
> }
>
> -static __net_exit void smc_sysctl_exit_net(struct net *net)
> +void smc_sysctl_net_exit(struct net *net)
> {
> unregister_net_sysctl_table(net->smc.smc_hdr);
> }
> +int smc_sysctl_net_init(struct net *net);
> +void smc_sysctl_net_exit(struct net *net);
I believe these functions can become / remain __net_init and __net_exit,
since all the callers are also marked as such.
> #else
>
> -int smc_sysctl_init(void)
> +static inline int smc_sysctl_net_init(struct net *net)
> {
> + net->smc.sysctl_autocorking_size = SMC_AUTOCORKING_DEFAULT_SIZE;
> return 0;
> }
>
> -void smc_sysctl_exit(void) { }
> +static inline void smc_sysctl_net_exit(struct net *net) { }
Doesn't matter for static inlines.
> #endif /* CONFIG_SYSCTL */
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v2] net/smc: fix compile warning for smc_sysctl
2022-03-05 5:31 ` Jakub Kicinski
@ 2022-03-06 14:27 ` dust.li
0 siblings, 0 replies; 3+ messages in thread
From: dust.li @ 2022-03-06 14:27 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Karsten Graul, Tony Lu, davem, netdev, linux-s390, linux-rdma
On Fri, Mar 04, 2022 at 09:31:51PM -0800, Jakub Kicinski wrote:
>On Thu, 3 Mar 2022 16:40:06 +0800 Dust Li wrote:
>> kernel test robot reports multiple warning for smc_sysctl:
>>
>> In file included from net/smc/smc_sysctl.c:17:
>> >> net/smc/smc_sysctl.h:23:5: warning: no previous prototype \
>> for function 'smc_sysctl_init' [-Wmissing-prototypes]
>> int smc_sysctl_init(void)
>> ^
>> and
>> >> WARNING: modpost: vmlinux.o(.text+0x12ced2d): Section mismatch \
>> in reference from the function smc_sysctl_exit() to the variable
>> .init.data:smc_sysctl_ops
>> The function smc_sysctl_exit() references
>> the variable __initdata smc_sysctl_ops.
>> This is often because smc_sysctl_exit lacks a __initdata
>> annotation or the annotation of smc_sysctl_ops is wrong.
>>
>> and
>> net/smc/smc_sysctl.c: In function 'smc_sysctl_init_net':
>> net/smc/smc_sysctl.c:47:17: error: 'struct netns_smc' has no member named 'smc_hdr'
>> 47 | net->smc.smc_hdr = register_net_sysctl(net, "net/smc", table);
>>
>> Since we don't need global sysctl initialization. To make things
>> clean and simple, remove the global pernet_operations and
>> smc_sysctl_{init|exit}. Call smc_sysctl_net_{init|exit} directly
>> from smc_net_{init|exit}.
>>
>> Also initialized sysctl_autocorking_size if CONFIG_SYSCTL it not
>> set, this makes sure SMC autocorking is enabled by default if
>> CONFIG_SYSCTL is not set.
>
>I think that makes sense, one nit below.
>
>> -static __net_init int smc_sysctl_init_net(struct net *net)
>> +int smc_sysctl_net_init(struct net *net)
>> {
>> struct ctl_table *table;
>>
>> @@ -59,22 +59,7 @@ static __net_init int smc_sysctl_init_net(struct net *net)
>> return -ENOMEM;
>> }
>>
>> -static __net_exit void smc_sysctl_exit_net(struct net *net)
>> +void smc_sysctl_net_exit(struct net *net)
>> {
>> unregister_net_sysctl_table(net->smc.smc_hdr);
>> }
>
>> +int smc_sysctl_net_init(struct net *net);
>> +void smc_sysctl_net_exit(struct net *net);
>
>I believe these functions can become / remain __net_init and __net_exit,
>since all the callers are also marked as such.
Agree, I will add this in the next version.
>
>> #else
>>
>> -int smc_sysctl_init(void)
>> +static inline int smc_sysctl_net_init(struct net *net)
>> {
>> + net->smc.sysctl_autocorking_size = SMC_AUTOCORKING_DEFAULT_SIZE;
>> return 0;
>> }
>>
>> -void smc_sysctl_exit(void) { }
>> +static inline void smc_sysctl_net_exit(struct net *net) { }
>
>Doesn't matter for static inlines.
OK
Thanks for you advice
>
>> #endif /* CONFIG_SYSCTL */
>>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-06 14:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-03 8:40 [PATCH net-next v2] net/smc: fix compile warning for smc_sysctl Dust Li
2022-03-05 5:31 ` Jakub Kicinski
2022-03-06 14:27 ` dust.li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).