From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 11 Apr 2024 07:33:08 +0000 (+0200)
Subject: 6.6-stable patches
X-Git-Tag: v4.19.312~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33720392ef608cba1b9999f9881a44c63e3138d3;p=thirdparty%2Fkernel%2Fstable-queue.git

6.6-stable patches

added patches:
	selftests-mptcp-display-simult-in-extra_msg.patch
---

diff --git a/queue-6.6/selftests-mptcp-display-simult-in-extra_msg.patch b/queue-6.6/selftests-mptcp-display-simult-in-extra_msg.patch
new file mode 100644
index 00000000000..9f0c4d18f32
--- /dev/null
+++ b/queue-6.6/selftests-mptcp-display-simult-in-extra_msg.patch
@@ -0,0 +1,55 @@
+From 629b35a225b0d49fbcff3b5c22e3b983c7c7b36f Mon Sep 17 00:00:00 2001
+From: Geliang Tang <geliang.tang@suse.com>
+Date: Wed, 25 Oct 2023 16:37:11 -0700
+Subject: selftests: mptcp: display simult in extra_msg
+
+From: Geliang Tang <geliang.tang@suse.com>
+
+commit 629b35a225b0d49fbcff3b5c22e3b983c7c7b36f upstream.
+
+Just like displaying "invert" after "Info: ", "simult" should be
+displayed too when rm_subflow_nr doesn't match the expect value in
+chk_rm_nr():
+
+      syn                                 [ ok ]
+      synack                              [ ok ]
+      ack                                 [ ok ]
+      add                                 [ ok ]
+      echo                                [ ok ]
+      rm                                  [ ok ]
+      rmsf                                [ ok ] 3 in [2:4]
+      Info: invert simult
+
+      syn                                 [ ok ]
+      synack                              [ ok ]
+      ack                                 [ ok ]
+      add                                 [ ok ]
+      echo                                [ ok ]
+      rm                                  [ ok ]
+      rmsf                                [ ok ]
+      Info: invert
+
+Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
+Signed-off-by: Geliang Tang <geliang.tang@suse.com>
+Signed-off-by: Mat Martineau <martineau@kernel.org>
+Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-10-db8f25f798eb@kernel.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/testing/selftests/net/mptcp/mptcp_join.sh |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
++++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
+@@ -1740,7 +1740,10 @@ chk_rm_nr()
+ 		# in case of simult flush, the subflow removal count on each side is
+ 		# unreliable
+ 		count=$((count + cnt))
+-		[ "$count" != "$rm_subflow_nr" ] && suffix="$count in [$rm_subflow_nr:$((rm_subflow_nr*2))]"
++		if [ "$count" != "$rm_subflow_nr" ]; then
++			suffix="$count in [$rm_subflow_nr:$((rm_subflow_nr*2))]"
++			extra_msg="$extra_msg simult"
++		fi
+ 		if [ $count -ge "$rm_subflow_nr" ] && \
+ 		   [ "$count" -le "$((rm_subflow_nr *2 ))" ]; then
+ 			print_ok "$suffix"
diff --git a/queue-6.6/series b/queue-6.6/series
index e23c588c8bb..2d6305c8213 100644
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -102,3 +102,4 @@ drivers-nvme-add-quirks-for-device-126f-2262.patch
 fbmon-prevent-division-by-zero-in-fb_videomode_from_.patch
 alsa-hda-realtek-add-quirks-for-some-clevo-laptops.patch
 gcc-plugins-stackleak-avoid-.head.text-section.patch
+selftests-mptcp-display-simult-in-extra_msg.patch