Skip to contentSkip to conversation

FAILED: patch "[PATCH] selftests: mptcp: depend on SYN_COOKIES" failed to apply to 5.10-stable tree

PATCH In review [email protected] 2 participants 3 messages Jul 21, 2023 – Aug 1, 2023

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 6c8880fcaa5c45355179b759c1d11737775e31fc
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023072148-curry-reboot-ef1c@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..

Possible dependencies:

6c8880fcaa5c ("selftests: mptcp: depend on SYN_COOKIES") 8d014eaa9254 ("selftests: mptcp: add ADD_ADDR timeout test case")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 6c8880fcaa5c45355179b759c1d11737775e31fc Mon Sep 17 00:00:00 2001
From: Matthieu Baerts <[email protected]>
Date: Tue, 4 Jul 2023 22:44:40 +0200
Subject: [PATCH] selftests: mptcp: depend on SYN_COOKIES

MPTCP selftests are using TCP SYN Cookies for quite a while now, since v5.9.

Some CIs don't have this config option enabled and this is causing issues in the tests:

  # ns1 MPTCP -> ns1 (10.0.1.1:10000      ) MPTCP     (duration   167ms) sysctl: cannot stat /proc/sys/net/ipv4/tcp_syncookies: No such file or directory
  # [ OK ]./mptcp_connect.sh: line 554: [: -eq: unary operator expected

There is no impact in the results but the test is not doing what it is supposed to do.

Fixes fed61c4b584c ("selftests: mptcp: make 2nd net namespace use tcp syn cookies unconditionally")
tools/testing/selftests/net/mptcp/config +1 -0
index 6032f9b23c4c..e317c2e44dae 100644
@@ -6,6 +6,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_MPTCP_DIAG=m
 CONFIG_VETH=y
 CONFIG_NET_SCH_NETEM=m
+CONFIG_SYN_COOKIES=y
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y
 CONFIG_NETFILTER_NETLINK=m
#1 lore raw

PATCH 1/1 selftests: mptcp: depend on SYN_COOKIES

commit 6c8880fcaa5c45355179b759c1d11737775e31fc upstream.

MPTCP selftests are using TCP SYN Cookies for quite a while now, since v5.9.

Some CIs don't have this config option enabled and this is causing issues in the tests:

  # ns1 MPTCP -> ns1 (10.0.1.1:10000      ) MPTCP     (duration   167ms) sysctl: cannot stat /proc/sys/net/ipv4/tcp_syncookies: No such file or directory
  # [ OK ]./mptcp_connect.sh: line 554: [: -eq: unary operator expected

There is no impact in the results but the test is not doing what it is supposed to do.

Fixes fed61c4b584c ("selftests: mptcp: make 2nd net namespace use tcp syn cookies unconditionally")

---
Backport notes:
- We don't have kconfig that have been added later, that's normal.
- Only added the new kconfig dep then.

---
 tools/testing/selftests/net/mptcp/config | 1 +
 1 file changed, 1 insertion(+)
tools/testing/selftests/net/mptcp/config +1 -0
index 1a4c11a444d9..8867c40258b5 100644
@@ -6,3 +6,4 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_MPTCP_DIAG=m
 CONFIG_VETH=y
 CONFIG_NET_SCH_NETEM=m
+CONFIG_SYN_COOKIES=y
Signature · 1 line
2.40.1
author maintainer
#2 lore raw

Re: [PATCH 5.10.y] selftests: mptcp: depend on SYN_COOKIES

Quoted 39 lines · Matthieu Baerts

commit 6c8880fcaa5c45355179b759c1d11737775e31fc upstream.

MPTCP selftests are using TCP SYN Cookies for quite a while now, since v5.9.

Some CIs don't have this config option enabled and this is causing issues in the tests:

  # ns1 MPTCP -> ns1 (10.0.1.1:10000      ) MPTCP     (duration   167ms) sysctl: cannot stat /proc/sys/net/ipv4/tcp_syncookies: No such file or directory
  # [ OK ]./mptcp_connect.sh: line 554: [: -eq: unary operator expected

There is no impact in the results but the test is not doing what it is supposed to do.

Fixes fed61c4b584c ("selftests: mptcp: make 2nd net namespace use tcp syn cookies unconditionally")

---
Backport notes:
- We don't have kconfig that have been added later, that's normal.
- Only added the new kconfig dep then.

---
 tools/testing/selftests/net/mptcp/config | 1 +
 1 file changed, 1 insertion(+)
tools/testing/selftests/net/mptcp/config +1 -0
index 1a4c11a444d9..8867c40258b5 100644
@@ -6,3 +6,4 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_MPTCP_DIAG=m
 CONFIG_VETH=y
 CONFIG_NET_SCH_NETEM=m
+CONFIG_SYN_COOKIES=y
Signature · 1 line
2.40.1

All now queued up, thanks.

greg k-h