* [PATCH 6.6.y 0/2] Fixes for recent backports
@ 2024-09-04 13:37 Matthieu Baerts (NGI0)
2024-09-04 13:37 ` [PATCH 6.6.y 1/2] selftests: mptcp: join: disable get and dump addr checks Matthieu Baerts (NGI0)
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Matthieu Baerts (NGI0) @ 2024-09-04 13:37 UTC (permalink / raw)
To: mptcp, stable, gregkh; +Cc: Matthieu Baerts (NGI0), sashal
A few commits have been recently queued to v6.6 and needs to be adapted
for this kernel version:
- 38f027fca1b7 ("selftests: mptcp: dump userspace addrs list")
- 4cc5cc7ca052 ("selftests: mptcp: userspace pm get addr tests")
- b2e2248f365a ("selftests: mptcp: userspace pm create id 0 subflow")
Matthieu Baerts (NGI0) (2):
selftests: mptcp: join: disable get and dump addr checks
selftests: mptcp: join: stop transfer when check is done (part 2.2)
tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
2.45.2
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 6.6.y 1/2] selftests: mptcp: join: disable get and dump addr checks 2024-09-04 13:37 [PATCH 6.6.y 0/2] Fixes for recent backports Matthieu Baerts (NGI0) @ 2024-09-04 13:37 ` Matthieu Baerts (NGI0) 2024-09-04 14:29 ` Patch "selftests: mptcp: join: disable get and dump addr checks" has been added to the 6.6-stable tree gregkh 2024-09-04 13:37 ` [PATCH 6.6.y 2/2] selftests: mptcp: join: stop transfer when check is done (part 2.2) Matthieu Baerts (NGI0) 2024-09-04 14:21 ` [PATCH 6.6.y 0/2] Fixes for recent backports Greg KH 2 siblings, 1 reply; 6+ messages in thread From: Matthieu Baerts (NGI0) @ 2024-09-04 13:37 UTC (permalink / raw) To: mptcp, stable, gregkh; +Cc: Matthieu Baerts (NGI0), sashal These new checks have been recently queued to v6.6 [1] with the backport of commit 38f027fca1b7 ("selftests: mptcp: dump userspace addrs list"), and commit 4cc5cc7ca052 ("selftests: mptcp: userspace pm get addr tests"). On v6.6, these checks will simply print 'skip', because the associated features are not available in this version. That's fine, except that the MPTCP CI sets the SELFTESTS_MPTCP_LIB_EXPECT_ALL_FEATURES=1 env var, which will force these subtests to fail when using the selftests from v6.6 on a v6.6 kernel, because the feature is not available. To ease the backports (and possible future ones), I suggest to keep the recent backports, but skip calling mptcp_lib_kallsyms_has() not to have the CIs setting this env var complaining about the associated features not being available. Link: https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=bd2122541bd8 [1] Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index 0ff60b3744c0..14c80f980396 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3469,7 +3469,7 @@ userspace_pm_chk_dump_addr() print_check "dump addrs ${check}" - if mptcp_lib_kallsyms_has "mptcp_userspace_pm_dump_addr$"; then + if false && mptcp_lib_kallsyms_has "mptcp_userspace_pm_dump_addr$"; then check_output "userspace_pm_dump ${ns}" "${exp}" else print_skip @@ -3484,7 +3484,7 @@ userspace_pm_chk_get_addr() print_check "get id ${id} addr" - if mptcp_lib_kallsyms_has "mptcp_userspace_pm_get_addr$"; then + if false && mptcp_lib_kallsyms_has "mptcp_userspace_pm_get_addr$"; then check_output "userspace_pm_get_addr ${ns} ${id}" "${exp}" else print_skip -- 2.45.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Patch "selftests: mptcp: join: disable get and dump addr checks" has been added to the 6.6-stable tree 2024-09-04 13:37 ` [PATCH 6.6.y 1/2] selftests: mptcp: join: disable get and dump addr checks Matthieu Baerts (NGI0) @ 2024-09-04 14:29 ` gregkh 0 siblings, 0 replies; 6+ messages in thread From: gregkh @ 2024-09-04 14:29 UTC (permalink / raw) To: gregkh, matttbe, mptcp, sashal; +Cc: stable-commits This is a note to let you know that I've just added the patch titled selftests: mptcp: join: disable get and dump addr checks to the 6.6-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-join-disable-get-and-dump-addr-checks.patch and it can be found in the queue-6.6 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@vger.kernel.org> know about it. From stable+bounces-73054-greg=kroah.com@vger.kernel.org Wed Sep 4 15:39:40 2024 From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org> Date: Wed, 4 Sep 2024 15:37:57 +0200 Subject: selftests: mptcp: join: disable get and dump addr checks To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>, sashal@kernel.org Message-ID: <20240904133755.67974-5-matttbe@kernel.org> From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org> These new checks have been recently queued to v6.6 [1] with the backport of commit 38f027fca1b7 ("selftests: mptcp: dump userspace addrs list"), and commit 4cc5cc7ca052 ("selftests: mptcp: userspace pm get addr tests"). On v6.6, these checks will simply print 'skip', because the associated features are not available in this version. That's fine, except that the MPTCP CI sets the SELFTESTS_MPTCP_LIB_EXPECT_ALL_FEATURES=1 env var, which will force these subtests to fail when using the selftests from v6.6 on a v6.6 kernel, because the feature is not available. To ease the backports (and possible future ones), I suggest to keep the recent backports, but skip calling mptcp_lib_kallsyms_has() not to have the CIs setting this env var complaining about the associated features not being available. Link: https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=bd2122541bd8 [1] Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- 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 @@ -3472,7 +3472,7 @@ userspace_pm_chk_dump_addr() print_check "dump addrs ${check}" - if mptcp_lib_kallsyms_has "mptcp_userspace_pm_dump_addr$"; then + if false && mptcp_lib_kallsyms_has "mptcp_userspace_pm_dump_addr$"; then check_output "userspace_pm_dump ${ns}" "${exp}" else print_skip @@ -3487,7 +3487,7 @@ userspace_pm_chk_get_addr() print_check "get id ${id} addr" - if mptcp_lib_kallsyms_has "mptcp_userspace_pm_get_addr$"; then + if false && mptcp_lib_kallsyms_has "mptcp_userspace_pm_get_addr$"; then check_output "userspace_pm_get_addr ${ns} ${id}" "${exp}" else print_skip Patches currently in stable-queue which might be from matttbe@kernel.org are queue-6.6/selftests-mptcp-add-mptcp_lib_events-helper.patch queue-6.6/selftests-mptcp-join-validate-event-numbers.patch queue-6.6/selftests-mptcp-join-check-re-re-adding-id-0-signal.patch queue-6.6/selftests-mptcp-join-cannot-rm-sf-if-closed.patch queue-6.6/selftests-mptcp-declare-event-macros-in-mptcp_lib.patch queue-6.6/mptcp-pm-fix-rm_addr-id-for-the-initial-subflow.patch queue-6.6/mptcp-make-pm_remove_addrs_and_subflows-static.patch queue-6.6/selftests-mptcp-dump-userspace-addrs-list.patch queue-6.6/selftests-mptcp-join-stop-transfer-when-check-is-done-part-2.2.patch queue-6.6/selftests-mptcp-join-test-for-flush-re-add-endpoints.patch queue-6.6/selftests-mptcp-add-explicit-test-case-for-remove-re.patch queue-6.6/mptcp-avoid-duplicated-sub_closed-events.patch queue-6.6/selftests-mptcp-join-check-re-adding-init-endp-with-.patch queue-6.6/mptcp-pr_debug-add-missing-n-at-the-end.patch queue-6.6/selftests-mptcp-join-check-re-using-id-of-unused-add.patch queue-6.6/selftests-mptcp-userspace-pm-create-id-0-subflow.patch queue-6.6/selftests-mptcp-userspace-pm-get-addr-tests.patch queue-6.6/selftests-mptcp-join-disable-get-and-dump-addr-checks.patch ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 6.6.y 2/2] selftests: mptcp: join: stop transfer when check is done (part 2.2) 2024-09-04 13:37 [PATCH 6.6.y 0/2] Fixes for recent backports Matthieu Baerts (NGI0) 2024-09-04 13:37 ` [PATCH 6.6.y 1/2] selftests: mptcp: join: disable get and dump addr checks Matthieu Baerts (NGI0) @ 2024-09-04 13:37 ` Matthieu Baerts (NGI0) 2024-09-04 14:29 ` Patch "selftests: mptcp: join: stop transfer when check is done (part 2.2)" has been added to the 6.6-stable tree gregkh 2024-09-04 14:21 ` [PATCH 6.6.y 0/2] Fixes for recent backports Greg KH 2 siblings, 1 reply; 6+ messages in thread From: Matthieu Baerts (NGI0) @ 2024-09-04 13:37 UTC (permalink / raw) To: mptcp, stable, gregkh; +Cc: Matthieu Baerts (NGI0), sashal Use mptcp_lib_kill_wait in "userspace pm create id 0 subflow" subtest. This new test has recently been queued to v6.6 [1] with the backport of commit b2e2248f365a ("selftests: mptcp: userspace pm create id 0 subflow"). The modification here was part of commit 04b57c9e096a ("selftests: mptcp: join: stop transfer when check is done (part 2)") that has been backported to v6.6 a few months ago -- see commit 358f02b84fbb ("selftests: mptcp: join: stop transfer when check is done (part 2)") -- but it was not modifying this subtest as it was not present in v6.6. Link: https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=bd2122541bd8 [1] Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index 14c80f980396..2fd83f2a93e3 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3645,7 +3645,7 @@ userspace_tests() chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2 kill_events_pids - wait $tests_pid + mptcp_lib_kill_wait $tests_pid fi } -- 2.45.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Patch "selftests: mptcp: join: stop transfer when check is done (part 2.2)" has been added to the 6.6-stable tree 2024-09-04 13:37 ` [PATCH 6.6.y 2/2] selftests: mptcp: join: stop transfer when check is done (part 2.2) Matthieu Baerts (NGI0) @ 2024-09-04 14:29 ` gregkh 0 siblings, 0 replies; 6+ messages in thread From: gregkh @ 2024-09-04 14:29 UTC (permalink / raw) To: gregkh, matttbe, mptcp, sashal; +Cc: stable-commits This is a note to let you know that I've just added the patch titled selftests: mptcp: join: stop transfer when check is done (part 2.2) to the 6.6-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-join-stop-transfer-when-check-is-done-part-2.2.patch and it can be found in the queue-6.6 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@vger.kernel.org> know about it. From stable+bounces-73055-greg=kroah.com@vger.kernel.org Wed Sep 4 15:39:40 2024 From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org> Date: Wed, 4 Sep 2024 15:37:58 +0200 Subject: selftests: mptcp: join: stop transfer when check is done (part 2.2) To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>, sashal@kernel.org Message-ID: <20240904133755.67974-6-matttbe@kernel.org> From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org> Use mptcp_lib_kill_wait in "userspace pm create id 0 subflow" subtest. This new test has recently been queued to v6.6 [1] with the backport of commit b2e2248f365a ("selftests: mptcp: userspace pm create id 0 subflow"). The modification here was part of commit 04b57c9e096a ("selftests: mptcp: join: stop transfer when check is done (part 2)") that has been backported to v6.6 a few months ago -- see commit 358f02b84fbb ("selftests: mptcp: join: stop transfer when check is done (part 2)") -- but it was not modifying this subtest as it was not present in v6.6. Link: https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=bd2122541bd8 [1] Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3678,7 +3678,7 @@ userspace_tests() chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2 kill_events_pids - wait $tests_pid + mptcp_lib_kill_wait $tests_pid fi } Patches currently in stable-queue which might be from matttbe@kernel.org are queue-6.6/selftests-mptcp-add-mptcp_lib_events-helper.patch queue-6.6/selftests-mptcp-join-validate-event-numbers.patch queue-6.6/selftests-mptcp-join-check-re-re-adding-id-0-signal.patch queue-6.6/selftests-mptcp-join-cannot-rm-sf-if-closed.patch queue-6.6/selftests-mptcp-declare-event-macros-in-mptcp_lib.patch queue-6.6/mptcp-pm-fix-rm_addr-id-for-the-initial-subflow.patch queue-6.6/mptcp-make-pm_remove_addrs_and_subflows-static.patch queue-6.6/selftests-mptcp-dump-userspace-addrs-list.patch queue-6.6/selftests-mptcp-join-stop-transfer-when-check-is-done-part-2.2.patch queue-6.6/selftests-mptcp-join-test-for-flush-re-add-endpoints.patch queue-6.6/selftests-mptcp-add-explicit-test-case-for-remove-re.patch queue-6.6/mptcp-avoid-duplicated-sub_closed-events.patch queue-6.6/selftests-mptcp-join-check-re-adding-init-endp-with-.patch queue-6.6/mptcp-pr_debug-add-missing-n-at-the-end.patch queue-6.6/selftests-mptcp-join-check-re-using-id-of-unused-add.patch queue-6.6/selftests-mptcp-userspace-pm-create-id-0-subflow.patch queue-6.6/selftests-mptcp-userspace-pm-get-addr-tests.patch queue-6.6/selftests-mptcp-join-disable-get-and-dump-addr-checks.patch ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 6.6.y 0/2] Fixes for recent backports 2024-09-04 13:37 [PATCH 6.6.y 0/2] Fixes for recent backports Matthieu Baerts (NGI0) 2024-09-04 13:37 ` [PATCH 6.6.y 1/2] selftests: mptcp: join: disable get and dump addr checks Matthieu Baerts (NGI0) 2024-09-04 13:37 ` [PATCH 6.6.y 2/2] selftests: mptcp: join: stop transfer when check is done (part 2.2) Matthieu Baerts (NGI0) @ 2024-09-04 14:21 ` Greg KH 2 siblings, 0 replies; 6+ messages in thread From: Greg KH @ 2024-09-04 14:21 UTC (permalink / raw) To: Matthieu Baerts (NGI0); +Cc: mptcp, stable, sashal On Wed, Sep 04, 2024 at 03:37:56PM +0200, Matthieu Baerts (NGI0) wrote: > A few commits have been recently queued to v6.6 and needs to be adapted > for this kernel version: > > - 38f027fca1b7 ("selftests: mptcp: dump userspace addrs list") > - 4cc5cc7ca052 ("selftests: mptcp: userspace pm get addr tests") > - b2e2248f365a ("selftests: mptcp: userspace pm create id 0 subflow") > > Matthieu Baerts (NGI0) (2): > selftests: mptcp: join: disable get and dump addr checks > selftests: mptcp: join: stop transfer when check is done (part 2.2) > > tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > -- > 2.45.2 > > Now queued up, thanks. greg k-h ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-09-04 14:29 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-09-04 13:37 [PATCH 6.6.y 0/2] Fixes for recent backports Matthieu Baerts (NGI0) 2024-09-04 13:37 ` [PATCH 6.6.y 1/2] selftests: mptcp: join: disable get and dump addr checks Matthieu Baerts (NGI0) 2024-09-04 14:29 ` Patch "selftests: mptcp: join: disable get and dump addr checks" has been added to the 6.6-stable tree gregkh 2024-09-04 13:37 ` [PATCH 6.6.y 2/2] selftests: mptcp: join: stop transfer when check is done (part 2.2) Matthieu Baerts (NGI0) 2024-09-04 14:29 ` Patch "selftests: mptcp: join: stop transfer when check is done (part 2.2)" has been added to the 6.6-stable tree gregkh 2024-09-04 14:21 ` [PATCH 6.6.y 0/2] Fixes for recent backports Greg KH
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.