From patchwork Mon Jun 16 16:21:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 897144 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 61EC4286D5D; Mon, 16 Jun 2025 16:21:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750090884; cv=none; b=qcPIwuGry2Nh/5u0sBNgpEsEkEt6bArZdH+Rry+2PP2krKQ5nFknaAR2OJauCd+53CTJgxiwl3JBnZtKWhQe0AY/YfVta2Pyp9hGecYXsDogCNLJeQjaEZYf40iVpn58SMSkadZ66dyWjGYbt0myVWisBJqxnjIWExKFnSi7gos= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750090884; c=relaxed/simple; bh=ybzdEKFoXnN30cRASg2fmf1ICH7BtS5CDfPQ1BrrNm4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SNU6F7g9AS/plHMKwOhOaUNiiy6r+xFenOPdrsL3g8puvnaC/O28nqlEp5LjRagWdStfvZsR9gqVJfJPbLox/Y39e8gkSgZw8KI6A0S+L8KSBKwRMn097sVW9fZNtp1ROjFY4KUCpX5GouojnOO3q1iHdp6zLlHXj0+Bm+FB/do= 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=mY64G0VX; arc=none smtp.client-ip=209.85.216.52 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="mY64G0VX" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-3138d31e40aso4700792a91.1; Mon, 16 Jun 2025 09:21:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750090881; x=1750695681; 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=1xlGbr7S7dkulxlPf5XLC+Ja0lhJQ4XwBOGvbFljsao=; b=mY64G0VXMrKXQwt4VHoSuEbLR/IjVi4jLlAjU3gY0dVotmDoRUKn3YNkPgcXlgQl4t 82OJGlRNZEadFCGJzC81ls9SLu1jh3CjV60ND0aBcM7ZdmPAggrhU/HhKb5EF14lpvOQ 2qch9N1EPHmG2f2EHrJtQUvKuIn6G7KlcF+hsALLbf7WPKn8pS8ZoBj8EvJ0kNNh+8zd qwBy8qI+/BQPuWjxMa8stxYHxbYEZX90YC5J9tqQx3CfdYAuzka44+xQE09ThG6Ylr4p Jvru0qDhLaj7AfPT4lnxJd/wau3AppvDyGA/5+VIUfThH6Wmm0MMAwliNCVeryihe+4j 68Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750090881; x=1750695681; 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=1xlGbr7S7dkulxlPf5XLC+Ja0lhJQ4XwBOGvbFljsao=; b=b7d+a78HrfkJGTNr0sqvqGFzFoLQp/GVkcG5UR7nWSA1vMql/TlSfibqwrLLpF1cmH fak1eCKa/v0REEM6wCgmz6tEqpbU53yNaQeuzrH8HkQSbHfFBRBqOD8Cc051diKTZ3K/ /45yOZYe/XV2xc/yin1sVxTZugwDM8v6z+ELXn2gkB7f38YRFsAqcYWADBInlAY5vfum /Cc0VTH7AEJolSWSyq4pLWznHxlBpURaGmGmNLHxdDuvW5OOZ6NuGvuszDxgybPfs1OO AMXzpfJRJO0PXm3QZXlmBbfUGBRCt8HSDpdDl7Q2MV4AAc7zxukZPbYZPDl1JDQv/tEf StYw== X-Forwarded-Encrypted: i=1; AJvYcCU8ijIGqLNbZaxmLa5bt7flovhB7MtX2XL43wm3zpBRAB43sTQGgeP8Z+1uwUZX6Y1Ka8JRQHC+YxN5nw==@vger.kernel.org, AJvYcCUq1TDoayq54whqomthOspH5MCrnNEwsMy+PVuzdftdiyezds1LEY9NXIhJ1dqVsHEv3HaMarE0uevgKnpcJIND@vger.kernel.org, AJvYcCX8hYPNB8tZwnn9XrRIH1seNP0yQ1JNZ6DuBVzgaKtaMIEWHKlCLAt8L1nCIA0zmY5ZVCnWv9ywOTSSTM0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw69feI4V5FKO3ysjB2xB5t/OMYbAEjhW4F/IstlYHVIMcWE8nH FkFXK1XShvQ3psJmJQzy3kkKNZyEA3zgUbmffvJaeftq9SHRcjV7BYBPj36W X-Gm-Gg: ASbGncvreja9JiQFQLR2xnuu1t7VZOCk/lNuv4JOLPzo5yp9jdzKTYrSsiKeajxg3Xa xIqqwa9apnvND+RDwYQfsjguwuD6nshYNuSOhQ4BCDXngOz2ZanTVcrqGUnYWyB4fwMJCvx0sNE yM6JH5yYLdb50bLVAhnn7uWpuL3gjsjs9ovs+Y9stnBF+gO4BEddqfdb7OatnHrL01FRTEbhycW rKncIDRjcXcwlE8I3i8Q9EJhyLC9QbiMDHrhN1L++GkfJiblIzTWPAtg7DGaZFHLwr9oNVI4blh thjCIYV6wtERlMtuMzrHVLt44siYAX5JDCLUg+8+zoQa39cQK5h2VSbfTL4Y1eJJPRIDwLJeawj y1ozuS9LAKkMW08qhUwQi5bs= X-Google-Smtp-Source: AGHT+IF7Gy6U2OL6gPix8g51SpcUE/2qYnFFOYPZXfOzRPgtiht0N+QO0UDM5lmm0Sw3NeYwiMvL/g== X-Received: by 2002:a17:90b:1b48:b0:311:df4b:4b91 with SMTP id 98e67ed59e1d1-313f1ca77e4mr16887983a91.7.1750090881242; Mon, 16 Jun 2025 09:21:21 -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-313c1b6d56bsm9952895a91.46.2025.06.16.09.21.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 09:21:20 -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, tglx@linutronix.de, mingo@kernel.org, ruanjinjie@huawei.com, idosch@nvidia.com, razor@blackwall.org, petrm@nvidia.com, kuniyu@google.com, sdf@fomichev.me, 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 v5 2/6] vxlan: drop sock_lock Date: Mon, 16 Jun 2025 09:21:13 -0700 Message-ID: <20250616162117.287806-3-stfomichev@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250616162117.287806-1-stfomichev@gmail.com> References: <20250616162117.287806-1-stfomichev@gmail.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We won't be able to sleep soon in vxlan_offload_rx_ports and won't be able to grab sock_lock. Instead of having separate spinlock to manage sockets, rely on rtnl lock. This is similar to how geneve manages its sockets. Signed-off-by: Stanislav Fomichev --- drivers/net/vxlan/vxlan_core.c | 35 ++++++++++++----------------- drivers/net/vxlan/vxlan_private.h | 2 +- drivers/net/vxlan/vxlan_vnifilter.c | 18 ++++++--------- 3 files changed, 22 insertions(+), 33 deletions(-) diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c index 97792de896b7..9d7249caf137 100644 --- a/drivers/net/vxlan/vxlan_core.c +++ b/drivers/net/vxlan/vxlan_core.c @@ -1485,21 +1485,18 @@ static enum skb_drop_reason vxlan_snoop(struct net_device *dev, static bool __vxlan_sock_release_prep(struct vxlan_sock *vs) { - struct vxlan_net *vn; + ASSERT_RTNL(); if (!vs) return false; if (!refcount_dec_and_test(&vs->refcnt)) return false; - vn = net_generic(sock_net(vs->sock->sk), vxlan_net_id); - spin_lock(&vn->sock_lock); hlist_del_rcu(&vs->hlist); udp_tunnel_notify_del_rx_port(vs->sock, (vs->flags & VXLAN_F_GPE) ? UDP_TUNNEL_TYPE_VXLAN_GPE : UDP_TUNNEL_TYPE_VXLAN); - spin_unlock(&vn->sock_lock); return true; } @@ -2847,26 +2844,23 @@ static void vxlan_cleanup(struct timer_list *t) static void vxlan_vs_del_dev(struct vxlan_dev *vxlan) { - struct vxlan_net *vn = net_generic(vxlan->net, vxlan_net_id); + ASSERT_RTNL(); - spin_lock(&vn->sock_lock); hlist_del_init_rcu(&vxlan->hlist4.hlist); #if IS_ENABLED(CONFIG_IPV6) hlist_del_init_rcu(&vxlan->hlist6.hlist); #endif - spin_unlock(&vn->sock_lock); } static void vxlan_vs_add_dev(struct vxlan_sock *vs, struct vxlan_dev *vxlan, struct vxlan_dev_node *node) { - struct vxlan_net *vn = net_generic(vxlan->net, vxlan_net_id); __be32 vni = vxlan->default_dst.remote_vni; + ASSERT_RTNL(); + node->vxlan = vxlan; - spin_lock(&vn->sock_lock); hlist_add_head_rcu(&node->hlist, vni_head(vs, vni)); - spin_unlock(&vn->sock_lock); } /* Setup stats when device is created */ @@ -3291,9 +3285,10 @@ static void vxlan_offload_rx_ports(struct net_device *dev, bool push) struct vxlan_net *vn = net_generic(net, vxlan_net_id); unsigned int i; - spin_lock(&vn->sock_lock); + ASSERT_RTNL(); + for (i = 0; i < PORT_HASH_SIZE; ++i) { - hlist_for_each_entry_rcu(vs, &vn->sock_list[i], hlist) { + hlist_for_each_entry(vs, &vn->sock_list[i], hlist) { unsigned short type; if (vs->flags & VXLAN_F_GPE) @@ -3307,7 +3302,6 @@ static void vxlan_offload_rx_ports(struct net_device *dev, bool push) udp_tunnel_drop_rx_port(dev, vs->sock, type); } } - spin_unlock(&vn->sock_lock); } /* Initialize the device structure. */ @@ -3537,12 +3531,13 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, bool ipv6, __be16 port, u32 flags, int ifindex) { - struct vxlan_net *vn = net_generic(net, vxlan_net_id); struct vxlan_sock *vs; struct socket *sock; unsigned int h; struct udp_tunnel_sock_cfg tunnel_cfg; + ASSERT_RTNL(); + vs = kzalloc(sizeof(*vs), GFP_KERNEL); if (!vs) return ERR_PTR(-ENOMEM); @@ -3560,13 +3555,11 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, bool ipv6, refcount_set(&vs->refcnt, 1); vs->flags = (flags & VXLAN_F_RCV_FLAGS); - spin_lock(&vn->sock_lock); hlist_add_head_rcu(&vs->hlist, vs_head(net, port)); udp_tunnel_notify_add_rx_port(sock, (vs->flags & VXLAN_F_GPE) ? UDP_TUNNEL_TYPE_VXLAN_GPE : UDP_TUNNEL_TYPE_VXLAN); - spin_unlock(&vn->sock_lock); /* Mark socket as an encapsulation socket. */ memset(&tunnel_cfg, 0, sizeof(tunnel_cfg)); @@ -3590,26 +3583,27 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, bool ipv6, static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6) { - struct vxlan_net *vn = net_generic(vxlan->net, vxlan_net_id); bool metadata = vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA; struct vxlan_sock *vs = NULL; struct vxlan_dev_node *node; int l3mdev_index = 0; + ASSERT_RTNL(); + if (vxlan->cfg.remote_ifindex) l3mdev_index = l3mdev_master_upper_ifindex_by_index( vxlan->net, vxlan->cfg.remote_ifindex); if (!vxlan->cfg.no_share) { - spin_lock(&vn->sock_lock); + rcu_read_lock(); vs = vxlan_find_sock(vxlan->net, ipv6 ? AF_INET6 : AF_INET, vxlan->cfg.dst_port, vxlan->cfg.flags, l3mdev_index); if (vs && !refcount_inc_not_zero(&vs->refcnt)) { - spin_unlock(&vn->sock_lock); + rcu_read_unlock(); return -EBUSY; } - spin_unlock(&vn->sock_lock); + rcu_read_unlock(); } if (!vs) vs = vxlan_socket_create(vxlan->net, ipv6, @@ -4875,7 +4869,6 @@ static __net_init int vxlan_init_net(struct net *net) unsigned int h; INIT_LIST_HEAD(&vn->vxlan_list); - spin_lock_init(&vn->sock_lock); vn->nexthop_notifier_block.notifier_call = vxlan_nexthop_event; for (h = 0; h < PORT_HASH_SIZE; ++h) diff --git a/drivers/net/vxlan/vxlan_private.h b/drivers/net/vxlan/vxlan_private.h index d328aed9feef..6c625fb29c6c 100644 --- a/drivers/net/vxlan/vxlan_private.h +++ b/drivers/net/vxlan/vxlan_private.h @@ -19,8 +19,8 @@ extern const struct rhashtable_params vxlan_vni_rht_params; /* per-network namespace private data for this module */ struct vxlan_net { struct list_head vxlan_list; + /* sock_list is protected by rtnl lock */ struct hlist_head sock_list[PORT_HASH_SIZE]; - spinlock_t sock_lock; struct notifier_block nexthop_notifier_block; }; diff --git a/drivers/net/vxlan/vxlan_vnifilter.c b/drivers/net/vxlan/vxlan_vnifilter.c index 186d0660669a..4ff56d9f8f28 100644 --- a/drivers/net/vxlan/vxlan_vnifilter.c +++ b/drivers/net/vxlan/vxlan_vnifilter.c @@ -40,11 +40,11 @@ static void vxlan_vs_add_del_vninode(struct vxlan_dev *vxlan, struct vxlan_vni_node *v, bool del) { - struct vxlan_net *vn = net_generic(vxlan->net, vxlan_net_id); struct vxlan_dev_node *node; struct vxlan_sock *vs; - spin_lock(&vn->sock_lock); + ASSERT_RTNL(); + if (del) { if (!hlist_unhashed(&v->hlist4.hlist)) hlist_del_init_rcu(&v->hlist4.hlist); @@ -52,7 +52,7 @@ static void vxlan_vs_add_del_vninode(struct vxlan_dev *vxlan, if (!hlist_unhashed(&v->hlist6.hlist)) hlist_del_init_rcu(&v->hlist6.hlist); #endif - goto out; + return; } #if IS_ENABLED(CONFIG_IPV6) @@ -67,23 +67,21 @@ static void vxlan_vs_add_del_vninode(struct vxlan_dev *vxlan, node = &v->hlist4; hlist_add_head_rcu(&node->hlist, vni_head(vs, v->vni)); } -out: - spin_unlock(&vn->sock_lock); } void vxlan_vs_add_vnigrp(struct vxlan_dev *vxlan, struct vxlan_sock *vs, bool ipv6) { - struct vxlan_net *vn = net_generic(vxlan->net, vxlan_net_id); struct vxlan_vni_group *vg = rtnl_dereference(vxlan->vnigrp); struct vxlan_vni_node *v, *tmp; struct vxlan_dev_node *node; + ASSERT_RTNL(); + if (!vg) return; - spin_lock(&vn->sock_lock); list_for_each_entry_safe(v, tmp, &vg->vni_list, vlist) { #if IS_ENABLED(CONFIG_IPV6) if (ipv6) @@ -94,26 +92,24 @@ void vxlan_vs_add_vnigrp(struct vxlan_dev *vxlan, node->vxlan = vxlan; hlist_add_head_rcu(&node->hlist, vni_head(vs, v->vni)); } - spin_unlock(&vn->sock_lock); } void vxlan_vs_del_vnigrp(struct vxlan_dev *vxlan) { struct vxlan_vni_group *vg = rtnl_dereference(vxlan->vnigrp); - struct vxlan_net *vn = net_generic(vxlan->net, vxlan_net_id); struct vxlan_vni_node *v, *tmp; + ASSERT_RTNL(); + if (!vg) return; - spin_lock(&vn->sock_lock); list_for_each_entry_safe(v, tmp, &vg->vni_list, vlist) { hlist_del_init_rcu(&v->hlist4.hlist); #if IS_ENABLED(CONFIG_IPV6) hlist_del_init_rcu(&v->hlist6.hlist); #endif } - spin_unlock(&vn->sock_lock); } static void vxlan_vnifilter_stats_get(const struct vxlan_vni_node *vninode, From patchwork Mon Jun 16 16:21:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 897143 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (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 274562877E3; Mon, 16 Jun 2025 16:21:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750090886; cv=none; b=ZLetVBzDnXoT6TIb/Je/+b46HfxHPVIojIRTQGEX+EzNvzvC0IS+bCA59hB9/v5AsN1LylmiO47R7r9dd6/JWl3alDZv109plpEpRw61N5I9A5AUaFlgrG/rcafmeIxxfJqawac+/Ree53uiyPrCypJl+2Dzfh8J614oFzoANJY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750090886; c=relaxed/simple; bh=ctkVmqF3JrN4+M3Jq2BUDPgQr7j2TwSOV9URy1jJ6Mo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G+I69QhFd7YX1B+I7iKl5ZnPhigaircVl7QwRFnI/dXJRbI1gpvJnu3n6/QXe+0o396YWvfSV8JPRq8ybd/Om7OLBR1qc7VXu2pnpeNgtJbPViUtXrDR7Jh0DBniI0bPWr3v/jsaQQ6suMfJ3CQGr0XwN5K87OqPz/DLLBQx7HI= 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=K29VL5kC; arc=none smtp.client-ip=209.85.215.177 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="K29VL5kC" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-7fd581c2bf4so3791852a12.3; Mon, 16 Jun 2025 09:21:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750090884; x=1750695684; 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=hOzLGPoCr0MeSXGXJzKmOKNWDgmi51GcdPfztdwS3U8=; b=K29VL5kCf1d97eNsgrCfni2EnAhd5eumGHP+9fP4go8wXjj3U/g3YeCgvPfE3oQidS GkVvcKID4Wo39RSdgWtbrPIDawIFNomnZRUvfHUXUZ9wEZjjUJtSIJByDfeF+jxCketd Re9Xa43YijzrwWozj++u1VfSXPrjz5FcxS87LcXFMxxP6KdeggZQMln8uLpgXVlE2geU kBljNB+Kx2dCCQMfz0atz0PZa7Sx45XJuTcubzDoBtSJS+a+y8W/jni0fwMvv9r7ZKEt V00CAgDetfG3zEfsH5Tsvt41yAMyrYi//+NxAcRInE/N40KdtJgjIdSoXQZvpjDWoR8T 8yFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750090884; x=1750695684; 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=hOzLGPoCr0MeSXGXJzKmOKNWDgmi51GcdPfztdwS3U8=; b=Kdz7pcpbWoMjm8Qrvg+23PVtOm2d7XLqTTKgPQRtCUqZaEZFRYNzdYl+Bxj+dIkV5r d1duNX5INGeUNyf75beTvHP+/8aNppMNWsnoP3GmzlJfcVRHiSJOIycnjlAUV/EfhQ6g aLrG5RcZPgobsIDd5983WBi3F/ZdMf9LQY/ULrnexlo/OpDvo1PnCc6pVUBgS6OruhwL eqYZsbadgvv3wjHOuLmVhx7z9NKMeD3As+pEuJfJJy9P7th2peb/0GCOI7Fa2G7eqJan isCjlem4ibCrR8/kNCWNy3ecwJ6owNmWNyqVAguGRcd+bu4KriZM5bSs/Tp7UvG5JXD5 iQgw== X-Forwarded-Encrypted: i=1; AJvYcCUU1UCmie0jqhgU/G6QL7hZRe1uKxPnPZIBEsSmh8d5Osach7fYXJZ93ssVtlZyCBsM00ztKt2PuQNmQLLx5p/L@vger.kernel.org, AJvYcCWvB8FpvcbRnCs7MdiH1DeCIr70pwNi8vXRnMsHzHOVGAV1RPWEJo6KUzrUwN8x+aFGBjJ8YdsPgGrH6w==@vger.kernel.org, AJvYcCXFQ56POjBbw8grHy+RsCU+5Z8JZXxiDk2UYxoiYibPqCASdT07fVZRuaiIU6X7TAxCRK4zRCInMVc62dE=@vger.kernel.org X-Gm-Message-State: AOJu0YxlhV5KxGpJ79SWe4M73/1IW94NEwNIe0nosFubKluOBFnKpY2D LY4pE2x91qXalg8Xa3FxA1pa0xcpGm4KQuQnaNsiVb3a7XyuC8GuNGz70lnM X-Gm-Gg: ASbGncutWLQoSbqZNYWFcaD3QL05prhvWD0cWb0kFOc/tut3ZrHT2TXg6Bf6mZW78wK 5fLmt8jAjFJsOSKaiPb+zgMkgwDmodzyEvOnjXBhuBOfSiomvkZRm2i/8cI1ivzjMSea/s9dQ4j XiuiZ/ZYx0DJtnWj5RrjowUM/V2Cb19G9J/dmno7Fk6RsuH2ZJBPD61WCqL7g6hzkUs+iAPd3Lr vKF9GAAAnQ8YHEu7fQa28Rk/zqbK9qMsjmFG3XMnl2xF49HpmTqtDWqc6DVcyKrwHQW4j/Q2iyn sPuP5lgcMhP73EEu2vYS6KzU5hl9Df/BCI3oPnXwqrJvKEd1FGeTKFfiem3s2TqxdyPLaxobzYa wku8n0mRVp8Ng9ZDin1vqtOM= X-Google-Smtp-Source: AGHT+IGZvOQH3Qch7I0qSswC74QzMJM0k/uZMNM7l+NTLMMpD2tzor7yNnd4dIMkv3IMj/awGe4+rw== X-Received: by 2002:a05:6a21:b8b:b0:1f3:33c2:29c5 with SMTP id adf61e73a8af0-21fbd559187mr15017168637.7.1750090883975; Mon, 16 Jun 2025 09:21:23 -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-74890084013sm7296033b3a.96.2025.06.16.09.21.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 09:21:23 -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, tglx@linutronix.de, mingo@kernel.org, ruanjinjie@huawei.com, idosch@nvidia.com, razor@blackwall.org, petrm@nvidia.com, kuniyu@google.com, sdf@fomichev.me, 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 v5 4/6] net: remove redundant ASSERT_RTNL() in queue setup functions Date: Mon, 16 Jun 2025 09:21:15 -0700 Message-ID: <20250616162117.287806-5-stfomichev@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250616162117.287806-1-stfomichev@gmail.com> References: <20250616162117.287806-1-stfomichev@gmail.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 --- net/core/dev.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 43f56b44f351..df1678b1fe24 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 *dev, unsigned int txq) if (dev->reg_state == NETREG_REGISTERED || dev->reg_state == NETREG_UNREGISTERING) { - ASSERT_RTNL(); netdev_ops_assert_locked(dev); rc = netdev_queue_update_kobjects(dev, dev->real_num_tx_queues, @@ -3229,7 +3228,6 @@ int netif_set_real_num_rx_queues(struct net_device *dev, unsigned int rxq) return -EINVAL; if (dev->reg_state == NETREG_REGISTERED) { - ASSERT_RTNL(); netdev_ops_assert_locked(dev); rc = net_rx_queue_update_kobjects(dev, dev->real_num_rx_queues, From patchwork Mon Jun 16 16:21:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 897142 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.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 CB95F288525; Mon, 16 Jun 2025 16:21:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750090889; cv=none; b=kHa1a13y+PSEFGJOQkqI+ab/9HmczkCJ3K91lnRukqRQK10aIDmGDB3vsBQAHJjqD7/5OBYaYAesWwHvXt7YgG7kbHHGBlbHFjBTx2XbRSmztS3O4kpITMg6HyKI0IRzQFSQUwSliyLCX+wyunJmfo4W9NMq/97ypNXnovU3ReE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750090889; c=relaxed/simple; bh=aV4hNI8aqhzy9bbbQZ0vNyWIkwogBSS8SXPlSQfiUPw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fqktylo0mM5kH9MO6Fb+v8i3fxZcF7ADoUbEu7MDWpWNAg5UjQqXamEcbK9ZAlxU22xLUzkVwJA4oKxMzXg1OmN3+HppeLg/GVAdS8wJ9O9nSyo4FEB8bQewfj2jIc0xcWsucgcEBj/SBcvnC75g/1WAAFT9J2V2othHZUT7iRM= 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=Io8qAyRx; arc=none smtp.client-ip=209.85.214.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="Io8qAyRx" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2350b1b9129so32509915ad.0; Mon, 16 Jun 2025 09:21:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750090887; x=1750695687; 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=Vf7ea9OeOxjFZqaN2n/DTUZpfsQZsze4A6wO+u7qE8A=; b=Io8qAyRxspHUtE0PBSlhmmK4rj45RhXmbbjJUqW2JyrnFMiTmI/NDgbtO5l4BJa+6I HsO1vi90Mn1uXWECLavQNpxCPCiJViq545tmh8f8Hjk2KIrsgSgZ+QXO5qnH3zHyKUGn RbwC+remeQcRJyaR2F6NybhXWBk5TqYAmr0XXmENbLcrrcQFLIXGNWQH1XW4B1HiufFE hSaDUDkbe80dorztymlJJ6fQAWaqvoCZl7osgISeSI860YcWV8TmP73fZTLA9gojGlda evkEioiIYEs1NblHs6zCNmmoBgdtQMnWwRQo67yTg4KL2VYPgtGnnI5NO6akLmcTM0AF NuJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750090887; x=1750695687; 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=Vf7ea9OeOxjFZqaN2n/DTUZpfsQZsze4A6wO+u7qE8A=; b=gdK5ZSXH5HszWWx7ONP7V4Y+mB6tgLMbiQQfLhJ8u4sppUHN7issthMs2m2POUz8PE 755MPTjvm9mL2AupRx31x3UNNEaO5TF+5tgynevL5ecXSPdlCbbKH8FZ7lZtuRpdF5De xnCbEBbCfzDf4oeeBYfTB1gwQz9lMMVBHwQEnEetlnUvtesbco5gWqG8XrPomj77JsMv o5Tf6u6qcnFP6NvPsnd1ilXddukaUA8L6+IBwBSsuwEP4rNWJeXz4pErKFxE33wpLC/3 aHbVQwiNssrt2edtdnslKK2iLQ7IHvW37vOnHTfsi+5AJT651roZbLCuI6KXX8kksk7N KN7Q== X-Forwarded-Encrypted: i=1; AJvYcCUYVK9NHICVYLZyGTwrqDp60e+luzqa/2TCGhTZQTaTMLmLLZIDHKfUFuFzR6HqpmjneF5rqo6mxOzirsY=@vger.kernel.org, AJvYcCV4+bPf5tzD8BI3GK6TFzwyuOhStwst1cWQzyKbNlJ291KCh/8Rrc3390WRhkTAxy6LBpSUyTH69bSx2/j18D7Q@vger.kernel.org, AJvYcCX5HfgTj9Ncnb2ysD9ogInXKED8vKQMUyMEHyB5xraapi930JQRVmM3sBZVhFMj5lyjVz7Qz0AkHM7JVA==@vger.kernel.org X-Gm-Message-State: AOJu0YzTuT0aG6255cEiKe7v4Pjn3sLnIB8Of1Cyuqs1qm5ln0KCho9i WsTQngGyWANGJKILj5waZCaQRLmp6fdd7TpI8JHt0V58EG2BC9Oix5XNxxGA X-Gm-Gg: ASbGncuz1FvvtmE9onBfMfKycqsXgboa70u+adYxuS06zwKeebAFriwRW1tRF6XCp08 uWBcaXK4BO2xAbdPYfISUpna5vifdVr/1i0MP8cRGM2VT7Nc3c7c2gsyeYykbXcX7ADRIyLB9EE tfLXN1OIYMYTtRZ96NIol6flrv3s5AipL13NIz2ar83OSYv3osGdUD8r7C+SFHw6F+OdpnmEQIW EklqssOMDroBdJAq0p+uHx25hKOzqMOCpo2D9SkNUkFCwlIBE+AflNtXEyxqTd0JAcFbvBNBTe7 5m10+mi/gQx7xxteisRxaJK0veyRV3CHnxKxSQiT9Otq1rVGx4RUSGpGKG7ppZoPEKO+Vpl1aoS OFPwuN9ShNU685k5uVOxFov4= X-Google-Smtp-Source: AGHT+IFTpneJMscp64JsQsBTZDsdXWWWprF9evpsvYcOGwB/ozwI/DF68CMRCP+T0+BlojYTo1Hn1A== X-Received: by 2002:a17:90b:1c04:b0:312:f2ee:a895 with SMTP id 98e67ed59e1d1-313f1e1a908mr13632801a91.31.1750090886699; Mon, 16 Jun 2025 09:21: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 d9443c01a7336-2365deb87bfsm62925985ad.190.2025.06.16.09.21.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 09:21: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, tglx@linutronix.de, mingo@kernel.org, ruanjinjie@huawei.com, idosch@nvidia.com, razor@blackwall.org, petrm@nvidia.com, kuniyu@google.com, sdf@fomichev.me, 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 v5 6/6] Revert "bnxt_en: bring back rtnl_lock() in the bnxt_open() path" Date: Mon, 16 Jun 2025 09:21:17 -0700 Message-ID: <20250616162117.287806-7-stfomichev@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250616162117.287806-1-stfomichev@gmail.com> References: <20250616162117.287806-1-stfomichev@gmail.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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/ethernet/broadcom/bnxt/bnxt.c index 7946586802af..b359ef4b78a9 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); } -/* 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); } /* Only called from bnxt_sp_task() */ @@ -14084,9 +14069,9 @@ static void bnxt_rx_ring_reset(struct bnxt *bp) { int i; - 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); } 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 = 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 = 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; } @@ -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; } @@ -16812,7 +16794,6 @@ static int bnxt_resume(struct device *device) struct bnxt *bp = netdev_priv(dev); int rc = 0; - rtnl_lock(); netdev_lock(dev); rc = pci_enable_device(bp->pdev); if (rc) { @@ -16857,7 +16838,6 @@ static int bnxt_resume(struct device *device) 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; netdev_info(bp->dev, "PCI Slot Resume\n"); - rtnl_lock(); netdev_lock(netdev); err = bnxt_hwrm_func_qcaps(bp); @@ -17041,7 +17020,6 @@ static void bnxt_io_resume(struct pci_dev *pdev) netif_device_attach(netdev); netdev_unlock(netdev); - rtnl_unlock(); bnxt_ulp_start(bp, err); if (!err) bnxt_reenable_sriov(bp);