net: secure_seq: Move net_secret_init() definition into CONFIG_IPV6 if block
Subsystems (2)
PATCH 1/1 net: secure_seq: Move net_secret_init() definition into CONFIG_IPV6 if block
From: Fabio Estevam <[email protected]>
Commit 9a3bab6b05 (net: net_secret should not depend on TCP) introduced the following build warning when CONFIG_IPV6 is not selected:
net/core/secure_seq.c:17:13: warning: 'net_secret_init' defined but not used [-Wunused-function]
Fix it by moving net_secret_init(void) inside the '#if IS_ENABLED(CONFIG_IPV6)' block.
--- net/core/secure_seq.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
net/core/secure_seq.c +18 -18
@@ -10,6 +10,24 @@#include <net/secure_seq.h> +#ifdef CONFIG_INET +static u32 seq_scale (u32 seq) +{ +/* +* As close as possible to RFC 793, which +* suggests using a 250 kHz clock. +* Further reading shows this assumes 2 Mb/s networks. +* For 10 Mb/s Ethernet, a 1 MHz clock is appropriate. +* For 10 Gb/s Ethernet, a 1 GHz clock should be ok, but +* we also need to limit the resolution so that the u32 seq +* overlaps less than one time per MSL (2 minutes). +* Choosing a clock of 64 ns period is OK. (period of 274 s) +*/ +return seq + (ktime_to_ns (ktime_get_real ()) >>6 ); +} +#endif + +#if IS_ENABLED (CONFIG_IPV6 )#define NET_SECRET_SIZE (MD5_MESSAGE_BYTES / 4)static u32 net_secret[NET_SECRET_SIZE ]____cacheline_aligned ;
@@ -30,24 +48,6 @@ static void net_secret_init(void) } } -#ifdef CONFIG_INET -static u32 seq_scale (u32 seq) -{ -/* -* As close as possible to RFC 793, which -* suggests using a 250 kHz clock. -* Further reading shows this assumes 2 Mb/s networks. -* For 10 Mb/s Ethernet, a 1 MHz clock is appropriate. -* For 10 Gb/s Ethernet, a 1 GHz clock should be ok, but -* we also need to limit the resolution so that the u32 seq -* overlaps less than one time per MSL (2 minutes). -* Choosing a clock of 64 ns period is OK. (period of 274 s) -*/ -return seq + (ktime_to_ns (ktime_get_real ()) >>6 ); -} -#endif - -#if IS_ENABLED (CONFIG_IPV6 )__u32 secure_tcpv6_sequence_number (const __be32 *saddr,const __be32 *daddr,__be16 sport,__be16 dport) {
Signature · 1 line
1.8.1.2
Quoted 5 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Commit
9a3bab6b05(net:net_secretshould not depend on TCP) introduced the following build warning whenCONFIG_IPV6is not selected:
Quoted 7 lines
net/core/secure_seq.c:17:13: warning: 'net_secret_init' defined but not used [-Wunused-function]Fix it by moving
net_secret_init(void)inside the '#ifIS_ENABLED(CONFIG_IPV6)' block.Reported-by Olof Johansson <[email protected]>Signed-off-by Fabio Estevam <[email protected]>
Another solution would be:
net/core/secure_seq.c +2 -0
@@ -10,6 +10,7 @@#include <net/secure_seq.h> +#if IS_ENABLED (CONFIG_IPV6 )#define NET_SECRET_SIZE (MD5_MESSAGE_BYTES / 4)static u32 net_secret[NET_SECRET_SIZE ]____cacheline_aligned ;
@@ -29,6 +30,7 @@ static void net_secret_init(void) cmpxchg(&net_secret[--i], 0, tmp); } } +#endif
If this is preferred, I can send a v2 like that.
David Miller
maintainerFrom: Fabio Estevam <[email protected]>
Date: Sat, 5 Oct 2013 17:09:50 -0300
Quoted 5 lines
From: Fabio Estevam <[email protected]>
Commit
9a3bab6b05(net:net_secretshould not depend on TCP) introduced the following build warning whenCONFIG_IPV6is not selected:
Quoted 7 lines
net/core/secure_seq.c:17:13: warning: 'net_secret_init' defined but not used [-Wunused-function]Fix it by moving
net_secret_init(void)inside the '#ifIS_ENABLED(CONFIG_IPV6)' block.Reported-by Olof Johansson <[email protected]>Signed-off-by Fabio Estevam <[email protected]>
seq_scale is used by secure_tcp_sequence_number, which is only protected by CONFIG_INET. I have no idea how you can get this build problem.
And I cannot reproduce it here:
[davem@drr net]$ egrep CONFIG_IPV6 .config
# CONFIG_IPV6 is not set
[davem@drr net]$ make net/core/secure_seq.oscripts/kconfig/conf --silentoldconfig Kconfig
make[1]: Nothing to be done for `all'.
make[1]: Nothing to be done for `relocs'.
CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CALL scripts/checksyscalls.sh CC net/core/secure_seq.o
[davem@drr net]$
Furthermore your commit message is talking about net_secret_init but your patch does things with seq_scale.
I'm not applying this patch.
Quoted 13 lines · David Miller
From: Fabio Estevam <[email protected]>
Date: Sat, 5 Oct 2013 17:09:50 -0300Quoted 10 lines
From: Fabio Estevam <[email protected]>
Commit
9a3bab6b05(net:net_secretshould not depend on TCP) introduced the following build warning whenCONFIG_IPV6is not selected:
net/core/secure_seq.c:17:13: warning: 'net_secret_init' defined but not used [-Wunused-function]Fix it by moving
net_secret_init(void)inside the '#ifIS_ENABLED(CONFIG_IPV6)' block.
Quoted 7 lines
Quoted 2 lines
Reported-by Olof Johansson <[email protected]>Signed-off-by Fabio Estevam <[email protected]>
seq_scaleis used bysecure_tcp_sequence_number, which is only protected byCONFIG_INET. I have no idea how you can get this build problem.And I cannot reproduce it here:
You get it if you have CONFIG_NET enabled, but CONFIG_INET off. We seem to have a few defconfigs on arm that has that setting, likely because they lack native network interfaces but need local unix sockets. Or whatever. But that's how you hit it.
Steps to reproduce, even with ARCH=sparc:
make allnoconfig
edit .config, set CONFIG_NET=y
yes "" | make oldconfig
make
-Olof
Hi Olof,
Quoted 11 lines · Olof Johansson
You get it if you have
CONFIG_NETenabled, butCONFIG_INEToff. We seem to have a few defconfigs on arm that has that setting, likely because they lack native network interfaces but need local unix sockets. Or whatever. But that's how you hit it.Steps to reproduce, even with ARCH=sparc:
make allnoconfig
edit .config, setCONFIG_NET=y
yes "" | make oldconfig
make
Yes, I fixed the commit log and patch in v2.
Regards,
Fabio Estevam