From patchwork Thu Jun 24 16:06:03 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: 12342623 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, URIBL_BLOCKED,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 D7C44C49EB7 for ; Thu, 24 Jun 2021 16:06:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BF4B1613EB for ; Thu, 24 Jun 2021 16:06:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232005AbhFXQI5 (ORCPT ); Thu, 24 Jun 2021 12:08:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41029 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231653AbhFXQIr (ORCPT ); Thu, 24 Jun 2021 12:08:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624550787; 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=4HZENA/DgIRqzTQFaPlI7HLLaKbjRPeaazW1V9p71pE=; b=Sop6EizUMfgZKiQtE/7+YgYvImWxiaNSzl+XFMAOrSWqQsl0ipWchFFEVDlTmqvS9iH4Vi ofIDgKyCLK+oaWymHlvasXfiTJ/fMYcrJIqX/fpsTLb8FeTqRHymyftk/2YUhKXvVznIOa 5UE7HS9Ib9CXFL9gh0eDz5FB/vrhewI= 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-251-qq1PKpYgMeuBhpnNJRPgzg-1; Thu, 24 Jun 2021 12:06:25 -0400 X-MC-Unique: qq1PKpYgMeuBhpnNJRPgzg-1 Received: by mail-ed1-f72.google.com with SMTP id j19-20020aa7c4130000b029039497d5cdbeso3581278edq.15 for ; Thu, 24 Jun 2021 09:06:25 -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=4HZENA/DgIRqzTQFaPlI7HLLaKbjRPeaazW1V9p71pE=; b=iTqOUWkDrhvLVAxGnVcJFqQ1VVFUP/MqspsaUlp0pyqncjz4jnLcqRpWWET80x/w7i +ZK4CWyvCvLUIm0ycbgxArj4QhyoIYzw1ToFqBAl/Jgsz8rUDFp73EObiOGWtrX6t2Yq p1Zd8w/7rKlOFB/39goJNPkeExZyms1wDssqpkojtWt/m+mNvRjQLRcy/q/KUWvJ8w2Y syHrsYr30PlrzhX9VT+eLqQVEwUWxAT9r7UrzShJqyC/23OAKjjOiqDstiawRKSFvBFu eSofknCIFjgxMSYiVMvuaC6eX1HUetkZ7TKFiV/T2UhfKHrCFmGUkrWTZQkhXGuxsOKW fM2Q== X-Gm-Message-State: AOAM531esfAFsOfFSBnOti+GnFB1kZgB8IR6y79kvKyyS76zAvelo393 UP2B2WWVyeW3mnXCyT4wsK8WpMvWC2Amtt2QvAzG+sfPcwAuJWjNFMcZYwZ8sNzVwPXGbOQp/Tu rQZcDAywTxqGv X-Received: by 2002:a17:907:20ed:: with SMTP id rh13mr5923175ejb.137.1624550784125; Thu, 24 Jun 2021 09:06:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymuoDGHbfvZKplY9RBsGybZkq21Hh0wdUnS+ml2EhRktVxqqDq4LhKonWx2QxmNk4uIIhRDQ== X-Received: by 2002:a17:907:20ed:: with SMTP id rh13mr5923141ejb.137.1624550783729; Thu, 24 Jun 2021 09:06:23 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id g12sm2149959edb.23.2021.06.24.09.06.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Jun 2021 09:06:22 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 8DA7418073E; Thu, 24 Jun 2021 18:06:10 +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?= , Tariq Toukan Subject: [PATCH bpf-next v5 13/19] mlx4: remove rcu_read_lock() around XDP program invocation Date: Thu, 24 Jun 2021 18:06:03 +0200 Message-Id: <20210624160609.292325-14-toke@redhat.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210624160609.292325-1-toke@redhat.com> References: <20210624160609.292325-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 mlx4 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. Also switch the RCU dereferences in the driver loop itself to the _bh variants. Cc: Tariq Toukan Reviewed-by: Tariq Toukan Signed-off-by: Toke Høiland-Jørgensen --- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index cea62b8f554c..442991d91c15 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@ -679,9 +679,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud ring = priv->rx_ring[cq_ring]; - /* Protect accesses to: ring->xdp_prog, priv->mac_hash list */ - rcu_read_lock(); - xdp_prog = rcu_dereference(ring->xdp_prog); + xdp_prog = rcu_dereference_bh(ring->xdp_prog); xdp_init_buff(&xdp, priv->frag_info[0].frag_stride, &ring->xdp_rxq); doorbell_pending = false; @@ -744,7 +742,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud /* Drop the packet, since HW loopback-ed it */ mac_hash = ethh->h_source[MLX4_EN_MAC_HASH_IDX]; bucket = &priv->mac_hash[mac_hash]; - hlist_for_each_entry_rcu(entry, bucket, hlist) { + hlist_for_each_entry_rcu_bh(entry, bucket, hlist) { if (ether_addr_equal_64bits(entry->mac, ethh->h_source)) goto next; @@ -899,8 +897,6 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud break; } - rcu_read_unlock(); - if (likely(polled)) { if (doorbell_pending) { priv->tx_cq[TX_XDP][cq_ring]->xdp_busy = true;