Message ID | 20200323194644.1021740-1-matthieu.baerts@tessares.net |
---|---|
State | Accepted, archived |
Delegated to: | Matthieu Baerts |
Headers | show |
Series | mptcp:netlink: fix compilation warning | expand |
On Mon, 23 Mar 2020, Matthieu Baerts wrote: > net/mptcp/pm_netlink.c: In function ‘mptcp_pm_nl_add_addr_received’: > net/mptcp/pm_netlink.c:238:23: warning: variable ‘pernet’ set but not used [-Wunused-but-set-variable] > 238 | struct pm_nl_pernet *pernet; > | ^~~~~~ > > Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> > --- > > Notes: > to be squashed in "mptcp: add netlink-based PM" > > net/mptcp/pm_netlink.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c > index 4bab1b32f932..743c3c58f826 100644 > --- a/net/mptcp/pm_netlink.c > +++ b/net/mptcp/pm_netlink.c > @@ -235,9 +235,6 @@ void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk) > struct sock *sk = (struct sock *)msk; > struct mptcp_addr_info remote; > struct mptcp_addr_info local; > - struct pm_nl_pernet *pernet; > - > - pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id); > > pr_debug("accepted %d:%d remote family %d", > msk->pm.add_addr_accepted, msk->pm.add_addr_accept_max, I think this is ok to drop for now. Looks like it's left over from copied code, but we should double-check with Paolo tomorrow in case it was intended to check the pernet limits. -- Mat Martineau Intel
Hi, On Mon, 2020-03-23 at 13:04 -0700, Mat Martineau wrote: > On Mon, 23 Mar 2020, Matthieu Baerts wrote: > > > net/mptcp/pm_netlink.c: In function ‘mptcp_pm_nl_add_addr_received’: > > net/mptcp/pm_netlink.c:238:23: warning: variable ‘pernet’ set but not used [-Wunused-but-set-variable] > > 238 | struct pm_nl_pernet *pernet; > > | ^~~~~~ > > > > Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> > > --- > > > > Notes: > > to be squashed in "mptcp: add netlink-based PM" > > > > net/mptcp/pm_netlink.c | 3 --- > > 1 file changed, 3 deletions(-) > > > > diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c > > index 4bab1b32f932..743c3c58f826 100644 > > --- a/net/mptcp/pm_netlink.c > > +++ b/net/mptcp/pm_netlink.c > > @@ -235,9 +235,6 @@ void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk) > > struct sock *sk = (struct sock *)msk; > > struct mptcp_addr_info remote; > > struct mptcp_addr_info local; > > - struct pm_nl_pernet *pernet; > > - > > - pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id); > > > > pr_debug("accepted %d:%d remote family %d", > > msk->pm.add_addr_accepted, msk->pm.add_addr_accept_max, > > I think this is ok to drop for now. Looks like it's left over from copied > code, but we should double-check with Paolo tomorrow in case it was > intended to check the pernet limits. This is a left-over from previous iteration. The funny thing is that I don't get the warning locally: $ touch net/mptcp/pm_netlink.c; make C=2 net/mptcp/pm_netlink.o CHECK scripts/mod/empty.c CALL scripts/checksyscalls.sh CALL scripts/atomic/check-atomics.sh DESCEND objtool CHECK net/mptcp/pm_netlink.c CC net/mptcp/pm_netlink.o # no other output ?!? despite there is actually no usage of 'pernet' ?!? gcc 9.2.1 here. I hope there are no other left-over! /P
Hi Paolo, On 24/03/2020 09:49, Paolo Abeni wrote: > Hi, > > On Mon, 2020-03-23 at 13:04 -0700, Mat Martineau wrote: >> On Mon, 23 Mar 2020, Matthieu Baerts wrote: >> >>> net/mptcp/pm_netlink.c: In function ‘mptcp_pm_nl_add_addr_received’: >>> net/mptcp/pm_netlink.c:238:23: warning: variable ‘pernet’ set but not used [-Wunused-but-set-variable] >>> 238 | struct pm_nl_pernet *pernet; >>> | ^~~~~~ >>> >>> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> >>> --- >>> >>> Notes: >>> to be squashed in "mptcp: add netlink-based PM" >>> >>> net/mptcp/pm_netlink.c | 3 --- >>> 1 file changed, 3 deletions(-) >>> >>> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c >>> index 4bab1b32f932..743c3c58f826 100644 >>> --- a/net/mptcp/pm_netlink.c >>> +++ b/net/mptcp/pm_netlink.c >>> @@ -235,9 +235,6 @@ void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk) >>> struct sock *sk = (struct sock *)msk; >>> struct mptcp_addr_info remote; >>> struct mptcp_addr_info local; >>> - struct pm_nl_pernet *pernet; >>> - >>> - pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id); >>> >>> pr_debug("accepted %d:%d remote family %d", >>> msk->pm.add_addr_accepted, msk->pm.add_addr_accept_max, >> >> I think this is ok to drop for now. Looks like it's left over from copied >> code, but we should double-check with Paolo tomorrow in case it was >> intended to check the pernet limits. > > This is a left-over from previous iteration. The funny thing is that I > don't get the warning locally: > > $ touch net/mptcp/pm_netlink.c; make C=2 net/mptcp/pm_netlink.o > CHECK scripts/mod/empty.c > CALL scripts/checksyscalls.sh > CALL scripts/atomic/check-atomics.sh > DESCEND objtool > CHECK net/mptcp/pm_netlink.c > CC net/mptcp/pm_netlink.o > # no other output ?!? > > despite there is actually no usage of 'pernet' ?!? gcc 9.2.1 here. > > I hope there are no other left-over! I checked by manually doing: $ make W=1 -j$(nproc) ## lot of warnings are produced... $ rm net/mptcp/*.[oa] $ make W=1 -j$(nproc) See the content of Makefile for the explanation why it is disabled: https://elixir.bootlin.com/linux/latest/source/Makefile#L753 I am looking at automatize this check. It seems OK with: for i in net/mptcp/*.o; do touch ${i:0:-1}c KCFLAGS="-Werror" make W=1 $i done W=23 produces too many warnings due to code we don't control. Cheers, Matt
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 4bab1b32f932..743c3c58f826 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -235,9 +235,6 @@ void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk) struct sock *sk = (struct sock *)msk; struct mptcp_addr_info remote; struct mptcp_addr_info local; - struct pm_nl_pernet *pernet; - - pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id); pr_debug("accepted %d:%d remote family %d", msk->pm.add_addr_accepted, msk->pm.add_addr_accept_max,
net/mptcp/pm_netlink.c: In function ‘mptcp_pm_nl_add_addr_received’: net/mptcp/pm_netlink.c:238:23: warning: variable ‘pernet’ set but not used [-Wunused-but-set-variable] 238 | struct pm_nl_pernet *pernet; | ^~~~~~ Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> --- Notes: to be squashed in "mptcp: add netlink-based PM" net/mptcp/pm_netlink.c | 3 --- 1 file changed, 3 deletions(-)