From nobody Thu Sep 19 00:59:57 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B3A06BFC0 for ; Tue, 16 Jul 2024 20:53:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721163209; cv=none; b=BEu+nOgZP4TSRQovKUkNZSjkrt85iy2irom40405OTSa/epKmCUP3rUvCMiixSVDi0wsAwJ29k2TQwzT1S/NYY19ye3ESlBaP6I7NlXhoKHrv3QuUabPZ+6rwyxNmrTo8uBxYYX+b0qhfiF7ixxKKsL3j9rtm+TpEVeO5EBKJj0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721163209; c=relaxed/simple; bh=gBK2JdnwdsBPpyEW31JDq9vWPONErvqy6/WDuyAgm3E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gldsBgQ691kv3nS0SQ4vKqpuRl2KLD1wbOusUNs9MhM5ahiKn23wfvdL10AJortgbo93jLv8va2fRUlUw6V1HWc3d5zYPpjOneZ2WK4aKQrWh0CcwNaigthL3spnyZektYgr8CBejND6fGqSxeXYfLGTF3ZEHlZ79z1/e48orlw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PE/leZQ2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PE/leZQ2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A65CDC4AF0E; Tue, 16 Jul 2024 20:53:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721163209; bh=gBK2JdnwdsBPpyEW31JDq9vWPONErvqy6/WDuyAgm3E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=PE/leZQ2GjSRHO6D1dRbQ0gCbw4BHmYxOMYhu96kfEmNE1sutQmjXSLeh7KRyeC16 WTHwDveJljjLygKMtLKitfUuaKIH47bvE1+w98YyghxiZbsbYwC4WVctZYLunLTJn+ XbxeN6qCzAHCOx92pWcs3Szmo4GXcLNP7MdCZp2J6WncmNuYRAvSQWF/GGqf05FTaa 3Hk/IpWvzy97c+i649pTYPBd+U78QJRsclPLyrNcjXagvFzIWuv3laXjQ2Y/5zqAt7 g3SvtKrE5LL83ocYd2fUD9+Qf671/O4561TNYCvgWpVDhkUd+Kw4fEfM+d9FEO6mxN OimmejBaBIlow== From: "Matthieu Baerts (NGI0)" Date: Tue, 16 Jul 2024 22:53:18 +0200 Subject: [PATCH mptcp-net v2 6/9] mptcp: pm: fix backup support in signal endpoints Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240716-mptcp-backup-mpj-v2-6-4d50247405fb@kernel.org> References: <20240716-mptcp-backup-mpj-v2-0-4d50247405fb@kernel.org> In-Reply-To: <20240716-mptcp-backup-mpj-v2-0-4d50247405fb@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=9760; i=matttbe@kernel.org; h=from:subject:message-id; bh=gBK2JdnwdsBPpyEW31JDq9vWPONErvqy6/WDuyAgm3E=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmlt3BKn4bAjifVUKBrQKM6FbdpWv+5516r7xZS UqyXvqV2e+JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZpbdwQAKCRD2t4JPQmmg c1ljEACsI3YrfXKki4Vh555HqZGd9WNJ7zU9Xh26p8ljBqnA+sBb/j3NCtIyrU+WAcy7JaqGGkE TI/eAr4HGjuMcfifAWLgtUcm6P2aftabPi7N87ykjYaePH75Z2q/XO163xsMBTacAilF+1DJKBm 3OMN+PH6m7mN6+1ktM/Md37N/3U6nLuFUdX/BZndjrsIwUUBJHVF1IqcSmM2d2nSKibmsRXPxzQ n4yD/bSNLn0qCPYPoGFGI/gJAoHwDBQxs0XNV/vybqxyN2sjD8ML+xjbUzUpg36BL8xlk9WsJyv Wu0nLANFFk9Z0sXYlifRbwDYVr0hpHnu2GrjQL3FaDAfeFkTg3Z55cgmCId2BGAdxLFlY3nk7s2 CoRwJQT0/RExiltz+HkXRdksFN3jSf8fZ6fiUgOLU7CKNWFbDScNsF7FBT5IGXnqp/hjM1hAQEM 57OJUl/u9cNnNhlDZPkLGAqds8/aCSgezfjee87/uxVDA6+5v0jdpF2d1bW7TDiYNyH+nviY649 JXLNbJWMiS9GYjfnlt/Jhzu+/mA53x3gdQiny4/BqphQNZgA1UaVcudLajzjbUklWIzwZ/LY1pb D/lXhuoPceMmlKqegn5EsRhFAx60lpGqo3eIVY7nDEZDFxpeuolvIjZLSvqGjDd6fHTmyHio+1D qPBID2reZjHfQWA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 There was a support for signal endpoints, but only when the endpoint's flag was changed during a connection. If an endpoint with the signal and backup was already present, the MP_JOIN reply was not containing the backup flag as expected. That's confusing to have this inconsistent behaviour. On the other hand, the infrastructure to set the backup flag in the SYN + ACK + MP_JOIN was already there, it was just never set before. Now when requesting the local ID from the path-manager, the backup status is also requested. There is a special case for the ID0: the PM has to return this ID0 if the local address of the initial subflow is being used, and not the ID of the related endpoint. Still, it is required to look at the different endpoints to find if one has been defined for this address with the backup flag. Note that when the userspace PM is used, the backup flag can be set if the local address was already used before with a backup flag, e.g. if the address was announced with the 'backup' flag, or a subflow was created with the 'backup' flag. Fixes: 4596a2c1b7f5 ("mptcp: allow creating non-backup subflows") Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/507 Signed-off-by: Matthieu Baerts (NGI0) --- Notes: - v2: - Only set *backup on success (Mat). - Support MPJ to/from ID0 with backup. - Split the tests in a new dedicated commit to ease the backports. --- net/mptcp/pm.c | 15 +++++++++++---- net/mptcp/pm_netlink.c | 23 ++++++++++++++++++++++- net/mptcp/pm_userspace.c | 25 +++++++++++++++++++++++-- net/mptcp/protocol.h | 11 ++++++++--- net/mptcp/subflow.c | 9 +++++++-- 5 files changed, 71 insertions(+), 12 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 55406720c607..359738b8826e 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -405,7 +405,8 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, un= signed int remaining, return ret; } =20 -int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc) +int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc, + bool *backup) { struct mptcp_addr_info skc_local; struct mptcp_addr_info msk_local; @@ -418,12 +419,18 @@ int mptcp_pm_get_local_id(struct mptcp_sock *msk, str= uct sock_common *skc) */ mptcp_local_address((struct sock_common *)msk, &msk_local); mptcp_local_address((struct sock_common *)skc, &skc_local); - if (mptcp_addresses_equal(&msk_local, &skc_local, false)) + if (mptcp_addresses_equal(&msk_local, &skc_local, false)) { + if (mptcp_pm_is_userspace(msk)) + *backup =3D mptcp_userspace_pm_is_backup(msk, &skc_local); + else + *backup =3D mptcp_pm_nl_is_backup(msk, &skc_local); + return 0; + } =20 if (mptcp_pm_is_userspace(msk)) - return mptcp_userspace_pm_get_local_id(msk, &skc_local); - return mptcp_pm_nl_get_local_id(msk, &skc_local); + return mptcp_userspace_pm_get_local_id(msk, &skc_local, backup); + return mptcp_pm_nl_get_local_id(msk, &skc_local, backup); } =20 int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned = int id, diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 7635fac91539..796800a7fe96 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1064,7 +1064,8 @@ static int mptcp_pm_nl_create_listen_socket(struct so= ck *sk, return err; } =20 -int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_inf= o *skc) +int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_inf= o *skc, + bool *backup) { struct mptcp_pm_addr_entry *entry; struct pm_nl_pernet *pernet; @@ -1076,6 +1077,7 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, = struct mptcp_addr_info *skc list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) { if (mptcp_addresses_equal(&entry->addr, skc, entry->addr.port)) { ret =3D entry->addr.id; + *backup =3D !!(entry->flags & MPTCP_PM_ADDR_FLAG_BACKUP); break; } } @@ -1094,6 +1096,7 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, = struct mptcp_addr_info *skc entry->ifindex =3D 0; entry->flags =3D MPTCP_PM_ADDR_FLAG_IMPLICIT; entry->lsk =3D NULL; + *backup =3D false; ret =3D mptcp_pm_nl_append_new_local_addr(pernet, entry, true); if (ret < 0) kfree(entry); @@ -1101,6 +1104,24 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk,= struct mptcp_addr_info *skc return ret; } =20 +bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info = *skc) +{ + struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); + struct mptcp_pm_addr_entry *entry; + bool backup =3D false; + + rcu_read_lock(); + list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) { + if (mptcp_addresses_equal(&entry->addr, skc, entry->addr.port)) { + backup =3D !!(entry->flags & MPTCP_PM_ADDR_FLAG_BACKUP); + break; + } + } + rcu_read_unlock(); + + return backup; +} + #define MPTCP_PM_CMD_GRP_OFFSET 0 #define MPTCP_PM_EV_GRP_OFFSET 1 =20 diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index f0a4590506c6..4e3829f96c88 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -137,7 +137,7 @@ int mptcp_userspace_pm_get_flags_and_ifindex_by_id(stru= ct mptcp_sock *msk, } =20 int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, - struct mptcp_addr_info *skc) + struct mptcp_addr_info *skc, bool *backup) { struct mptcp_pm_addr_entry *entry =3D NULL, *e, new_entry; __be16 msk_sport =3D ((struct inet_sock *) @@ -151,13 +151,16 @@ int mptcp_userspace_pm_get_local_id(struct mptcp_sock= *msk, } } spin_unlock_bh(&msk->pm.lock); - if (entry) + if (entry) { + *backup =3D !!(entry->flags & MPTCP_PM_ADDR_FLAG_BACKUP); return entry->addr.id; + } =20 memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry)); new_entry.addr =3D *skc; new_entry.addr.id =3D 0; new_entry.flags =3D MPTCP_PM_ADDR_FLAG_IMPLICIT; + *backup =3D false; =20 if (new_entry.addr.port =3D=3D msk_sport) new_entry.addr.port =3D 0; @@ -165,6 +168,24 @@ int mptcp_userspace_pm_get_local_id(struct mptcp_sock = *msk, return mptcp_userspace_pm_append_new_local_addr(msk, &new_entry, true); } =20 +bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, + struct mptcp_addr_info *skc) +{ + struct mptcp_pm_addr_entry *entry; + bool backup =3D false; + + spin_lock_bh(&msk->pm.lock); + list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { + if (mptcp_addresses_equal(&entry->addr, skc, false)) { + backup =3D !!(entry->flags & MPTCP_PM_ADDR_FLAG_BACKUP); + break; + } + } + spin_unlock_bh(&msk->pm.lock); + + return backup; +} + int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info) { struct nlattr *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 6b6b76152db5..e6cc7111f843 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1111,9 +1111,14 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk= , const struct sk_buff *skb, bool *drop_other_suboptions); bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remainin= g, struct mptcp_rm_list *rm_list); -int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc); -int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_inf= o *skc); -int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, struct mptcp_a= ddr_info *skc); +int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc, + bool *backup); +int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_inf= o *skc, + bool *backup); +int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, struct mptcp_a= ddr_info *skc, + bool *backup); +bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info = *skc); +bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, struct mptcp_add= r_info *skc); int mptcp_pm_dump_addr(struct sk_buff *msg, struct netlink_callback *cb); int mptcp_pm_nl_dump_addr(struct sk_buff *msg, struct netlink_callback *cb); diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index be406197b1c4..e60ba0327e4d 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -87,6 +87,7 @@ static struct mptcp_sock *subflow_token_join_request(stru= ct request_sock *req) struct mptcp_subflow_request_sock *subflow_req =3D mptcp_subflow_rsk(req); struct mptcp_sock *msk; int local_id; + bool backup; =20 msk =3D mptcp_token_get_sock(sock_net(req_to_sk(req)), subflow_req->token= ); if (!msk) { @@ -94,12 +95,13 @@ static struct mptcp_sock *subflow_token_join_request(st= ruct request_sock *req) return NULL; } =20 - local_id =3D mptcp_pm_get_local_id(msk, (struct sock_common *)req); + local_id =3D mptcp_pm_get_local_id(msk, (struct sock_common *)req, &backu= p); if (local_id < 0) { sock_put((struct sock *)msk); return NULL; } subflow_req->local_id =3D local_id; + subflow_req->request_bkup =3D backup; =20 return msk; } @@ -610,16 +612,19 @@ static int subflow_chk_local_id(struct sock *sk) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(sk); struct mptcp_sock *msk =3D mptcp_sk(subflow->conn); + bool backup; int err; =20 if (likely(subflow->local_id >=3D 0)) return 0; =20 - err =3D mptcp_pm_get_local_id(msk, (struct sock_common *)sk); + err =3D mptcp_pm_get_local_id(msk, (struct sock_common *)sk, &backup); if (err < 0) return err; =20 subflow_set_local_id(subflow, err); + subflow->request_bkup =3D backup; + return 0; } =20 --=20 2.45.2