| Message ID | 1d4a6ebd0f843910f35a842673af55fca6962b8e.1719589916.git.pabeni@redhat.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Commit | dc47c6d60de4fa3940325a8b0b647b58bd835ff6 |
| Headers | show |
| Series | mptcp: fix signal endpoint readd | expand |
| Context | Check | Description |
|---|---|---|
| matttbe/build | success | Build and static analysis OK |
| matttbe/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 34 lines checked |
| matttbe/shellcheck | success | No ShellCheck issues |
| matttbe/KVM_Validation__normal | success | Success! ✅ |
| matttbe/KVM_Validation__debug | success | Success! ✅ |
| matttbe/KVM_Validation__btf__only_bpftest_all_ | success | Success! ✅ |
Hi Paolo, On 28/06/2024 17:54, Paolo Abeni wrote: > Delete and re-create a signal endpoint and ensure that the PM > actually deletes and re-create the subflow. > > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > --- > .../testing/selftests/net/mptcp/mptcp_join.sh | 28 +++++++++++++++++++ > 1 file changed, 28 insertions(+) > > diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh > index 108aeeb84ef1..228fecee61f9 100755 > --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh > +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh > @@ -3526,6 +3526,34 @@ endpoint_tests() > chk_mptcp_info subflows 1 subflows 1 > mptcp_lib_kill_wait $tests_pid > fi > + > + # remove and re-add > + if reset "delete re-add signal"; then In the previous tests -- "delete and re-add", we added: mptcp_lib_kallsyms_has "subflow_rebuild_header$" At the beginning of the endpoint_tests() function there is this comment: # subflow_rebuild_header is needed to support the implicit flag Maybe I put the same check on "delete and re-add" by mistake. I don't think this test depends on the "implicit" type. Or maybe it is, because its introduction is also linked to some big modifications on the PM side. In this case, should we have the same check? && mptcp_lib_kallsyms_has "subflow_rebuild_header$" Cheers, Matt
On Tue, 2024-07-02 at 11:01 +0200, Matthieu Baerts wrote: > Hi Paolo, > > On 28/06/2024 17:54, Paolo Abeni wrote: > > Delete and re-create a signal endpoint and ensure that the PM > > actually deletes and re-create the subflow. > > > > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > > --- > > .../testing/selftests/net/mptcp/mptcp_join.sh | 28 +++++++++++++++++++ > > 1 file changed, 28 insertions(+) > > > > diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh > > index 108aeeb84ef1..228fecee61f9 100755 > > --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh > > +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh > > @@ -3526,6 +3526,34 @@ endpoint_tests() > > chk_mptcp_info subflows 1 subflows 1 > > mptcp_lib_kill_wait $tests_pid > > fi > > + > > + # remove and re-add > > + if reset "delete re-add signal"; then > > In the previous tests -- "delete and re-add", we added: > > mptcp_lib_kallsyms_has "subflow_rebuild_header$" > > At the beginning of the endpoint_tests() function there is this comment: > > # subflow_rebuild_header is needed to support the implicit flag > > Maybe I put the same check on "delete and re-add" by mistake. I don't > think this test depends on the "implicit" type. Or maybe it is, because > its introduction is also linked to some big modifications on the PM > side. In this case, should we have the same check? > > && mptcp_lib_kallsyms_has "subflow_rebuild_header$" Uhmm... sounds a little too much defensive programming, but I guess I can add the test here Thanks! Paolo
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index 108aeeb84ef1..228fecee61f9 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3526,6 +3526,34 @@ endpoint_tests() chk_mptcp_info subflows 1 subflows 1 mptcp_lib_kill_wait $tests_pid fi + + # remove and re-add + if reset "delete re-add signal"; then + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns1 10.0.2.1 id 1 flags signal + test_linkfail=4 speed=20 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=$! + + wait_mpj $ns2 + pm_nl_check_endpoint "creation" \ + $ns1 10.0.2.1 id 1 flags signal + chk_subflow_nr "before delete" 2 + chk_mptcp_info subflows 1 subflows 1 + + pm_nl_del_endpoint $ns1 1 10.0.2.1 + sleep 0.5 + chk_subflow_nr "after delete" 1 + chk_mptcp_info subflows 0 subflows 0 + + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + wait_mpj $ns2 + chk_subflow_nr "after re-add" 2 + chk_mptcp_info subflows 1 subflows 1 + mptcp_lib_kill_wait $tests_pid + fi + } # [$1: error message]
Delete and re-create a signal endpoint and ensure that the PM actually deletes and re-create the subflow. Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- .../testing/selftests/net/mptcp/mptcp_join.sh | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+)