From patchwork Wed Jun 9 10:33:09 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: 457418 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=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, 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 9D4B7C48BCD for ; Wed, 9 Jun 2021 10:33:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 790DF608FE for ; Wed, 9 Jun 2021 10:33:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237377AbhFIKf3 (ORCPT ); Wed, 9 Jun 2021 06:35:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22340 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234299AbhFIKf3 (ORCPT ); Wed, 9 Jun 2021 06:35:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623234814; 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; bh=BrObvSYupYh6qyBf2GV1ZSOskI6VA5gZ5J5abwVvhBw=; b=Wud7oJ5xwhkiEbWeReWXz5sU3QbY+mbdPoLp9+O2/6R4LymuZ/AeTbSF1iVI6JlgI/6wUl v9rpU9tqeQ8ocOYy0YgspFcaUVfHStL8yB+30w3NQX6YXc5s6DjOv41BD7xmhv5sQ6nzFo Fa8HoSrzwir1DVdYfmpCtieRP/sRc1E= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-278-IHC6h1m2Mp-lWux-sKfqTA-1; Wed, 09 Jun 2021 06:33:33 -0400 X-MC-Unique: IHC6h1m2Mp-lWux-sKfqTA-1 Received: by mail-ej1-f70.google.com with SMTP id n8-20020a1709067b48b02904171dc68f87so3337841ejo.21 for ; Wed, 09 Jun 2021 03:33:33 -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:mime-version :content-transfer-encoding; bh=BrObvSYupYh6qyBf2GV1ZSOskI6VA5gZ5J5abwVvhBw=; b=AsI6JOPq5YzrLCWpqNH4ALMCX6MqIC70YMLtRxgcMqucyfBZ7cLeSTWDcKq5dqBc4y mjJGqQD2Z9uu8tcHcmTG5EvkkXH5CxNwVWuYNeyxJdoE6u3Xggw8fIaYnLPkYvBCTdnb z3D1R9uaqSUp419Z50taChw1WcMCLAwFBSzxcsIKKZ92L5OFEM3Fl8NKQ2ksPPOT7uRY qyPqyAUljtBd0kA51RYnWczNDiX6wqh4+4mK/MtfJoDbuUw+fcy0WEiJYbn42WP+Gdzc Cp3FJETARRc8MdHMZaMRGfyMTcRmaMwXDR943JAu4/mTwnRW4Xf7upLf/m9mk1bZ14PJ XN5Q== X-Gm-Message-State: AOAM5334fq3hJhHTjTC0ahCl1Xhkc9XeD+x/Wv8ybFzfI9+Cbn2RCU5Y F4nJ8K1xEUTmuRAd8gp6MHVfHK09EO9woRDQenHcalJwbAFtd5KaFwPv6EyA9M1nrIxW81vKnq2 VbETIk+XQsnK/SU1f X-Received: by 2002:aa7:c9ce:: with SMTP id i14mr29983868edt.148.1623234811963; Wed, 09 Jun 2021 03:33:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyqDm/l3QgRMbGJvrFjaLDbXtKnR0CrFHvo+w5NyHk7473MTiGLqVu7POym5G1im71jelelg== X-Received: by 2002:aa7:c9ce:: with SMTP id i14mr29983847edt.148.1623234811527; Wed, 09 Jun 2021 03:33:31 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id bd3sm974496edb.34.2021.06.09.03.33.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 03:33:31 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 54B031802A4; Wed, 9 Jun 2021 12:33:30 +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?= Subject: [PATCH bpf-next 00/17] Clean up and document RCU-based object protection for XDP_REDIRECT Date: Wed, 9 Jun 2021 12:33:09 +0200 Message-Id: <20210609103326.278782-1-toke@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org During the discussion[0] of Hangbin's multicast patch series, Martin pointed out that the lifetime of the RCU-protected map entries used by XDP_REDIRECT is by no means obvious. I promised to look into cleaning this up, and Paul helpfully provided some hints and a new unrcu_pointer() helper to aid in this. This is mostly a documentation exercise, clearing up the description of the lifetime expectations and adding __rcu annotations so sparse and lockdep can help verify it. Patches 1-2 are prepatory: Patch 1 adds Paul's unrcu_pointer() helper (which has already been added to his tree) and patch 2 is a small fix for dev_get_by_index_rcu() so lockdep understands _bh-disabled access to it. Patch 3 is the main bit that adds the __rcu annotations and updates documentation comments, and the rest are patches updating the drivers, with one patch per distinct maintainer. Unfortunately I don't have any hardware to test any of the driver patches; Jesper helpfully verified that it doesn't break anything on i40e, but the rest of the driver patches are only compile-tested. [0] https://lore.kernel.org/bpf/20210415173551.7ma4slcbqeyiba2r@kafai-mbp.dhcp.thefacebook.com/ Paul E. McKenney (1): rcu: Create an unrcu_pointer() to remove __rcu from a pointer Toke Høiland-Jørgensen (16): bpf: allow RCU-protected lookups to happen from bh context dev: add rcu_read_lock_bh_held() as a valid check when getting a RCU dev ref xdp: add proper __rcu annotations to redirect map entries ena: remove rcu_read_lock() around XDP program invocation bnxt: remove rcu_read_lock() around XDP program invocation thunderx: remove rcu_read_lock() around XDP program invocation freescale: remove rcu_read_lock() around XDP program invocation net: intel: remove rcu_read_lock() around XDP program invocation marvell: remove rcu_read_lock() around XDP program invocation mlx4: remove rcu_read_lock() around XDP program invocation nfp: remove rcu_read_lock() around XDP program invocation qede: remove rcu_read_lock() around XDP program invocation sfc: remove rcu_read_lock() around XDP program invocation netsec: remove rcu_read_lock() around XDP program invocation stmmac: remove rcu_read_lock() around XDP program invocation net: ti: remove rcu_read_lock() around XDP program invocation drivers/net/ethernet/amazon/ena/ena_netdev.c | 3 -- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 2 - .../net/ethernet/cavium/thunder/nicvf_main.c | 2 - .../net/ethernet/freescale/dpaa/dpaa_eth.c | 8 +-- .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 3 -- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 - drivers/net/ethernet/intel/i40e/i40e_xsk.c | 6 +-- drivers/net/ethernet/intel/ice/ice_txrx.c | 6 +-- drivers/net/ethernet/intel/ice/ice_xsk.c | 6 +-- drivers/net/ethernet/intel/igb/igb_main.c | 2 - drivers/net/ethernet/intel/igc/igc_main.c | 7 +-- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 - drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 6 +-- .../net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 - drivers/net/ethernet/marvell/mvneta.c | 2 - .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 -- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 8 +-- .../ethernet/netronome/nfp/nfp_net_common.c | 2 - drivers/net/ethernet/qlogic/qede/qede_fp.c | 6 --- drivers/net/ethernet/sfc/rx.c | 9 +--- drivers/net/ethernet/socionext/netsec.c | 3 -- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 10 +--- drivers/net/ethernet/ti/cpsw_priv.c | 10 +--- include/linux/rcupdate.h | 14 +++++ include/net/xdp_sock.h | 2 +- kernel/bpf/cpumap.c | 14 +++-- kernel/bpf/devmap.c | 52 ++++++++----------- kernel/bpf/hashtab.c | 21 +++++--- kernel/bpf/helpers.c | 6 +-- kernel/bpf/lpm_trie.c | 6 ++- net/core/dev.c | 2 +- net/core/filter.c | 28 ++++++++++ net/xdp/xsk.c | 4 +- net/xdp/xsk.h | 4 +- net/xdp/xskmap.c | 29 ++++++----- 35 files changed, 134 insertions(+), 159 deletions(-) Tested-by: Grygorii Strashko Reviewed-by: Grygorii Strashko Acked-by: Ilias Apalodimas Reviewed-by: Tariq Toukan Acked-by: Martin KaFai Lau