lkml.org 
[lkml]   [2020]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [PATCH bpf-next] bpf: tcp: Fix unused function warnings
    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

    \
     
     \ /
      Last update: 2020-03-19 16:38    [W:4.082 / U:0.532 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site