From patchwork Wed Jun 23 11:07:27 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: 12339641 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.1 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=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 234DEC4743C for ; Wed, 23 Jun 2021 11:13:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0FA3961166 for ; Wed, 23 Jun 2021 11:13:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230235AbhFWLQC (ORCPT ); Wed, 23 Jun 2021 07:16:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30569 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230222AbhFWLQB (ORCPT ); Wed, 23 Jun 2021 07:16:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624446824; 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=436OaxB7FEvDC8Cj4cGRRV7bgo1JzvFAvSGPF+E5hVA=; b=WYqNt7VrfMPudHS4vOBEDIOeKp9b+FM95dU/6Gtg2iiIPcgw68GcN7NTZFwZOjKuuvmlwz twaVR222m8MIXnlcJ54wzOsY68X0vicZDZw349Igm+QpCvw8W1O03TBYEdfkobcefPso4w UgQs4Emc5sLBdm6q9RTR/P9n+WYZNL4= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-407-vAECKVh5NcKGd1-WHzUrKw-1; Wed, 23 Jun 2021 07:13:42 -0400 X-MC-Unique: vAECKVh5NcKGd1-WHzUrKw-1 Received: by mail-ed1-f69.google.com with SMTP id w1-20020a0564022681b0290394cedd8a6aso1098204edd.14 for ; Wed, 23 Jun 2021 04:13:42 -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=436OaxB7FEvDC8Cj4cGRRV7bgo1JzvFAvSGPF+E5hVA=; b=SEMozjLoxqMscAr3+5sfbMpqu/i8k8pyVz0GxdFm8FFr3CNI76gYYi+qBVY1aN9Hf1 RNIdGnD1MkxcShTGJ124nPmEjqmV22rF7B/ZMNECqNAgOzwCpTy2ALjXgSWvP8Tt5OOS pnrgQWkxOnpvci3X29pEdSZ3IHli5mIjlehMPtYbTRzASPcXax4BCt0paIjiIAT0kRyu r8Lx37H4LeWnbN/Hz239JHdegI8i5V5lT2N8q0lO3T0sg3U9dF+753kxC83tNd2SEdqn qyBVoY7kHrikUlw0K4W8WlN4M2ec6F4UwhTcJbM+8qp5Y2Mpd+LAM7F7Z9+FXHfvrLaY eOyA== X-Gm-Message-State: AOAM530lawDhgPd981+mCVdC+wabX0nRZ4rxZwE1MgbuGTiX9GY8aTvM LPS8OGxHQUXcNxF3Lw2CwwrFV8iuU/y6ayoBN2IQ/ILbULMWf1oMRNp4Ux8hFOhzdxaKPYdhHlM GIlS+kor9BNb9QZfXrjYw+w== X-Received: by 2002:a17:907:628d:: with SMTP id nd13mr9065691ejc.299.1624446821446; Wed, 23 Jun 2021 04:13:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaB0sFOK4WAUNgBrAcENVFdpPOx4htt22G+HZurPvZsTao6jHLM32s7B6T27sxtDVUXTa1cg== X-Received: by 2002:a17:907:628d:: with SMTP id nd13mr9065675ejc.299.1624446821251; Wed, 23 Jun 2021 04:13:41 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id d7sm4046175edy.6.2021.06.23.04.13.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 04:13:40 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 8C7E0180743; Wed, 23 Jun 2021 13:07:28 +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" , Jakub Kicinski , =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , Grygorii Strashko , linux-omap@vger.kernel.org Subject: [PATCH bpf-next v4 19/19] net: ti: remove rcu_read_lock() around XDP program invocation Date: Wed, 23 Jun 2021 13:07:27 +0200 Message-Id: <20210623110727.221922-20-toke@redhat.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210623110727.221922-1-toke@redhat.com> References: <20210623110727.221922-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 Tested-by: Grygorii Strashko Reviewed-by: Grygorii Strashko 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; }