From 78c73fc17d94c2718dd681719d6f0bba16e4104a Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 10 Mar 2024 17:52:59 -0400 Subject: [PATCH] Drop selftests-mptcp-simult-flows-format-subtests-results.patch Signed-off-by: Sasha Levin --- ...simult-flows-format-subtests-results.patch | 68 ------------------- queue-5.15/series | 1 - ...simult-flows-format-subtests-results.patch | 68 ------------------- queue-6.1/series | 1 - 4 files changed, 138 deletions(-) delete mode 100644 queue-5.15/selftests-mptcp-simult-flows-format-subtests-results.patch delete mode 100644 queue-6.1/selftests-mptcp-simult-flows-format-subtests-results.patch diff --git a/queue-5.15/selftests-mptcp-simult-flows-format-subtests-results.patch b/queue-5.15/selftests-mptcp-simult-flows-format-subtests-results.patch deleted file mode 100644 index e05fcd3973b..00000000000 --- a/queue-5.15/selftests-mptcp-simult-flows-format-subtests-results.patch +++ /dev/null @@ -1,68 +0,0 @@ -From f007bec4e943548bed9e5612ce2f65241ab5ef4e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 17 Jul 2023 15:21:31 +0200 -Subject: selftests: mptcp: simult flows: format subtests results in TAP - -From: Matthieu Baerts - -[ Upstream commit 675d99338e7a6cd925d61d7dbf8c26612f7f08a9 ] - -The current selftests infrastructure formats the results in TAP 13. This -version doesn't support subtests and only the end result of each -selftest is taken into account. It means that a single issue in a -subtest of a selftest containing multiple subtests forces the whole -selftest to be marked as failed. It also means that subtests results are -not tracked by CIs executing selftests. - -MPTCP selftests run hundreds of various subtests. It is then important -to track each of them and not one result per selftest. - -It is particularly interesting to do that when validating stable kernels -with the last version of the test suite: tests might fail because a -feature is not supported but the test didn't skip that part. In this -case, if subtests are not tracked, the whole selftest will be marked as -failed making the other subtests useless because their results are -ignored. - -This patch formats subtests results in TAP in simult_flows.sh selftest. - -Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 -Acked-by: Paolo Abeni -Signed-off-by: Matthieu Baerts -Signed-off-by: David S. Miller -Stable-dep-of: 5e2f3c65af47 ("selftests: mptcp: decrease BW in simult flows") -Signed-off-by: Sasha Levin ---- - tools/testing/selftests/net/mptcp/simult_flows.sh | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh -index 752cef1688040..d41fcd9f4ba76 100755 ---- a/tools/testing/selftests/net/mptcp/simult_flows.sh -+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh -@@ -251,6 +251,7 @@ run_test() - printf "%-60s" "$msg" - do_transfer $small $large $time - lret=$? -+ mptcp_lib_result_code "${lret}" "${msg}" - if [ $lret -ne 0 ]; then - ret=$lret - [ $bail -eq 0 ] || exit $ret -@@ -259,6 +260,7 @@ run_test() - printf "%-60s" "$msg - reverse direction" - do_transfer $large $small $time - lret=$? -+ mptcp_lib_result_code "${lret}" "${msg}" - if [ $lret -ne 0 ]; then - ret=$lret - [ $bail -eq 0 ] || exit $ret -@@ -295,4 +297,6 @@ run_test 10 10 1 50 "balanced bwidth with unbalanced delay" - run_test 30 10 0 0 "unbalanced bwidth" - run_test 30 10 1 50 "unbalanced bwidth with unbalanced delay" - run_test 30 10 50 1 "unbalanced bwidth with opposed, unbalanced delay" -+ -+mptcp_lib_result_print_all_tap - exit $ret --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index f7474324d99..a4186f6b306 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -52,7 +52,6 @@ serial-max310x-use-a-separate-regmap-for-each-port.patch serial-max310x-prevent-infinite-while-loop-in-port-s.patch drm-amd-pm-do-not-expose-the-api-used-internally-onl.patch drm-amdgpu-reset-ih-overflow_clear-bit.patch -selftests-mptcp-simult-flows-format-subtests-results.patch selftests-mptcp-decrease-bw-in-simult-flows.patch hv_netvsc-use-netif_is_bond_master-instead-of-open-c.patch hv_netvsc-register-vf-in-netvsc_probe-if-net_device_.patch diff --git a/queue-6.1/selftests-mptcp-simult-flows-format-subtests-results.patch b/queue-6.1/selftests-mptcp-simult-flows-format-subtests-results.patch deleted file mode 100644 index 19529613cd3..00000000000 --- a/queue-6.1/selftests-mptcp-simult-flows-format-subtests-results.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 4eeef0aaffa567f812390612c30f800de02edd73 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 17 Jul 2023 15:21:31 +0200 -Subject: selftests: mptcp: simult flows: format subtests results in TAP - -From: Matthieu Baerts - -[ Upstream commit 675d99338e7a6cd925d61d7dbf8c26612f7f08a9 ] - -The current selftests infrastructure formats the results in TAP 13. This -version doesn't support subtests and only the end result of each -selftest is taken into account. It means that a single issue in a -subtest of a selftest containing multiple subtests forces the whole -selftest to be marked as failed. It also means that subtests results are -not tracked by CIs executing selftests. - -MPTCP selftests run hundreds of various subtests. It is then important -to track each of them and not one result per selftest. - -It is particularly interesting to do that when validating stable kernels -with the last version of the test suite: tests might fail because a -feature is not supported but the test didn't skip that part. In this -case, if subtests are not tracked, the whole selftest will be marked as -failed making the other subtests useless because their results are -ignored. - -This patch formats subtests results in TAP in simult_flows.sh selftest. - -Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 -Acked-by: Paolo Abeni -Signed-off-by: Matthieu Baerts -Signed-off-by: David S. Miller -Stable-dep-of: 5e2f3c65af47 ("selftests: mptcp: decrease BW in simult flows") -Signed-off-by: Sasha Levin ---- - tools/testing/selftests/net/mptcp/simult_flows.sh | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh -index 4a417f9d51d67..6b0014f538a22 100755 ---- a/tools/testing/selftests/net/mptcp/simult_flows.sh -+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh -@@ -263,6 +263,7 @@ run_test() - printf "%-60s" "$msg" - do_transfer $small $large $time - lret=$? -+ mptcp_lib_result_code "${lret}" "${msg}" - if [ $lret -ne 0 ]; then - ret=$lret - [ $bail -eq 0 ] || exit $ret -@@ -271,6 +272,7 @@ run_test() - printf "%-60s" "$msg - reverse direction" - do_transfer $large $small $time - lret=$? -+ mptcp_lib_result_code "${lret}" "${msg}" - if [ $lret -ne 0 ]; then - ret=$lret - [ $bail -eq 0 ] || exit $ret -@@ -307,4 +309,6 @@ run_test 10 10 1 50 "balanced bwidth with unbalanced delay" - run_test 30 10 0 0 "unbalanced bwidth" - run_test 30 10 1 50 "unbalanced bwidth with unbalanced delay" - run_test 30 10 50 1 "unbalanced bwidth with opposed, unbalanced delay" -+ -+mptcp_lib_result_print_all_tap - exit $ret --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index c18937e36ea..ea87dbbbd00 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -40,7 +40,6 @@ selftests-mm-fix-map_hugetlb-failure-on-64k-page-siz.patch xhci-process-isoc-td-properly-when-there-was-a-trans.patch xhci-handle-isoc-babble-and-buffer-overrun-events-pr.patch drm-amdgpu-reset-ih-overflow_clear-bit.patch -selftests-mptcp-simult-flows-format-subtests-results.patch selftests-mptcp-decrease-bw-in-simult-flows.patch blk-iocost-disable-writeback-throttling.patch elevator-remove-redundant-code-in-elv_unregister_que.patch -- 2.47.3