[v1] selftests: mptcp: join: cannot rm sf if closed

[PATCH 6.6.y] selftests: mptcp: join: cannot rm sf if closed

Posted by Matthieu Baerts (NGI0) 2 months, 2 weeks ago

commit e93681afcb96864ec26c3b2ce94008ce93577373 upstream.

Thanks to the previous commit, the MPTCP subflows are now closed on both
directions even when only the MPTCP path-manager of one peer asks for
their closure.

In the two tests modified here -- "userspace pm add & remove address"
and "userspace pm create destroy subflow" -- one peer is controlled by
the userspace PM, and the other one by the in-kernel PM. When the
userspace PM sends a RM_ADDR notification, the in-kernel PM will
automatically react by closing all subflows using this address. Now,
thanks to the previous commit, the subflows are properly closed on both
directions, the userspace PM can then no longer closes the same
subflows if they are already closed. Before, it was OK to do that,
because the subflows were still half-opened, still OK to send a RM_ADDR.

In other words, thanks to the previous commit closing the subflows, an
error will be returned to the userspace if it tries to close a subflow
that has already been closed. So no need to run this command, which mean
that the linked counters will then not be incremented.

These tests are then no longer sending both a RM_ADDR, then closing the
linked subflow just after. The test with the userspace PM on the server
side is now removing one subflow linked to one address, then sending
a RM_ADDR for another address. The test with the userspace PM on the
client side is now only removing the subflow that was previously
created.

Fixes: 4369c198e599 ("selftests: mptcp: test userspace pm out of transfer")
Cc: stable@vger.kernel.org
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240826-net-mptcp-close-extra-sf-fin-v1-2-905199fe1172@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
[ Conflicts in mptcp_join.sh, due to commit 38f027fca1b7 ("selftests:
  mptcp: dump userspace addrs list") -- linked to a new feature, not
  backportable to stable -- and commit 23a0485d1c04 ("selftests: mptcp:
  declare event macros in mptcp_lib") not in this version. The conflicts
  have been resolved by applying the same modifications except in the
  parameters given to userspace_pm_chk_dump_addr helpers, which are not
  used here. ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index a338ad9b779c..176790507019 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3513,11 +3513,9 @@ userspace_tests()
 		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
 		userspace_pm_rm_addr $ns1 20
-		userspace_pm_rm_sf $ns1 10.0.3.1 $SUB_ESTABLISHED
-		chk_rm_nr 2 2 invert
+		chk_rm_nr 1 1 invert
 		chk_mptcp_info subflows 0 subflows 0
 		chk_subflows_total 1 1
 		kill_events_pids
@@ -3537,9 +3535,8 @@ userspace_tests()
 		chk_join_nr 1 1 1
 		chk_mptcp_info subflows 1 subflows 1
 		chk_subflows_total 2 2
-		userspace_pm_rm_addr $ns2 20
 		userspace_pm_rm_sf $ns2 10.0.3.2 $SUB_ESTABLISHED
-		chk_rm_nr 1 1
+		chk_rm_nr 0 1
 		chk_mptcp_info subflows 0 subflows 0
 		chk_subflows_total 1 1
 		kill_events_pids
-- 
2.45.2

Re: [PATCH 6.6.y] selftests: mptcp: join: cannot rm sf if closed

Posted by Matthieu Baerts 2 months, 2 weeks ago

Hi Greg, Sasha,

On 03/09/2024 12:18, Matthieu Baerts (NGI0) wrote:
> commit e93681afcb96864ec26c3b2ce94008ce93577373 upstream.
> 
> Thanks to the previous commit, the MPTCP subflows are now closed on both
> directions even when only the MPTCP path-manager of one peer asks for
> their closure.
> 
> In the two tests modified here -- "userspace pm add & remove address"
> and "userspace pm create destroy subflow" -- one peer is controlled by
> the userspace PM, and the other one by the in-kernel PM. When the
> userspace PM sends a RM_ADDR notification, the in-kernel PM will
> automatically react by closing all subflows using this address. Now,
> thanks to the previous commit, the subflows are properly closed on both
> directions, the userspace PM can then no longer closes the same
> subflows if they are already closed. Before, it was OK to do that,
> because the subflows were still half-opened, still OK to send a RM_ADDR.
> 
> In other words, thanks to the previous commit closing the subflows, an
> error will be returned to the userspace if it tries to close a subflow
> that has already been closed. So no need to run this command, which mean
> that the linked counters will then not be incremented.
> 
> These tests are then no longer sending both a RM_ADDR, then closing the
> linked subflow just after. The test with the userspace PM on the server
> side is now removing one subflow linked to one address, then sending
> a RM_ADDR for another address. The test with the userspace PM on the
> client side is now only removing the subflow that was previously
> created.
FYI, Sasha has recently queued this patch to v6.6, with a bunch of
dependences.

I'm OK with that, no need to take this version here where I resolved the
conflicts not to take the dependences. But then, please also queue the 2
patches that are needed for new dependences that have been added:

  https://lore.kernel.org/20240904133755.67974-4-matttbe@kernel.org

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

Re: [PATCH 6.6.y] selftests: mptcp: join: cannot rm sf if closed

Posted by Greg KH 2 months, 2 weeks ago

On Wed, Sep 04, 2024 at 03:43:03PM +0200, Matthieu Baerts wrote:
> Hi Greg, Sasha,
> 
> On 03/09/2024 12:18, Matthieu Baerts (NGI0) wrote:
> > commit e93681afcb96864ec26c3b2ce94008ce93577373 upstream.
> > 
> > Thanks to the previous commit, the MPTCP subflows are now closed on both
> > directions even when only the MPTCP path-manager of one peer asks for
> > their closure.
> > 
> > In the two tests modified here -- "userspace pm add & remove address"
> > and "userspace pm create destroy subflow" -- one peer is controlled by
> > the userspace PM, and the other one by the in-kernel PM. When the
> > userspace PM sends a RM_ADDR notification, the in-kernel PM will
> > automatically react by closing all subflows using this address. Now,
> > thanks to the previous commit, the subflows are properly closed on both
> > directions, the userspace PM can then no longer closes the same
> > subflows if they are already closed. Before, it was OK to do that,
> > because the subflows were still half-opened, still OK to send a RM_ADDR.
> > 
> > In other words, thanks to the previous commit closing the subflows, an
> > error will be returned to the userspace if it tries to close a subflow
> > that has already been closed. So no need to run this command, which mean
> > that the linked counters will then not be incremented.
> > 
> > These tests are then no longer sending both a RM_ADDR, then closing the
> > linked subflow just after. The test with the userspace PM on the server
> > side is now removing one subflow linked to one address, then sending
> > a RM_ADDR for another address. The test with the userspace PM on the
> > client side is now only removing the subflow that was previously
> > created.
> FYI, Sasha has recently queued this patch to v6.6, with a bunch of
> dependences.
> 
> I'm OK with that, no need to take this version here where I resolved the
> conflicts not to take the dependences. But then, please also queue the 2
> patches that are needed for new dependences that have been added:
> 
>   https://lore.kernel.org/20240904133755.67974-4-matttbe@kernel.org

Ok, I think I've got this all right for 6.6.y now, if not, please let me
know.

thanks,

greg k-h