From: Eric Dumazet <edumazet@google.com>
To: Leon Romanovsky <leon@kernel.org>
Cc: Jakub Kicinski <kuba@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Pablo Neira Ayuso <pablo@netfilter.org>,
Leon Romanovsky <leonro@nvidia.com>,
coreteam@netfilter.org, Florian Westphal <fw@strlen.de>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Jozsef Kadlecsik <kadlec@netfilter.org>,
Julian Anastasov <ja@ssi.bg>, LKML <linux-kernel@vger.kernel.org>,
lvs-devel@vger.kernel.org, Matteo Croce <mcroce@redhat.com>,
netdev <netdev@vger.kernel.org>,
netfilter-devel@vger.kernel.org,
Simon Horman <horms@verge.net.au>
Subject: Re: [PATCH net 3/4] net/core: move ipv6 gro function declarations to net/ipv6
Date: Tue, 2 Feb 2021 15:57:07 +0100 [thread overview]
Message-ID: <CANn89iLeC8YLt2Spq4P+JA+XBf=GDjF4UT5N68-E08JdS5iPJA@mail.gmail.com> (raw)
In-Reply-To: <20210202135544.3262383-4-leon@kernel.org>
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
>
next prev parent reply other threads:[~2021-02-02 15:00 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-02 13:55 [PATCH net 0/4] Fix W=1 compilation warnings in net/* folder Leon Romanovsky
2021-02-02 13:55 ` [PATCH net 1/4] ipv6: silence compilation warning for non-IPV6 builds Leon Romanovsky
2021-02-02 16:29 ` Jakub Kicinski
2021-02-02 18:55 ` Leon Romanovsky
2021-02-02 21:55 ` Jakub Kicinski
2021-02-02 13:55 ` [PATCH net 2/4] ipv6: move udp declarations to net/udp.h Leon Romanovsky
2021-02-02 13:55 ` [PATCH net 3/4] net/core: move ipv6 gro function declarations to net/ipv6 Leon Romanovsky
2021-02-02 14:57 ` Eric Dumazet [this message]
2021-02-02 15:59 ` Leon Romanovsky
2021-02-02 13:55 ` [PATCH net 4/4] netfilter: move handlers to net/ip_vs.h Leon Romanovsky
2021-02-02 14:34 ` [PATCH net 0/4] Fix W=1 compilation warnings in net/* folder Eric Dumazet
2021-02-02 14:57 ` Leon Romanovsky
2021-02-02 14:59 ` Eric Dumazet
2021-02-02 15:54 ` Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CANn89iLeC8YLt2Spq4P+JA+XBf=GDjF4UT5N68-E08JdS5iPJA@mail.gmail.com' \
--to=edumazet@google.com \
--cc=coreteam@netfilter.org \
--cc=davem@davemloft.net \
--cc=fw@strlen.de \
--cc=horms@verge.net.au \
--cc=ja@ssi.bg \
--cc=kadlec@netfilter.org \
--cc=kuba@kernel.org \
--cc=leon@kernel.org \
--cc=leonro@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lvs-devel@vger.kernel.org \
--cc=mcroce@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).