* [PATCH net-next] selftests: netfilter: avoid test timeouts on debug kernels
@ 2024-04-29 10:57 Florian Westphal
2024-04-30 15:20 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Florian Westphal @ 2024-04-29 10:57 UTC (permalink / raw
To: netdev
Cc: Paolo Abeni, David S. Miller, Eric Dumazet, Jakub Kicinski,
netfilter-devel, pablo
Jakub reports that some tests fail on netdev CI when executed in a debug
kernel.
Increase test timeout to 30m, this should hopefully be enough.
Also reduce test duration where possible for "slow" machines.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
tools/testing/selftests/net/netfilter/br_netfilter.sh | 6 +++++-
tools/testing/selftests/net/netfilter/nft_nat_zones.sh | 1 +
tools/testing/selftests/net/netfilter/nft_zones_many.sh | 4 +++-
tools/testing/selftests/net/netfilter/settings | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/net/netfilter/br_netfilter.sh b/tools/testing/selftests/net/netfilter/br_netfilter.sh
index d7806753f5de..c28379a965d8 100755
--- a/tools/testing/selftests/net/netfilter/br_netfilter.sh
+++ b/tools/testing/selftests/net/netfilter/br_netfilter.sh
@@ -40,7 +40,11 @@ bcast_ping()
fromns="$1"
dstip="$2"
- for i in $(seq 1 500); do
+ local packets=500
+
+ [ "$KSFT_MACHINE_SLOW" = yes ] && packets=100
+
+ for i in $(seq 1 $packets); do
if ! ip netns exec "$fromns" ping -q -f -b -c 1 -q "$dstip" > /dev/null 2>&1; then
echo "ERROR: ping -b from $fromns to $dstip"
ip netns exec "$ns0" nft list ruleset
diff --git a/tools/testing/selftests/net/netfilter/nft_nat_zones.sh b/tools/testing/selftests/net/netfilter/nft_nat_zones.sh
index 549f264b41f3..3b81d88bdde3 100755
--- a/tools/testing/selftests/net/netfilter/nft_nat_zones.sh
+++ b/tools/testing/selftests/net/netfilter/nft_nat_zones.sh
@@ -13,6 +13,7 @@ maxclients=100
have_socat=0
ret=0
+[ "$KSFT_MACHINE_SLOW" = yes ] && maxclients=40
# client1---.
# veth1-.
# |
diff --git a/tools/testing/selftests/net/netfilter/nft_zones_many.sh b/tools/testing/selftests/net/netfilter/nft_zones_many.sh
index 4ad75038f6ff..7db9982ba5a6 100755
--- a/tools/testing/selftests/net/netfilter/nft_zones_many.sh
+++ b/tools/testing/selftests/net/netfilter/nft_zones_many.sh
@@ -6,6 +6,8 @@
source lib.sh
zones=2000
+[ "$KSFT_MACHINE_SLOW" = yes ] && zones=500
+
have_ct_tool=0
ret=0
@@ -89,7 +91,7 @@ fi
count=$(ip netns exec "$ns1" conntrack -C)
duration=$((stop-outerstart))
- if [ "$count" -eq "$max_zones" ]; then
+ if [ "$count" -ge "$max_zones" ]; then
echo "PASS: inserted $count entries from packet path in $duration ms total"
else
ip netns exec "$ns1" conntrack -S 1>&2
diff --git a/tools/testing/selftests/net/netfilter/settings b/tools/testing/selftests/net/netfilter/settings
index 288bd9704773..abc5648b59ab 100644
--- a/tools/testing/selftests/net/netfilter/settings
+++ b/tools/testing/selftests/net/netfilter/settings
@@ -1 +1 @@
-timeout=500
+timeout=1800
--
2.44.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] selftests: netfilter: avoid test timeouts on debug kernels
2024-04-29 10:57 [PATCH net-next] selftests: netfilter: avoid test timeouts on debug kernels Florian Westphal
@ 2024-04-30 15:20 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-04-30 15:20 UTC (permalink / raw
To: Florian Westphal
Cc: netdev, pabeni, davem, edumazet, kuba, netfilter-devel, pablo
Hello:
This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Mon, 29 Apr 2024 12:57:28 +0200 you wrote:
> Jakub reports that some tests fail on netdev CI when executed in a debug
> kernel.
>
> Increase test timeout to 30m, this should hopefully be enough.
> Also reduce test duration where possible for "slow" machines.
>
> Signed-off-by: Florian Westphal <fw@strlen.de>
>
> [...]
Here is the summary with links:
- [net-next] selftests: netfilter: avoid test timeouts on debug kernels
https://git.kernel.org/netdev/net-next/c/f581bcf02f0e
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] 2+ messages in thread
end of thread, other threads:[~2024-04-30 15:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-29 10:57 [PATCH net-next] selftests: netfilter: avoid test timeouts on debug kernels Florian Westphal
2024-04-30 15:20 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).