* [PATCH net 0/2] selftests: net: Fix problems in some drivers/net tests
@ 2022-10-19 9:10 Benjamin Poirier
2022-10-19 9:10 ` [PATCH net 1/2] selftests: net: Fix cross-tree inclusion of scripts Benjamin Poirier
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Benjamin Poirier @ 2022-10-19 9:10 UTC (permalink / raw)
To: netdev
Cc: Jay Vosburgh, Veaceslav Falico, Andy Gospodarek, Shuah Khan,
Andrew Lunn, Vivien Didelot, Florian Fainelli, Vladimir Oltean,
Jiri Pirko, David S. Miller, linux-kernel, linux-kselftest,
Jonathan Toppins, Eric Dumazet, Jakub Kicinski, Paolo Abeni
From: Benjamin Poirier <benjamin.poirier@gmail.com>
Fix two problems mostly introduced in commit bbb774d921e2 ("net: Add tests
for bonding and team address list management").
Benjamin Poirier (2):
selftests: net: Fix cross-tree inclusion of scripts
selftests: net: Fix netdev name mismatch in cleanup
tools/testing/selftests/drivers/net/bonding/Makefile | 4 +++-
.../testing/selftests/drivers/net/bonding/dev_addr_lists.sh | 2 +-
.../selftests/drivers/net/bonding/net_forwarding_lib.sh | 1 +
.../selftests/drivers/net/dsa/test_bridge_fdb_stress.sh | 4 ++--
tools/testing/selftests/drivers/net/team/Makefile | 4 ++++
tools/testing/selftests/drivers/net/team/dev_addr_lists.sh | 6 +++---
tools/testing/selftests/drivers/net/team/lag_lib.sh | 1 +
.../selftests/drivers/net/team/net_forwarding_lib.sh | 1 +
tools/testing/selftests/lib.mk | 4 ++--
9 files changed, 18 insertions(+), 9 deletions(-)
create mode 120000 tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh
create mode 120000 tools/testing/selftests/drivers/net/team/lag_lib.sh
create mode 120000 tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh
--
2.37.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net 1/2] selftests: net: Fix cross-tree inclusion of scripts
2022-10-19 9:10 [PATCH net 0/2] selftests: net: Fix problems in some drivers/net tests Benjamin Poirier
@ 2022-10-19 9:10 ` Benjamin Poirier
2022-10-19 9:10 ` [PATCH net 2/2] selftests: net: Fix netdev name mismatch in cleanup Benjamin Poirier
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Benjamin Poirier @ 2022-10-19 9:10 UTC (permalink / raw)
To: netdev
Cc: Jay Vosburgh, Veaceslav Falico, Andy Gospodarek, Shuah Khan,
Andrew Lunn, Vivien Didelot, Florian Fainelli, Vladimir Oltean,
Jiri Pirko, David S. Miller, linux-kernel, linux-kselftest,
Jonathan Toppins, Eric Dumazet, Jakub Kicinski, Paolo Abeni
When exporting and running a subset of selftests via kselftest, files from
parts of the source tree which were not exported are not available. A few
tests are trying to source such files. Address the problem by using
symlinks.
The problem can be reproduced by running:
make -C tools/testing/selftests gen_tar TARGETS="drivers/net/bonding"
[... extract archive ...]
./run_kselftest.sh
or:
make kselftest KBUILD_OUTPUT=/tmp/kselftests TARGETS="drivers/net/bonding"
Fixes: bbb774d921e2 ("net: Add tests for bonding and team address list management")
Fixes: eccd0a80dc7f ("selftests: net: dsa: add a stress test for unlocked FDB operations")
Link: https://lore.kernel.org/netdev/40f04ded-0c86-8669-24b1-9a313ca21076@redhat.com/
Reported-by: Jonathan Toppins <jtoppins@redhat.com>
Signed-off-by: Benjamin Poirier <bpoirier@nvidia.com>
---
tools/testing/selftests/drivers/net/bonding/Makefile | 4 +++-
tools/testing/selftests/drivers/net/bonding/dev_addr_lists.sh | 2 +-
.../selftests/drivers/net/bonding/net_forwarding_lib.sh | 1 +
.../selftests/drivers/net/dsa/test_bridge_fdb_stress.sh | 4 ++--
tools/testing/selftests/drivers/net/team/Makefile | 4 ++++
tools/testing/selftests/drivers/net/team/dev_addr_lists.sh | 4 ++--
tools/testing/selftests/drivers/net/team/lag_lib.sh | 1 +
.../testing/selftests/drivers/net/team/net_forwarding_lib.sh | 1 +
tools/testing/selftests/lib.mk | 4 ++--
9 files changed, 17 insertions(+), 8 deletions(-)
create mode 120000 tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh
create mode 120000 tools/testing/selftests/drivers/net/team/lag_lib.sh
create mode 120000 tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh
diff --git a/tools/testing/selftests/drivers/net/bonding/Makefile b/tools/testing/selftests/drivers/net/bonding/Makefile
index e9dab5f9d773..6b8d2e2f23c2 100644
--- a/tools/testing/selftests/drivers/net/bonding/Makefile
+++ b/tools/testing/selftests/drivers/net/bonding/Makefile
@@ -7,6 +7,8 @@ TEST_PROGS := \
bond-lladdr-target.sh \
dev_addr_lists.sh
-TEST_FILES := lag_lib.sh
+TEST_FILES := \
+ lag_lib.sh \
+ net_forwarding_lib.sh
include ../../../lib.mk
diff --git a/tools/testing/selftests/drivers/net/bonding/dev_addr_lists.sh b/tools/testing/selftests/drivers/net/bonding/dev_addr_lists.sh
index e6fa24eded5b..5cfe7d8ebc25 100755
--- a/tools/testing/selftests/drivers/net/bonding/dev_addr_lists.sh
+++ b/tools/testing/selftests/drivers/net/bonding/dev_addr_lists.sh
@@ -14,7 +14,7 @@ ALL_TESTS="
REQUIRE_MZ=no
NUM_NETIFS=0
lib_dir=$(dirname "$0")
-source "$lib_dir"/../../../net/forwarding/lib.sh
+source "$lib_dir"/net_forwarding_lib.sh
source "$lib_dir"/lag_lib.sh
diff --git a/tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh b/tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh
new file mode 120000
index 000000000000..39c96828c5ef
--- /dev/null
+++ b/tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh
@@ -0,0 +1 @@
+../../../net/forwarding/lib.sh
\ No newline at end of file
diff --git a/tools/testing/selftests/drivers/net/dsa/test_bridge_fdb_stress.sh b/tools/testing/selftests/drivers/net/dsa/test_bridge_fdb_stress.sh
index dca8be6092b9..a1f269ee84da 100755
--- a/tools/testing/selftests/drivers/net/dsa/test_bridge_fdb_stress.sh
+++ b/tools/testing/selftests/drivers/net/dsa/test_bridge_fdb_stress.sh
@@ -18,8 +18,8 @@ NUM_NETIFS=1
REQUIRE_JQ="no"
REQUIRE_MZ="no"
NETIF_CREATE="no"
-lib_dir=$(dirname $0)/../../../net/forwarding
-source $lib_dir/lib.sh
+lib_dir=$(dirname "$0")
+source "$lib_dir"/lib.sh
cleanup() {
echo "Cleaning up"
diff --git a/tools/testing/selftests/drivers/net/team/Makefile b/tools/testing/selftests/drivers/net/team/Makefile
index 642d8df1c137..6a86e61e8bfe 100644
--- a/tools/testing/selftests/drivers/net/team/Makefile
+++ b/tools/testing/selftests/drivers/net/team/Makefile
@@ -3,4 +3,8 @@
TEST_PROGS := dev_addr_lists.sh
+TEST_FILES := \
+ lag_lib.sh \
+ net_forwarding_lib.sh
+
include ../../../lib.mk
diff --git a/tools/testing/selftests/drivers/net/team/dev_addr_lists.sh b/tools/testing/selftests/drivers/net/team/dev_addr_lists.sh
index debda7262956..9684163949f0 100755
--- a/tools/testing/selftests/drivers/net/team/dev_addr_lists.sh
+++ b/tools/testing/selftests/drivers/net/team/dev_addr_lists.sh
@@ -11,9 +11,9 @@ ALL_TESTS="
REQUIRE_MZ=no
NUM_NETIFS=0
lib_dir=$(dirname "$0")
-source "$lib_dir"/../../../net/forwarding/lib.sh
+source "$lib_dir"/net_forwarding_lib.sh
-source "$lib_dir"/../bonding/lag_lib.sh
+source "$lib_dir"/lag_lib.sh
destroy()
diff --git a/tools/testing/selftests/drivers/net/team/lag_lib.sh b/tools/testing/selftests/drivers/net/team/lag_lib.sh
new file mode 120000
index 000000000000..e1347a10afde
--- /dev/null
+++ b/tools/testing/selftests/drivers/net/team/lag_lib.sh
@@ -0,0 +1 @@
+../bonding/lag_lib.sh
\ No newline at end of file
diff --git a/tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh b/tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh
new file mode 120000
index 000000000000..39c96828c5ef
--- /dev/null
+++ b/tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh
@@ -0,0 +1 @@
+../../../net/forwarding/lib.sh
\ No newline at end of file
diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk
index 9d4cb94cf437..a3ea3d4a206d 100644
--- a/tools/testing/selftests/lib.mk
+++ b/tools/testing/selftests/lib.mk
@@ -70,7 +70,7 @@ endef
run_tests: all
ifdef building_out_of_srctree
@if [ "X$(TEST_PROGS)$(TEST_PROGS_EXTENDED)$(TEST_FILES)" != "X" ]; then \
- rsync -aq $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(OUTPUT); \
+ rsync -aLq $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(OUTPUT); \
fi
@if [ "X$(TEST_PROGS)" != "X" ]; then \
$(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) \
@@ -84,7 +84,7 @@ endif
define INSTALL_SINGLE_RULE
$(if $(INSTALL_LIST),@mkdir -p $(INSTALL_PATH))
- $(if $(INSTALL_LIST),rsync -a $(INSTALL_LIST) $(INSTALL_PATH)/)
+ $(if $(INSTALL_LIST),rsync -aL $(INSTALL_LIST) $(INSTALL_PATH)/)
endef
define INSTALL_RULE
--
2.37.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net 2/2] selftests: net: Fix netdev name mismatch in cleanup
2022-10-19 9:10 [PATCH net 0/2] selftests: net: Fix problems in some drivers/net tests Benjamin Poirier
2022-10-19 9:10 ` [PATCH net 1/2] selftests: net: Fix cross-tree inclusion of scripts Benjamin Poirier
@ 2022-10-19 9:10 ` Benjamin Poirier
2022-10-19 16:54 ` [PATCH net 0/2] selftests: net: Fix problems in some drivers/net tests Jonathan Toppins
2022-10-21 5:10 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Benjamin Poirier @ 2022-10-19 9:10 UTC (permalink / raw)
To: netdev
Cc: Jay Vosburgh, Veaceslav Falico, Andy Gospodarek, Shuah Khan,
Andrew Lunn, Vivien Didelot, Florian Fainelli, Vladimir Oltean,
Jiri Pirko, David S. Miller, linux-kernel, linux-kselftest,
Jonathan Toppins, Eric Dumazet, Jakub Kicinski, Paolo Abeni
lag_lib.sh creates the interfaces dummy1 and dummy2 whereas
dev_addr_lists.sh:destroy() deletes the interfaces dummy0 and dummy1. Fix
the mismatch in names.
Fixes: bbb774d921e2 ("net: Add tests for bonding and team address list management")
Signed-off-by: Benjamin Poirier <bpoirier@nvidia.com>
---
tools/testing/selftests/drivers/net/team/dev_addr_lists.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/drivers/net/team/dev_addr_lists.sh b/tools/testing/selftests/drivers/net/team/dev_addr_lists.sh
index 9684163949f0..33913112d5ca 100755
--- a/tools/testing/selftests/drivers/net/team/dev_addr_lists.sh
+++ b/tools/testing/selftests/drivers/net/team/dev_addr_lists.sh
@@ -18,7 +18,7 @@ source "$lib_dir"/lag_lib.sh
destroy()
{
- local ifnames=(dummy0 dummy1 team0 mv0)
+ local ifnames=(dummy1 dummy2 team0 mv0)
local ifname
for ifname in "${ifnames[@]}"; do
--
2.37.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net 0/2] selftests: net: Fix problems in some drivers/net tests
2022-10-19 9:10 [PATCH net 0/2] selftests: net: Fix problems in some drivers/net tests Benjamin Poirier
2022-10-19 9:10 ` [PATCH net 1/2] selftests: net: Fix cross-tree inclusion of scripts Benjamin Poirier
2022-10-19 9:10 ` [PATCH net 2/2] selftests: net: Fix netdev name mismatch in cleanup Benjamin Poirier
@ 2022-10-19 16:54 ` Jonathan Toppins
2022-10-21 5:10 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Jonathan Toppins @ 2022-10-19 16:54 UTC (permalink / raw)
To: Benjamin Poirier, netdev
Cc: Jay Vosburgh, Veaceslav Falico, Andy Gospodarek, Shuah Khan,
Andrew Lunn, Vivien Didelot, Florian Fainelli, Vladimir Oltean,
Jiri Pirko, David S. Miller, linux-kernel, linux-kselftest,
Eric Dumazet, Jakub Kicinski, Paolo Abeni
On 10/19/22 05:10, Benjamin Poirier wrote:
> From: Benjamin Poirier <benjamin.poirier@gmail.com>
>
> Fix two problems mostly introduced in commit bbb774d921e2 ("net: Add tests
> for bonding and team address list management").
>
> Benjamin Poirier (2):
> selftests: net: Fix cross-tree inclusion of scripts
> selftests: net: Fix netdev name mismatch in cleanup
>
> tools/testing/selftests/drivers/net/bonding/Makefile | 4 +++-
> .../testing/selftests/drivers/net/bonding/dev_addr_lists.sh | 2 +-
> .../selftests/drivers/net/bonding/net_forwarding_lib.sh | 1 +
> .../selftests/drivers/net/dsa/test_bridge_fdb_stress.sh | 4 ++--
> tools/testing/selftests/drivers/net/team/Makefile | 4 ++++
> tools/testing/selftests/drivers/net/team/dev_addr_lists.sh | 6 +++---
> tools/testing/selftests/drivers/net/team/lag_lib.sh | 1 +
> .../selftests/drivers/net/team/net_forwarding_lib.sh | 1 +
> tools/testing/selftests/lib.mk | 4 ++--
> 9 files changed, 18 insertions(+), 9 deletions(-)
> create mode 120000 tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh
> create mode 120000 tools/testing/selftests/drivers/net/team/lag_lib.sh
> create mode 120000 tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh
>
Looks good, thanks.
For the series
Reviewed-by: Jonathan Toppins <jtoppins@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net 0/2] selftests: net: Fix problems in some drivers/net tests
2022-10-19 9:10 [PATCH net 0/2] selftests: net: Fix problems in some drivers/net tests Benjamin Poirier
` (2 preceding siblings ...)
2022-10-19 16:54 ` [PATCH net 0/2] selftests: net: Fix problems in some drivers/net tests Jonathan Toppins
@ 2022-10-21 5:10 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-10-21 5:10 UTC (permalink / raw)
To: Benjamin Poirier
Cc: netdev, j.vosburgh, vfalico, andy, shuah, andrew, vivien.didelot,
f.fainelli, olteanv, jiri, davem, linux-kernel, linux-kselftest,
jtoppins, edumazet, kuba, pabeni
Hello:
This series was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 19 Oct 2022 18:10:40 +0900 you wrote:
> From: Benjamin Poirier <benjamin.poirier@gmail.com>
>
> Fix two problems mostly introduced in commit bbb774d921e2 ("net: Add tests
> for bonding and team address list management").
>
> Benjamin Poirier (2):
> selftests: net: Fix cross-tree inclusion of scripts
> selftests: net: Fix netdev name mismatch in cleanup
>
> [...]
Here is the summary with links:
- [net,1/2] selftests: net: Fix cross-tree inclusion of scripts
https://git.kernel.org/netdev/net/c/ae108c48b5d2
- [net,2/2] selftests: net: Fix netdev name mismatch in cleanup
https://git.kernel.org/netdev/net/c/b2c0921b926c
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-10-21 5:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-19 9:10 [PATCH net 0/2] selftests: net: Fix problems in some drivers/net tests Benjamin Poirier
2022-10-19 9:10 ` [PATCH net 1/2] selftests: net: Fix cross-tree inclusion of scripts Benjamin Poirier
2022-10-19 9:10 ` [PATCH net 2/2] selftests: net: Fix netdev name mismatch in cleanup Benjamin Poirier
2022-10-19 16:54 ` [PATCH net 0/2] selftests: net: Fix problems in some drivers/net tests Jonathan Toppins
2022-10-21 5:10 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.