From patchwork Wed Jun 9 10:33:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 457216 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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 41EE7C48BCF for ; Wed, 9 Jun 2021 10:38:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2B35D613AE for ; Wed, 9 Jun 2021 10:38:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239000AbhFIKku (ORCPT ); Wed, 9 Jun 2021 06:40:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25669 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238986AbhFIKkn (ORCPT ); Wed, 9 Jun 2021 06:40:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623235129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8R6RyRHO67ifLZIR9gGLNOyftDsWB9ahrub2+xbd3e4=; b=DTK5saOnJl5E0EKgSJxyjIzRle0kDpoEWio9AQUYIg3iDpQ6jnD7otRchsB7qfCPO5XFiX fvtWZfJJKvj/U1GH2qvFi8dR8gyJpwyvyFFsyTwzIS7ZPb6/iouxKSDBINltgEMr6Ol/0d jk6SMerWBzASiuNO/0pKxVpM193CQA4= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-229-x2gQmStUM4uOeDOpoXcaew-1; Wed, 09 Jun 2021 06:38:45 -0400 X-MC-Unique: x2gQmStUM4uOeDOpoXcaew-1 Received: by mail-ed1-f71.google.com with SMTP id dd28-20020a056402313cb029038fc9850034so12234838edb.7 for ; Wed, 09 Jun 2021 03:38:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8R6RyRHO67ifLZIR9gGLNOyftDsWB9ahrub2+xbd3e4=; b=sAZtExbc5olXFKLshOE/ldliuX7m7b36Tf/ecwc8RGoMc3WneY+Bkd0u/a3tXuj4dR vENvYzEhtmR4S5D8BfG4vwbzOmFexpyDIsDyBkjLyras0YlPt8XYiTNV6w+UAVejNFGv xgGJlpXclF19lYDj5y5vzEEKMl+9tB9MebdsKG0tmje2KMU0/f44LS6H8TBipeQXq1Su PnsuOnK0hu3fHJHRbBG2VF3dH4kgXV8WJcgV23vWlq+A9i/0r+vcf3IqGHhfztJnBkJO z11NQgArFa9FSOszWxZp7Kgmw4aSsHCIjZJo6Q1Na2xvwjwrSIm//FJBun3QSyxOgAfC tW7w== X-Gm-Message-State: AOAM531GF4JMUuroLWUD78MoaJpp4lyixn46JiyqR+woFmULcC8moaWb DIMpFK/7S2tHBYG1Ee0BAh41OZOo0WMtyhqC7izwAWrYvloWgXijTO2Lt1xHQkkShf9vvtKqOqP PNG0UeTZWcrcUnCA2EJlCdQ== X-Received: by 2002:a17:906:9715:: with SMTP id k21mr28048383ejx.553.1623235124785; Wed, 09 Jun 2021 03:38:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvLr0lbuBFvW5cCFJTjirrWeEr6r/YlVd/ZkLudMiEalQXD0poZgcUxpKwqjuuUBC3AxiU/Q== X-Received: by 2002:a17:906:9715:: with SMTP id k21mr28048369ejx.553.1623235124649; Wed, 09 Jun 2021 03:38:44 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id u19sm920226ejt.74.2021.06.09.03.38.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 03:38:43 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 0ADBF180735; Wed, 9 Jun 2021 12:33:31 +0200 (CEST) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: bpf@vger.kernel.org, netdev@vger.kernel.org Cc: Martin KaFai Lau , Hangbin Liu , Jesper Dangaard Brouer , Magnus Karlsson , "Paul E . McKenney" , =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , Grygorii Strashko , linux-omap@vger.kernel.org Subject: [PATCH bpf-next 17/17] net: ti: remove rcu_read_lock() around XDP program invocation Date: Wed, 9 Jun 2021 12:33:26 +0200 Message-Id: <20210609103326.278782-18-toke@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210609103326.278782-1-toke@redhat.com> References: <20210609103326.278782-1-toke@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The cpsw driver has rcu_read_lock()/rcu_read_unlock() pairs around XDP program invocations. However, the actual lifetime of the objects referred by the XDP program invocation is longer, all the way through to the call to xdp_do_flush(), making the scope of the rcu_read_lock() too small. This turns out to be harmless because it all happens in a single NAPI poll cycle (and thus under local_bh_disable()), but it makes the rcu_read_lock() misleading. Rather than extend the scope of the rcu_read_lock(), just get rid of it entirely. With the addition of RCU annotations to the XDP_REDIRECT map types that take bh execution into account, lockdep even understands this to be safe, so there's really no reason to keep it around. Cc: Grygorii Strashko Cc: linux-omap@vger.kernel.org Signed-off-by: Toke Høiland-Jørgensen --- drivers/net/ethernet/ti/cpsw_priv.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw_priv.c b/drivers/net/ethernet/ti/cpsw_priv.c index 5862f0a4a975..ecc2a6b7e28f 100644 --- a/drivers/net/ethernet/ti/cpsw_priv.c +++ b/drivers/net/ethernet/ti/cpsw_priv.c @@ -1328,13 +1328,9 @@ int cpsw_run_xdp(struct cpsw_priv *priv, int ch, struct xdp_buff *xdp, struct bpf_prog *prog; u32 act; - rcu_read_lock(); - prog = READ_ONCE(priv->xdp_prog); - if (!prog) { - ret = CPSW_XDP_PASS; - goto out; - } + if (!prog) + return CPSW_XDP_PASS; act = bpf_prog_run_xdp(prog, xdp); /* XDP prog might have changed packet data and boundaries */ @@ -1378,10 +1374,8 @@ int cpsw_run_xdp(struct cpsw_priv *priv, int ch, struct xdp_buff *xdp, ndev->stats.rx_bytes += *len; ndev->stats.rx_packets++; out: - rcu_read_unlock(); return ret; drop: - rcu_read_unlock(); page_pool_recycle_direct(cpsw->page_pool[ch], page); return ret; }