From patchwork Wed Jun 23 11:07: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: 12339633 X-Patchwork-Delegate: bpf@iogearbox.net 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 A8C17C4743C for ; Wed, 23 Jun 2021 11:13:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 968A6610F7 for ; Wed, 23 Jun 2021 11:13:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230232AbhFWLQE (ORCPT ); Wed, 23 Jun 2021 07:16:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45507 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230205AbhFWLQD (ORCPT ); Wed, 23 Jun 2021 07:16:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624446825; 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=llJCIySvFOtrYZhTAdojGqVA7hNSjDHEmwwvlUzwRuo=; b=BN5m6m9d/5aK6ze/ACjEHaAt9YX4ZAcQUjh0nHmtWO2lmxxc5PmaBbKfup/gic0HPhgcwu sl/qflNG0JBmaImJwwVzGyAnEccb9xeRwoMsvjjCgqiezM63jNHcTrOrh/XaWXvNckKn78 8laCrxKHy5SRKCmp0eVAi7c8P/uMMt4= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-503-V1YKrT8tN62LSg3aVI019w-1; Wed, 23 Jun 2021 07:13:44 -0400 X-MC-Unique: V1YKrT8tN62LSg3aVI019w-1 Received: by mail-ed1-f72.google.com with SMTP id y18-20020a0564022712b029038ffac1995eso1112407edd.12 for ; Wed, 23 Jun 2021 04:13:44 -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=llJCIySvFOtrYZhTAdojGqVA7hNSjDHEmwwvlUzwRuo=; b=KszepY4fjcIrVxDEwJqdZZdEyIWs0Q81Hw65AFcQ2ZSd+p5HhnkoYiU1GBetgae9Fa /P/Ox00GzMe4zbiYPGpD7Ung83sX8Ga90J2ndqMFlFgFKpJwcbNsOPFrwv9XDFdWkz5O /gBiaPpSbRxD/LuHoCyEWqUKFwxT4WCbq1Cfo5j/Z6ZUx/2KJ1uIh1NqLGpBpJumCCGw YkrjhEqeeH2XKIb7ETi2jfFrkNvuUlZHFo9Td0RZfKbVxU6KWmbTajfIGaUSWmW7XGa6 kcZHEurx3af/7n4omPD3eYg8bfFpPdwyHgCcqE1Djn6WdiQKRUQdwNpeRcpaH/m1ZKgX aTOQ== X-Gm-Message-State: AOAM531dMfrKBEjIucy4DU393Q/aOko5EK5QrDjj2rJOwMcmWFQfcgMv R4/PhRjCakboVsldAwSj0qN8/Vi3LRsNzc3HnVMQa6JmbC/H/2kPY6ORkUb/hjXA5sU2zFhrPhb gWkyOLJdGOCaA X-Received: by 2002:a05:6402:42d2:: with SMTP id i18mr11522743edc.168.1624446823371; Wed, 23 Jun 2021 04:13:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz8yFgTmKihKxpCubnh8O8F/QHFr0n5nAr6MMyZq4hXtQykYRJ1mSniQXOqaN4HV1YIOxxxAQ== X-Received: by 2002:a05:6402:42d2:: with SMTP id i18mr11522725edc.168.1624446823254; Wed, 23 Jun 2021 04:13:43 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id gx4sm3605409ejc.34.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 872E3180742; 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?= , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu Subject: [PATCH bpf-next v4 18/19] stmmac: remove rcu_read_lock() around XDP program invocation Date: Wed, 23 Jun 2021 13:07:26 +0200 Message-Id: <20210623110727.221922-19-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: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net The stmmac 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: Giuseppe Cavallaro Cc: Alexandre Torgue Cc: Jose Abreu Signed-off-by: Toke Høiland-Jørgensen --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index bf9fe25fed69..08c4b999e1ba 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -4654,7 +4654,6 @@ static int stmmac_xdp_xmit_back(struct stmmac_priv *priv, return res; } -/* This function assumes rcu_read_lock() is held by the caller. */ static int __stmmac_xdp_run_prog(struct stmmac_priv *priv, struct bpf_prog *prog, struct xdp_buff *xdp) @@ -4696,17 +4695,14 @@ static struct sk_buff *stmmac_xdp_run_prog(struct stmmac_priv *priv, struct bpf_prog *prog; int res; - rcu_read_lock(); - prog = READ_ONCE(priv->xdp_prog); if (!prog) { res = STMMAC_XDP_PASS; - goto unlock; + goto out; } res = __stmmac_xdp_run_prog(priv, prog, xdp); -unlock: - rcu_read_unlock(); +out: return ERR_PTR(-res); } @@ -4976,10 +4972,8 @@ static int stmmac_rx_zc(struct stmmac_priv *priv, int limit, u32 queue) buf->xdp->data_end = buf->xdp->data + buf1_len; xsk_buff_dma_sync_for_cpu(buf->xdp, rx_q->xsk_pool); - rcu_read_lock(); prog = READ_ONCE(priv->xdp_prog); res = __stmmac_xdp_run_prog(priv, prog, buf->xdp); - rcu_read_unlock(); switch (res) { case STMMAC_XDP_PASS: