From nobody Sat Oct 11 12:08:56 2025 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 F2CD3244660; Tue, 10 Jun 2025 17:15:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749575728; cv=none; b=XHGo8p8vDIH9EGbO0nzwvtknNMTPTV5dELm3d5vfdh+ZOdbxo8FNt4rHiFQ259H7y+a+bshIFd7V9nilvJDbGAf9KLH5aI7RfTkzDvGpGqAMt86f9bg0rNpsFenihK55c/CsOz3B57gupOM+dD0HKELe6U9Zr9X4UoBCCi1km8Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749575728; c=relaxed/simple; bh=S3g7OLdkbgbHF8hzS1zZZ7ZfahSCi9rUhwJp/qT2/Uo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H15wjrsGULDvNwPF3lvheAaNmNsZ0Jfkg5Y47hmwpHJeGf6SI3SVNNZ0JoxZyvvaLrh1DM6E49sgaTyUIJe8rB1trxxGhErcQMwYHjycPt2CtGxKT7Ozry2E59VPvk8EV5MH0E6MYRb0YmalMj7+dMcO0QtxkaMEW5K5t28d8xA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lpFH6Kre; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lpFH6Kre" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-235a3dd4f0dso39731235ad.0; Tue, 10 Jun 2025 10:15:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749575726; x=1750180526; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PbIGzSVfDwiEgSWF74Mc6LFH+xkyt/V3j/EbdHhOVFA=; b=lpFH6KreXr4vZ7bCSDEktzgGhEBAUJ5jw0cnn4UmwqXRZfGVkvS5SrAjUMKBRhIiC8 wy/mvlbncwJn72D+jIg0dlrKG8d9E9efKec2eLqe0axpZLrNXC3hamK6ohGjnDHibhGF NlLiQeq/pulCsHFkv2vyAezDtTffF0fSpih7oIh0uOBlkob0V9Jibiluf9KHIR60IuAE GuCzv7OWn/2hjQPP4Top1hOdqQjVQ7LQtroUPmb2001PVDlN7YYLjlsdCthS/qcAfejU g/ZDo8DgeIbVV6IYtrnu3NZ8IPWWEWraWt1ywLOefuTbJ35e1yKVdKd0zjYH7elf0Ek3 yeHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749575726; x=1750180526; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PbIGzSVfDwiEgSWF74Mc6LFH+xkyt/V3j/EbdHhOVFA=; b=XMMKPedwN6jiPT+/5ZPcOA8foI7f7DlJeYx5avwUSZXBv1aW93scYwBWyK+FIPeYO0 nqeWVOSc4BTvklL0SxxMXJzxTx9Fblwx8+HsKrzxbkBZn+z2psThECGa2Doa9cqz0F6C 1JklR6JUDfmkyHqXV8CyvVkrhPqmX1wHOV4iJezZ3OkFfyxbE+p6o31P1C6kuZEvNmWk qewgnRbiUnddKPzcFJPq9qtSmfKDQHETEkvkSCmuwa4+/cf0sAe9p1I9OVAKyy+ccltv NgTusCuwkgEaJVDAUW/gWUJA2SIO9EnKQBEJOiDj/9G5BFpd8H5TY2chGo82W0EMkl2u +dSw== X-Forwarded-Encrypted: i=1; AJvYcCU9wTBEHYRRKqEiap3Igr4FWYK8fWQWoEPrhApuAoD5Sjv3t+ZkoNvwFCIxq+lNgqhx/DGQQM6h1+gm7w==@vger.kernel.org, AJvYcCX6CbCp28eqcpwOwghibaswfK0W1LioCaPyoBpXTuBXURxO6Uw6//cYEd8+xbbj9lVIB2nL8Hg3CyIZ/yaTkh2t@vger.kernel.org, AJvYcCX9n5nuybdavYnWv5pCT3k1SgptPdxYXPYchj2l/8HZ2RHZoKLNuuOUivf0avYs9uKPblcLK5rILrPUO1c=@vger.kernel.org X-Gm-Message-State: AOJu0YzzreF631ce/NCPS8evkp9iktlzhelBqQBoaCmxoUbbHrb2JAGJ v+kNTbIa00sR2gUFB1ck6hIrvutpGhZNhT99Cbg79C+irYM7bsWHumDTsgE7 X-Gm-Gg: ASbGncufr6fCmMXvB8gAJJ62UQasO+HIAOnBXtNPtuZ6pc7qnypGgmZQWPIeqc3AbKP bBQVUG9GhcS73Ek0fpZ+sTRTmUHkQz0+m34GfH7G/DjDZlTBZ+mleZn7EoVmZqwfnoyrkG/n/yx ZFPxIMoU+jHiuzlWCpy4YfCoYZXtKmL0jBpsAZUKMGFd28B8d+gGWN4ZcqwQ0pnHZ5FEMWov7h8 3Qe/JTlxSCtE21emL5ioc1yBhg4E1KIvPmC6nCeFL1BSb84vcPx2otWhd84xlzpTspGmbX8XjPI bs63x5VxDt9v6ahoDTiDt97jVt3Zbxf8fJmWYrKqZ/7KK5/YzcRhP5oOAZ3ex73i/p6XL3VtbHU oNaW/gIJlmsjNh8pGlX/acMI= X-Google-Smtp-Source: AGHT+IGZ9tejt0MSuMTdOic/nmELO8U8E+URRvnGcKJeXl48oXaS7nVF+OfxpaEqUoK81AoUlZMjAQ== X-Received: by 2002:a17:902:f54b:b0:235:f298:cbbe with SMTP id d9443c01a7336-23641abc322mr1500425ad.12.1749575725391; Tue, 10 Jun 2025 10:15:25 -0700 (PDT) Received: from localhost (c-73-158-218-242.hsd1.ca.comcast.net. [73.158.218.242]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-23603077edbsm73764305ad.14.2025.06.10.10.15.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 10:15:24 -0700 (PDT) From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, skalluru@marvell.com, manishc@marvell.com, andrew+netdev@lunn.ch, michael.chan@broadcom.com, pavan.chebbi@broadcom.com, ajit.khaparde@broadcom.com, sriharsha.basavapatna@broadcom.com, somnath.kotur@broadcom.com, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, tariqt@nvidia.com, saeedm@nvidia.com, louis.peens@corigine.com, shshaikh@marvell.com, GR-Linux-NIC-Dev@marvell.com, ecree.xilinx@gmail.com, horms@kernel.org, dsahern@kernel.org, shuah@kernel.org, ruanjinjie@huawei.com, mheib@redhat.com, stfomichev@gmail.com, linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-rdma@vger.kernel.org, oss-drivers@corigine.com, linux-net-drivers@amd.com, linux-kselftest@vger.kernel.org, leon@kernel.org, Cosmin Ratiu Subject: [PATCH net-next v3 1/4] udp_tunnel: remove rtnl_lock dependency Date: Tue, 10 Jun 2025 10:15:19 -0700 Message-ID: <20250610171522.2119030-2-stfomichev@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610171522.2119030-1-stfomichev@gmail.com> References: <20250610171522.2119030-1-stfomichev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Drivers that are using ops lock and don't depend on RTNL lock still need to manage it because udp_tunnel's RTNL dependency. Introduce new udp_tunnel_nic_lock and use it instead of rtnl_lock. Drop non-UDP_TUNNEL_NIC_INFO_MAY_SLEEP mode from udp_tunnel infra (udp_tunnel_nic_device_sync_work needs to grab udp_tunnel_nic_lock mutex and might sleep). Cc: Michael Chan Reviewed-by: Cosmin Ratiu Suggested-by: Jakub Kicinski Signed-off-by: Stanislav Fomichev --- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 ++-- drivers/net/ethernet/emulex/benet/be_main.c | 3 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 1 - drivers/net/ethernet/intel/ice/ice_main.c | 1 - .../net/ethernet/mellanox/mlx4/en_netdev.c | 3 +- .../net/ethernet/mellanox/mlx5/core/en_main.c | 3 +- .../ethernet/netronome/nfp/nfp_net_common.c | 3 +- .../net/ethernet/qlogic/qede/qede_filter.c | 3 -- .../net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 - drivers/net/ethernet/sfc/ef10.c | 1 - drivers/net/netdevsim/udp_tunnels.c | 4 --- include/net/udp_tunnel.h | 8 ++--- net/ipv4/udp_tunnel_nic.c | 30 +++++++++---------- 14 files changed, 24 insertions(+), 46 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net= /ethernet/broadcom/bnx2x/bnx2x_main.c index f522ca8ff66b..fa7e5adf9804 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -10219,8 +10219,7 @@ static int bnx2x_udp_tunnel_sync(struct net_device = *netdev, unsigned int table) =20 static const struct udp_tunnel_nic_info bnx2x_udp_tunnels =3D { .sync_table =3D bnx2x_udp_tunnel_sync, - .flags =3D UDP_TUNNEL_NIC_INFO_MAY_SLEEP | - UDP_TUNNEL_NIC_INFO_OPEN_ONLY, + .flags =3D UDP_TUNNEL_NIC_INFO_OPEN_ONLY, .tables =3D { { .n_entries =3D 1, .tunnel_types =3D UDP_TUNNEL_TYPE_VXLAN, }, { .n_entries =3D 1, .tunnel_types =3D UDP_TUNNEL_TYPE_GENEVE, }, diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index d5495762c945..a3dadde65b8d 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -15573,8 +15573,7 @@ static int bnxt_udp_tunnel_unset_port(struct net_de= vice *netdev, unsigned int ta static const struct udp_tunnel_nic_info bnxt_udp_tunnels =3D { .set_port =3D bnxt_udp_tunnel_set_port, .unset_port =3D bnxt_udp_tunnel_unset_port, - .flags =3D UDP_TUNNEL_NIC_INFO_MAY_SLEEP | - UDP_TUNNEL_NIC_INFO_OPEN_ONLY, + .flags =3D UDP_TUNNEL_NIC_INFO_OPEN_ONLY, .tables =3D { { .n_entries =3D 1, .tunnel_types =3D UDP_TUNNEL_TYPE_VXLAN, }, { .n_entries =3D 1, .tunnel_types =3D UDP_TUNNEL_TYPE_GENEVE, }, @@ -15582,8 +15581,7 @@ static const struct udp_tunnel_nic_info bnxt_udp_tu= nnels =3D { }, bnxt_udp_tunnels_p7 =3D { .set_port =3D bnxt_udp_tunnel_set_port, .unset_port =3D bnxt_udp_tunnel_unset_port, - .flags =3D UDP_TUNNEL_NIC_INFO_MAY_SLEEP | - UDP_TUNNEL_NIC_INFO_OPEN_ONLY, + .flags =3D UDP_TUNNEL_NIC_INFO_OPEN_ONLY, .tables =3D { { .n_entries =3D 1, .tunnel_types =3D UDP_TUNNEL_TYPE_VXLAN, }, { .n_entries =3D 1, .tunnel_types =3D UDP_TUNNEL_TYPE_GENEVE, }, diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethe= rnet/emulex/benet/be_main.c index 3d2e21592119..f49400ba9729 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -4031,8 +4031,7 @@ static int be_vxlan_unset_port(struct net_device *net= dev, unsigned int table, static const struct udp_tunnel_nic_info be_udp_tunnels =3D { .set_port =3D be_vxlan_set_port, .unset_port =3D be_vxlan_unset_port, - .flags =3D UDP_TUNNEL_NIC_INFO_MAY_SLEEP | - UDP_TUNNEL_NIC_INFO_OPEN_ONLY, + .flags =3D UDP_TUNNEL_NIC_INFO_OPEN_ONLY, .tables =3D { { .n_entries =3D 1, .tunnel_types =3D UDP_TUNNEL_TYPE_VXLAN, }, }, diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethe= rnet/intel/i40e/i40e_main.c index 120d68654e3f..3d3da9d15348 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -15891,7 +15891,6 @@ static int i40e_probe(struct pci_dev *pdev, const s= truct pci_device_id *ent) =20 pf->udp_tunnel_nic.set_port =3D i40e_udp_tunnel_set_port; pf->udp_tunnel_nic.unset_port =3D i40e_udp_tunnel_unset_port; - pf->udp_tunnel_nic.flags =3D UDP_TUNNEL_NIC_INFO_MAY_SLEEP; pf->udp_tunnel_nic.shared =3D &pf->udp_tunnel_shared; pf->udp_tunnel_nic.tables[0].n_entries =3D I40E_MAX_PF_UDP_OFFLOAD_PORTS; pf->udp_tunnel_nic.tables[0].tunnel_types =3D UDP_TUNNEL_TYPE_VXLAN | diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethern= et/intel/ice/ice_main.c index d97d4b25b30d..e309531f8c9d 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -4764,7 +4764,6 @@ int ice_init_dev(struct ice_pf *pf) =20 pf->hw.udp_tunnel_nic.set_port =3D ice_udp_tunnel_set_port; pf->hw.udp_tunnel_nic.unset_port =3D ice_udp_tunnel_unset_port; - pf->hw.udp_tunnel_nic.flags =3D UDP_TUNNEL_NIC_INFO_MAY_SLEEP; pf->hw.udp_tunnel_nic.shared =3D &pf->hw.udp_tunnel_shared; if (pf->hw.tnl.valid_count[TNL_VXLAN]) { pf->hw.udp_tunnel_nic.tables[0].n_entries =3D diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/e= thernet/mellanox/mlx4/en_netdev.c index 281b34af0bb4..d2071aff7b8f 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -2670,8 +2670,7 @@ static int mlx4_udp_tunnel_sync(struct net_device *de= v, unsigned int table) =20 static const struct udp_tunnel_nic_info mlx4_udp_tunnels =3D { .sync_table =3D mlx4_udp_tunnel_sync, - .flags =3D UDP_TUNNEL_NIC_INFO_MAY_SLEEP | - UDP_TUNNEL_NIC_INFO_IPV4_ONLY, + .flags =3D UDP_TUNNEL_NIC_INFO_IPV4_ONLY, .tables =3D { { .n_entries =3D 1, .tunnel_types =3D UDP_TUNNEL_TYPE_VXLAN, }, }, diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/ne= t/ethernet/mellanox/mlx5/core/en_main.c index ea822c69d137..ccde53f94045 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -5303,8 +5303,7 @@ void mlx5e_vxlan_set_netdev_info(struct mlx5e_priv *p= riv) =20 priv->nic_info.set_port =3D mlx5e_vxlan_set_port; priv->nic_info.unset_port =3D mlx5e_vxlan_unset_port; - priv->nic_info.flags =3D UDP_TUNNEL_NIC_INFO_MAY_SLEEP | - UDP_TUNNEL_NIC_INFO_STATIC_IANA_VXLAN; + priv->nic_info.flags =3D UDP_TUNNEL_NIC_INFO_STATIC_IANA_VXLAN; priv->nic_info.tables[0].tunnel_types =3D UDP_TUNNEL_TYPE_VXLAN; /* Don't count the space hard-coded to the IANA port */ priv->nic_info.tables[0].n_entries =3D diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/= net/ethernet/netronome/nfp/nfp_net_common.c index 28997ddab966..14ba38bcb07b 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -2394,8 +2394,7 @@ static int nfp_udp_tunnel_sync(struct net_device *net= dev, unsigned int table) =20 static const struct udp_tunnel_nic_info nfp_udp_tunnels =3D { .sync_table =3D nfp_udp_tunnel_sync, - .flags =3D UDP_TUNNEL_NIC_INFO_MAY_SLEEP | - UDP_TUNNEL_NIC_INFO_OPEN_ONLY, + .flags =3D UDP_TUNNEL_NIC_INFO_OPEN_ONLY, .tables =3D { { .n_entries =3D NFP_NET_N_VXLAN_PORTS, diff --git a/drivers/net/ethernet/qlogic/qede/qede_filter.c b/drivers/net/e= thernet/qlogic/qede/qede_filter.c index 985026dd816f..7e341e026489 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_filter.c +++ b/drivers/net/ethernet/qlogic/qede/qede_filter.c @@ -987,20 +987,17 @@ static int qede_udp_tunnel_sync(struct net_device *de= v, unsigned int table) =20 static const struct udp_tunnel_nic_info qede_udp_tunnels_both =3D { .sync_table =3D qede_udp_tunnel_sync, - .flags =3D UDP_TUNNEL_NIC_INFO_MAY_SLEEP, .tables =3D { { .n_entries =3D 1, .tunnel_types =3D UDP_TUNNEL_TYPE_VXLAN, }, { .n_entries =3D 1, .tunnel_types =3D UDP_TUNNEL_TYPE_GENEVE, }, }, }, qede_udp_tunnels_vxlan =3D { .sync_table =3D qede_udp_tunnel_sync, - .flags =3D UDP_TUNNEL_NIC_INFO_MAY_SLEEP, .tables =3D { { .n_entries =3D 1, .tunnel_types =3D UDP_TUNNEL_TYPE_VXLAN, }, }, }, qede_udp_tunnels_geneve =3D { .sync_table =3D qede_udp_tunnel_sync, - .flags =3D UDP_TUNNEL_NIC_INFO_MAY_SLEEP, .tables =3D { { .n_entries =3D 1, .tunnel_types =3D UDP_TUNNEL_TYPE_GENEVE, }, }, diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net= /ethernet/qlogic/qlcnic/qlcnic_main.c index eb69121df726..53cdd36c4123 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -486,7 +486,6 @@ static int qlcnic_udp_tunnel_sync(struct net_device *de= v, unsigned int table) =20 static const struct udp_tunnel_nic_info qlcnic_udp_tunnels =3D { .sync_table =3D qlcnic_udp_tunnel_sync, - .flags =3D UDP_TUNNEL_NIC_INFO_MAY_SLEEP, .tables =3D { { .n_entries =3D 1, .tunnel_types =3D UDP_TUNNEL_TYPE_VXLAN, }, }, diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef1= 0.c index 47349c148c0c..fcec81f862ec 100644 --- a/drivers/net/ethernet/sfc/ef10.c +++ b/drivers/net/ethernet/sfc/ef10.c @@ -3985,7 +3985,6 @@ static int efx_ef10_udp_tnl_unset_port(struct net_dev= ice *dev, static const struct udp_tunnel_nic_info efx_ef10_udp_tunnels =3D { .set_port =3D efx_ef10_udp_tnl_set_port, .unset_port =3D efx_ef10_udp_tnl_unset_port, - .flags =3D UDP_TUNNEL_NIC_INFO_MAY_SLEEP, .tables =3D { { .n_entries =3D 16, diff --git a/drivers/net/netdevsim/udp_tunnels.c b/drivers/net/netdevsim/ud= p_tunnels.c index 640b4983a9a0..10cbbf1c584b 100644 --- a/drivers/net/netdevsim/udp_tunnels.c +++ b/drivers/net/netdevsim/udp_tunnels.c @@ -112,12 +112,10 @@ nsim_udp_tunnels_info_reset_write(struct file *file, = const char __user *data, struct net_device *dev =3D file->private_data; struct netdevsim *ns =3D netdev_priv(dev); =20 - rtnl_lock(); if (dev->reg_state =3D=3D NETREG_REGISTERED) { memset(ns->udp_ports.ports, 0, sizeof(ns->udp_ports.__ports)); udp_tunnel_nic_reset_ntf(dev); } - rtnl_unlock(); =20 return count; } @@ -181,8 +179,6 @@ int nsim_udp_tunnels_info_create(struct nsim_dev *nsim_= dev, info->sync_table =3D NULL; } =20 - if (ns->udp_ports.sleep) - info->flags |=3D UDP_TUNNEL_NIC_INFO_MAY_SLEEP; if (nsim_dev->udp_ports.open_only) info->flags |=3D UDP_TUNNEL_NIC_INFO_OPEN_ONLY; if (nsim_dev->udp_ports.ipv4_only) diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h index 2df3b8344eb5..606168b0b64a 100644 --- a/include/net/udp_tunnel.h +++ b/include/net/udp_tunnel.h @@ -221,19 +221,17 @@ static inline void udp_tunnel_encap_enable(struct soc= k *sk) #define UDP_TUNNEL_NIC_MAX_TABLES 4 =20 enum udp_tunnel_nic_info_flags { - /* Device callbacks may sleep */ - UDP_TUNNEL_NIC_INFO_MAY_SLEEP =3D BIT(0), /* Device only supports offloads when it's open, all ports * will be removed before close and re-added after open. */ - UDP_TUNNEL_NIC_INFO_OPEN_ONLY =3D BIT(1), + UDP_TUNNEL_NIC_INFO_OPEN_ONLY =3D BIT(0), /* Device supports only IPv4 tunnels */ - UDP_TUNNEL_NIC_INFO_IPV4_ONLY =3D BIT(2), + UDP_TUNNEL_NIC_INFO_IPV4_ONLY =3D BIT(1), /* Device has hard-coded the IANA VXLAN port (4789) as VXLAN. * This port must not be counted towards n_entries of any table. * Driver will not receive any callback associated with port 4789. */ - UDP_TUNNEL_NIC_INFO_STATIC_IANA_VXLAN =3D BIT(3), + UDP_TUNNEL_NIC_INFO_STATIC_IANA_VXLAN =3D BIT(2), }; =20 struct udp_tunnel_nic; diff --git a/net/ipv4/udp_tunnel_nic.c b/net/ipv4/udp_tunnel_nic.c index b6d2d16189c0..956a04c4bed4 100644 --- a/net/ipv4/udp_tunnel_nic.c +++ b/net/ipv4/udp_tunnel_nic.c @@ -34,6 +34,7 @@ struct udp_tunnel_nic_table_entry { * @work_pending: @work is currently scheduled * @n_tables: number of tables under @entries * @missed: bitmap of tables which overflown + * @lock: protects entries * @entries: table of tables of ports currently offloaded */ struct udp_tunnel_nic { @@ -47,6 +48,7 @@ struct udp_tunnel_nic { =20 unsigned int n_tables; unsigned long missed; + struct mutex lock; struct udp_tunnel_nic_table_entry *entries[] __counted_by(n_tables); }; =20 @@ -298,22 +300,11 @@ __udp_tunnel_nic_device_sync(struct net_device *dev, = struct udp_tunnel_nic *utn) static void udp_tunnel_nic_device_sync(struct net_device *dev, struct udp_tunnel_nic *= utn) { - const struct udp_tunnel_nic_info *info =3D dev->udp_tunnel_nic_info; - bool may_sleep; - if (!utn->need_sync) return; =20 - /* Drivers which sleep in the callback need to update from - * the workqueue, if we come from the tunnel driver's notification. - */ - may_sleep =3D info->flags & UDP_TUNNEL_NIC_INFO_MAY_SLEEP; - if (!may_sleep) - __udp_tunnel_nic_device_sync(dev, utn); - if (may_sleep || utn->need_replay) { - queue_work(udp_tunnel_nic_workqueue, &utn->work); - utn->work_pending =3D 1; - } + queue_work(udp_tunnel_nic_workqueue, &utn->work); + utn->work_pending =3D 1; } =20 static bool @@ -554,12 +545,12 @@ static void __udp_tunnel_nic_reset_ntf(struct net_dev= ice *dev) struct udp_tunnel_nic *utn; unsigned int i, j; =20 - ASSERT_RTNL(); - utn =3D dev->udp_tunnel_nic; if (!utn) return; =20 + mutex_lock(&utn->lock); + utn->need_sync =3D false; for (i =3D 0; i < utn->n_tables; i++) for (j =3D 0; j < info->tables[i].n_entries; j++) { @@ -569,7 +560,7 @@ static void __udp_tunnel_nic_reset_ntf(struct net_devic= e *dev) =20 entry->flags &=3D ~(UDP_TUNNEL_NIC_ENTRY_DEL | UDP_TUNNEL_NIC_ENTRY_OP_FAIL); - /* We don't release rtnl across ops */ + /* We don't release utn lock across ops */ WARN_ON(entry->flags & UDP_TUNNEL_NIC_ENTRY_FROZEN); if (!entry->use_cnt) continue; @@ -579,6 +570,8 @@ static void __udp_tunnel_nic_reset_ntf(struct net_devic= e *dev) } =20 __udp_tunnel_nic_device_sync(dev, utn); + + mutex_unlock(&utn->lock); } =20 static size_t @@ -710,11 +703,15 @@ static void udp_tunnel_nic_device_sync_work(struct wo= rk_struct *work) container_of(work, struct udp_tunnel_nic, work); =20 rtnl_lock(); + mutex_lock(&utn->lock); + utn->work_pending =3D 0; __udp_tunnel_nic_device_sync(utn->dev, utn); =20 if (utn->need_replay) udp_tunnel_nic_replay(utn->dev, utn); + + mutex_unlock(&utn->lock); rtnl_unlock(); } =20 @@ -730,6 +727,7 @@ udp_tunnel_nic_alloc(const struct udp_tunnel_nic_info *= info, return NULL; utn->n_tables =3D n_tables; INIT_WORK(&utn->work, udp_tunnel_nic_device_sync_work); + mutex_init(&utn->lock); =20 for (i =3D 0; i < n_tables; i++) { utn->entries[i] =3D kcalloc(info->tables[i].n_entries, --=20 2.49.0 From nobody Sat Oct 11 12:08:56 2025 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (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 EBDEB24469D; Tue, 10 Jun 2025 17:15:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749575729; cv=none; b=AjvRp3qrsFjMxGANIxL03H3y4LyjNJrFZV3f97+6qZV7GRQCtQEnhfLcU8YgmgNPlf9hvxvtW0e9/NHqUF6br3L7KdaNktXiauaAGzJOuYUMSu7u21o6Y0WJ0IkKrl0EvmYb/uhhjaUMXJkqoDsSGAJacZNpvh6OKEcNn/qgWuY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749575729; c=relaxed/simple; bh=gJFmnMD6We7T8CJJ9MqQYVPFTCjVQwwgiQcPRp9KYL8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dk8Z4Orh9gK5MCyUiVbx9XOS7PwnP81rUjuPnKksBCmsBxA7tc584jm/xd/psUI2YOLyW8ZIHZnLBrCWPWgZEkZKxDiIkg1BzgeZf8V/2RjyUhGNHKFh24iK6X2oyS79iWYSgLc3TLWAO0GX2Uswj+ihiqqOhD19R/oQDtK2q18= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ebGAu6xF; arc=none smtp.client-ip=209.85.215.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ebGAu6xF" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-b1fd59851baso3299891a12.0; Tue, 10 Jun 2025 10:15:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749575727; x=1750180527; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OIpCecH4yJO034nC1LHMnR1mqJnd63DXTBjtuXwa8mc=; b=ebGAu6xF11ojNi1SrLVi0IdX4MZClJznmhWTOMPfiU8vBp0V0UZP+XP8KjVXCPDRXa cBfV/1McSUcs1qWCV1izVl/zY2qHLyuC+hAiYojwtYEUtdhLI8me3C/SWykuZIHcLDCZ WlOc0Qq+EH9rFAFOenaCMHw7yKoqdQdHNydrQKLo+KkBbzJgwdyvuT4rlLovQg8ksxtn 7cKICdhqMBI1tegTMZJ/Ng4Qs/3jltHjBU1TbY4gabUY+Rbej+iEqctgCY2bkcf5bnBX Tp5bo26KkoMmU7Zpv0x3DOWSJDwZ7ae5n+3bGNUAZATJGjCfZpWvirnyS+bTnHzm9oYJ APlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749575727; x=1750180527; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OIpCecH4yJO034nC1LHMnR1mqJnd63DXTBjtuXwa8mc=; b=nqeamJFpSDuMIlBilYqjtRR0Fjy4HBx1lQ+ybEXM/zFH2ylCzCb/zWRQQm9Je3iRLj hLBwhpFDrijycWNKYxAXnCYFzcju1P6+hb0cgmROb0l0rEoH7yk74oRBrqzaafkXtq8V zT6jFdLgveRHwahPpw1JKe3/gs7sZB3fxHb8EvoME+Hv46i1dvzHocQ3aXhraIPPnvmn NPt6Eh5aWKJvRVcSLM+Lq+8ezZwqCVWVp9S4Gsba+A9SCOOQCYcb7OWSirXk/qKccqjc hR/8cbKRRTDZVmLqvFfn53UMuzHv88XQIAQDqCMmkS8WfZnmzi1mXvGRVXUgShrum6Vp etWQ== X-Forwarded-Encrypted: i=1; AJvYcCVi8PgeDaqBn7BANqu7QBM/ctQ+fv+VKEWY0wlC6ezCK+qOdXOaiXLegNk886IrkDfMS+cwc455RPQm8Q==@vger.kernel.org, AJvYcCWFSKs3l9JlfU+24kG98aEbuQ57MpxTfLlkKjikdb02GeSx7a7OZvDxS8cEWyWw3uIviQyCotFHmMNZtUqGv/WV@vger.kernel.org, AJvYcCXve1/CZFXH/VVzC6CnCeCUByrtBDZdxdAQPC9tT6qLleJUpoYzEZVxluDH+km980yGfyQNfk4jIj7om3c=@vger.kernel.org X-Gm-Message-State: AOJu0YzSz5aShLBXpCLJwc46xwNvH6aZ3fAN7yaF30HU4F6G593Hkxpr up3KM88REbAoaHsPPl1cho57JK7o8wsVHUP/qd5lGCtyJvJg+tt1AuZwa1CZ X-Gm-Gg: ASbGnctfDuGAd5mTsfqeJDV9XkjHoqTRU8j9SlWXEo/UpP54zEGkjXM+lBi+m+Hs7mX qsd/AZfNLkpj31RhEKbbxoD5bS6fqMcQg9pH99kyXEjt4x0/zjY0GWqz12Z+ZbZqJp6YTCfT2V7 NbVgWFLMLOyraEnUjSEFzbS8g4ySCrjZgBu+B3glsDoiZGMS3NlaPyuA8TOK7Qv00wPk/Rj+AAi GYiWVC+SMDw6sYmbKJxomJbrsmnlseqVdsEsf04GPZhrV9jrJ+z46L+m+eGfLbCmjPqUkVs0tZD 4c6XwOug2v6XfjTsuliVEMEAbxUUJljxCqrwYSLSc7KaQn0vm+7cp2VEew8lfDxAbKJ4u4eKWQ1 XtT6FuwnhX9WZXk3lG8i/oYM= X-Google-Smtp-Source: AGHT+IFNn384M0APO9NR5szwd5Jx/eM8GcxVstTXNBBj5YHPeF57nNlZNzxLY41eKB4Udjdn0vnI0g== X-Received: by 2002:a17:90b:390e:b0:311:e8cc:424c with SMTP id 98e67ed59e1d1-313af2603c8mr453324a91.25.1749575726795; Tue, 10 Jun 2025 10:15:26 -0700 (PDT) Received: from localhost (c-73-158-218-242.hsd1.ca.comcast.net. [73.158.218.242]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-31349fc3e72sm7562065a91.31.2025.06.10.10.15.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 10:15:26 -0700 (PDT) From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, skalluru@marvell.com, manishc@marvell.com, andrew+netdev@lunn.ch, michael.chan@broadcom.com, pavan.chebbi@broadcom.com, ajit.khaparde@broadcom.com, sriharsha.basavapatna@broadcom.com, somnath.kotur@broadcom.com, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, tariqt@nvidia.com, saeedm@nvidia.com, louis.peens@corigine.com, shshaikh@marvell.com, GR-Linux-NIC-Dev@marvell.com, ecree.xilinx@gmail.com, horms@kernel.org, dsahern@kernel.org, shuah@kernel.org, ruanjinjie@huawei.com, mheib@redhat.com, stfomichev@gmail.com, linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-rdma@vger.kernel.org, oss-drivers@corigine.com, linux-net-drivers@amd.com, linux-kselftest@vger.kernel.org, leon@kernel.org Subject: [PATCH net-next v3 2/4] net: remove redundant ASSERT_RTNL() in queue setup functions Date: Tue, 10 Jun 2025 10:15:20 -0700 Message-ID: <20250610171522.2119030-3-stfomichev@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610171522.2119030-1-stfomichev@gmail.com> References: <20250610171522.2119030-1-stfomichev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The existing netdev_ops_assert_locked() already asserts that either the RTNL lock or the per-device lock is held, making the explicit ASSERT_RTNL() redundant. Cc: Michael Chan Signed-off-by: Stanislav Fomichev Reviewed-by: Aleksandr Loktionov --- net/core/dev.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index be97c440ecd5..72997636b8ec 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3179,7 +3179,6 @@ int netif_set_real_num_tx_queues(struct net_device *d= ev, unsigned int txq) =20 if (dev->reg_state =3D=3D NETREG_REGISTERED || dev->reg_state =3D=3D NETREG_UNREGISTERING) { - ASSERT_RTNL(); netdev_ops_assert_locked(dev); =20 rc =3D netdev_queue_update_kobjects(dev, dev->real_num_tx_queues, @@ -3229,7 +3228,6 @@ int netif_set_real_num_rx_queues(struct net_device *d= ev, unsigned int rxq) return -EINVAL; =20 if (dev->reg_state =3D=3D NETREG_REGISTERED) { - ASSERT_RTNL(); netdev_ops_assert_locked(dev); =20 rc =3D net_rx_queue_update_kobjects(dev, dev->real_num_rx_queues, --=20 2.49.0 From nobody Sat Oct 11 12:08:56 2025 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 99B652459C9; Tue, 10 Jun 2025 17:15:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749575731; cv=none; b=dqfPC1too3vOFj1wBUNsIg29Oq688j3NkscMOfdSU0IMb66GFqoRfh93nxYWInUksFIUfaRFDJ2IHxme4zfMIofjesoJ/Qab3/k5m3y3PRjSwX1tz4QCMFPF3Su+Ai42hwD6b2+nH0V4ifct2lXVkyIbPY3TE6tJMduq/Hqb1Cs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749575731; c=relaxed/simple; bh=jrPADGdQVSlhHaHu88CYeq9ejs0dqL4pa8LW21dVeyc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eDBmFEcwQQihMes4abNHVPkEILL5MGLwtBiwRp+QmYYcwyVMXfrgD0WefSjrs75j53YfmVF/vvMCPhsz0nVVAE0Q++m26D75/Mr5cLIgNRLsCtKSCF4KGEV2eW9MC99g45gQyGex/vusqeAFw7vBNMRbb5onNw8yy3quOrn9b0k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Qxf/ALbo; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Qxf/ALbo" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-742c3d06de3so6566391b3a.0; Tue, 10 Jun 2025 10:15:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749575728; x=1750180528; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sO4neuwpUVoDLsDzSFLxxvkPcabDlga25iey737Q9/w=; b=Qxf/ALbomQba8c+yLlzKIhnzhpheLJWTJmRPh47Dm35AzjH9qtAmVWTPXQTtwFCSzp jHwpDVppw3Mrgp/+XfV3mbEbEhJzTSh9HytMrlZcYF3VQ5ZQqyHeg0qDT9JOv7H4vV61 Ros1eot/mGhnokYatGsxmmyUchlh5L9GNfDL4MXzvR0Xl9akzKX5/rLBDcTn9uiTKmLD 72U6+tHmsVcYQgFdlYTfYyYOPWO6Q8NthPXLRpkQisdp9fVSaNY3trMgY5Z/TT7pjfIb wYoOj23DdtzhcsdEuAuJh6XoUgShdG/5WIF7qONPE0e4yy9XM/Nqd/ednyknIlkSsd78 LfGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749575728; x=1750180528; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sO4neuwpUVoDLsDzSFLxxvkPcabDlga25iey737Q9/w=; b=HAqXdkYvwzpMuQm7jKd5u+VfliLRIK7aZcQF7ESVp5s4OraYBd0hmpkrGQqAg2NFZi S8fpCR++k6kLXAukGXRkM1+UX7XgWgmhG3MzrRLIEK3m1wiW+SEfWTojKDmZqOUbYTx/ +9zWgKxK1Z27XvYshT7nlzFDJYn1Kezz07UOWZKNjL2m5TZZaxVpD4nF+5EU41jP+xa9 V0GF3/1hbiEMrVTg2/gW7bFbyn1I9tDSu2uDujQmdq7HEA4W65g1G0nodBr+PkUXPBUG TKLtDVCUHmi2P6dUbsokHwDlp/x8WAeby6l+e7xapY0xXkZVaBh7RGJeH6fKAQLMPXvT DMgA== X-Forwarded-Encrypted: i=1; AJvYcCW8zmAfm8oqnJQOJxKL05RJT1cm89re531AL4OduPsnYt03G7Zg8BvmOav/wbGI5UOiMZ1XW2GqfzXNsi8=@vger.kernel.org, AJvYcCWSagzO6wSk0Qxf+UpsXbqqpEiiIOifKFKaGmSBZv5sqchpA4lrwrJH+294R56oGwyfFL0/A7mkveqw1R2tttdv@vger.kernel.org, AJvYcCXARO625jr7pbx5GIWQDO2mV7plT7XpNDrSEAe+FPrdnwPbE0n/Ivzw8wIc9JU7EAnvPC2KqgjEYeodcg==@vger.kernel.org X-Gm-Message-State: AOJu0Yw/E3KOO4qgx812abV5nqSjl8k0u5H1mhMmJ2cqAmRfuRTH17o+ IlblrInJll/hQKWSgOK7UqketqDQd40zbxMplpvqm5t3ULeUIIEUbpJJ08U6 X-Gm-Gg: ASbGncvfGloED0o3TVd8UUUOJDpsUWi+zxY5hyYZoTcNipKzFsWs8vJ8vyiwYtG8Ilj 4Wb36O7WQZBxymH1/8Qj2FkoSQD//dayqOlsrq+NojviIno5mZbEnG1DmynIoJVj/M5t0yPDQmH GUP12VMrIF+PJCkMR76+GRWCvuumCbWpY65mAWuFMRUpHAnn3CbodyhsVOC6k5l6hDe5cwWfb4y Ru4EdeI4LQvMIMFDcLB0wnQZLu46J4dXLnAACfzy0vt0VfJx60TdHTD9lE0s7fPkeILyho/xuka NzG8SxnrYPtYQFe2iq1cwAla+SvlOfD/OPnlxM0wuSjbYntDAsMe/nSs4W5croE5IPws+z0gYO/ +hidE6tkaNqSpg83Xv4zRZTw= X-Google-Smtp-Source: AGHT+IHQwD6S166ldxXHEAmMKaFIErFHVt3BndZz352NvZiGIWSykeBPCm21SoRRvyVBIk1bASc9ZA== X-Received: by 2002:a05:6a21:3289:b0:21f:4459:c032 with SMTP id adf61e73a8af0-21f86618eccmr614511637.18.1749575728142; Tue, 10 Jun 2025 10:15:28 -0700 (PDT) Received: from localhost (c-73-158-218-242.hsd1.ca.comcast.net. [73.158.218.242]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-7482b0c212fsm7901253b3a.135.2025.06.10.10.15.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 10:15:27 -0700 (PDT) From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, skalluru@marvell.com, manishc@marvell.com, andrew+netdev@lunn.ch, michael.chan@broadcom.com, pavan.chebbi@broadcom.com, ajit.khaparde@broadcom.com, sriharsha.basavapatna@broadcom.com, somnath.kotur@broadcom.com, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, tariqt@nvidia.com, saeedm@nvidia.com, louis.peens@corigine.com, shshaikh@marvell.com, GR-Linux-NIC-Dev@marvell.com, ecree.xilinx@gmail.com, horms@kernel.org, dsahern@kernel.org, shuah@kernel.org, ruanjinjie@huawei.com, mheib@redhat.com, stfomichev@gmail.com, linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-rdma@vger.kernel.org, oss-drivers@corigine.com, linux-net-drivers@amd.com, linux-kselftest@vger.kernel.org, leon@kernel.org, Aleksandr Loktionov Subject: [PATCH net-next v3 3/4] netdevsim: remove udp_ports_sleep Date: Tue, 10 Jun 2025 10:15:21 -0700 Message-ID: <20250610171522.2119030-4-stfomichev@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610171522.2119030-1-stfomichev@gmail.com> References: <20250610171522.2119030-1-stfomichev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Now that there is only one path in udp_tunnel, there is no need to have udp_ports_sleep knob. Remove it and adjust the test. Cc: Michael Chan Reviewed-by: Aleksandr Loktionov Signed-off-by: Stanislav Fomichev --- drivers/net/netdevsim/netdevsim.h | 2 -- drivers/net/netdevsim/udp_tunnels.c | 8 ------- .../drivers/net/netdevsim/udp_tunnel_nic.sh | 23 +------------------ 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netd= evsim.h index d04401f0bdf7..511ed72a93ce 100644 --- a/drivers/net/netdevsim/netdevsim.h +++ b/drivers/net/netdevsim/netdevsim.h @@ -131,7 +131,6 @@ struct netdevsim { struct nsim_macsec macsec; struct { u32 inject_error; - u32 sleep; u32 __ports[2][NSIM_UDP_TUNNEL_N_PORTS]; u32 (*ports)[NSIM_UDP_TUNNEL_N_PORTS]; struct dentry *ddir; @@ -342,7 +341,6 @@ struct nsim_dev { bool ipv4_only; bool shared; bool static_iana_vxlan; - u32 sleep; } udp_ports; struct nsim_dev_psample *psample; u16 esw_mode; diff --git a/drivers/net/netdevsim/udp_tunnels.c b/drivers/net/netdevsim/ud= p_tunnels.c index 10cbbf1c584b..89fff76e51cf 100644 --- a/drivers/net/netdevsim/udp_tunnels.c +++ b/drivers/net/netdevsim/udp_tunnels.c @@ -18,9 +18,6 @@ nsim_udp_tunnel_set_port(struct net_device *dev, unsigned= int table, ret =3D -ns->udp_ports.inject_error; ns->udp_ports.inject_error =3D 0; =20 - if (ns->udp_ports.sleep) - msleep(ns->udp_ports.sleep); - if (!ret) { if (ns->udp_ports.ports[table][entry]) { WARN(1, "entry already in use\n"); @@ -47,8 +44,6 @@ nsim_udp_tunnel_unset_port(struct net_device *dev, unsign= ed int table, ret =3D -ns->udp_ports.inject_error; ns->udp_ports.inject_error =3D 0; =20 - if (ns->udp_ports.sleep) - msleep(ns->udp_ports.sleep); if (!ret) { u32 val =3D be16_to_cpu(ti->port) << 16 | ti->type; =20 @@ -170,7 +165,6 @@ int nsim_udp_tunnels_info_create(struct nsim_dev *nsim_= dev, GFP_KERNEL); if (!info) return -ENOMEM; - ns->udp_ports.sleep =3D nsim_dev->udp_ports.sleep; =20 if (nsim_dev->udp_ports.sync_all) { info->set_port =3D NULL; @@ -213,6 +207,4 @@ void nsim_udp_tunnels_debugfs_create(struct nsim_dev *n= sim_dev) &nsim_dev->udp_ports.shared); debugfs_create_bool("udp_ports_static_iana_vxlan", 0600, nsim_dev->ddir, &nsim_dev->udp_ports.static_iana_vxlan); - debugfs_create_u32("udp_ports_sleep", 0600, nsim_dev->ddir, - &nsim_dev->udp_ports.sleep); } diff --git a/tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.s= h b/tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh index 92c2f0376c08..4c859ecdad94 100755 --- a/tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh +++ b/tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh @@ -266,7 +266,6 @@ for port in 0 1; do echo $NSIM_ID > /sys/bus/netdevsim/new_device else echo 1 > $NSIM_DEV_DFS/udp_ports_open_only - echo 1 > $NSIM_DEV_DFS/udp_ports_sleep echo 1 > $NSIM_DEV_SYS/new_port fi NSIM_NETDEV=3D`get_netdev_name old_netdevs` @@ -350,23 +349,11 @@ old_netdevs=3D$(ls /sys/class/net) port=3D0 echo $NSIM_ID > /sys/bus/netdevsim/new_device echo 0 > $NSIM_DEV_SYS/del_port -echo 1000 > $NSIM_DEV_DFS/udp_ports_sleep echo 0 > $NSIM_DEV_SYS/new_port NSIM_NETDEV=3D`get_netdev_name old_netdevs` =20 msg=3D"create VxLANs" -exp0=3D( 0 0 0 0 ) # sleep is longer than out wait -new_vxlan vxlan0 10000 $NSIM_NETDEV - -modprobe -r vxlan -modprobe -r udp_tunnel - -msg=3D"remove tunnels" -exp0=3D( 0 0 0 0 ) -check_tables - -msg=3D"create VxLANs" -exp0=3D( 0 0 0 0 ) # sleep is longer than out wait +exp0=3D( `mke 10000 1` 0 0 0 ) new_vxlan vxlan0 10000 $NSIM_NETDEV =20 exp0=3D( 0 0 0 0 ) @@ -428,7 +415,6 @@ echo 0 > $NSIM_DEV_SYS/del_port for port in 0 1; do if [ $port -ne 0 ]; then echo 1 > $NSIM_DEV_DFS/udp_ports_open_only - echo 1 > $NSIM_DEV_DFS/udp_ports_sleep fi =20 echo $port > $NSIM_DEV_SYS/new_port @@ -486,7 +472,6 @@ echo 1 > $NSIM_DEV_DFS/udp_ports_sync_all for port in 0 1; do if [ $port -ne 0 ]; then echo 1 > $NSIM_DEV_DFS/udp_ports_open_only - echo 1 > $NSIM_DEV_DFS/udp_ports_sleep fi =20 echo $port > $NSIM_DEV_SYS/new_port @@ -543,7 +528,6 @@ echo 0 > $NSIM_DEV_SYS/del_port for port in 0 1; do if [ $port -ne 0 ]; then echo 1 > $NSIM_DEV_DFS/udp_ports_open_only - echo 1 > $NSIM_DEV_DFS/udp_ports_sleep fi =20 echo $port > $NSIM_DEV_SYS/new_port @@ -573,7 +557,6 @@ echo 1 > $NSIM_DEV_DFS/udp_ports_ipv4_only for port in 0 1; do if [ $port -ne 0 ]; then echo 1 > $NSIM_DEV_DFS/udp_ports_open_only - echo 1 > $NSIM_DEV_DFS/udp_ports_sleep fi =20 echo $port > $NSIM_DEV_SYS/new_port @@ -634,7 +617,6 @@ echo 0 > $NSIM_DEV_SYS/del_port for port in 0 1; do if [ $port -ne 0 ]; then echo 1 > $NSIM_DEV_DFS/udp_ports_open_only - echo 1 > $NSIM_DEV_DFS/udp_ports_sleep fi =20 echo $port > $NSIM_DEV_SYS/new_port @@ -690,7 +672,6 @@ echo 0 > $NSIM_DEV_SYS/del_port for port in 0 1; do if [ $port -ne 0 ]; then echo 1 > $NSIM_DEV_DFS/udp_ports_open_only - echo 1 > $NSIM_DEV_DFS/udp_ports_sleep fi =20 echo $port > $NSIM_DEV_SYS/new_port @@ -750,7 +731,6 @@ echo 0 > $NSIM_DEV_SYS/del_port for port in 0 1; do if [ $port -ne 0 ]; then echo 1 > $NSIM_DEV_DFS/udp_ports_open_only - echo 1 > $NSIM_DEV_DFS/udp_ports_sleep fi =20 echo $port > $NSIM_DEV_SYS/new_port @@ -809,7 +789,6 @@ echo $NSIM_ID > /sys/bus/netdevsim/new_device echo 0 > $NSIM_DEV_SYS/del_port =20 echo 0 > $NSIM_DEV_DFS/udp_ports_open_only -echo 1 > $NSIM_DEV_DFS/udp_ports_sleep echo 1 > $NSIM_DEV_DFS/udp_ports_shared =20 old_netdevs=3D$(ls /sys/class/net) --=20 2.49.0 From nobody Sat Oct 11 12:08:56 2025 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 F229E24677E; Tue, 10 Jun 2025 17:15:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749575732; cv=none; b=AnqE3zgV/PxWWCdqpJTDcL2IBTFq9zwQq1kP15DVJmejIzbyslItyCCqRkDAdt9oVBEsINolOcpt8CycMEQvFC4D5r3JLOZ2GVz4w03vlnqWfo4GHKnT0AMvcG3uFhsSZhldgFV3TNxYpvv7nJdIgEfrOgyYVGbomVojfANVjFw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749575732; c=relaxed/simple; bh=u8r2Q+UtHJ4Nd9Z2cHIyBuA8VSeH+waJg4MzAJzv7o8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YWP20+q1aV/VxoSd2G2CUNJJeLjc5FM9GxCtIN8WcXoaZvd1CAYrKWHrLM6UT9gycSxM4bnrgr7Z3sLF3/DFQ2bIM3Zn811PLar7TSsMzCcDrcF1TOgnk7sudx3LK+rLIWcUglRFnHfwGnZ8fjdY+Z4CCane0i+CGAnSimwv2NM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=k+rsxyU8; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="k+rsxyU8" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2363e973db1so608435ad.0; Tue, 10 Jun 2025 10:15:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749575730; x=1750180530; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rIrnh6Y6z0RsAszSzJMckGXGP+N0IS1GPSV62LbBz1M=; b=k+rsxyU88u8RUD8fJhtZv3d6ytR4Cv00By8tOCzvdHICVKiWOn27CbjQT9BQwDlLv7 mNwGjLCJVqVA7KGpiwcE6miAgvueOvvGqD8gWXurN2RmKlZVIugINTMrP6sco2u33ivX VlGBzyoL83UA2BFa7j1cL58fhp24i3oIcHAqNHR7tgiajKuqXbrjgKQuRDQQ0c6dz11v acZRJkYg0J4luEW/Ll6F4hyDlF7vgvpqLrf6FN5EZ/4b11cp7ZsRhqkYj7B+XECUaiPc 8FsQS8MNKz3alLt4bII9mfsYrajVKSX7+TqF2PeVv4P8w2xrD8AkDrkv8Cg15Y6iIbzv cL8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749575730; x=1750180530; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rIrnh6Y6z0RsAszSzJMckGXGP+N0IS1GPSV62LbBz1M=; b=K+a7IHA43DMtX0BEnvN41xA8D+Lfvkv08JgYrXvXVmUzm3YXSaTbV1hSELub61YhIJ BBznb/2/w1H056ztfXa3HD/VT5RdItPEgH4x4IBrMUuNuluGzLjYvxwPSN4veP/8tQms XbY0QIke4BxysiOEpulQW4ZZUiRdT5gy87pAfxfGl4DkrKZ/eGWoRupLG6eIt1kAGcid HgvhsHE6tjxw6K1xiKJWAl+vXka9IZEcoTL9FLVRbeGilwdyfybQ0YUug2YNPJb7E8yL s1inTe0QJMoOyPCLSx9yDW+Sx9NUS72/8+R/DX6cdQ8K2A8xmAXLafUKTui0X8mOzpCD oJJA== X-Forwarded-Encrypted: i=1; AJvYcCVTUcdhGVHgug0Az4QlX/FyIkYFmPMW2dyvF0d1PLRtAgvLjXh2PHuljZRPib5/UJxjHr59qx92VYHydG6RzPNB@vger.kernel.org, AJvYcCVpK+gsEUvv0AeoJDP9iuwzxmCOH5uOLWLMuNPd70PfA6XUJRMldFbU/Na/fCnLs0Yv/4BcMX4h6MJBXw==@vger.kernel.org, AJvYcCWlUhYryU237ogrn0UoTY/VBkXCNZ9q/dNu04ec5JJYxN0Gjxiobh1XtujSmMRUw4IkYjN5t8tNUj9IMvI=@vger.kernel.org X-Gm-Message-State: AOJu0YyTNjJMCaK3k3X4D/URxFM84dKG9HrliLl/BK5egW+jpstO+1ed RKJXX3NAWnkcYrMyZ74QIFEo9rQLd+CNOUpDLZK3sXFtxvOx5kmwMEY002YU X-Gm-Gg: ASbGncuViBFSeX2lFttoKjsk9zp0g6JDC+m3TNZHABJsmXdOcg4xNgLlLfu4pZkfUxm 9JcQNKboyZAbbY+v7PxnuCaozpHEfowwTci7LOeIvo9DqpH9rPKIT4APZaeTcHn3cWXNZY2Mjjx jFzq76D0zDLi2Dy3xdWs/KPPijDvoPW50FgOTkdaeOplx8pzN7HzMFjhvh/5jXSb/Nhyw5KFAwg dh5U0fw2ZfuCS/cBnLdEp+d3Z1M526IUVopYJ31v+PPE18ewhSVPEbKdoJ8ka2/QDWs8Ff9X+KZ RwYADLp8a+/8OKhjQ3lKjId6Wk77S74+3x5T+ffqMaFz16VLon9rI5g3NAwGS6T5kpEPuGPx+e5 uMqvnJ4WM6Go+L0OyQfQVIHQ= X-Google-Smtp-Source: AGHT+IGjKW9uxJxECrtSXh89niGE9d1wlACS6WP7qG1lr3n7ec7MLI9AA185gIqYfLOWUsY3utuoDQ== X-Received: by 2002:a17:903:1b44:b0:231:d0da:5e1f with SMTP id d9443c01a7336-2364183445fmr2280735ad.21.1749575729503; Tue, 10 Jun 2025 10:15:29 -0700 (PDT) Received: from localhost (c-73-158-218-242.hsd1.ca.comcast.net. [73.158.218.242]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-236032fccd6sm73703615ad.134.2025.06.10.10.15.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 10:15:29 -0700 (PDT) From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, skalluru@marvell.com, manishc@marvell.com, andrew+netdev@lunn.ch, michael.chan@broadcom.com, pavan.chebbi@broadcom.com, ajit.khaparde@broadcom.com, sriharsha.basavapatna@broadcom.com, somnath.kotur@broadcom.com, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, tariqt@nvidia.com, saeedm@nvidia.com, louis.peens@corigine.com, shshaikh@marvell.com, GR-Linux-NIC-Dev@marvell.com, ecree.xilinx@gmail.com, horms@kernel.org, dsahern@kernel.org, shuah@kernel.org, ruanjinjie@huawei.com, mheib@redhat.com, stfomichev@gmail.com, linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-rdma@vger.kernel.org, oss-drivers@corigine.com, linux-net-drivers@amd.com, linux-kselftest@vger.kernel.org, leon@kernel.org, Aleksandr Loktionov Subject: [PATCH net-next v3 4/4] Revert "bnxt_en: bring back rtnl_lock() in the bnxt_open() path" Date: Tue, 10 Jun 2025 10:15:22 -0700 Message-ID: <20250610171522.2119030-5-stfomichev@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610171522.2119030-1-stfomichev@gmail.com> References: <20250610171522.2119030-1-stfomichev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This reverts commit 325eb217e41fa14f307c7cc702bd18d0bb38fe84. udp_tunnel infra doesn't need RTNL, should be safe to get back to only netdev instance lock. Cc: Michael Chan Reviewed-by: Aleksandr Loktionov Signed-off-by: Stanislav Fomichev --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 36 +++++------------------ 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index a3dadde65b8d..1da208c36572 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -14055,28 +14055,13 @@ static void bnxt_unlock_sp(struct bnxt *bp) netdev_unlock(bp->dev); } =20 -/* Same as bnxt_lock_sp() with additional rtnl_lock */ -static void bnxt_rtnl_lock_sp(struct bnxt *bp) -{ - clear_bit(BNXT_STATE_IN_SP_TASK, &bp->state); - rtnl_lock(); - netdev_lock(bp->dev); -} - -static void bnxt_rtnl_unlock_sp(struct bnxt *bp) -{ - set_bit(BNXT_STATE_IN_SP_TASK, &bp->state); - netdev_unlock(bp->dev); - rtnl_unlock(); -} - /* Only called from bnxt_sp_task() */ static void bnxt_reset(struct bnxt *bp, bool silent) { - bnxt_rtnl_lock_sp(bp); + bnxt_lock_sp(bp); if (test_bit(BNXT_STATE_OPEN, &bp->state)) bnxt_reset_task(bp, silent); - bnxt_rtnl_unlock_sp(bp); + bnxt_unlock_sp(bp); } =20 /* Only called from bnxt_sp_task() */ @@ -14084,9 +14069,9 @@ static void bnxt_rx_ring_reset(struct bnxt *bp) { int i; =20 - bnxt_rtnl_lock_sp(bp); + bnxt_lock_sp(bp); if (!test_bit(BNXT_STATE_OPEN, &bp->state)) { - bnxt_rtnl_unlock_sp(bp); + bnxt_unlock_sp(bp); return; } /* Disable and flush TPA before resetting the RX ring */ @@ -14125,7 +14110,7 @@ static void bnxt_rx_ring_reset(struct bnxt *bp) } if (bp->flags & BNXT_FLAG_TPA) bnxt_set_tpa(bp, true); - bnxt_rtnl_unlock_sp(bp); + bnxt_unlock_sp(bp); } =20 static void bnxt_fw_fatal_close(struct bnxt *bp) @@ -15017,17 +15002,15 @@ static void bnxt_fw_reset_task(struct work_struct= *work) bp->fw_reset_state =3D BNXT_FW_RESET_STATE_OPENING; fallthrough; case BNXT_FW_RESET_STATE_OPENING: - while (!rtnl_trylock()) { + while (!netdev_trylock(bp->dev)) { bnxt_queue_fw_reset_work(bp, HZ / 10); return; } - netdev_lock(bp->dev); rc =3D bnxt_open(bp->dev); if (rc) { netdev_err(bp->dev, "bnxt_open() failed during FW reset\n"); bnxt_fw_reset_abort(bp, rc); netdev_unlock(bp->dev); - rtnl_unlock(); goto ulp_start; } =20 @@ -15047,7 +15030,6 @@ static void bnxt_fw_reset_task(struct work_struct *= work) bnxt_dl_health_fw_status_update(bp, true); } netdev_unlock(bp->dev); - rtnl_unlock(); bnxt_ulp_start(bp, 0); bnxt_reenable_sriov(bp); netdev_lock(bp->dev); @@ -15996,7 +15978,7 @@ static int bnxt_queue_start(struct net_device *dev,= void *qmem, int idx) rc); napi_enable_locked(&bnapi->napi); bnxt_db_nq_arm(bp, &cpr->cp_db, cpr->cp_raw_cons); - netif_close(dev); + bnxt_reset_task(bp, true); return rc; } =20 @@ -16812,7 +16794,6 @@ static int bnxt_resume(struct device *device) struct bnxt *bp =3D netdev_priv(dev); int rc =3D 0; =20 - rtnl_lock(); netdev_lock(dev); rc =3D pci_enable_device(bp->pdev); if (rc) { @@ -16857,7 +16838,6 @@ static int bnxt_resume(struct device *device) =20 resume_exit: netdev_unlock(bp->dev); - rtnl_unlock(); bnxt_ulp_start(bp, rc); if (!rc) bnxt_reenable_sriov(bp); @@ -17023,7 +17003,6 @@ static void bnxt_io_resume(struct pci_dev *pdev) int err; =20 netdev_info(bp->dev, "PCI Slot Resume\n"); - rtnl_lock(); netdev_lock(netdev); =20 err =3D bnxt_hwrm_func_qcaps(bp); @@ -17041,7 +17020,6 @@ static void bnxt_io_resume(struct pci_dev *pdev) netif_device_attach(netdev); =20 netdev_unlock(netdev); - rtnl_unlock(); bnxt_ulp_start(bp, err); if (!err) bnxt_reenable_sriov(bp); --=20 2.49.0