Takashi Iwai 18a51e
From f2b50f17268390567bc0e95642170d88f336c8f4 Mon Sep 17 00:00:00 2001
Takashi Iwai 18a51e
From: Kal Conley <kal.conley@dectris.com>
Takashi Iwai 18a51e
Date: Wed, 5 Apr 2023 10:29:04 +0200
Takashi Iwai 18a51e
Subject: [PATCH] selftests: xsk: Disable IPv6 on VETH1
Takashi Iwai 18a51e
Git-commit: f2b50f17268390567bc0e95642170d88f336c8f4
Takashi Iwai 18a51e
Patch-mainline: v6.4-rc1
Takashi Iwai 18a51e
References: git-fixes
Takashi Iwai 18a51e
Takashi Iwai 18a51e
This change fixes flakiness in the BIDIRECTIONAL test:
Takashi Iwai 18a51e
Takashi Iwai 18a51e
    # [is_pkt_valid] expected length [60], got length [90]
Takashi Iwai 18a51e
    not ok 1 FAIL: SKB BUSY-POLL BIDIRECTIONAL
Takashi Iwai 18a51e
Takashi Iwai 18a51e
When IPv6 is enabled, the interface will periodically send MLDv1 and
Takashi Iwai 18a51e
MLDv2 packets. These packets can cause the BIDIRECTIONAL test to fail
Takashi Iwai 18a51e
since it uses VETH0 for RX.
Takashi Iwai 18a51e
Takashi Iwai 18a51e
For other tests, this was not a problem since they only receive on VETH1
Takashi Iwai 18a51e
and IPv6 was already disabled on VETH0.
Takashi Iwai 18a51e
Takashi Iwai 18a51e
Fixes: a89052572ebb ("selftests/bpf: Xsk selftests framework")
Takashi Iwai 18a51e
Signed-off-by: Kal Conley <kal.conley@dectris.com>
Takashi Iwai 18a51e
Link: https://lore.kernel.org/r/20230405082905.6303-1-kal.conley@dectris.com
Takashi Iwai 18a51e
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Takashi Iwai 18a51e
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 18a51e
Takashi Iwai 18a51e
---
Takashi Iwai 18a51e
 tools/testing/selftests/bpf/test_xsk.sh |    1 +
Takashi Iwai 18a51e
 1 file changed, 1 insertion(+)
Takashi Iwai 18a51e
Takashi Iwai 18a51e
--- a/tools/testing/selftests/bpf/test_xsk.sh
Takashi Iwai 18a51e
+++ b/tools/testing/selftests/bpf/test_xsk.sh
Takashi Iwai 18a51e
@@ -110,6 +110,7 @@ setup_vethPairs() {
Takashi Iwai 18a51e
 	ip link add ${VETH0} numtxqueues 4 numrxqueues 4 type veth peer name ${VETH1} numtxqueues 4 numrxqueues 4
Takashi Iwai 18a51e
 	if [ -f /proc/net/if_inet6 ]; then
Takashi Iwai 18a51e
 		echo 1 > /proc/sys/net/ipv6/conf/${VETH0}/disable_ipv6
Takashi Iwai 18a51e
+		echo 1 > /proc/sys/net/ipv6/conf/${VETH1}/disable_ipv6
Takashi Iwai 18a51e
 	fi
Takashi Iwai 18a51e
 	if [[ $verbose -eq 1 ]]; then
Takashi Iwai 18a51e
 	        echo "setting up ${VETH1}: namespace: ${NS1}"