From: Greg Kroah-Hartman Date: Wed, 15 Nov 2023 11:52:44 +0000 (-0500) Subject: 6.6-stable patches X-Git-Tag: v4.14.330~36 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6244aad14050164890719cfe3005ff3c2765aa21;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: selftests-mptcp-fix-wait_rm_addr-sf-parameters.patch selftests-mptcp-run-userspace-pm-tests-slower.patch --- diff --git a/queue-6.6/eventfs-check-for-null-ef-in-eventfs_set_attr.patch b/queue-6.6/eventfs-check-for-null-ef-in-eventfs_set_attr.patch index 12e8650c909..3409c52b970 100644 --- a/queue-6.6/eventfs-check-for-null-ef-in-eventfs_set_attr.patch +++ b/queue-6.6/eventfs-check-for-null-ef-in-eventfs_set_attr.patch @@ -15,6 +15,7 @@ Fixes: 9aaee3eebc91 ("eventfs: Save ownership and mode") Reported-by: Milian Wolff Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- fs/tracefs/event_inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/queue-6.6/selftests-mptcp-fix-wait_rm_addr-sf-parameters.patch b/queue-6.6/selftests-mptcp-fix-wait_rm_addr-sf-parameters.patch new file mode 100644 index 00000000000..c6aeaa92e5e --- /dev/null +++ b/queue-6.6/selftests-mptcp-fix-wait_rm_addr-sf-parameters.patch @@ -0,0 +1,79 @@ +From 9168ea02b898d3dde98b51e4bd3fb082bd438dab Mon Sep 17 00:00:00 2001 +From: Geliang Tang +Date: Wed, 25 Oct 2023 16:37:03 -0700 +Subject: selftests: mptcp: fix wait_rm_addr/sf parameters + +From: Geliang Tang + +commit 9168ea02b898d3dde98b51e4bd3fb082bd438dab upstream. + +The second input parameter of 'wait_rm_addr/sf $1 1' is misused. If it's +1, wait_rm_addr/sf will never break, and will loop ten times, then +'wait_rm_addr/sf' equals to 'sleep 1'. This delay time is too long, +which can sometimes make the tests fail. + +A better way to use wait_rm_addr/sf is to use rm_addr/sf_count to obtain +the current value, and then pass into wait_rm_addr/sf. + +Fixes: 4369c198e599 ("selftests: mptcp: test userspace pm out of transfer") +Cc: stable@vger.kernel.org +Suggested-by: Matthieu Baerts +Reviewed-by: Matthieu Baerts +Signed-off-by: Geliang Tang +Signed-off-by: Mat Martineau +Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-2-db8f25f798eb@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh ++++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh +@@ -3289,6 +3289,7 @@ userspace_pm_rm_sf_addr_ns1() + local addr=$1 + local id=$2 + local tk sp da dp ++ local cnt_addr cnt_sf + + tk=$(grep "type:1," "$evts_ns1" | + sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q') +@@ -3298,11 +3299,13 @@ userspace_pm_rm_sf_addr_ns1() + sed -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q') + dp=$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q') ++ cnt_addr=$(rm_addr_count ${ns1}) ++ cnt_sf=$(rm_sf_count ${ns1}) + ip netns exec $ns1 ./pm_nl_ctl rem token $tk id $id + ip netns exec $ns1 ./pm_nl_ctl dsf lip "::ffff:$addr" \ + lport $sp rip $da rport $dp token $tk +- wait_rm_addr $ns1 1 +- wait_rm_sf $ns1 1 ++ wait_rm_addr $ns1 "${cnt_addr}" ++ wait_rm_sf $ns1 "${cnt_sf}" + } + + userspace_pm_add_sf() +@@ -3324,17 +3327,20 @@ userspace_pm_rm_sf_addr_ns2() + local addr=$1 + local id=$2 + local tk da dp sp ++ local cnt_addr cnt_sf + + tk=$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") + da=$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evts_ns2") + dp=$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") + sp=$(grep "type:10" "$evts_ns2" | + sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') ++ cnt_addr=$(rm_addr_count ${ns2}) ++ cnt_sf=$(rm_sf_count ${ns2}) + ip netns exec $ns2 ./pm_nl_ctl rem token $tk id $id + ip netns exec $ns2 ./pm_nl_ctl dsf lip $addr lport $sp \ + rip $da rport $dp token $tk +- wait_rm_addr $ns2 1 +- wait_rm_sf $ns2 1 ++ wait_rm_addr $ns2 "${cnt_addr}" ++ wait_rm_sf $ns2 "${cnt_sf}" + } + + userspace_tests() diff --git a/queue-6.6/selftests-mptcp-run-userspace-pm-tests-slower.patch b/queue-6.6/selftests-mptcp-run-userspace-pm-tests-slower.patch new file mode 100644 index 00000000000..f0a0f3bb7da --- /dev/null +++ b/queue-6.6/selftests-mptcp-run-userspace-pm-tests-slower.patch @@ -0,0 +1,65 @@ +From f4a75e9d11001481dca005541b6dc861e1472f03 Mon Sep 17 00:00:00 2001 +From: Geliang Tang +Date: Wed, 25 Oct 2023 16:37:02 -0700 +Subject: selftests: mptcp: run userspace pm tests slower + +From: Geliang Tang + +commit f4a75e9d11001481dca005541b6dc861e1472f03 upstream. + +Some userspace pm tests failed are reported by CI: + +112 userspace pm add & remove address + syn [ ok ] + synack [ ok ] + ack [ ok ] + add [ ok ] + echo [ ok ] + mptcp_info subflows=1:1 [ ok ] + subflows_total 2:2 [ ok ] + mptcp_info add_addr_signal=1:1 [ ok ] + rm [ ok ] + rmsf [ ok ] + Info: invert + mptcp_info subflows=0:0 [ ok ] + subflows_total 1:1 [fail] + got subflows 0:0 expected 1:1 +Server ns stats +TcpPassiveOpens 2 0.0 +TcpInSegs 118 0.0 + +This patch fixes them by changing 'speed' to 5 to run the tests much more +slowly. + +Fixes: 4369c198e599 ("selftests: mptcp: test userspace pm out of transfer") +Cc: stable@vger.kernel.org +Reviewed-by: Matthieu Baerts +Signed-off-by: Geliang Tang +Signed-off-by: Mat Martineau +Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-1-db8f25f798eb@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh ++++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh +@@ -3417,7 +3417,7 @@ userspace_tests() + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns1 + pm_nl_set_limits $ns2 1 1 +- speed=10 \ ++ speed=5 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=$! + wait_mpj $ns1 +@@ -3438,7 +3438,7 @@ userspace_tests() + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns2 + pm_nl_set_limits $ns1 0 1 +- speed=10 \ ++ speed=5 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=$! + wait_mpj $ns2 diff --git a/queue-6.6/series b/queue-6.6/series index 3944eb9041b..c09698a19eb 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -593,3 +593,5 @@ alsa-hda-realtek-add-support-dual-speaker-for-dell.patch fbdev-fsl-diu-fb-mark-wr_reg_wa-static.patch tracing-kprobes-fix-the-order-of-argument-descriptio.patch eventfs-check-for-null-ef-in-eventfs_set_attr.patch +selftests-mptcp-run-userspace-pm-tests-slower.patch +selftests-mptcp-fix-wait_rm_addr-sf-parameters.patch