Message ID | 20200319124631.58432-1-yuehaibing@huawei.com |
---|---|
State | Changes Requested |
Delegated to: | BPF Maintainers |
Headers | show |
Series | [bpf-next] bpf: tcp: Fix unused function warnings | expand |
On Thu, 19 Mar 2020 at 12:47, YueHaibing <yuehaibing@huawei.com> wrote: > > If BPF_STREAM_PARSER is not set, gcc warns: > > net/ipv4/tcp_bpf.c:483:12: warning: 'tcp_bpf_sendpage' defined but not used [-Wunused-function] > net/ipv4/tcp_bpf.c:395:12: warning: 'tcp_bpf_sendmsg' defined but not used [-Wunused-function] > net/ipv4/tcp_bpf.c:13:13: warning: 'tcp_bpf_stream_read' defined but not used [-Wunused-function] > > Moves the unused functions into the #ifdef Thanks for fixing this. Reviewed-by: Lorenz Bauer <lmb@cloudflare.com> > > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > net/ipv4/tcp_bpf.c | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) > > diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c > index fe7b4fbc31c1..37c91f25cae3 100644 > --- a/net/ipv4/tcp_bpf.c > +++ b/net/ipv4/tcp_bpf.c > @@ -10,19 +10,6 @@ > #include <net/inet_common.h> > #include <net/tls.h> > > -static bool tcp_bpf_stream_read(const struct sock *sk) > -{ > - struct sk_psock *psock; > - bool empty = true; > - > - rcu_read_lock(); > - psock = sk_psock(sk); > - if (likely(psock)) > - empty = list_empty(&psock->ingress_msg); > - rcu_read_unlock(); > - return !empty; > -} > - > static int tcp_bpf_wait_data(struct sock *sk, struct sk_psock *psock, > int flags, long timeo, int *err) > { > @@ -298,6 +285,20 @@ int tcp_bpf_sendmsg_redir(struct sock *sk, struct sk_msg *msg, > } > EXPORT_SYMBOL_GPL(tcp_bpf_sendmsg_redir); > > +#ifdef CONFIG_BPF_STREAM_PARSER > +static bool tcp_bpf_stream_read(const struct sock *sk) > +{ > + struct sk_psock *psock; > + bool empty = true; > + > + rcu_read_lock(); > + psock = sk_psock(sk); > + if (likely(psock)) > + empty = list_empty(&psock->ingress_msg); > + rcu_read_unlock(); > + return !empty; > +} > + > static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, > struct sk_msg *msg, int *copied, int flags) > { > @@ -528,7 +529,6 @@ static int tcp_bpf_sendpage(struct sock *sk, struct page *page, int offset, > return copied ? copied : err; > } > > -#ifdef CONFIG_BPF_STREAM_PARSER > enum { > TCP_BPF_IPV4, > TCP_BPF_IPV6, > -- > 2.17.1 > > -- Lorenz Bauer | Systems Engineer 6th Floor, County Hall/The Riverside Building, SE1 7PB, UK www.cloudflare.com
On Thu, Mar 19, 2020 at 01:46 PM CET, YueHaibing wrote: > If BPF_STREAM_PARSER is not set, gcc warns: > > net/ipv4/tcp_bpf.c:483:12: warning: 'tcp_bpf_sendpage' defined but not used [-Wunused-function] > net/ipv4/tcp_bpf.c:395:12: warning: 'tcp_bpf_sendmsg' defined but not used [-Wunused-function] > net/ipv4/tcp_bpf.c:13:13: warning: 'tcp_bpf_stream_read' defined but not used [-Wunused-function] > > Moves the unused functions into the #ifdef > > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- In addition to this fix, looks like tcp_bpf_recvmsg can be static and also conditional on CONFIG_BPF_STREAM_PARSER. Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
On Thu, Mar 19, 2020 at 10:00 AM Jakub Sitnicki <jakub@cloudflare.com> wrote: > > On Thu, Mar 19, 2020 at 01:46 PM CET, YueHaibing wrote: > > If BPF_STREAM_PARSER is not set, gcc warns: > > > > net/ipv4/tcp_bpf.c:483:12: warning: 'tcp_bpf_sendpage' defined but not used [-Wunused-function] > > net/ipv4/tcp_bpf.c:395:12: warning: 'tcp_bpf_sendmsg' defined but not used [-Wunused-function] > > net/ipv4/tcp_bpf.c:13:13: warning: 'tcp_bpf_stream_read' defined but not used [-Wunused-function] > > > > Moves the unused functions into the #ifdef > > > > Reported-by: Hulk Robot <hulkci@huawei.com> > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > > --- > > In addition to this fix, looks like tcp_bpf_recvmsg can be static and > also conditional on CONFIG_BPF_STREAM_PARSER. > > Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com> Fixes tag is missing as well?
On 2020/3/20 1:00, Jakub Sitnicki wrote: > On Thu, Mar 19, 2020 at 01:46 PM CET, YueHaibing wrote: >> If BPF_STREAM_PARSER is not set, gcc warns: >> >> net/ipv4/tcp_bpf.c:483:12: warning: 'tcp_bpf_sendpage' defined but not used [-Wunused-function] >> net/ipv4/tcp_bpf.c:395:12: warning: 'tcp_bpf_sendmsg' defined but not used [-Wunused-function] >> net/ipv4/tcp_bpf.c:13:13: warning: 'tcp_bpf_stream_read' defined but not used [-Wunused-function] >> >> Moves the unused functions into the #ifdef >> >> Reported-by: Hulk Robot <hulkci@huawei.com> >> Signed-off-by: YueHaibing <yuehaibing@huawei.com> >> --- > > In addition to this fix, looks like tcp_bpf_recvmsg can be static and > also conditional on CONFIG_BPF_STREAM_PARSER. Thanks, will do this in next version. > > Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com> > > . >
diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c index fe7b4fbc31c1..37c91f25cae3 100644 --- a/net/ipv4/tcp_bpf.c +++ b/net/ipv4/tcp_bpf.c @@ -10,19 +10,6 @@ #include <net/inet_common.h> #include <net/tls.h> -static bool tcp_bpf_stream_read(const struct sock *sk) -{ - struct sk_psock *psock; - bool empty = true; - - rcu_read_lock(); - psock = sk_psock(sk); - if (likely(psock)) - empty = list_empty(&psock->ingress_msg); - rcu_read_unlock(); - return !empty; -} - static int tcp_bpf_wait_data(struct sock *sk, struct sk_psock *psock, int flags, long timeo, int *err) { @@ -298,6 +285,20 @@ int tcp_bpf_sendmsg_redir(struct sock *sk, struct sk_msg *msg, } EXPORT_SYMBOL_GPL(tcp_bpf_sendmsg_redir); +#ifdef CONFIG_BPF_STREAM_PARSER +static bool tcp_bpf_stream_read(const struct sock *sk) +{ + struct sk_psock *psock; + bool empty = true; + + rcu_read_lock(); + psock = sk_psock(sk); + if (likely(psock)) + empty = list_empty(&psock->ingress_msg); + rcu_read_unlock(); + return !empty; +} + static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, struct sk_msg *msg, int *copied, int flags) { @@ -528,7 +529,6 @@ static int tcp_bpf_sendpage(struct sock *sk, struct page *page, int offset, return copied ? copied : err; } -#ifdef CONFIG_BPF_STREAM_PARSER enum { TCP_BPF_IPV4, TCP_BPF_IPV6,
If BPF_STREAM_PARSER is not set, gcc warns: net/ipv4/tcp_bpf.c:483:12: warning: 'tcp_bpf_sendpage' defined but not used [-Wunused-function] net/ipv4/tcp_bpf.c:395:12: warning: 'tcp_bpf_sendmsg' defined but not used [-Wunused-function] net/ipv4/tcp_bpf.c:13:13: warning: 'tcp_bpf_stream_read' defined but not used [-Wunused-function] Moves the unused functions into the #ifdef Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- net/ipv4/tcp_bpf.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)