FAILED: patch "[PATCH] selftests: mptcp: rm subflow with v4/v4mapped addr" failed to apply to 6.1-stable tree

PATCH [email protected] 2 participants 6 messages Mar 4, 2024

Subsystems (4)

Networking Stable branch Kselftest Networking MPTCP

lore

Share & tools

lore

[email protected]

author maintainer

2024-03-04 08:30 UTC #0 lore raw

The patch below does not apply to the 6.1-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-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 7092dbee23282b6fcf1313fc64e2b92649ee16e8
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024030422-dinner-rotten-5ef3@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..

Possible dependencies:

7092dbee2328 ("selftests: mptcp: rm subflow with v4/v4mapped addr") b850f2c7dd85 ("selftests: mptcp: add mptcp_lib_is_v6")
bdbef0a6ff10 ("selftests: mptcp: add mptcp_lib_kill_wait") 757c828ce949 ("selftests: mptcp: update userspace pm test helpers") 80775412882e ("selftests: mptcp: add chk_subflows_total helper") 06848c0f341e ("selftests: mptcp: add evts_get_info helper") 9168ea02b898 ("selftests: mptcp: fix wait_rm_addr/sf parameters") f4a75e9d1100 ("selftests: mptcp: run userspace pm tests slower") 03668c65d153 ("selftests: mptcp: join: rework detailed report") 9e86a297796b ("selftests: mptcp: sockopt: format subtests results in TAP") 7f117cd37c61 ("selftests: mptcp: join: format subtests results in TAP") c4192967e62f ("selftests: mptcp: lib: format subtests results in TAP") e198ad759273 ("selftests: mptcp: userspace_pm: uniform results printing") 8320b1387a15 ("selftests: mptcp: userspace_pm: fix shellcheck warnings") e141c1e8e4c1 ("selftests: mptcp: userspace pm: don't stop if error") e571fb09c893 ("selftests: mptcp: add speed env var")
4aadde088a58 ("selftests: mptcp: add fullmesh env var")
080b7f5733fd ("selftests: mptcp: add fastclose env var")
662aa22d7dcd ("selftests: mptcp: set all env vars as local ones") 966c6c3adfb1 ("selftests: mptcp: userspace_pm: report errors with 'remove' tests")

thanks,

greg k-h

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

From 7092dbee23282b6fcf1313fc64e2b92649ee16e8 Mon Sep 17 00:00:00 2001
From: Geliang Tang <[email protected]>
Date: Fri, 23 Feb 2024 17:14:12 +0100
Subject: [PATCH] selftests: mptcp: rm subflow with v4/v4mapped addr

Now both a v4 address and a v4-mapped address are supported when destroying a userspace pm subflow, this patch adds a second subflow to "userspace pm add & remove address" test, and two subflows could be removed two different ways, one with the v4mapped and one with v4.

Closes https://github.com/multipath-tcp/mptcp_net-next/issues/387

Fixes 48d73f609dcc ("selftests: mptcp: update userspace pm addr tests")

Cc [email protected]

Signed-off-by Geliang Tang <[email protected]>

Reviewed-by Mat Martineau <[email protected]>

Reviewed-by Matthieu Baerts (NGI0) <[email protected]>

Signed-off-by Matthieu Baerts (NGI0) <[email protected]>

Link https://lore.kernel.org/r/20240223-upstream-net-20240223-misc-fixes-v1-2-162e87e48497@kernel.org open here

Signed-off-by Jakub Kicinski <[email protected]>

tools/testing/selftests/net/mptcp/mptcp_join.sh +16 ~~-12~~

index c07386e21e0a..e68b1bc2c2e4 100755
@@ -3333,16 +3333,17 @@ userspace_pm_rm_sf()
 {
 	local evts=$evts_ns1
 	local t=${3:-1}
-	local ip=4
+	local ip
 	local tk da dp sp
 	local cnt
 
 	[ "$1" == "$ns2" ] && evts=$evts_ns2
-	if mptcp_lib_is_v6 $2; then ip=6; fi
+	[ -n "$(mptcp_lib_evts_get_info "saddr4" "$evts" $t)" ] && ip=4
+	[ -n "$(mptcp_lib_evts_get_info "saddr6" "$evts" $t)" ] && ip=6
 	tk=$(mptcp_lib_evts_get_info token "$evts")
-	da=$(mptcp_lib_evts_get_info "daddr$ip" "$evts" $t)
-	dp=$(mptcp_lib_evts_get_info dport "$evts" $t)
-	sp=$(mptcp_lib_evts_get_info sport "$evts" $t)
+	da=$(mptcp_lib_evts_get_info "daddr$ip" "$evts" $t $2)
+	dp=$(mptcp_lib_evts_get_info dport "$evts" $t $2)
+	sp=$(mptcp_lib_evts_get_info sport "$evts" $t $2)
 
 	cnt=$(rm_sf_count ${1})
 	ip netns exec $1 ./pm_nl_ctl dsf lip $2 lport $sp \

@@ -3429,20 +3430,23 @@ userspace_tests()
 	if reset_with_events "userspace pm add & remove address" &&
 	   continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
 		set_userspace_pm $ns1
-		pm_nl_set_limits $ns2 1 1
+		pm_nl_set_limits $ns2 2 2
 		speed=5 \
 			run_tests $ns1 $ns2 10.0.1.1 &
 		local tests_pid=$!
 		wait_mpj $ns1
 		userspace_pm_add_addr $ns1 10.0.2.1 10
-		chk_join_nr 1 1 1
-		chk_add_nr 1 1
-		chk_mptcp_info subflows 1 subflows 1
-		chk_subflows_total 2 2
-		chk_mptcp_info add_addr_signal 1 add_addr_accepted 1
+		userspace_pm_add_addr $ns1 10.0.3.1 20
+		chk_join_nr 2 2 2
+		chk_add_nr 2 2
+		chk_mptcp_info subflows 2 subflows 2
+		chk_subflows_total 3 3
+		chk_mptcp_info add_addr_signal 2 add_addr_accepted 2
 		userspace_pm_rm_addr $ns1 10
 		userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $SUB_ESTABLISHED
-		chk_rm_nr 1 1 invert
+		userspace_pm_rm_addr $ns1 20
+		userspace_pm_rm_sf $ns1 10.0.3.1 $SUB_ESTABLISHED
+		chk_rm_nr 2 2 invert
 		chk_mptcp_info subflows 0 subflows 0
 		chk_subflows_total 1 1
 		kill_events_pids

tools/testing/selftests/net/mptcp/mptcp_lib.sh +2 -2

index 3a2abae5993e..3777d66fc56d 100644
@@ -213,9 +213,9 @@ mptcp_lib_get_info_value() {
 	grep "${2}" | sed -n 's/.*\('"${1}"':\)\([0-9a-f:.]*\).*$/\2/p;q'
 }
 
-# $1: info name ; $2: evts_ns ; $3: event type
+# $1: info name ; $2: evts_ns ; [$3: event type; [$4: addr]]
 mptcp_lib_evts_get_info() {
-	mptcp_lib_get_info_value "${1}" "^type:${3:-1}," < "${2}"
+	grep "${4:-}" "${2}" | mptcp_lib_get_info_value "${1}" "^type:${3:-1},"
 }
 
 # $1: PID

Matthieu Baerts

maintainer

2024-03-04 10:07 UTC #1 lore raw

Hi Greg,

Quoted 1 line · On 04/03/2024 09:30, [email protected] wrote:

The patch below does not apply to the 6.1-stable tree.

Thank you for the notification!

(...)

Quoted 22 lines

Possible dependencies:
7092dbee2328 ("selftests: mptcp: rm subflow with v4/v4mapped addr") b850f2c7dd85 ("selftests: mptcp: add mptcp_lib_is_v6")
bdbef0a6ff10 ("selftests: mptcp: add mptcp_lib_kill_wait") 757c828ce949 ("selftests: mptcp: update userspace pm test helpers") 80775412882e ("selftests: mptcp: add chk_subflows_total helper") 06848c0f341e ("selftests: mptcp: add evts_get_info helper") 9168ea02b898 ("selftests: mptcp: fix wait_rm_addr/sf parameters") f4a75e9d1100 ("selftests: mptcp: run userspace pm tests slower") 03668c65d153 ("selftests: mptcp: join: rework detailed report") 9e86a297796b ("selftests: mptcp: sockopt: format subtests results in TAP") 7f117cd37c61 ("selftests: mptcp: join: format subtests results in TAP") c4192967e62f ("selftests: mptcp: lib: format subtests results in TAP") e198ad759273 ("selftests: mptcp: userspace_pm: uniform results printing") 8320b1387a15 ("selftests: mptcp: userspace_pm: fix shellcheck warnings") e141c1e8e4c1 ("selftests: mptcp: userspace pm: don't stop if error") e571fb09c893 ("selftests: mptcp: add speed env var")
4aadde088a58 ("selftests: mptcp: add fullmesh env var")
080b7f5733fd ("selftests: mptcp: add fastclose env var")
662aa22d7dcd ("selftests: mptcp: set all env vars as local ones") 966c6c3adfb1 ("selftests: mptcp: userspace_pm: report errors with 'remove' tests")

(...)

Quoted 11 lines

------------------ original commit in Linus's tree ------------------
From 7092dbee23282b6fcf1313fc64e2b92649ee16e8 Mon Sep 17 00:00:00 2001
From: Geliang Tang <[email protected]>
Date: Fri, 23 Feb 2024 17:14:12 +0100
Subject: [PATCH] selftests: mptcp: rm subflow with v4/v4mapped addr
Now both a v4 address and a v4-mapped address are supported when destroying a userspace pm subflow, this patch adds a second subflow to "userspace pm add & remove address" test, and two subflows could be removed two different ways, one with the v4mapped and one with v4.

I don't think it is worth having this patch backported to v6.1: there are a lot of conflicts because this patch depends on many others. Also, many CIs validating stable trees will use the selftests from the last stable version, I suppose. So this new test will be validated on older versions.

For v6.6 and v6.7, I can help to fix conflicts. I will just wait for the "queue/6.6" and "queue/6.7" branches to be updated with the latest patches :)

Cheers,
Matt

Signature · 1 line

Sponsored by the NGI0 Core fund.

Greg KH

author maintainer

2024-03-04 10:32 UTC #2 lore raw

Quoted 51 lines · Matthieu Baerts

Hi Greg,
Quoted 1 line · On 04/03/2024 09:30, [email protected] wrote:
The patch below does not apply to the 6.1-stable tree.
Thank you for the notification!
(...)
Quoted 22 lines
Possible dependencies:
7092dbee2328 ("selftests: mptcp: rm subflow with v4/v4mapped addr") b850f2c7dd85 ("selftests: mptcp: add mptcp_lib_is_v6")
bdbef0a6ff10 ("selftests: mptcp: add mptcp_lib_kill_wait") 757c828ce949 ("selftests: mptcp: update userspace pm test helpers") 80775412882e ("selftests: mptcp: add chk_subflows_total helper") 06848c0f341e ("selftests: mptcp: add evts_get_info helper") 9168ea02b898 ("selftests: mptcp: fix wait_rm_addr/sf parameters") f4a75e9d1100 ("selftests: mptcp: run userspace pm tests slower") 03668c65d153 ("selftests: mptcp: join: rework detailed report") 9e86a297796b ("selftests: mptcp: sockopt: format subtests results in TAP") 7f117cd37c61 ("selftests: mptcp: join: format subtests results in TAP") c4192967e62f ("selftests: mptcp: lib: format subtests results in TAP") e198ad759273 ("selftests: mptcp: userspace_pm: uniform results printing") 8320b1387a15 ("selftests: mptcp: userspace_pm: fix shellcheck warnings") e141c1e8e4c1 ("selftests: mptcp: userspace pm: don't stop if error") e571fb09c893 ("selftests: mptcp: add speed env var")
4aadde088a58 ("selftests: mptcp: add fullmesh env var")
080b7f5733fd ("selftests: mptcp: add fastclose env var")
662aa22d7dcd ("selftests: mptcp: set all env vars as local ones") 966c6c3adfb1 ("selftests: mptcp: userspace_pm: report errors with 'remove' tests")
(...)
Quoted 11 lines
------------------ original commit in Linus's tree ------------------
From 7092dbee23282b6fcf1313fc64e2b92649ee16e8 Mon Sep 17 00:00:00 2001
From: Geliang Tang <[email protected]>
Date: Fri, 23 Feb 2024 17:14:12 +0100
Subject: [PATCH] selftests: mptcp: rm subflow with v4/v4mapped addr
Now both a v4 address and a v4-mapped address are supported when destroying a userspace pm subflow, this patch adds a second subflow to "userspace pm add & remove address" test, and two subflows could be removed two different ways, one with the v4mapped and one with v4.
I don't think it is worth having this patch backported to v6.1: there are a lot of conflicts because this patch depends on many others. Also, many CIs validating stable trees will use the selftests from the last stable version, I suppose. So this new test will be validated on older versions.

Quoted 3 lines

For v6.6 and v6.7, I can help to fix conflicts. I will just wait for the "queue/6.6" and "queue/6.7" branches to be updated with the latest patches :)

Should all now be up to date, I don't see any pending mptcp patches in my review mbox to process.

thanks,

greg k-h

Matthieu Baerts

maintainer

2024-03-04 10:40 UTC #3 lore raw

Quoted 2 lines · Greg KH

Quoted 1 line · Matthieu Baerts
On 04/03/2024 09:30, [email protected] wrote:

(...)

Quoted 17 lines

Quoted 17 lines
Quoted 11 lines
------------------ original commit in Linus's tree ------------------
From 7092dbee23282b6fcf1313fc64e2b92649ee16e8 Mon Sep 17 00:00:00 2001
From: Geliang Tang <[email protected]>
Date: Fri, 23 Feb 2024 17:14:12 +0100
Subject: [PATCH] selftests: mptcp: rm subflow with v4/v4mapped addr
Now both a v4 address and a v4-mapped address are supported when destroying a userspace pm subflow, this patch adds a second subflow to "userspace pm add & remove address" test, and two subflows could be removed two different ways, one with the v4mapped and one with v4.
I don't think it is worth having this patch backported to v6.1: there are a lot of conflicts because this patch depends on many others. Also, many CIs validating stable trees will use the selftests from the last stable version, I suppose. So this new test will be validated on older versions.

Quoted 5 lines

Quoted 3 lines
For v6.6 and v6.7, I can help to fix conflicts. I will just wait for the "queue/6.6" and "queue/6.7" branches to be updated with the latest patches :)
Should all now be up to date,

Maybe we are not talking about the same thing: are the "queue/X.Y" branches from the "linux-stable-rc" repo [1] not updated automatically when patches are added to the "stable-queue" repo [2]?

It is just to know which base I use to resolve conflicts :)

[1]
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/

Quoted 2 lines

I don't see any pending mptcp patches in
my review mbox to process.

Thank you for having applied all these patches!

Cheers,
Matt

Signature · 1 line

Sponsored by the NGI0 Core fund.

Greg KH

author maintainer

2024-03-04 10:58 UTC #4 lore raw

Quoted 27 lines · Matthieu Baerts

Quoted 2 lines · Greg KH
Quoted 1 line · Matthieu Baerts
On 04/03/2024 09:30, [email protected] wrote:
(...)
Quoted 21 lines
Quoted 20 lines
Quoted 11 lines
------------------ original commit in Linus's tree ------------------
From 7092dbee23282b6fcf1313fc64e2b92649ee16e8 Mon Sep 17 00:00:00 2001
From: Geliang Tang <[email protected]>
Date: Fri, 23 Feb 2024 17:14:12 +0100
Subject: [PATCH] selftests: mptcp: rm subflow with v4/v4mapped addr
Now both a v4 address and a v4-mapped address are supported when destroying a userspace pm subflow, this patch adds a second subflow to "userspace pm add & remove address" test, and two subflows could be removed two different ways, one with the v4mapped and one with v4.
I don't think it is worth having this patch backported to v6.1: there are a lot of conflicts because this patch depends on many others. Also, many CIs validating stable trees will use the selftests from the last stable version, I suppose. So this new test will be validated on older versions.
For v6.6 and v6.7, I can help to fix conflicts. I will just wait for the "queue/6.6" and "queue/6.7" branches to be updated with the latest patches :)

Quoted 5 lines

Quoted 1 line
Should all now be up to date,
Maybe we are not talking about the same thing: are the "queue/X.Y" branches from the "linux-stable-rc" repo [1] not updated automatically when patches are added to the "stable-queue" repo [2]?

Ah, that, yeah, it somehow automagically works, I have no idea how it does it or what controls it or who uses it, sorry :)

Quoted 1 line

It is just to know which base I use to resolve conflicts :)

If it works for you, great!

thanks

greg k-h

Matthieu Baerts

maintainer

2024-03-04 11:32 UTC #5 lore raw

Quoted 28 lines · Greg KH

Quoted 27 lines · Matthieu Baerts
Quoted 2 lines · Greg KH
Quoted 1 line · Matthieu Baerts
On 04/03/2024 09:30, [email protected] wrote:
(...)
Quoted 21 lines
Quoted 20 lines
Quoted 11 lines
------------------ original commit in Linus's tree ------------------
From 7092dbee23282b6fcf1313fc64e2b92649ee16e8 Mon Sep 17 00:00:00 2001
From: Geliang Tang <[email protected]>
Date: Fri, 23 Feb 2024 17:14:12 +0100
Subject: [PATCH] selftests: mptcp: rm subflow with v4/v4mapped addr
Now both a v4 address and a v4-mapped address are supported when destroying a userspace pm subflow, this patch adds a second subflow to "userspace pm add & remove address" test, and two subflows could be removed two different ways, one with the v4mapped and one with v4.
I don't think it is worth having this patch backported to v6.1: there are a lot of conflicts because this patch depends on many others. Also, many CIs validating stable trees will use the selftests from the last stable version, I suppose. So this new test will be validated on older versions.
For v6.6 and v6.7, I can help to fix conflicts. I will just wait for the "queue/6.6" and "queue/6.7" branches to be updated with the latest patches :)

Quoted 8 lines

Quoted 5 lines
Quoted 1 line
Should all now be up to date,
Maybe we are not talking about the same thing: are the "queue/X.Y" branches from the "linux-stable-rc" repo [1] not updated automatically when patches are added to the "stable-queue" repo [2]?
Ah, that, yeah, it somehow automagically works, I have no idea how it does it or what controls it or who uses it, sorry :)

Ah, OK! :)

I have to admit it is quite handy, not to have to apply the patches successfully added in the queue manually. But that's OK, I guess it will magically work again in the future. For now, I can apply these other patches manually, no problem!

Cheers,
Matt

Signature · 1 line

Sponsored by the NGI0 Core fund.