Skip to content

Commit f922c7b

Browse files
Jiri PirkoPaolo Abeni
authored andcommitted
sefltests: netdevsim: wait for devlink instance after netns removal
When devlink instance is put into network namespace and that network namespace gets deleted, devlink instance is moved back into init_ns. This is done as a part of cleanup_net() routine. Since cleanup_net() is called asynchronously from workqueue, there is no guarantee that the devlink instance move is done after "ip netns del" returns. So fix this race by making sure that the devlink instance is present before any other operation. Reported-by: Amir Tzin <[email protected]> Fixes: b74c37f ("selftests: netdevsim: add tests for devlink reload with resources") Signed-off-by: Jiri Pirko <[email protected]> Reviewed-by: Pavan Chebbi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
1 parent b60417a commit f922c7b

File tree

1 file changed

+18
-0
lines changed
  • tools/testing/selftests/drivers/net/netdevsim

1 file changed

+18
-0
lines changed

tools/testing/selftests/drivers/net/netdevsim/devlink.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@ SYSFS_NET_DIR=/sys/bus/netdevsim/devices/$DEV_NAME/net/
1717
DEBUGFS_DIR=/sys/kernel/debug/netdevsim/$DEV_NAME/
1818
DL_HANDLE=netdevsim/$DEV_NAME
1919

20+
wait_for_devlink()
21+
{
22+
"$@" | grep -q $DL_HANDLE
23+
}
24+
25+
devlink_wait()
26+
{
27+
local timeout=$1
28+
29+
busywait "$timeout" wait_for_devlink devlink dev
30+
}
31+
2032
fw_flash_test()
2133
{
2234
RET=0
@@ -256,6 +268,9 @@ netns_reload_test()
256268
ip netns del testns2
257269
ip netns del testns1
258270

271+
# Wait until netns async cleanup is done.
272+
devlink_wait 2000
273+
259274
log_test "netns reload test"
260275
}
261276

@@ -348,6 +363,9 @@ resource_test()
348363
ip netns del testns2
349364
ip netns del testns1
350365

366+
# Wait until netns async cleanup is done.
367+
devlink_wait 2000
368+
351369
log_test "resource test"
352370
}
353371

0 commit comments

Comments
 (0)