From: Greg Kroah-Hartman Date: Fri, 6 Feb 2026 11:09:34 +0000 (+0100) Subject: drop selftest patches that would not run X-Git-Tag: v5.10.249~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ca4ee1d7f630c195abb86ddcdd24215c31c3118;p=thirdparty%2Fkernel%2Fstable-queue.git drop selftest patches that would not run --- diff --git a/queue-5.10/selftests-net-convert-fib-onlink-tests.sh-to-run-it-.patch b/queue-5.10/selftests-net-convert-fib-onlink-tests.sh-to-run-it-.patch deleted file mode 100644 index d34ef24468..0000000000 --- a/queue-5.10/selftests-net-convert-fib-onlink-tests.sh-to-run-it-.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 40fe487e8b4f535a68ccc96dea8f4688c8f61ed4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 13 Dec 2023 14:08:53 +0800 -Subject: selftests/net: convert fib-onlink-tests.sh to run it in unique - namespace - -From: Hangbin Liu - -[ Upstream commit 3a06833b2adc0a902f2469ad4ce41ccd64f1f3ab ] - -Remove PEER_CMD, which is not used in this test - -Here is the test result after conversion. - - ]# ./fib-onlink-tests.sh - Error: ipv4: FIB table does not exist. - Flush terminated - Error: ipv6: FIB table does not exist. - Flush terminated - - ######################################## - Configuring interfaces - - ... - - TEST: Gateway resolves to wrong nexthop device - VRF [ OK ] - - Tests passed: 38 - Tests failed: 0 - -Acked-by: David Ahern -Signed-off-by: Hangbin Liu -Link: https://lore.kernel.org/r/20231213060856.4030084-11-liuhangbin@gmail.com -Signed-off-by: Jakub Kicinski -Stable-dep-of: 4f5f148dd7c0 ("selftests: net: fib-onlink-tests: Convert to use namespaces by default") -Signed-off-by: Sasha Levin ---- - tools/testing/selftests/net/fib-onlink-tests.sh | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/tools/testing/selftests/net/fib-onlink-tests.sh b/tools/testing/selftests/net/fib-onlink-tests.sh -index c287b90b8af80..ec2d6ceb1f08d 100755 ---- a/tools/testing/selftests/net/fib-onlink-tests.sh -+++ b/tools/testing/selftests/net/fib-onlink-tests.sh -@@ -3,6 +3,7 @@ - - # IPv4 and IPv6 onlink tests - -+source lib.sh - PAUSE_ON_FAIL=${PAUSE_ON_FAIL:=no} - VERBOSE=0 - -@@ -74,9 +75,6 @@ TEST_NET4IN6[2]=10.2.1.254 - # mcast address - MCAST6=ff02::1 - -- --PEER_NS=bart --PEER_CMD="ip netns exec ${PEER_NS}" - VRF=lisa - VRF_TABLE=1101 - PBR_TABLE=101 -@@ -176,8 +174,7 @@ setup() - set -e - - # create namespace -- ip netns add ${PEER_NS} -- ip -netns ${PEER_NS} li set lo up -+ setup_ns PEER_NS - - # add vrf table - ip li add ${VRF} type vrf table ${VRF_TABLE} -@@ -219,7 +216,7 @@ setup() - cleanup() - { - # make sure we start from a clean slate -- ip netns del ${PEER_NS} 2>/dev/null -+ cleanup_ns ${PEER_NS} 2>/dev/null - for n in 1 3 5 7; do - ip link del ${NETIFS[p${n}]} 2>/dev/null - done --- -2.51.0 - diff --git a/queue-5.10/selftests-net-fib-onlink-tests-convert-to-use-namesp.patch b/queue-5.10/selftests-net-fib-onlink-tests-convert-to-use-namesp.patch deleted file mode 100644 index 8d271bdb84..0000000000 --- a/queue-5.10/selftests-net-fib-onlink-tests-convert-to-use-namesp.patch +++ /dev/null @@ -1,185 +0,0 @@ -From c2a286b60cf757072288d6549a41900ba89ad47d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 13 Jan 2026 12:37:44 -0300 -Subject: selftests: net: fib-onlink-tests: Convert to use namespaces by - default -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Ricardo B. Marlière - -[ Upstream commit 4f5f148dd7c0459229d2ab9a769b2e820f9ee6a2 ] - -Currently, the test breaks if the SUT already has a default route -configured for IPv6. Fix by avoiding the use of the default namespace. - -Fixes: 4ed591c8ab44 ("net/ipv6: Allow onlink routes to have a device mismatch if it is the default route") -Suggested-by: Fernando Fernandez Mancera -Signed-off-by: Ricardo B. Marlière -Reviewed-by: Ido Schimmel -Reviewed-by: Fernando Fernandez Mancera -Link: https://patch.msgid.link/20260113-selftests-net-fib-onlink-v2-1-89de2b931389@suse.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - .../testing/selftests/net/fib-onlink-tests.sh | 71 ++++++++----------- - 1 file changed, 30 insertions(+), 41 deletions(-) - -diff --git a/tools/testing/selftests/net/fib-onlink-tests.sh b/tools/testing/selftests/net/fib-onlink-tests.sh -index ec2d6ceb1f08d..c01be076b210d 100755 ---- a/tools/testing/selftests/net/fib-onlink-tests.sh -+++ b/tools/testing/selftests/net/fib-onlink-tests.sh -@@ -120,7 +120,7 @@ log_subsection() - - run_cmd() - { -- local cmd="$*" -+ local cmd="$1" - local out - local rc - -@@ -145,7 +145,7 @@ get_linklocal() - local pfx - local addr - -- addr=$(${pfx} ip -6 -br addr show dev ${dev} | \ -+ addr=$(${pfx} ${IP} -6 -br addr show dev ${dev} | \ - awk '{ - for (i = 3; i <= NF; ++i) { - if ($i ~ /^fe80/) -@@ -173,58 +173,48 @@ setup() - - set -e - -- # create namespace -- setup_ns PEER_NS -+ # create namespaces -+ setup_ns ns1 -+ IP="ip -netns $ns1" -+ setup_ns ns2 - - # add vrf table -- ip li add ${VRF} type vrf table ${VRF_TABLE} -- ip li set ${VRF} up -- ip ro add table ${VRF_TABLE} unreachable default metric 8192 -- ip -6 ro add table ${VRF_TABLE} unreachable default metric 8192 -+ ${IP} li add ${VRF} type vrf table ${VRF_TABLE} -+ ${IP} li set ${VRF} up -+ ${IP} ro add table ${VRF_TABLE} unreachable default metric 8192 -+ ${IP} -6 ro add table ${VRF_TABLE} unreachable default metric 8192 - - # create test interfaces -- ip li add ${NETIFS[p1]} type veth peer name ${NETIFS[p2]} -- ip li add ${NETIFS[p3]} type veth peer name ${NETIFS[p4]} -- ip li add ${NETIFS[p5]} type veth peer name ${NETIFS[p6]} -- ip li add ${NETIFS[p7]} type veth peer name ${NETIFS[p8]} -+ ${IP} li add ${NETIFS[p1]} type veth peer name ${NETIFS[p2]} -+ ${IP} li add ${NETIFS[p3]} type veth peer name ${NETIFS[p4]} -+ ${IP} li add ${NETIFS[p5]} type veth peer name ${NETIFS[p6]} -+ ${IP} li add ${NETIFS[p7]} type veth peer name ${NETIFS[p8]} - - # enslave vrf interfaces - for n in 5 7; do -- ip li set ${NETIFS[p${n}]} vrf ${VRF} -+ ${IP} li set ${NETIFS[p${n}]} vrf ${VRF} - done - - # add addresses - for n in 1 3 5 7; do -- ip li set ${NETIFS[p${n}]} up -- ip addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} -- ip addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad -+ ${IP} li set ${NETIFS[p${n}]} up -+ ${IP} addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} -+ ${IP} addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad - done - - # move peer interfaces to namespace and add addresses - for n in 2 4 6 8; do -- ip li set ${NETIFS[p${n}]} netns ${PEER_NS} up -- ip -netns ${PEER_NS} addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} -- ip -netns ${PEER_NS} addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad -+ ${IP} li set ${NETIFS[p${n}]} netns ${ns2} up -+ ip -netns $ns2 addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} -+ ip -netns $ns2 addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad - done - -- ip -6 ro add default via ${V6ADDRS[p3]/::[0-9]/::64} -- ip -6 ro add table ${VRF_TABLE} default via ${V6ADDRS[p7]/::[0-9]/::64} -+ ${IP} -6 ro add default via ${V6ADDRS[p3]/::[0-9]/::64} -+ ${IP} -6 ro add table ${VRF_TABLE} default via ${V6ADDRS[p7]/::[0-9]/::64} - - set +e - } - --cleanup() --{ -- # make sure we start from a clean slate -- cleanup_ns ${PEER_NS} 2>/dev/null -- for n in 1 3 5 7; do -- ip link del ${NETIFS[p${n}]} 2>/dev/null -- done -- ip link del ${VRF} 2>/dev/null -- ip ro flush table ${VRF_TABLE} -- ip -6 ro flush table ${VRF_TABLE} --} -- - ################################################################################ - # IPv4 tests - # -@@ -241,7 +231,7 @@ run_ip() - # dev arg may be empty - [ -n "${dev}" ] && dev="dev ${dev}" - -- run_cmd ip ro add table "${table}" "${prefix}"/32 via "${gw}" "${dev}" onlink -+ run_cmd "${IP} ro add table ${table} ${prefix}/32 via ${gw} ${dev} onlink" - log_test $? ${exp_rc} "${desc}" - } - -@@ -257,8 +247,8 @@ run_ip_mpath() - # dev arg may be empty - [ -n "${dev}" ] && dev="dev ${dev}" - -- run_cmd ip ro add table "${table}" "${prefix}"/32 \ -- nexthop via ${nh1} nexthop via ${nh2} -+ run_cmd "${IP} ro add table ${table} ${prefix}/32 \ -+ nexthop via ${nh1} nexthop via ${nh2}" - log_test $? ${exp_rc} "${desc}" - } - -@@ -339,7 +329,7 @@ run_ip6() - # dev arg may be empty - [ -n "${dev}" ] && dev="dev ${dev}" - -- run_cmd ip -6 ro add table "${table}" "${prefix}"/128 via "${gw}" "${dev}" onlink -+ run_cmd "${IP} -6 ro add table ${table} ${prefix}/128 via ${gw} ${dev} onlink" - log_test $? ${exp_rc} "${desc}" - } - -@@ -353,8 +343,8 @@ run_ip6_mpath() - local exp_rc="$6" - local desc="$7" - -- run_cmd ip -6 ro add table "${table}" "${prefix}"/128 "${opts}" \ -- nexthop via ${nh1} nexthop via ${nh2} -+ run_cmd "${IP} -6 ro add table ${table} ${prefix}/128 ${opts} \ -+ nexthop via ${nh1} nexthop via ${nh2}" - log_test $? ${exp_rc} "${desc}" - } - -@@ -491,10 +481,9 @@ do - esac - done - --cleanup - setup - run_onlink_tests --cleanup -+cleanup_ns ${ns1} ${ns2} - - if [ "$TESTS" != "none" ]; then - printf "\nTests passed: %3d\n" ${nsuccess} --- -2.51.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 4a12a86a62..5bd2522933 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -46,8 +46,6 @@ fix-memory-leak-in-posix_clock_open.patch posix-clock-store-file-pointer-in-struct-posix_clock.patch ptp-add-phc-file-mode-checks.-allow-ro-adjtime-witho.patch net-usb-dm9601-remove-broken-sr9700-support.patch -selftests-net-convert-fib-onlink-tests.sh-to-run-it-.patch -selftests-net-fib-onlink-tests-convert-to-use-namesp.patch sctp-sm_statefuns-fix-spelling-mistakes.patch sctp-move-sctp_cmd_assoc_shkey-right-after-sctp_cmd_.patch amd-xgbe-avoid-misleading-per-packet-error-log.patch diff --git a/queue-5.15/selftests-net-convert-fib-onlink-tests.sh-to-run-it-.patch b/queue-5.15/selftests-net-convert-fib-onlink-tests.sh-to-run-it-.patch deleted file mode 100644 index 98bcb4b7f1..0000000000 --- a/queue-5.15/selftests-net-convert-fib-onlink-tests.sh-to-run-it-.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 0ee8141aafe9e3a20dc8545f78fa2f0f9498e53b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 13 Dec 2023 14:08:53 +0800 -Subject: selftests/net: convert fib-onlink-tests.sh to run it in unique - namespace - -From: Hangbin Liu - -[ Upstream commit 3a06833b2adc0a902f2469ad4ce41ccd64f1f3ab ] - -Remove PEER_CMD, which is not used in this test - -Here is the test result after conversion. - - ]# ./fib-onlink-tests.sh - Error: ipv4: FIB table does not exist. - Flush terminated - Error: ipv6: FIB table does not exist. - Flush terminated - - ######################################## - Configuring interfaces - - ... - - TEST: Gateway resolves to wrong nexthop device - VRF [ OK ] - - Tests passed: 38 - Tests failed: 0 - -Acked-by: David Ahern -Signed-off-by: Hangbin Liu -Link: https://lore.kernel.org/r/20231213060856.4030084-11-liuhangbin@gmail.com -Signed-off-by: Jakub Kicinski -Stable-dep-of: 4f5f148dd7c0 ("selftests: net: fib-onlink-tests: Convert to use namespaces by default") -Signed-off-by: Sasha Levin ---- - tools/testing/selftests/net/fib-onlink-tests.sh | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/tools/testing/selftests/net/fib-onlink-tests.sh b/tools/testing/selftests/net/fib-onlink-tests.sh -index c287b90b8af80..ec2d6ceb1f08d 100755 ---- a/tools/testing/selftests/net/fib-onlink-tests.sh -+++ b/tools/testing/selftests/net/fib-onlink-tests.sh -@@ -3,6 +3,7 @@ - - # IPv4 and IPv6 onlink tests - -+source lib.sh - PAUSE_ON_FAIL=${PAUSE_ON_FAIL:=no} - VERBOSE=0 - -@@ -74,9 +75,6 @@ TEST_NET4IN6[2]=10.2.1.254 - # mcast address - MCAST6=ff02::1 - -- --PEER_NS=bart --PEER_CMD="ip netns exec ${PEER_NS}" - VRF=lisa - VRF_TABLE=1101 - PBR_TABLE=101 -@@ -176,8 +174,7 @@ setup() - set -e - - # create namespace -- ip netns add ${PEER_NS} -- ip -netns ${PEER_NS} li set lo up -+ setup_ns PEER_NS - - # add vrf table - ip li add ${VRF} type vrf table ${VRF_TABLE} -@@ -219,7 +216,7 @@ setup() - cleanup() - { - # make sure we start from a clean slate -- ip netns del ${PEER_NS} 2>/dev/null -+ cleanup_ns ${PEER_NS} 2>/dev/null - for n in 1 3 5 7; do - ip link del ${NETIFS[p${n}]} 2>/dev/null - done --- -2.51.0 - diff --git a/queue-5.15/selftests-net-fib-onlink-tests-convert-to-use-namesp.patch b/queue-5.15/selftests-net-fib-onlink-tests-convert-to-use-namesp.patch deleted file mode 100644 index 67fd0db227..0000000000 --- a/queue-5.15/selftests-net-fib-onlink-tests-convert-to-use-namesp.patch +++ /dev/null @@ -1,185 +0,0 @@ -From 0988a747ae7612c0c63226918633bd02837d8ab0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 13 Jan 2026 12:37:44 -0300 -Subject: selftests: net: fib-onlink-tests: Convert to use namespaces by - default -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Ricardo B. Marlière - -[ Upstream commit 4f5f148dd7c0459229d2ab9a769b2e820f9ee6a2 ] - -Currently, the test breaks if the SUT already has a default route -configured for IPv6. Fix by avoiding the use of the default namespace. - -Fixes: 4ed591c8ab44 ("net/ipv6: Allow onlink routes to have a device mismatch if it is the default route") -Suggested-by: Fernando Fernandez Mancera -Signed-off-by: Ricardo B. Marlière -Reviewed-by: Ido Schimmel -Reviewed-by: Fernando Fernandez Mancera -Link: https://patch.msgid.link/20260113-selftests-net-fib-onlink-v2-1-89de2b931389@suse.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - .../testing/selftests/net/fib-onlink-tests.sh | 71 ++++++++----------- - 1 file changed, 30 insertions(+), 41 deletions(-) - -diff --git a/tools/testing/selftests/net/fib-onlink-tests.sh b/tools/testing/selftests/net/fib-onlink-tests.sh -index ec2d6ceb1f08d..c01be076b210d 100755 ---- a/tools/testing/selftests/net/fib-onlink-tests.sh -+++ b/tools/testing/selftests/net/fib-onlink-tests.sh -@@ -120,7 +120,7 @@ log_subsection() - - run_cmd() - { -- local cmd="$*" -+ local cmd="$1" - local out - local rc - -@@ -145,7 +145,7 @@ get_linklocal() - local pfx - local addr - -- addr=$(${pfx} ip -6 -br addr show dev ${dev} | \ -+ addr=$(${pfx} ${IP} -6 -br addr show dev ${dev} | \ - awk '{ - for (i = 3; i <= NF; ++i) { - if ($i ~ /^fe80/) -@@ -173,58 +173,48 @@ setup() - - set -e - -- # create namespace -- setup_ns PEER_NS -+ # create namespaces -+ setup_ns ns1 -+ IP="ip -netns $ns1" -+ setup_ns ns2 - - # add vrf table -- ip li add ${VRF} type vrf table ${VRF_TABLE} -- ip li set ${VRF} up -- ip ro add table ${VRF_TABLE} unreachable default metric 8192 -- ip -6 ro add table ${VRF_TABLE} unreachable default metric 8192 -+ ${IP} li add ${VRF} type vrf table ${VRF_TABLE} -+ ${IP} li set ${VRF} up -+ ${IP} ro add table ${VRF_TABLE} unreachable default metric 8192 -+ ${IP} -6 ro add table ${VRF_TABLE} unreachable default metric 8192 - - # create test interfaces -- ip li add ${NETIFS[p1]} type veth peer name ${NETIFS[p2]} -- ip li add ${NETIFS[p3]} type veth peer name ${NETIFS[p4]} -- ip li add ${NETIFS[p5]} type veth peer name ${NETIFS[p6]} -- ip li add ${NETIFS[p7]} type veth peer name ${NETIFS[p8]} -+ ${IP} li add ${NETIFS[p1]} type veth peer name ${NETIFS[p2]} -+ ${IP} li add ${NETIFS[p3]} type veth peer name ${NETIFS[p4]} -+ ${IP} li add ${NETIFS[p5]} type veth peer name ${NETIFS[p6]} -+ ${IP} li add ${NETIFS[p7]} type veth peer name ${NETIFS[p8]} - - # enslave vrf interfaces - for n in 5 7; do -- ip li set ${NETIFS[p${n}]} vrf ${VRF} -+ ${IP} li set ${NETIFS[p${n}]} vrf ${VRF} - done - - # add addresses - for n in 1 3 5 7; do -- ip li set ${NETIFS[p${n}]} up -- ip addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} -- ip addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad -+ ${IP} li set ${NETIFS[p${n}]} up -+ ${IP} addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} -+ ${IP} addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad - done - - # move peer interfaces to namespace and add addresses - for n in 2 4 6 8; do -- ip li set ${NETIFS[p${n}]} netns ${PEER_NS} up -- ip -netns ${PEER_NS} addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} -- ip -netns ${PEER_NS} addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad -+ ${IP} li set ${NETIFS[p${n}]} netns ${ns2} up -+ ip -netns $ns2 addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} -+ ip -netns $ns2 addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad - done - -- ip -6 ro add default via ${V6ADDRS[p3]/::[0-9]/::64} -- ip -6 ro add table ${VRF_TABLE} default via ${V6ADDRS[p7]/::[0-9]/::64} -+ ${IP} -6 ro add default via ${V6ADDRS[p3]/::[0-9]/::64} -+ ${IP} -6 ro add table ${VRF_TABLE} default via ${V6ADDRS[p7]/::[0-9]/::64} - - set +e - } - --cleanup() --{ -- # make sure we start from a clean slate -- cleanup_ns ${PEER_NS} 2>/dev/null -- for n in 1 3 5 7; do -- ip link del ${NETIFS[p${n}]} 2>/dev/null -- done -- ip link del ${VRF} 2>/dev/null -- ip ro flush table ${VRF_TABLE} -- ip -6 ro flush table ${VRF_TABLE} --} -- - ################################################################################ - # IPv4 tests - # -@@ -241,7 +231,7 @@ run_ip() - # dev arg may be empty - [ -n "${dev}" ] && dev="dev ${dev}" - -- run_cmd ip ro add table "${table}" "${prefix}"/32 via "${gw}" "${dev}" onlink -+ run_cmd "${IP} ro add table ${table} ${prefix}/32 via ${gw} ${dev} onlink" - log_test $? ${exp_rc} "${desc}" - } - -@@ -257,8 +247,8 @@ run_ip_mpath() - # dev arg may be empty - [ -n "${dev}" ] && dev="dev ${dev}" - -- run_cmd ip ro add table "${table}" "${prefix}"/32 \ -- nexthop via ${nh1} nexthop via ${nh2} -+ run_cmd "${IP} ro add table ${table} ${prefix}/32 \ -+ nexthop via ${nh1} nexthop via ${nh2}" - log_test $? ${exp_rc} "${desc}" - } - -@@ -339,7 +329,7 @@ run_ip6() - # dev arg may be empty - [ -n "${dev}" ] && dev="dev ${dev}" - -- run_cmd ip -6 ro add table "${table}" "${prefix}"/128 via "${gw}" "${dev}" onlink -+ run_cmd "${IP} -6 ro add table ${table} ${prefix}/128 via ${gw} ${dev} onlink" - log_test $? ${exp_rc} "${desc}" - } - -@@ -353,8 +343,8 @@ run_ip6_mpath() - local exp_rc="$6" - local desc="$7" - -- run_cmd ip -6 ro add table "${table}" "${prefix}"/128 "${opts}" \ -- nexthop via ${nh1} nexthop via ${nh2} -+ run_cmd "${IP} -6 ro add table ${table} ${prefix}/128 ${opts} \ -+ nexthop via ${nh1} nexthop via ${nh2}" - log_test $? ${exp_rc} "${desc}" - } - -@@ -491,10 +481,9 @@ do - esac - done - --cleanup - setup - run_onlink_tests --cleanup -+cleanup_ns ${ns1} ${ns2} - - if [ "$TESTS" != "none" ]; then - printf "\nTests passed: %3d\n" ${nsuccess} --- -2.51.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 0de9da108c..9eb772881d 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -63,8 +63,6 @@ selftest-ptp-update-ptp-selftest-to-exercise-the-get.patch testptp-add-option-to-open-phc-in-readonly-mode.patch net-usb-dm9601-remove-broken-sr9700-support.patch bonding-limit-bond_mode_8023ad-to-ethernet-devices.patch -selftests-net-convert-fib-onlink-tests.sh-to-run-it-.patch -selftests-net-fib-onlink-tests-convert-to-use-namesp.patch sctp-move-sctp_cmd_assoc_shkey-right-after-sctp_cmd_.patch amd-xgbe-avoid-misleading-per-packet-error-log.patch gue-fix-skb-memleak-with-inner-ip-protocol-0.patch diff --git a/queue-6.1/selftests-net-convert-fib-onlink-tests.sh-to-run-it-.patch b/queue-6.1/selftests-net-convert-fib-onlink-tests.sh-to-run-it-.patch deleted file mode 100644 index 89996fb244..0000000000 --- a/queue-6.1/selftests-net-convert-fib-onlink-tests.sh-to-run-it-.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 042b574cae1694c5f62d3065cc0f95c340762218 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 13 Dec 2023 14:08:53 +0800 -Subject: selftests/net: convert fib-onlink-tests.sh to run it in unique - namespace - -From: Hangbin Liu - -[ Upstream commit 3a06833b2adc0a902f2469ad4ce41ccd64f1f3ab ] - -Remove PEER_CMD, which is not used in this test - -Here is the test result after conversion. - - ]# ./fib-onlink-tests.sh - Error: ipv4: FIB table does not exist. - Flush terminated - Error: ipv6: FIB table does not exist. - Flush terminated - - ######################################## - Configuring interfaces - - ... - - TEST: Gateway resolves to wrong nexthop device - VRF [ OK ] - - Tests passed: 38 - Tests failed: 0 - -Acked-by: David Ahern -Signed-off-by: Hangbin Liu -Link: https://lore.kernel.org/r/20231213060856.4030084-11-liuhangbin@gmail.com -Signed-off-by: Jakub Kicinski -Stable-dep-of: 4f5f148dd7c0 ("selftests: net: fib-onlink-tests: Convert to use namespaces by default") -Signed-off-by: Sasha Levin ---- - tools/testing/selftests/net/fib-onlink-tests.sh | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/tools/testing/selftests/net/fib-onlink-tests.sh b/tools/testing/selftests/net/fib-onlink-tests.sh -index c287b90b8af80..ec2d6ceb1f08d 100755 ---- a/tools/testing/selftests/net/fib-onlink-tests.sh -+++ b/tools/testing/selftests/net/fib-onlink-tests.sh -@@ -3,6 +3,7 @@ - - # IPv4 and IPv6 onlink tests - -+source lib.sh - PAUSE_ON_FAIL=${PAUSE_ON_FAIL:=no} - VERBOSE=0 - -@@ -74,9 +75,6 @@ TEST_NET4IN6[2]=10.2.1.254 - # mcast address - MCAST6=ff02::1 - -- --PEER_NS=bart --PEER_CMD="ip netns exec ${PEER_NS}" - VRF=lisa - VRF_TABLE=1101 - PBR_TABLE=101 -@@ -176,8 +174,7 @@ setup() - set -e - - # create namespace -- ip netns add ${PEER_NS} -- ip -netns ${PEER_NS} li set lo up -+ setup_ns PEER_NS - - # add vrf table - ip li add ${VRF} type vrf table ${VRF_TABLE} -@@ -219,7 +216,7 @@ setup() - cleanup() - { - # make sure we start from a clean slate -- ip netns del ${PEER_NS} 2>/dev/null -+ cleanup_ns ${PEER_NS} 2>/dev/null - for n in 1 3 5 7; do - ip link del ${NETIFS[p${n}]} 2>/dev/null - done --- -2.51.0 - diff --git a/queue-6.1/selftests-net-fib-onlink-tests-convert-to-use-namesp.patch b/queue-6.1/selftests-net-fib-onlink-tests-convert-to-use-namesp.patch deleted file mode 100644 index af96a366b2..0000000000 --- a/queue-6.1/selftests-net-fib-onlink-tests-convert-to-use-namesp.patch +++ /dev/null @@ -1,185 +0,0 @@ -From a448636a7d38638fecdb3b032d9f98e06720459e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 13 Jan 2026 12:37:44 -0300 -Subject: selftests: net: fib-onlink-tests: Convert to use namespaces by - default -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Ricardo B. Marlière - -[ Upstream commit 4f5f148dd7c0459229d2ab9a769b2e820f9ee6a2 ] - -Currently, the test breaks if the SUT already has a default route -configured for IPv6. Fix by avoiding the use of the default namespace. - -Fixes: 4ed591c8ab44 ("net/ipv6: Allow onlink routes to have a device mismatch if it is the default route") -Suggested-by: Fernando Fernandez Mancera -Signed-off-by: Ricardo B. Marlière -Reviewed-by: Ido Schimmel -Reviewed-by: Fernando Fernandez Mancera -Link: https://patch.msgid.link/20260113-selftests-net-fib-onlink-v2-1-89de2b931389@suse.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - .../testing/selftests/net/fib-onlink-tests.sh | 71 ++++++++----------- - 1 file changed, 30 insertions(+), 41 deletions(-) - -diff --git a/tools/testing/selftests/net/fib-onlink-tests.sh b/tools/testing/selftests/net/fib-onlink-tests.sh -index ec2d6ceb1f08d..c01be076b210d 100755 ---- a/tools/testing/selftests/net/fib-onlink-tests.sh -+++ b/tools/testing/selftests/net/fib-onlink-tests.sh -@@ -120,7 +120,7 @@ log_subsection() - - run_cmd() - { -- local cmd="$*" -+ local cmd="$1" - local out - local rc - -@@ -145,7 +145,7 @@ get_linklocal() - local pfx - local addr - -- addr=$(${pfx} ip -6 -br addr show dev ${dev} | \ -+ addr=$(${pfx} ${IP} -6 -br addr show dev ${dev} | \ - awk '{ - for (i = 3; i <= NF; ++i) { - if ($i ~ /^fe80/) -@@ -173,58 +173,48 @@ setup() - - set -e - -- # create namespace -- setup_ns PEER_NS -+ # create namespaces -+ setup_ns ns1 -+ IP="ip -netns $ns1" -+ setup_ns ns2 - - # add vrf table -- ip li add ${VRF} type vrf table ${VRF_TABLE} -- ip li set ${VRF} up -- ip ro add table ${VRF_TABLE} unreachable default metric 8192 -- ip -6 ro add table ${VRF_TABLE} unreachable default metric 8192 -+ ${IP} li add ${VRF} type vrf table ${VRF_TABLE} -+ ${IP} li set ${VRF} up -+ ${IP} ro add table ${VRF_TABLE} unreachable default metric 8192 -+ ${IP} -6 ro add table ${VRF_TABLE} unreachable default metric 8192 - - # create test interfaces -- ip li add ${NETIFS[p1]} type veth peer name ${NETIFS[p2]} -- ip li add ${NETIFS[p3]} type veth peer name ${NETIFS[p4]} -- ip li add ${NETIFS[p5]} type veth peer name ${NETIFS[p6]} -- ip li add ${NETIFS[p7]} type veth peer name ${NETIFS[p8]} -+ ${IP} li add ${NETIFS[p1]} type veth peer name ${NETIFS[p2]} -+ ${IP} li add ${NETIFS[p3]} type veth peer name ${NETIFS[p4]} -+ ${IP} li add ${NETIFS[p5]} type veth peer name ${NETIFS[p6]} -+ ${IP} li add ${NETIFS[p7]} type veth peer name ${NETIFS[p8]} - - # enslave vrf interfaces - for n in 5 7; do -- ip li set ${NETIFS[p${n}]} vrf ${VRF} -+ ${IP} li set ${NETIFS[p${n}]} vrf ${VRF} - done - - # add addresses - for n in 1 3 5 7; do -- ip li set ${NETIFS[p${n}]} up -- ip addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} -- ip addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad -+ ${IP} li set ${NETIFS[p${n}]} up -+ ${IP} addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} -+ ${IP} addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad - done - - # move peer interfaces to namespace and add addresses - for n in 2 4 6 8; do -- ip li set ${NETIFS[p${n}]} netns ${PEER_NS} up -- ip -netns ${PEER_NS} addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} -- ip -netns ${PEER_NS} addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad -+ ${IP} li set ${NETIFS[p${n}]} netns ${ns2} up -+ ip -netns $ns2 addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} -+ ip -netns $ns2 addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad - done - -- ip -6 ro add default via ${V6ADDRS[p3]/::[0-9]/::64} -- ip -6 ro add table ${VRF_TABLE} default via ${V6ADDRS[p7]/::[0-9]/::64} -+ ${IP} -6 ro add default via ${V6ADDRS[p3]/::[0-9]/::64} -+ ${IP} -6 ro add table ${VRF_TABLE} default via ${V6ADDRS[p7]/::[0-9]/::64} - - set +e - } - --cleanup() --{ -- # make sure we start from a clean slate -- cleanup_ns ${PEER_NS} 2>/dev/null -- for n in 1 3 5 7; do -- ip link del ${NETIFS[p${n}]} 2>/dev/null -- done -- ip link del ${VRF} 2>/dev/null -- ip ro flush table ${VRF_TABLE} -- ip -6 ro flush table ${VRF_TABLE} --} -- - ################################################################################ - # IPv4 tests - # -@@ -241,7 +231,7 @@ run_ip() - # dev arg may be empty - [ -n "${dev}" ] && dev="dev ${dev}" - -- run_cmd ip ro add table "${table}" "${prefix}"/32 via "${gw}" "${dev}" onlink -+ run_cmd "${IP} ro add table ${table} ${prefix}/32 via ${gw} ${dev} onlink" - log_test $? ${exp_rc} "${desc}" - } - -@@ -257,8 +247,8 @@ run_ip_mpath() - # dev arg may be empty - [ -n "${dev}" ] && dev="dev ${dev}" - -- run_cmd ip ro add table "${table}" "${prefix}"/32 \ -- nexthop via ${nh1} nexthop via ${nh2} -+ run_cmd "${IP} ro add table ${table} ${prefix}/32 \ -+ nexthop via ${nh1} nexthop via ${nh2}" - log_test $? ${exp_rc} "${desc}" - } - -@@ -339,7 +329,7 @@ run_ip6() - # dev arg may be empty - [ -n "${dev}" ] && dev="dev ${dev}" - -- run_cmd ip -6 ro add table "${table}" "${prefix}"/128 via "${gw}" "${dev}" onlink -+ run_cmd "${IP} -6 ro add table ${table} ${prefix}/128 via ${gw} ${dev} onlink" - log_test $? ${exp_rc} "${desc}" - } - -@@ -353,8 +343,8 @@ run_ip6_mpath() - local exp_rc="$6" - local desc="$7" - -- run_cmd ip -6 ro add table "${table}" "${prefix}"/128 "${opts}" \ -- nexthop via ${nh1} nexthop via ${nh2} -+ run_cmd "${IP} -6 ro add table ${table} ${prefix}/128 ${opts} \ -+ nexthop via ${nh1} nexthop via ${nh2}" - log_test $? ${exp_rc} "${desc}" - } - -@@ -491,10 +481,9 @@ do - esac - done - --cleanup - setup - run_onlink_tests --cleanup -+cleanup_ns ${ns1} ${ns2} - - if [ "$TESTS" != "none" ]; then - printf "\nTests passed: %3d\n" ${nsuccess} --- -2.51.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 4d99c26116..06928a5aca 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -94,8 +94,6 @@ ata-libata-call-ata_dev_config_lpm-for-atapi-devices.patch ata-libata-print-features-also-for-atapi-devices.patch net-usb-dm9601-remove-broken-sr9700-support.patch bonding-limit-bond_mode_8023ad-to-ethernet-devices.patch -selftests-net-convert-fib-onlink-tests.sh-to-run-it-.patch -selftests-net-fib-onlink-tests-convert-to-use-namesp.patch can-gs_usb-gs_usb_receive_bulk_callback-unanchor-url.patch sctp-move-sctp_cmd_assoc_shkey-right-after-sctp_cmd_.patch amd-xgbe-avoid-misleading-per-packet-error-log.patch