From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0D1CC4332B for ; Thu, 19 Mar 2020 15:38:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 91AD720775 for ; Thu, 19 Mar 2020 15:38:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="Xy4Hv9B1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727632AbgCSPiO (ORCPT ); Thu, 19 Mar 2020 11:38:14 -0400 Received: from mail-ot1-f68.google.com ([209.85.210.68]:37557 "EHLO mail-ot1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727462AbgCSPiO (ORCPT ); Thu, 19 Mar 2020 11:38:14 -0400 Received: by mail-ot1-f68.google.com with SMTP id i12so2821377otp.4 for ; Thu, 19 Mar 2020 08:38:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=seCAy6xYY0ujQIsNH75m2599DrTdig4Y4u9evBOvPIA=; b=Xy4Hv9B1Q/8NsaVAgg5N3Z6vnoVUApM/gVfQN6OhHKjRA8QBEmOawruEKVCVz0LAkt CeJpe/zz4rUmz3J+2o4fdngDWigvxvl51Jn1Wq68BGK8s02vJJkjhxw/SrcJn/aVn83w DGUsdQ4R0giuJKSGh/IMUtDG7szQcVjT6SMV4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=seCAy6xYY0ujQIsNH75m2599DrTdig4Y4u9evBOvPIA=; b=BWZhO+1BijDyqDjdNYuNpdHkxEzYNLJ+fgXYqmazfB0VdU2Eu1Un5NgSOtGHOdsS2o Z1LHEU+OAdas/nsC2VEChcBqoryzW8VOzmMcFQRcCzFL2kk/FRHuDFQ5pDT5q5Jwo53J l3tQsQ3fnDvUYzuV1BUBtcQOlAW18Y5k7JOLdbAVqq0Z2DpiI/g/7moMLEJhIgHPfoo2 9duaHnoBYpvds/bNdCV7/kM692ovBxp382LXJfJoTNLTnwwETE3ZtPN6P7Pegv1pMo20 7eZLlLvE4mm2e1VcRtxRxknMJW4F6Qm9jo/1K5azUt6jwMNUSpyLa99Ux2vZZl+nb1rS J1Kw== X-Gm-Message-State: ANhLgQ2SZG65itEuGkVI9bxOdY2ER8YO2uMhHxpnW9umAnaOiY7XeCsB xaLTrbYR2wd0Kvt5zT7+2myG7Jgcr2Qs7DJnNCWYnw== X-Google-Smtp-Source: ADFU+vub2oGGaZwK6dqB/jd4b8EpyH4/obAagvR+weJB1BPBkFBrFv81Vmk8W+ZBTFzEINX6QykYl8LH1mYocO4UqFc= X-Received: by 2002:a9d:6310:: with SMTP id q16mr2598495otk.147.1584632293068; Thu, 19 Mar 2020 08:38:13 -0700 (PDT) MIME-Version: 1.0 References: <20200319124631.58432-1-yuehaibing@huawei.com> In-Reply-To: <20200319124631.58432-1-yuehaibing@huawei.com> From: Lorenz Bauer Date: Thu, 19 Mar 2020 15:38:00 +0000 Message-ID: Subject: Re: [PATCH bpf-next] bpf: tcp: Fix unused function warnings To: YueHaibing Cc: Daniel Borkmann , Jakub Sitnicki , John Fastabend , "David S . Miller" , Networking , bpf , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Thu, 19 Mar 2020 at 12:47, 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 Thanks for fixing this. Reviewed-by: Lorenz Bauer > > Reported-by: Hulk Robot > Signed-off-by: YueHaibing > --- > 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 > #include > > -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