From patchwork Fri Feb 21 19:55:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 13986213 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 046281EBA0C for ; Fri, 21 Feb 2025 19:56:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740167768; cv=none; b=GCn4eqL1Eh5snYkTQxFVVxqXlWidVh9I3ZIyn11Of7BfqGuqkqW9uo7cCK5Xz4XCYiac0NUz7IoJHrsnH1y/VwoBR6IBHv3nf58MYCnhGBLxnof47U03LHVUE8juZyrfjAC3CTB8wyk1CJIRkoTyJoU6nMFuiDa0Cn25V/9HNXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740167768; c=relaxed/simple; bh=LB3Rxw6Tp/KFxn2ruGX8CTjU3yGs0SOFZ7k7XNVLEG0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=H0H53T4ktzN/gbUUYvaSltg31W+z6+GpduZTbtF0FaAkoJR0H2/ym9Jle1DUmcJ52IjPHxP8JiOHPiwgaQlqaJAIhaIBCDesV1odoy8DTZFLywO+cUvJswp9VvZJcQKKJ3UoXLdYCNVUnuWqx7epAC7zVhvBoF4rl1HtwOxzkMc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fomichev.me; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fomichev.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-220e989edb6so70463485ad.1 for ; Fri, 21 Feb 2025 11:56:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740167766; x=1740772566; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zSnzg2sSY2Jp9KHbOJVowahRvkR1cLdK/5h3fKPp+bI=; b=WEWvPaJlQw5aEncg8AWTpRkODLxufnwI1ZQGBeWgFZV7rcAEAKYFQqn0MCIxM9QlwR byWBLaV4ZFvA6g6FipnLdw8EnG6M7GUVacUUr16Cmp/9HJnaj13fqyiU3zUw6uityGBC mYklUVyaFZD0ijIbS8QWXQO7BV8nFBcW+d/DSsYNkqS/IH6KXR4VQWIul/nYA6WhiRbO MuKsnQx8Rmpm5zIecy4J+89LZV6poC8aoEBvi+FxiL2O9eltNvbxty6vXFTfiyXvhipb vZjdoQZe4oZjlmiUXGc9QsdaaCMZtIR6gos8uDOyrn+TAlcStfkAnNTit+3VTBQ/Ua3v o1Cg== X-Gm-Message-State: AOJu0YxCTb2rBlqaBuI6b5igztXplZdzCLShzgNYxcD4p9vSa8UWEqyh yVN/iKtEPgf8RO8ZTfNTtXiXgfHKGNeHshHrVe4kJufHoX/kcToNYYYEi58= X-Gm-Gg: ASbGncuMWI5/orCVGrV4FOLt4hs/YnJ8zDDOyFpJ6UGBJg0hmL5Dwxuj8DlCyLL4VQR srK4EU19A4jIcVGShSec3nZDf2bMGhA+ZsUXKtf+qirHXAb2bahC9OwEwdsgYf7JM7Z4twVbEON Ilt8VtMy8t9oeIUg0AlbJwDEsIv7wgyxcwK4fdEql6JxkyoyIOxD5EWlnNEDYLkqR/1Dt9Cab3O yvGiDjJ1Y50Wm+OI9OOHymUiljAI1ea1KQB0W/9NucqVeqT0UqzB5i/UuWUFcSVXy40ekumczhW wazFMI/sPkjK3U88gpF461JKdQ== X-Google-Smtp-Source: AGHT+IGaBCZPE54UY/GPWrw5M4vF4oyQZ9vcsAr/jUtjDbTuJ+1UiQqyafGa+UG98wcUOb9DxXNJBw== X-Received: by 2002:a17:902:ea11:b0:216:55a1:35a with SMTP id d9443c01a7336-2219ff61e5cmr60213415ad.30.1740167765869; Fri, 21 Feb 2025 11:56:05 -0800 (PST) Received: from localhost ([2601:646:9e00:f56e:123b:cea3:439a:b3e3]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-220d545d051sm139660135ad.108.2025.02.21.11.56.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2025 11:56:05 -0800 (PST) From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, Saeed Mahameed , David Wei Subject: [PATCH net-next v6 00/12] net: Hold netdev instance lock during ndo operations Date: Fri, 21 Feb 2025 11:55:52 -0800 Message-ID: <20250221195604.2103132-1-sdf@fomichev.me> X-Mailer: git-send-email 2.48.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org As the gradual purging of rtnl continues, start grabbing netdev instance lock in more places so we can get to the state where most paths are working without rtnl. Start with requiring the drivers that use shaper api (and later queue mgmt api) to work with both rtnl and netdev instance lock. Eventually we might attempt to drop rtnl. This mostly affects iavf, gve, bnxt and netdev sim (as the drivers that implement shaper/queue mgmt) so those drivers are converted in the process. call_netdevice_notifiers locking is very inconsistent and might need a separate follow up. Some notified events are covered by the instance lock, some are not, which might complicate the driver expectations. Changes since v5: - fix comment in bnxt_lock_sp (Michael) - add netdev_lock/unlock around GVE suspend/resume (Sabrina) - grab netdev lock around ethtool_ops->reset in cmis_fw_update_reset (Sabrina) Changes since v4: - reword documentation about rtnl_lock and instance lock relation (Jakub) - do s/RTNL/rtnl_lock/ in the documentation (Jakub) - mention dev_xxx/netif_xxx distinction (Paolo) - add new patch to add request_ops_lock opt-in (Jakub) - drop patch that adds shaper API to dummy (Jakub) - drop () around dev in netdev_need_ops_lock Changes since v3: - add instance lock to netdev_lockdep_set_classes, move lock_set_cmp_fn to happen after set_class (NIPA) Changes since v2: - new patch to replace dev_addr_sem with instance lock (forwarding tests) - CONFIG_LOCKDEP around netdev_lock_cmp_fn (Jakub) - remove netif_device_present check from dev_setup_tc (bpf_offload.py) - reorder bpf_devs_locks and instance lock ordering in bpf map offload (bpf_offload.py) Changes since v1: - fix netdev_set_mtu_ext_locked in the wrong place (lkp@intel.com) - add missing depend on CONFIG_NET_SHAPER for dummy device (lkp@intel.com) - not sure we need to apply dummy device patch.. - need_netdev_ops_lock -> netdev_need_ops_lock (Jakub) - remove netdev_assert_locked near napi_xxx_locked calls (Jakub) - fix netdev_lock_cmp_fn comment and line length (Jakub) - fix kdoc style of dev_api.c routines (Jakub) - reflow dev_setup_tc to avoid indent (Jakub) - keep tc_can_offload checks outside of dev_setup_tc (Jakub) Changes since RFC: - other control paths are protected - bntx has been converted to mostly depend on netdev instance lock Cc: Saeed Mahameed Cc: David Wei Jakub Kicinski (1): net: ethtool: try to protect all callback with netdev instance lock Stanislav Fomichev (11): net: hold netdev instance lock during ndo_open/ndo_stop net: hold netdev instance lock during ndo_setup_tc net: hold netdev instance lock during queue operations net: hold netdev instance lock during rtnetlink operations net: hold netdev instance lock during ioctl operations net: hold netdev instance lock during sysfs operations net: hold netdev instance lock during ndo_bpf net: replace dev_addr_sem with netdev instance lock net: add option to request netdev instance lock docs: net: document new locking reality eth: bnxt: remove most dependencies on RTNL Documentation/networking/netdevices.rst | 65 +++- drivers/net/bonding/bond_main.c | 16 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 133 ++++---- .../net/ethernet/broadcom/bnxt/bnxt_devlink.c | 9 + .../net/ethernet/broadcom/bnxt/bnxt_sriov.c | 6 + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 16 +- drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 18 +- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 3 +- drivers/net/ethernet/google/gve/gve_main.c | 12 +- drivers/net/ethernet/google/gve/gve_utils.c | 6 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 16 +- drivers/net/netdevsim/ethtool.c | 2 - drivers/net/netdevsim/netdev.c | 36 +- drivers/net/tap.c | 2 +- drivers/net/tun.c | 2 +- include/linux/netdevice.h | 88 ++++- kernel/bpf/offload.c | 6 +- net/8021q/vlan_dev.c | 4 +- net/core/Makefile | 2 +- net/core/dev.c | 284 ++++++---------- net/core/dev.h | 22 +- net/core/dev_api.c | 318 ++++++++++++++++++ net/core/dev_ioctl.c | 69 ++-- net/core/net-sysfs.c | 9 +- net/core/netdev_rx_queue.c | 5 + net/core/rtnetlink.c | 51 ++- net/dsa/conduit.c | 16 +- net/dsa/user.c | 5 +- net/ethtool/cabletest.c | 20 +- net/ethtool/cmis_fw_update.c | 7 +- net/ethtool/features.c | 6 +- net/ethtool/ioctl.c | 6 + net/ethtool/module.c | 8 +- net/ethtool/netlink.c | 12 + net/ethtool/phy.c | 20 +- net/ethtool/rss.c | 2 + net/ethtool/tsinfo.c | 9 +- net/netfilter/nf_flow_table_offload.c | 2 +- net/netfilter/nf_tables_offload.c | 2 +- net/sched/cls_api.c | 2 +- net/sched/sch_api.c | 8 +- net/sched/sch_cbs.c | 8 +- net/sched/sch_etf.c | 8 +- net/sched/sch_ets.c | 4 +- net/sched/sch_fifo.c | 4 +- net/sched/sch_gred.c | 2 +- net/sched/sch_htb.c | 2 +- net/sched/sch_mq.c | 2 +- net/sched/sch_mqprio.c | 6 +- net/sched/sch_prio.c | 2 +- net/sched/sch_red.c | 5 +- net/sched/sch_taprio.c | 17 +- net/sched/sch_tbf.c | 4 +- net/xdp/xsk.c | 3 + net/xdp/xsk_buff_pool.c | 2 + 55 files changed, 929 insertions(+), 465 deletions(-) create mode 100644 net/core/dev_api.c