Commit 152866e8 authored by Litao Jiao's avatar Litao Jiao
Browse files

net/smc: fix compile warning for smc_sysctl 

mainline inclusion
from mainline-v5.18-rc1
commit 7de8eb0d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I76JHC
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/net/smc?id=7de8eb0d9039f16e1122d7aa524a1502a160c4ff



--------------------------------

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 make sure SMC autocorking is enabled by default if
CONFIG_SYSCTL is not set.

Fixes: 462791bb ("net/smc: add sysctl interface for SMC")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarDust Li <dust.li@linux.alibaba.com>
Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarLitao Jiao <jiaolitao@sangfor.com.cn>
parent 22eea3de

net/smc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ 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-y += smc_sysctl.o
 
smc-$(CONFIG_SYSCTL) 	+= smc_sysctl.o

net/smc/af_smc.c

+6 −7
Original line number Diff line number Diff line
@@ -2569,11 +2569,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);

}
@@ -2656,12 +2662,6 @@ 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_sock;

	}



	static_branch_enable(&tcp_have_smc);

	return 0;
@@ -2690,7 +2690,6 @@ static int __init smc_init(void) 
static void __exit smc_exit(void)

{

	static_branch_disable(&tcp_have_smc);

	smc_sysctl_exit();

	sock_unregister(PF_SMC);

	smc_core_exit();

	smc_ib_unregister_client();

net/smc/smc_sysctl.c

+2 −17
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static struct ctl_table smc_table[] = { 
	{  }

};



static __net_init int smc_sysctl_init_net(struct net *net)

int __net_init smc_sysctl_net_init(struct net *net)

{

	struct ctl_table *table;
@@ -49,22 +49,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 __net_exit 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);

}

net/smc/smc_sysctl.h

+4 −4
Original line number Diff line number Diff line
@@ -15,17 +15,17 @@ 


#ifdef CONFIG_SYSCTL



int smc_sysctl_init(void);

void smc_sysctl_exit(void);

int __net_init smc_sysctl_net_init(struct net *net);

void __net_exit smc_sysctl_net_exit(struct net *net);



#else



int smc_sysctl_init(void)

int __net_init smc_sysctl_net_init(struct net *net)

{

	return 0;

}



void smc_sysctl_exit(void) { }

void __net_exit smc_sysctl_net_exit(struct net *net) { }



#endif /* CONFIG_SYSCTL */