From nobody Mon Feb 9 19:05:16 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1788:b0:4ac:5e5b:1ad1 with SMTP id y8csp619145piq; Mon, 28 Mar 2022 19:14:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyf5cZi+4BP3G99FhvnOj+f9JqskSPpVD3Cv91In+XF6dRL9WUG6hM6Dun7Kp0iy7v5X+zN X-Received: by 2002:a17:906:4ad0:b0:6e0:12aa:a911 with SMTP id u16-20020a1709064ad000b006e012aaa911mr31943393ejt.455.1648520057970; Mon, 28 Mar 2022 19:14:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648520057; cv=none; d=google.com; s=arc-20160816; b=KHPz7vmg7Rlyn/tVrJ+8MlAfkYqC5YM2mh6pZw51g5Zs5Imtl6SsBCladPpK739oBZ aU+kq3Su330F8qXMArV2YlEeJiFlxL8QH9YWnCKL3NV7rZajDTV7s2fB8fQtHsldaEwe eQp1NPI6dBo2j91uK7d4orJ3AloSqMAbLaPFfRrPEDr5INxVgXMFyFSIuRUkg5WHx8Du 50rVvQQZFdfqYoDvI9MDRs2x6fVco075Wljf46rWLCBF12WLZBTnsaplZZ5z3YH3usQw hS2TWUEoy5kk1n534P8p/FuYSbFkKI8i4rgvFnPrqsgqfn/z/YHY/k2CCB70aSTHRLv8 oE/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=Y3b+YywSPJMNw5eSoxJwmA0BxK5znj8p7jPyjeljeRE=; b=WuG7BVjLaPP//B9ArM9pU+TLHMEY0Iu25xxQbgmZnY7jXmNV5UiQefhoNSZZ/R6WQr 4UBNhw5luCHMTehfT2X4PDpY/cJ/oRFlEcZAWPiE6QAEhfBhaxlPhmy1VUCPWQazl2oh 7MJPKU2iwOMGQ8ACd69j5e0hhCtGWL8o5wNhjcVGcB5EQOtXkjCnfw8+GTE7aYQvYpMT BF1vLHc8wk2VP4q4UUrjCVRvdFFpvBMrk8wD/2tRxVx0yRfZVqO6rG6SwjP0+lhtoUNa hmGcYtJdM0AJjARzdtbDJByKMFNvBPnErBuoVdS/NEBb2oNtotXYTRqi2vv5TyIX/LzN cfTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=S6sg2I7Y; spf=pass (google.com: domain of mptcp+bounces-4491-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4491-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id nb21-20020a1709071c9500b006e0003920d0si22421234ejc.405.2022.03.28.19.14.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Mar 2022 19:14:17 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4491-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=S6sg2I7Y; spf=pass (google.com: domain of mptcp+bounces-4491-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4491-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id D299D1C0A77 for ; Tue, 29 Mar 2022 02:14:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7F6D120EB; Tue, 29 Mar 2022 02:14:13 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 1049220E5 for ; Tue, 29 Mar 2022 02:14:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648520052; x=1680056052; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=M8VFKEXFq01Bzu5rjwUUaGZPLEnPWvxibr49JsGr9Tg=; b=S6sg2I7Yg7Zcdhcl/X035hmtBgsaLNApB8Sw2jBORp8rJfmbgjUk+nhy PKALkJV5rldmEQyn4Jv+C/5lBJ8YgY9+I4TKhz6sh+qORj5eLEQ22bUX6 4KE90RtvlY8ljUlqYRL7VvIZBuq7q2/WzHC9eIamYCc0Tq+Lkxs3nN+8H etxthkE/0GJ3MCZvKPWAp2I9Rnlbu4dE0JnPh04pfVm4hjW6/92Y9JCig uT4sbOj9ViwAwclzHTCfbVueilw1JKGtUeiftlRCW3jJ/fWTnjLG9e489 pcRnpYkT34bGubuIgGOG59iJbYlYkIUQzgVgkrdXpabZnL47SigOgWVGA A==; X-IronPort-AV: E=McAfee;i="6200,9189,10300"; a="345578745" X-IronPort-AV: E=Sophos;i="5.90,219,1643702400"; d="scan'208";a="345578745" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2022 19:14:08 -0700 X-IronPort-AV: E=Sophos;i="5.90,219,1643702400"; d="scan'208";a="564202547" Received: from otc-tsn-4.jf.intel.com ([10.23.153.135]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2022 19:14:08 -0700 From: Kishen Maloor To: kishen.maloor@intel.com, mptcp@lists.linux.dev Subject: [PATCH mptcp-next v9 4/6] mptcp: reflect remote port (not 0) in ANNOUNCED events Date: Mon, 28 Mar 2022 22:13:59 -0400 Message-Id: <20220329021401.1196466-5-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220329021401.1196466-1-kishen.maloor@intel.com> References: <20220329021401.1196466-1-kishen.maloor@intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Per RFC 8684, if no port is specified in an ADD_ADDR message, MPTCP SHOULD attempt to connect to the specified address on the same port as the port that is already in use by the subflow on which the ADD_ADDR signal was sent. To facilitate that, this change reflects the specific remote port in use by that subflow in MPTCP_EVENT_ANNOUNCED events. Signed-off-by: Kishen Maloor --- v9: removed explicit 'struct inet_sock *' cast. --- net/mptcp/options.c | 2 +- net/mptcp/pm.c | 6 ++++-- net/mptcp/pm_netlink.c | 11 ++++++++--- net/mptcp/protocol.h | 4 ++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 88f4ebbd6515..c9625fea3ef9 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1133,7 +1133,7 @@ bool mptcp_incoming_options(struct sock *sk, struct s= k_buff *skb) if ((mp_opt.suboptions & OPTION_MPTCP_ADD_ADDR) && add_addr_hmac_valid(msk, &mp_opt)) { if (!mp_opt.echo) { - mptcp_pm_add_addr_received(msk, &mp_opt.addr); + mptcp_pm_add_addr_received(sk, &mp_opt.addr); MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ADDADDR); } else { mptcp_pm_add_addr_echoed(msk, &mp_opt.addr); diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 8df9cb28d970..5d6832c4d9f2 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -200,15 +200,17 @@ void mptcp_pm_subflow_check_next(struct mptcp_sock *m= sk, const struct sock *ssk, spin_unlock_bh(&pm->lock); } =20 -void mptcp_pm_add_addr_received(struct mptcp_sock *msk, +void mptcp_pm_add_addr_received(const struct sock *ssk, const struct mptcp_addr_info *addr) { + struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); + struct mptcp_sock *msk =3D mptcp_sk(subflow->conn); struct mptcp_pm_data *pm =3D &msk->pm; =20 pr_debug("msk=3D%p remote_id=3D%d accept=3D%d", msk, addr->id, READ_ONCE(pm->accept_addr)); =20 - mptcp_event_addr_announced(msk, addr); + mptcp_event_addr_announced(ssk, addr); =20 spin_lock_bh(&pm->lock); =20 diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 491aedc486f1..6b555b20fd6f 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -2012,10 +2012,12 @@ void mptcp_event_addr_removed(const struct mptcp_so= ck *msk, uint8_t id) kfree_skb(skb); } =20 -void mptcp_event_addr_announced(const struct mptcp_sock *msk, +void mptcp_event_addr_announced(const struct sock *ssk, const struct mptcp_addr_info *info) { - struct net *net =3D sock_net((const struct sock *)msk); + struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); + struct mptcp_sock *msk =3D mptcp_sk(subflow->conn); + struct net *net =3D sock_net(ssk); struct nlmsghdr *nlh; struct sk_buff *skb; =20 @@ -2037,7 +2039,10 @@ void mptcp_event_addr_announced(const struct mptcp_s= ock *msk, if (nla_put_u8(skb, MPTCP_ATTR_REM_ID, info->id)) goto nla_put_failure; =20 - if (nla_put_be16(skb, MPTCP_ATTR_DPORT, info->port)) + if (nla_put_be16(skb, MPTCP_ATTR_DPORT, + info->port =3D=3D 0 ? + inet_sk(ssk)->inet_dport : + info->port)) goto nla_put_failure; =20 switch (info->family) { diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 85390146944d..a762b789f5ab 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -753,7 +753,7 @@ void mptcp_pm_subflow_established(struct mptcp_sock *ms= k); bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk); void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock= *ssk, const struct mptcp_subflow_context *subflow); -void mptcp_pm_add_addr_received(struct mptcp_sock *msk, +void mptcp_pm_add_addr_received(const struct sock *ssk, const struct mptcp_addr_info *addr); void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, const struct mptcp_addr_info *addr); @@ -782,7 +782,7 @@ int mptcp_pm_remove_subflow(struct mptcp_sock *msk, con= st struct mptcp_rm_list * =20 void mptcp_event(enum mptcp_event_type type, const struct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp); -void mptcp_event_addr_announced(const struct mptcp_sock *msk, const struct= mptcp_addr_info *info); +void mptcp_event_addr_announced(const struct sock *ssk, const struct mptcp= _addr_info *info); void mptcp_event_addr_removed(const struct mptcp_sock *msk, u8 id); bool mptcp_userspace_pm_active(const struct mptcp_sock *msk); =20 --=20 2.31.1