> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-boun...@osuosl.org> On Behalf
> Of Stanislav Fomichev
> Sent: Monday, June 9, 2025 6:26 PM
> To: net...@vger.kernel.org
> Cc: da...@davemloft.net; eduma...@google.com; k...@kernel.org;
> pab...@redhat.com; skall...@marvell.com; mani...@marvell.com;
> andrew+net...@lunn.ch; michael.c...@broadcom.com;
> pavan.che...@broadcom.com; ajit.khapa...@broadcom.com;
> sriharsha.basavapa...@broadcom.com; somnath.ko...@broadcom.com;
> Nguyen, Anthony L <anthony.l.ngu...@intel.com>; Kitszel, Przemyslaw
> <przemyslaw.kits...@intel.com>; tar...@nvidia.com; sae...@nvidia.com;
> louis.pe...@corigine.com; shsha...@marvell.com; GR-Linux-NIC-
> d...@marvell.com; ecree.xil...@gmail.com; ho...@kernel.org;
> dsah...@kernel.org; sh...@kernel.org; mh...@redhat.com;
> ruanjin...@huawei.com; stfomic...@gmail.com; linux-
> ker...@vger.kernel.org; intel-wired-...@lists.osuosl.org; linux-
> r...@vger.kernel.org; oss-driv...@corigine.com; linux-net-
> driv...@amd.com; linux-kselft...@vger.kernel.org; l...@kernel.org
> Subject: [Intel-wired-lan] [PATCH net-next v2 3/4] netdevsim: remove
> udp_ports_sleep
> 
> 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 <michael.c...@broadcom.com>
> Signed-off-by: Stanislav Fomichev <stfomic...@gmail.com>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktio...@intel.com>

> ---
>  drivers/net/netdevsim/netdevsim.h                      |  2 --
>  drivers/net/netdevsim/udp_tunnels.c                    |  8 --------
>  .../selftests/drivers/net/netdevsim/udp_tunnel_nic.sh  | 10 ---------
> -
>  3 files changed, 20 deletions(-)
> 
> diff --git a/drivers/net/netdevsim/netdevsim.h
> b/drivers/net/netdevsim/netdevsim.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/udp_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 = -ns->udp_ports.inject_error;
>       ns->udp_ports.inject_error = 0;
> 
> -     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,
> unsigned int table,
>       ret = -ns->udp_ports.inject_error;
>       ns->udp_ports.inject_error = 0;
> 
> -     if (ns->udp_ports.sleep)
> -             msleep(ns->udp_ports.sleep);
>       if (!ret) {
>               u32 val = be16_to_cpu(ti->port) << 16 | ti->type;
> 
> @@ -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 = nsim_dev->udp_ports.sleep;
> 
>       if (nsim_dev->udp_ports.sync_all) {
>               info->set_port = NULL;
> @@ -213,6 +207,4 @@ void nsim_udp_tunnels_debugfs_create(struct
> nsim_dev *nsim_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.sh
> b/tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh
> index 92c2f0376c08..8c5fe7bdf1ce 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=`get_netdev_name old_netdevs` @@ -350,7 +349,6 @@
> old_netdevs=$(ls /sys/class/net)
>  port=0
>  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=`get_netdev_name
> old_netdevs`
> 
> @@ -428,7 +426,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
> 
>      echo $port > $NSIM_DEV_SYS/new_port @@ -486,7 +483,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
> 
>      echo $port > $NSIM_DEV_SYS/new_port @@ -543,7 +539,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
> 
>      echo $port > $NSIM_DEV_SYS/new_port @@ -573,7 +568,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
> 
>      echo $port > $NSIM_DEV_SYS/new_port @@ -634,7 +628,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
> 
>      echo $port > $NSIM_DEV_SYS/new_port @@ -690,7 +683,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
> 
>      echo $port > $NSIM_DEV_SYS/new_port @@ -750,7 +742,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
> 
>      echo $port > $NSIM_DEV_SYS/new_port @@ -809,7 +800,6 @@ echo
> $NSIM_ID > /sys/bus/netdevsim/new_device  echo 0 >
> $NSIM_DEV_SYS/del_port
> 
>  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
> 
>  old_netdevs=$(ls /sys/class/net)
> --
> 2.49.0


Reply via email to