From nobody Fri Oct 10 02:41:35 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 690712882A7; Mon, 16 Jun 2025 16:21:26 +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=1750090888; cv=none; b=Eo8SwtFPUpdn7RMzxyIJeBsj5wsq182v/83JfJzVLtFpGnAExFLQ4isEysy2VnaWjVVV8dV4GkVUCF+4QZYV0Bxkkc6ytBiWoKCUE22mGY/i8pG1fkSFIz99NM0w1YSAx7xtWlLX3/EABcuTzNGAWuGVAjnh+cJAqOo0+xhTCx0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750090888; c=relaxed/simple; bh=jrPADGdQVSlhHaHu88CYeq9ejs0dqL4pa8LW21dVeyc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Yx5znTORn2/7M+NpqzZNzdn/PYP7pk1HZqLwhzlyCMYiGjfl8AzVkVOl37knOFn6/Bx193wZLHtukvMcm5wcXOLq0abOvAlZ9H40iYqjP+hmeYf/tHbrTTZcpJblnYN3W6RyajuJZUxJtIRbpyNLX6Wb0Trqj4pQsw6ymQ/Xp2A= 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=DIgDSVZM; 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="DIgDSVZM" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-742caef5896so3883224b3a.3; Mon, 16 Jun 2025 09:21:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750090885; x=1750695685; 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=DIgDSVZMVKlcDQOrCBx2yD8jc+qu2I5hi5rihPTE8J2bKmZviE1uxRccVtl9QgbOlW nWB43BcT0vEOIqKW58yTrR9kPSuJYyfwXz28cI7cL7DTqi7+/8MVu5Jp1rXO6NM8m8+C iS0bhyAzirGuzoQ3lRkf6WZTKoXkPhQ7zWkCwZGQNYNzcVGC/ySaTD5E29rHQYpk4mvc afvURfNibRWL6+OzEkXJDoKRXB7V+Mc+KvBOZflrSIhAOxSTw6gMuzasDUtwDEMtpAc1 pDDAN0RZJMViWZ4jcOXL79dMKXfy5UiXw8z6iXygmC9lDC9313mczDYbSViYf1ZCZd0T E+zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750090885; x=1750695685; 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=SBzSyK4RmydkVruVvYRXImrW/SJEfTB+fb6tiJUQdUQVNqB0q56DGxu1KCHK7EDUPS QdX0pv41IGtwW4LbtikeskW5WlF9us/Tk/xC4ow9sjjyw3px5PxUlK26lfwAwmnvtaDB uJykPZLrG0eKJtljbfsF94Xbl1MwkLQPPGXh693DGw+aWdkUbvUke/NLYuCaopdRDHkz R+Y7kmfSLpBFzyx3swo8L7wSDKJ4Jt7ViifNqtiKOrd1EvV++OHh6WhX1VPjFy/1J9C6 YZ8GRWNlTJ6UGLrQpEbrLL/kPZ0xlOcsbe4i9MeFn+gzMuKBu0HvNc/tqNtBH1zkfZ2s 6MQA== X-Forwarded-Encrypted: i=1; AJvYcCVW476xAK2jRZUYkQO6vkC3V75zD2iMMr9uGJk+jvrXZ+nXXE5g17CeHz/3fnxPVG/fan7bfFiISGQPdmc=@vger.kernel.org, AJvYcCWd7Tnb3RssJtk5VwVoyL3aIE/XrViQPvZn/xIAma/PghIh1c9JmGk7Sua+4n+ZnBGFuwPrNYp9cwEibULfIVDy@vger.kernel.org, AJvYcCXvsAzTohF//KmOmhABP77xUHSaHoMJtSqhcyiIv0uMoMzoz9iBWquAuA0Q0TfndSCW7cLsq/SRBC57DA==@vger.kernel.org X-Gm-Message-State: AOJu0Yz18Q9XVIJWWbTldEk9q5UnoM1sTd/BXkiy/HmV0ESBs1tG4I0C lxyyAhl7Rk3GN6Mb/cJkyFH5ri3AqWCyEIaggKz3q7W3FfGhDIOBK6A0MIYW X-Gm-Gg: ASbGncvbQG4ozLS3GhwpoMT1HJXxsBZqdFD7Yg3/NRCqjmPswC0F+gdrO+KhO8BSlJ6 3aVGAh0WCS4aT+ESwm95f+nXfPII9Q32Ndjdcxct9VAGoAt+P4thJ090ivUgB+X8Xsr3WzHgbms OaiL08vUEJWkLKiXBOb3Twg7kFEqocXWXFb17Couud/7QrWg0QM4a4EkLJit87hOqCUci8MH10U Mve12mKnPg16eXYVebBK2xVBgEyeRGkUkLMRdHeC+OdhuhyDk8YfwsXGmFiQPz/vmB3l3uxAUmN +nwPQ0OxFO2ioHAeFwp+GLwdqA5+qxIfltJaVkckpF6YgKaDiuFtRbzsAx2RsuO4MUlkpl50P6T 5GLUw/QCZ9/uF8A5S4yVAIxE= X-Google-Smtp-Source: AGHT+IEOIXk6H1jA9Q65lqOc49Vxlq3eijftqFKHC9WFXfMVrfJD9h7cj/ckYq+gS695PQbgjakP3Q== X-Received: by 2002:a05:6a00:ad6:b0:740:a85b:7554 with SMTP id d2e1a72fcca58-7489cdebe1emr12838444b3a.2.1750090885308; Mon, 16 Jun 2025 09:21: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 d2e1a72fcca58-748900ad2absm7002127b3a.110.2025.06.16.09.21.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 09:21: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, 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 5/6] netdevsim: remove udp_ports_sleep Date: Mon, 16 Jun 2025 09:21:16 -0700 Message-ID: <20250616162117.287806-6-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-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