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.chan@broadcom.com>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: Stanislav Fomichev <stfomichev@gmail.com>
Link: https://patch.msgid.link/20250616162117.287806-6-stfomichev@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h
index d04401f0bdf79eff4327b58aca66a9f856a8c3a3..511ed72a93ce67ec9ec6336e29634fdaa24dcd49 100644 (file)
--- 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 10cbbf1c584b9952cc29683296a2d5ee62d7e6eb..89fff76e51cf643dbf1231922ddf4e7f20971432 100644 (file)
--- 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 92c2f0376c081d437dbb8fec12692bcdc8cb1b9f..4c859ecdad944b31c725c0aa0c2d9b1d4f0827a5 100755 (executable)
--- 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,23 +349,11 @@ 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`
 
 msg="create VxLANs"
-exp0=( 0 0 0 0 ) # sleep is longer than out wait
-new_vxlan vxlan0 10000 $NSIM_NETDEV
-
-modprobe -r vxlan
-modprobe -r udp_tunnel
-
-msg="remove tunnels"
-exp0=( 0 0 0 0 )
-check_tables
-
-msg="create VxLANs"
-exp0=( 0 0 0 0 ) # sleep is longer than out wait
+exp0=( `mke 10000 1` 0 0 0 )
 new_vxlan vxlan0 10000 $NSIM_NETDEV
 
 exp0=( 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
 
     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
 
     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
 
     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
 
     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
 
     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
 
     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
 
     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
 
 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)