Commit 0cd55ef9 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'mptcp-fix-inconsistent-backup-usage' 



Matthieu Baerts says:

====================
mptcp: fix inconsistent backup usage

In all the MPTCP backup related tests, the backup flag was set on one
side, and the expected behaviour is to have both sides respecting this
decision. That's also the "natural" way, and what the users seem to
expect.

On the scheduler side, only the 'backup' field was checked, which is
supposed to be set only if the other peer flagged a subflow as backup.
But in various places, this flag was also set when the local host
flagged the subflow as backup, certainly to have the expected behaviour
mentioned above.

Patch 1 modifies the packet scheduler to check if the backup flag has
been set on both directions, not to change its behaviour after having
applied the following patches. That's what the default packet scheduler
should have done since the beginning in v5.7.

Patch 2 fixes the backup flag being mirrored on the MPJ+SYN+ACK by
accident since its introduction in v5.7. Instead, the received and sent
backup flags are properly distinguished in requests.

Patch 3 stops setting the received backup flag as well when sending an
MP_PRIO, something that was done since the MP_PRIO support in v5.12.

Patch 4 adds related and missing MIB counters to be able to easily check
if MP_JOIN are sent with a backup flag. Certainly because these counters
were not there, the behaviour that is fixed by patches here was not
properly verified.

Patch 5 validates the previous patch by extending the MPTCP Join
selftest.

Patch 6 fixes the backup support in signal endpoints: if a signal
endpoint had the backup flag, it was not set in the MPJ+SYN+ACK as
expected. It was only set for ongoing connections, but not future ones
as expected, since the introduction of the backup flag in endpoints in
v5.10.

Patch 7 validates the previous patch by extending the MPTCP Join
selftest as well.

Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
---
Matthieu Baerts (NGI0) (7):
      mptcp: sched: check both directions for backup
      mptcp: distinguish rcv vs sent backup flag in requests
      mptcp: pm: only set request_bkup flag when sending MP_PRIO
      mptcp: mib: count MPJ with backup flag
      selftests: mptcp: join: validate backup in MPJ
      mptcp: pm: fix backup support in signal endpoints
      selftests: mptcp: join: check backup support in signal endp

 include/trace/events/mptcp.h                    |  2 +-
 net/mptcp/mib.c                                 |  2 +
 net/mptcp/mib.h                                 |  2 +
 net/mptcp/options.c                             |  2 +-
 net/mptcp/pm.c                                  | 12 +++++
 net/mptcp/pm_netlink.c                          | 19 ++++++-
 net/mptcp/pm_userspace.c                        | 18 +++++++
 net/mptcp/protocol.c                            | 10 ++--
 net/mptcp/protocol.h                            |  4 ++
 net/mptcp/subflow.c                             | 10 ++++
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 72 ++++++++++++++++++++-----
 11 files changed, 132 insertions(+), 21 deletions(-)
====================

Link: https://patch.msgid.link/20240727-upstream-net-20240727-mptcp-backup-signal-v1-0-f50b31604cf1@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 039564d2 f833470c

include/trace/events/mptcp.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ TRACE_EVENT(mptcp_subflow_get_send, 
		struct sock *ssk;



		__entry->active = mptcp_subflow_active(subflow);

		__entry->backup = subflow->backup;

		__entry->backup = subflow->backup || subflow->request_bkup;



		if (subflow->tcp_sock && sk_fullsock(subflow->tcp_sock))

			__entry->free = sk_stream_memory_free(subflow->tcp_sock);

net/mptcp/mib.c

+2 −0
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ static const struct snmp_mib mptcp_snmp_list[] = { 
	SNMP_MIB_ITEM("MPTCPRetrans", MPTCP_MIB_RETRANSSEGS),

	SNMP_MIB_ITEM("MPJoinNoTokenFound", MPTCP_MIB_JOINNOTOKEN),

	SNMP_MIB_ITEM("MPJoinSynRx", MPTCP_MIB_JOINSYNRX),

	SNMP_MIB_ITEM("MPJoinSynBackupRx", MPTCP_MIB_JOINSYNBACKUPRX),

	SNMP_MIB_ITEM("MPJoinSynAckRx", MPTCP_MIB_JOINSYNACKRX),

	SNMP_MIB_ITEM("MPJoinSynAckBackupRx", MPTCP_MIB_JOINSYNACKBACKUPRX),

	SNMP_MIB_ITEM("MPJoinSynAckHMacFailure", MPTCP_MIB_JOINSYNACKMAC),

	SNMP_MIB_ITEM("MPJoinAckRx", MPTCP_MIB_JOINACKRX),

	SNMP_MIB_ITEM("MPJoinAckHMacFailure", MPTCP_MIB_JOINACKMAC),

net/mptcp/mib.h

+2 −0
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ enum linux_mptcp_mib_field { 
	MPTCP_MIB_RETRANSSEGS,		/* Segments retransmitted at the MPTCP-level */

	MPTCP_MIB_JOINNOTOKEN,		/* Received MP_JOIN but the token was not found */

	MPTCP_MIB_JOINSYNRX,		/* Received a SYN + MP_JOIN */

	MPTCP_MIB_JOINSYNBACKUPRX,	/* Received a SYN + MP_JOIN + backup flag */

	MPTCP_MIB_JOINSYNACKRX,		/* Received a SYN/ACK + MP_JOIN */

	MPTCP_MIB_JOINSYNACKBACKUPRX,	/* Received a SYN/ACK + MP_JOIN + backup flag */

	MPTCP_MIB_JOINSYNACKMAC,	/* HMAC was wrong on SYN/ACK + MP_JOIN */

	MPTCP_MIB_JOINACKRX,		/* Received an ACK + MP_JOIN */

	MPTCP_MIB_JOINACKMAC,		/* HMAC was wrong on ACK + MP_JOIN */

net/mptcp/options.c

+1 −1
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ bool mptcp_synack_options(const struct request_sock *req, unsigned int *size, 
		return true;

	} else if (subflow_req->mp_join) {

		opts->suboptions = OPTION_MPTCP_MPJ_SYNACK;

		opts->backup = subflow_req->backup;

		opts->backup = subflow_req->request_bkup;

		opts->join_id = subflow_req->local_id;

		opts->thmac = subflow_req->thmac;

		opts->nonce = subflow_req->local_nonce;

net/mptcp/pm.c

+12 −0
Original line number Diff line number Diff line
@@ -426,6 +426,18 @@ int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc) 
	return mptcp_pm_nl_get_local_id(msk, &skc_local);

}



bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc)

{

	struct mptcp_addr_info skc_local;



	mptcp_local_address((struct sock_common *)skc, &skc_local);



	if (mptcp_pm_is_userspace(msk))

		return mptcp_userspace_pm_is_backup(msk, &skc_local);



	return mptcp_pm_nl_is_backup(msk, &skc_local);

}



int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id,

					 u8 *flags, int *ifindex)

{