This is a note to let you know that I've just added the patch titled
selftests: mptcp: sockopt: skip TCP_INQ checks if not supported
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
selftests-mptcp-sockopt-skip-tcp_inq-checks-if-not-supported.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From matthieu.baerts@xxxxxxxxxxxx Thu Jun 22 11:17:19 2023
From: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
Date: Thu, 22 Jun 2023 11:17:09 +0200
Subject: selftests: mptcp: sockopt: skip TCP_INQ checks if not supported
To: stable@xxxxxxxxxxxxxxx, gregkh@xxxxxxxxxxxxxxxxxxx
Cc: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>, Jakub Kicinski <kuba@xxxxxxxxxx>
Message-ID: <20230622091709.2857780-1-matthieu.baerts@xxxxxxxxxxxx>
From: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
commit b631e3a4e94c77c9007d60b577a069c203ce9594 upstream.
Selftests are supposed to run on any kernels, including the old ones not
supporting all MPTCP features.
One of them is TCP_INQ cmsg support introduced in commit 2c9e77659a0c
("mptcp: add TCP_INQ cmsg support").
It is possible to look for "mptcp_ioctl" in kallsyms because it was
needed to introduce the mentioned feature. We can skip these tests and
not set TCPINQ option if the feature is not supported.
Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368
Fixes: 5cbd886ce2a9 ("selftests: mptcp: add TCP_INQ support")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -182,9 +182,14 @@ do_transfer()
local_addr="0.0.0.0"
fi
+ cmsg="TIMESTAMPNS"
+ if mptcp_lib_kallsyms_has "mptcp_ioctl$"; then
+ cmsg+=",TCPINQ"
+ fi
+
timeout ${timeout_test} \
ip netns exec ${listener_ns} \
- $mptcp_connect -t ${timeout_poll} -l -M 1 -p $port -s ${srv_proto} -c TIMESTAMPNS,TCPINQ \
+ $mptcp_connect -t ${timeout_poll} -l -M 1 -p $port -s ${srv_proto} -c "${cmsg}" \
${local_addr} < "$sin" > "$sout" &
spid=$!
@@ -192,7 +197,7 @@ do_transfer()
timeout ${timeout_test} \
ip netns exec ${connector_ns} \
- $mptcp_connect -t ${timeout_poll} -M 2 -p $port -s ${cl_proto} -c TIMESTAMPNS,TCPINQ \
+ $mptcp_connect -t ${timeout_poll} -M 2 -p $port -s ${cl_proto} -c "${cmsg}" \
$connect_addr < "$cin" > "$cout" &
cpid=$!
@@ -311,6 +316,11 @@ do_tcpinq_tests()
ip netns exec "$ns1" iptables -F
ip netns exec "$ns1" ip6tables -F
+ if ! mptcp_lib_kallsyms_has "mptcp_ioctl$"; then
+ echo "INFO: TCP_INQ not supported: SKIP"
+ return
+ fi
+
for args in "-t tcp" "-r tcp"; do
do_tcpinq_test $args
lret=$?
Patches currently in stable-queue which might be from matthieu.baerts@xxxxxxxxxxxx are
queue-6.1/selftests-mptcp-join-fix-shellcheck-warnings.patch
queue-6.1/selftests-mptcp-join-support-rm_addr-for-used-endpoints-or-not.patch
queue-6.1/selftests-mptcp-pm-nl-skip-fullmesh-flag-checks-if-not-supported.patch
queue-6.1/selftests-mptcp-lib-skip-if-missing-symbol.patch
queue-6.1/selftests-mptcp-join-skip-fullmesh-flag-tests-if-not-supported.patch
queue-6.1/selftests-mptcp-join-skip-fastclose-tests-if-not-supported.patch
queue-6.1/selftests-mptcp-remove-duplicated-entries-in-usage.patch
queue-6.1/selftests-mptcp-sockopt-skip-getsockopt-checks-if-not-supported.patch
queue-6.1/selftests-mptcp-join-skip-backup-if-set-flag-on-id-not-supported.patch
queue-6.1/selftests-mptcp-userspace-pm-skip-if-ip-tool-is-unavailable.patch
queue-6.1/selftests-mptcp-join-helpers-to-skip-tests.patch
queue-6.1/selftests-mptcp-lib-skip-if-not-below-kernel-version.patch
queue-6.1/selftests-mptcp-userspace-pm-skip-if-not-supported.patch
queue-6.1/selftests-mptcp-diag-skip-listen-tests-if-not-supported.patch
queue-6.1/selftests-mptcp-sockopt-skip-tcp_inq-checks-if-not-supported.patch
queue-6.1/selftests-mptcp-join-skip-implicit-tests-if-not-supported.patch
queue-6.1/selftests-mptcp-sockopt-relax-expected-returned-size.patch
queue-6.1/selftests-mptcp-pm-nl-remove-hardcoded-default-limits.patch
queue-6.1/selftests-mptcp-join-skip-check-if-mib-counter-not-supported.patch
queue-6.1/selftests-mptcp-join-use-iptables-legacy-if-available.patch
queue-6.1/selftests-mptcp-join-support-local-endpoint-being-tracked-or-not.patch
queue-6.1/selftests-mptcp-connect-skip-transp-tests-if-not-supported.patch
queue-6.1/selftests-mptcp-join-skip-mpc-backups-tests-if-not-supported.patch
queue-6.1/selftests-mptcp-connect-skip-disconnect-tests-if-not-supported.patch
