| Message ID | 20210202135544.3262383-4-leon@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Fix W=1 compilation warnings in net/* folder | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 8 maintainers not CCed: andriin@fb.com dsahern@kernel.org pabeni@redhat.com daniel@iogearbox.net bjorn@kernel.org ap420073@gmail.com ast@kernel.org xiyou.wangcong@gmail.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 2999 this patch: 2995 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 29 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 3423 this patch: 3419 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On Tue, Feb 2, 2021 at 2:56 PM Leon Romanovsky <leon@kernel.org> wrote: > > From: Leon Romanovsky <leonro@nvidia.com> > > Fir the following compilation warnings: > 1031 | INDIRECT_CALLABLE_SCOPE void udp_v6_early_demux(struct sk_buff *skb) > > net/ipv6/ip6_offload.c:182:41: warning: no previous prototype for ‘ipv6_gro_receive’ [-Wmissing-prototypes] > 182 | INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head, > | ^~~~~~~~~~~~~~~~ > net/ipv6/ip6_offload.c:320:29: warning: no previous prototype for ‘ipv6_gro_complete’ [-Wmissing-prototypes] > 320 | INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff) > | ^~~~~~~~~~~~~~~~~ > net/ipv6/ip6_offload.c:182:41: warning: no previous prototype for ‘ipv6_gro_receive’ [-Wmissing-prototypes] > 182 | INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head, > | ^~~~~~~~~~~~~~~~ > net/ipv6/ip6_offload.c:320:29: warning: no previous prototype for ‘ipv6_gro_complete’ [-Wmissing-prototypes] > 320 | INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff) > > Fixes: aaa5d90b395a ("net: use indirect call wrappers at GRO network layer") > Signed-off-by: Leon Romanovsky <leonro@nvidia.com> > --- > include/net/ipv6.h | 3 +++ > net/core/dev.c | 4 +--- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/include/net/ipv6.h b/include/net/ipv6.h > index bd1f396cc9c7..68676e6bd4b1 100644 > --- a/include/net/ipv6.h > +++ b/include/net/ipv6.h > @@ -1265,4 +1265,7 @@ static inline void ip6_sock_set_recvpktinfo(struct sock *sk) > release_sock(sk); > } > > +INDIRECT_CALLABLE_DECLARE(struct sk_buff *ipv6_gro_receive(struct list_head *, > + struct sk_buff *)); > +INDIRECT_CALLABLE_DECLARE(int ipv6_gro_complete(struct sk_buff *, int)); I think we should move this to a new include file. These declarations were static, and had to be made public only because of DIRECT call stuff, which is an implementation detail. Polluting include/net/ipv6.h seems not appropriate. > #endif /* _NET_IPV6_H */ > diff --git a/net/core/dev.c b/net/core/dev.c > index c360bb5367e2..9a3d8768524b 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c > @@ -101,6 +101,7 @@ > #include <net/dsa.h> > #include <net/dst.h> > #include <net/dst_metadata.h> > +#include <net/ipv6.h> > #include <net/pkt_sched.h> > #include <net/pkt_cls.h> > #include <net/checksum.h> > @@ -5743,7 +5744,6 @@ static void gro_normal_one(struct napi_struct *napi, struct sk_buff *skb) > } > > INDIRECT_CALLABLE_DECLARE(int inet_gro_complete(struct sk_buff *, int)); This is odd. You move ipv6_gro_complete() but not inet_gro_complete() I think we should be consistent. > -INDIRECT_CALLABLE_DECLARE(int ipv6_gro_complete(struct sk_buff *, int)); > static int napi_gro_complete(struct napi_struct *napi, struct sk_buff *skb) > { > struct packet_offload *ptype; > @@ -5914,8 +5914,6 @@ static void gro_flush_oldest(struct napi_struct *napi, struct list_head *head) > > INDIRECT_CALLABLE_DECLARE(struct sk_buff *inet_gro_receive(struct list_head *, > struct sk_buff *)); > -INDIRECT_CALLABLE_DECLARE(struct sk_buff *ipv6_gro_receive(struct list_head *, > - struct sk_buff *)); > static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb) > { > u32 hash = skb_get_hash_raw(skb) & (GRO_HASH_BUCKETS - 1); > -- > 2.29.2 >
On Tue, Feb 02, 2021 at 03:57:07PM +0100, Eric Dumazet wrote: > On Tue, Feb 2, 2021 at 2:56 PM Leon Romanovsky <leon@kernel.org> wrote: > > > > From: Leon Romanovsky <leonro@nvidia.com> > > > > Fir the following compilation warnings: > > 1031 | INDIRECT_CALLABLE_SCOPE void udp_v6_early_demux(struct sk_buff *skb) > > > > net/ipv6/ip6_offload.c:182:41: warning: no previous prototype for ‘ipv6_gro_receive’ [-Wmissing-prototypes] > > 182 | INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head, > > | ^~~~~~~~~~~~~~~~ > > net/ipv6/ip6_offload.c:320:29: warning: no previous prototype for ‘ipv6_gro_complete’ [-Wmissing-prototypes] > > 320 | INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff) > > | ^~~~~~~~~~~~~~~~~ > > net/ipv6/ip6_offload.c:182:41: warning: no previous prototype for ‘ipv6_gro_receive’ [-Wmissing-prototypes] > > 182 | INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head, > > | ^~~~~~~~~~~~~~~~ > > net/ipv6/ip6_offload.c:320:29: warning: no previous prototype for ‘ipv6_gro_complete’ [-Wmissing-prototypes] > > 320 | INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff) > > > > Fixes: aaa5d90b395a ("net: use indirect call wrappers at GRO network layer") > > Signed-off-by: Leon Romanovsky <leonro@nvidia.com> > > --- > > include/net/ipv6.h | 3 +++ > > net/core/dev.c | 4 +--- > > 2 files changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/include/net/ipv6.h b/include/net/ipv6.h > > index bd1f396cc9c7..68676e6bd4b1 100644 > > --- a/include/net/ipv6.h > > +++ b/include/net/ipv6.h > > @@ -1265,4 +1265,7 @@ static inline void ip6_sock_set_recvpktinfo(struct sock *sk) > > release_sock(sk); > > } > > > > +INDIRECT_CALLABLE_DECLARE(struct sk_buff *ipv6_gro_receive(struct list_head *, > > + struct sk_buff *)); > > +INDIRECT_CALLABLE_DECLARE(int ipv6_gro_complete(struct sk_buff *, int)); > > > I think we should move this to a new include file. The ipv6_gro_* used in net/core/dev.c and net/ipv6/ip6_offload.c. This left me with four options: 1. Use existing and already shared file - include/net/ipv6.h 2. Create new header and put it in net/, so include will be something like that "../new_file.h". 3. Put new header in one of the folders or core/ or ipv6/. 4. Create new file in include/net just for those two lines. I preferred option #1, which other option do you want me to redo? > > These declarations were static, and had to be made public only because > of DIRECT call stuff, > which is an implementation detail. > > Polluting include/net/ipv6.h seems not appropriate. Thanks for the review.
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index bd1f396cc9c7..68676e6bd4b1 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -1265,4 +1265,7 @@ static inline void ip6_sock_set_recvpktinfo(struct sock *sk) release_sock(sk); } +INDIRECT_CALLABLE_DECLARE(struct sk_buff *ipv6_gro_receive(struct list_head *, + struct sk_buff *)); +INDIRECT_CALLABLE_DECLARE(int ipv6_gro_complete(struct sk_buff *, int)); #endif /* _NET_IPV6_H */ diff --git a/net/core/dev.c b/net/core/dev.c index c360bb5367e2..9a3d8768524b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -101,6 +101,7 @@ #include <net/dsa.h> #include <net/dst.h> #include <net/dst_metadata.h> +#include <net/ipv6.h> #include <net/pkt_sched.h> #include <net/pkt_cls.h> #include <net/checksum.h> @@ -5743,7 +5744,6 @@ static void gro_normal_one(struct napi_struct *napi, struct sk_buff *skb) } INDIRECT_CALLABLE_DECLARE(int inet_gro_complete(struct sk_buff *, int)); -INDIRECT_CALLABLE_DECLARE(int ipv6_gro_complete(struct sk_buff *, int)); static int napi_gro_complete(struct napi_struct *napi, struct sk_buff *skb) { struct packet_offload *ptype; @@ -5914,8 +5914,6 @@ static void gro_flush_oldest(struct napi_struct *napi, struct list_head *head) INDIRECT_CALLABLE_DECLARE(struct sk_buff *inet_gro_receive(struct list_head *, struct sk_buff *)); -INDIRECT_CALLABLE_DECLARE(struct sk_buff *ipv6_gro_receive(struct list_head *, - struct sk_buff *)); static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb) { u32 hash = skb_get_hash_raw(skb) & (GRO_HASH_BUCKETS - 1);