From patchwork Tue Jun 15 14:54:49 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: 12322121 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=-18.9 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 CB42FC48BE5 for ; Tue, 15 Jun 2021 15:04:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A897D61613 for ; Tue, 15 Jun 2021 15:04:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231352AbhFOPGc (ORCPT ); Tue, 15 Jun 2021 11:06:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55842 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231274AbhFOPGb (ORCPT ); Tue, 15 Jun 2021 11:06:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623769466; 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=ZxWYziQTh5PhGh5gNlqbhBcg5NmHZI8IP9BRx6C+a+c=; b=XB4l3/O/suW1/oQS+SyKUA7b1NJkbodqYf/W19VZ5neF0zlbV3EI72c4x45yqpFslg9zvb Dl38up0+kDte/PoD5BgJOvkE+toL8anQxg8yAXyIWXuOHRLKjqWef4p/DjqlU6VqOE95N7 HPYxPCN6HxlmoRHDk0sKpkoGJxJTiR8= 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-389-IiBGbGenMfap1EEU4PHaEQ-1; Tue, 15 Jun 2021 11:04:25 -0400 X-MC-Unique: IiBGbGenMfap1EEU4PHaEQ-1 Received: by mail-ed1-f69.google.com with SMTP id g13-20020a056402090db02903935a4cb74fso16641139edz.1 for ; Tue, 15 Jun 2021 08:04:24 -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=ZxWYziQTh5PhGh5gNlqbhBcg5NmHZI8IP9BRx6C+a+c=; b=Zj/VPn376KaaJZkMnU4YK4pxYRjbT3YBqI2IWaM3NU9G1kEPxYZ6JWmeif2CSuS+on wh1oIKjvfe59OmJP9FXF8K8JlA8+ltlQnyZ7t6KgczyXhBJ1IhGG+2ifVRCbPp9YPMhF 6NxdE1pWT/Vjg8L6H/n+hTMmOuCmmy4oTpL5RO7yeIuo7GV+YM25W4JQxm1KgUZ5Um4r T2yzr3cfHmDNOF71x/3WqspmSk4mI4l801bnweVo66UhVW7KWfoa/Da1BGjSbLYPUDB+ /t05efJuFR9b2vYKmXH+aPqICfNaOWi1vFFuG5pMOGcgGFUxA8opAxo/PLxmahQNJmLs O5DA== X-Gm-Message-State: AOAM531uwLSr/CrHzQlCvvgNkTsDKJ+2Syxv/UYa12aAOqjIhPjqE1Ru 4eUwXYqQTkwjOP1CQ8gEnimlIrcIRvSJ1WvLO+UxBcub5rshRXG0fgC+c52ISs++1SyvHS44lnd XeiEpX89H/H5f X-Received: by 2002:a17:907:948f:: with SMTP id dm15mr21421644ejc.476.1623769463932; Tue, 15 Jun 2021 08:04:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzx2MELp8drUahchRUWbn1SY+20azHa5F2l+fLZOj+MrTocl/HB0ciEMAf412RgNG99qLgGdQ== X-Received: by 2002:a17:907:948f:: with SMTP id dm15mr21421618ejc.476.1623769463698; Tue, 15 Jun 2021 08:04:23 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id u15sm12545189edy.29.2021.06.15.08.04.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 08:04:22 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id EBE61180733; Tue, 15 Jun 2021 16:54:58 +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 v2 10/16] mlx4: remove rcu_read_lock() around XDP program invocation Date: Tue, 15 Jun 2021 16:54:49 +0200 Message-Id: <20210615145455.564037-11-toke@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615145455.564037-1-toke@redhat.com> References: <20210615145455.564037-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 e35e4d7ef4d1..3f08c14d0441 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;