Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Stanislav Fomichev 2025-06-16 09:21:16 -07:00 committed by Jakub Kicinski
parent 3a321b6b1f
commit e054c8ba3b
3 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/netdevsim/netdevsim.h
View File

@ -131,7 +131,6 @@ struct netdevsim {
struct nsim_macsec macsec; struct nsim_macsec macsec;
struct { struct {
u32 inject_error; u32 inject_error;
u32 sleep;
u32 __ports[2][NSIM_UDP_TUNNEL_N_PORTS]; u32 __ports[2][NSIM_UDP_TUNNEL_N_PORTS];
u32 (*ports)[NSIM_UDP_TUNNEL_N_PORTS]; u32 (*ports)[NSIM_UDP_TUNNEL_N_PORTS];
struct dentry *ddir; struct dentry *ddir;
@ -342,7 +341,6 @@ struct nsim_dev {
bool ipv4_only; bool ipv4_only;
bool shared; bool shared;
bool static_iana_vxlan; bool static_iana_vxlan;
u32 sleep;
} udp_ports; } udp_ports;
struct nsim_dev_psample *psample; struct nsim_dev_psample *psample;
u16 esw_mode; u16 esw_mode;

8
drivers/net/netdevsim/udp_tunnels.c
View File

@ -18,9 +18,6 @@ nsim_udp_tunnel_set_port(struct net_device *dev, unsigned int table,
ret = -ns->udp_ports.inject_error; ret = -ns->udp_ports.inject_error;
ns->udp_ports.inject_error = 0; ns->udp_ports.inject_error = 0;
if (ns->udp_ports.sleep)
msleep(ns->udp_ports.sleep);
if (!ret) { if (!ret) {
if (ns->udp_ports.ports[table][entry]) { if (ns->udp_ports.ports[table][entry]) {
WARN(1, "entry already in use\n"); 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; ret = -ns->udp_ports.inject_error;
ns->udp_ports.inject_error = 0; ns->udp_ports.inject_error = 0;
if (ns->udp_ports.sleep)
msleep(ns->udp_ports.sleep);
if (!ret) { if (!ret) {
u32 val = be16_to_cpu(ti->port) << 16 | ti->type; 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); GFP_KERNEL);
if (!info) if (!info)
return -ENOMEM; return -ENOMEM;
ns->udp_ports.sleep = nsim_dev->udp_ports.sleep;
if (nsim_dev->udp_ports.sync_all) { if (nsim_dev->udp_ports.sync_all) {
info->set_port = NULL; info->set_port = NULL;
@ -213,6 +207,4 @@ void nsim_udp_tunnels_debugfs_create(struct nsim_dev *nsim_dev)
&nsim_dev->udp_ports.shared); &nsim_dev->udp_ports.shared);
debugfs_create_bool("udp_ports_static_iana_vxlan", 0600, nsim_dev->ddir, debugfs_create_bool("udp_ports_static_iana_vxlan", 0600, nsim_dev->ddir,
&nsim_dev->udp_ports.static_iana_vxlan); &nsim_dev->udp_ports.static_iana_vxlan);
debugfs_create_u32("udp_ports_sleep", 0600, nsim_dev->ddir,
&nsim_dev->udp_ports.sleep);
} }

23
tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh
View File

@ -266,7 +266,6 @@ for port in 0 1; do
echo $NSIM_ID > /sys/bus/netdevsim/new_device echo $NSIM_ID > /sys/bus/netdevsim/new_device
else else
echo 1 > $NSIM_DEV_DFS/udp_ports_open_only echo 1 > $NSIM_DEV_DFS/udp_ports_open_only
echo 1 > $NSIM_DEV_DFS/udp_ports_sleep
echo 1 > $NSIM_DEV_SYS/new_port echo 1 > $NSIM_DEV_SYS/new_port
fi fi
NSIM_NETDEV=`get_netdev_name old_netdevs` NSIM_NETDEV=`get_netdev_name old_netdevs`
@ -350,23 +349,11 @@ old_netdevs=$(ls /sys/class/net)
port=0 port=0
echo $NSIM_ID > /sys/bus/netdevsim/new_device echo $NSIM_ID > /sys/bus/netdevsim/new_device
echo 0 > $NSIM_DEV_SYS/del_port echo 0 > $NSIM_DEV_SYS/del_port
echo 1000 > $NSIM_DEV_DFS/udp_ports_sleep
echo 0 > $NSIM_DEV_SYS/new_port echo 0 > $NSIM_DEV_SYS/new_port
NSIM_NETDEV=`get_netdev_name old_netdevs` NSIM_NETDEV=`get_netdev_name old_netdevs`
msg="create VxLANs" 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
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
new_vxlan vxlan0 10000 $NSIM_NETDEV new_vxlan vxlan0 10000 $NSIM_NETDEV
exp0=( 0 0 0 0 ) exp0=( 0 0 0 0 )
@ -428,7 +415,6 @@ echo 0 > $NSIM_DEV_SYS/del_port
for port in 0 1; do for port in 0 1; do
if [ $port -ne 0 ]; then if [ $port -ne 0 ]; then
echo 1 > $NSIM_DEV_DFS/udp_ports_open_only echo 1 > $NSIM_DEV_DFS/udp_ports_open_only
echo 1 > $NSIM_DEV_DFS/udp_ports_sleep
fi fi
echo $port > $NSIM_DEV_SYS/new_port 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 for port in 0 1; do
if [ $port -ne 0 ]; then if [ $port -ne 0 ]; then
echo 1 > $NSIM_DEV_DFS/udp_ports_open_only echo 1 > $NSIM_DEV_DFS/udp_ports_open_only
echo 1 > $NSIM_DEV_DFS/udp_ports_sleep
fi fi
echo $port > $NSIM_DEV_SYS/new_port echo $port > $NSIM_DEV_SYS/new_port
@ -543,7 +528,6 @@ echo 0 > $NSIM_DEV_SYS/del_port
for port in 0 1; do for port in 0 1; do
if [ $port -ne 0 ]; then if [ $port -ne 0 ]; then
echo 1 > $NSIM_DEV_DFS/udp_ports_open_only echo 1 > $NSIM_DEV_DFS/udp_ports_open_only
echo 1 > $NSIM_DEV_DFS/udp_ports_sleep
fi fi
echo $port > $NSIM_DEV_SYS/new_port 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 for port in 0 1; do
if [ $port -ne 0 ]; then if [ $port -ne 0 ]; then
echo 1 > $NSIM_DEV_DFS/udp_ports_open_only echo 1 > $NSIM_DEV_DFS/udp_ports_open_only
echo 1 > $NSIM_DEV_DFS/udp_ports_sleep
fi fi
echo $port > $NSIM_DEV_SYS/new_port echo $port > $NSIM_DEV_SYS/new_port
@ -634,7 +617,6 @@ echo 0 > $NSIM_DEV_SYS/del_port
for port in 0 1; do for port in 0 1; do
if [ $port -ne 0 ]; then if [ $port -ne 0 ]; then
echo 1 > $NSIM_DEV_DFS/udp_ports_open_only echo 1 > $NSIM_DEV_DFS/udp_ports_open_only
echo 1 > $NSIM_DEV_DFS/udp_ports_sleep
fi fi
echo $port > $NSIM_DEV_SYS/new_port echo $port > $NSIM_DEV_SYS/new_port
@ -690,7 +672,6 @@ echo 0 > $NSIM_DEV_SYS/del_port
for port in 0 1; do for port in 0 1; do
if [ $port -ne 0 ]; then if [ $port -ne 0 ]; then
echo 1 > $NSIM_DEV_DFS/udp_ports_open_only echo 1 > $NSIM_DEV_DFS/udp_ports_open_only
echo 1 > $NSIM_DEV_DFS/udp_ports_sleep
fi fi
echo $port > $NSIM_DEV_SYS/new_port echo $port > $NSIM_DEV_SYS/new_port
@ -750,7 +731,6 @@ echo 0 > $NSIM_DEV_SYS/del_port
for port in 0 1; do for port in 0 1; do
if [ $port -ne 0 ]; then if [ $port -ne 0 ]; then
echo 1 > $NSIM_DEV_DFS/udp_ports_open_only echo 1 > $NSIM_DEV_DFS/udp_ports_open_only
echo 1 > $NSIM_DEV_DFS/udp_ports_sleep
fi fi
echo $port > $NSIM_DEV_SYS/new_port 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_SYS/del_port
echo 0 > $NSIM_DEV_DFS/udp_ports_open_only 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 echo 1 > $NSIM_DEV_DFS/udp_ports_shared
old_netdevs=$(ls /sys/class/net) old_netdevs=$(ls /sys/class/net)