From nobody Fri Mar 29 09:53:26 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp1107773jah; Wed, 12 Jan 2022 14:16:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJz57M9He6F8LohviY9dMrRVWYHvZ9+KV6Ipxy28j3Rk7zHBMu7GVOkuMehZtayvkPL48PGw X-Received: by 2002:a37:6354:: with SMTP id x81mr1425066qkb.499.1642025776290; Wed, 12 Jan 2022 14:16:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642025776; cv=none; d=google.com; s=arc-20160816; b=vmmwL+mk0DfNNUN1gbKDmfLXx7w0sFcdanf1tasg7VeFdq33fIGLJISzPL6zLECbG6 H4ZEe+Krm7CQKz3GeAxOX6jeCEvcARfPTxw3j2lwaKojCSCa1Y+Z1v+UlMqvxbfnt9Ua s/ilsAVYchu/mW3pmoMS2lGErzd1Uqz5cCUFsoW4Dk7x+ksH0k/5zvCRwvRlB00MbIT7 WTSkXzOgX0CHKD3oV2nr8bNa85IHMZMJVWl1s/2RWAYxWmBiQf3h3KUb3huWiY5fx0t+ I/6WEGGeW3+XOziFHG7cAEXtxru7ABywtRdfygWv25j7tbQxUlmzunYttPA2yoQ18NmS AR7A== 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=JDsfPJA/xni+6/nmOw4c5ElQRtRQuhdflcNWOw58stM=; b=RCCvvyNYIz8uGgST/5lFofggOaZ7PXRnskSfmoRPqgam2KA2Hr+qje04zMMCeSqvTF moTFpIn6KZ5S2vmcU/h8/FxYPukgdSgRtC/DCaaJp0/YO9mZfBjqhHVTdxuqzwqo0q8F i9O96ySH3Bs1OeGa8IUMrtD3nXNuK3Q0rTa3VNHS50Dw9ngZ7ZM3OnvfzBfVzZ5izLmq n8hzzioNkogllpc6r0KjOr8WRIb0lz7HbuwOXKfJqxsbaNkGR3vX5WMZNDiztFVx+kca tl+nqLnZR50YCYc7Ont1mumRA7CFn+wOzJ9CEJZ4bgENZaRFt8Qhghbbyy8FURoGsCNn LfHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="d86+UgV/"; spf=pass (google.com: domain of mptcp+bounces-3077-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3077-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 m16si483165qtw.731.2022.01.12.14.16.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Jan 2022 14:16:16 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3077-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="d86+UgV/"; spf=pass (google.com: domain of mptcp+bounces-3077-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3077-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 E9C6D1C0BFC for ; Wed, 12 Jan 2022 22:16:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D8B472CA7; Wed, 12 Jan 2022 22:16:12 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 6AEB52CA1 for ; Wed, 12 Jan 2022 22:16:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642025771; x=1673561771; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=nRVymqImLVZUnWJH/FWCAR9ITX7opML5AleHBZilvmc=; b=d86+UgV/J7AQ/FBDbvJSyrvufHLCuC1j0JykVj5M+eMc5oY7WxfqJPaf vlmJ1s+xy/Je3rg2ZHL/PU7UsrAc/P9faIae3s46//Mc/ccYID6dFNtoI f5YoqVf5xqvdQu5TMIZuSFLRmlAi9XPMwd9dLuQ/ZFfp59VZtaSaq/leP Sbyp40EyUl5GlFOkJfWFMvPb4/l8ALv5xlmP/jzDgVJ5t1JFNcOr46C7Z y954I7syeCpbAm6u5mlmjN17YVIhQNowCxxx2gGMTE7WOunZz3cH8UqyR JCom1vlrIu/MiXXXbyjb6KBzYWruTVKILl98kZ3gsmskAhjHzYrb0xWeP g==; X-IronPort-AV: E=McAfee;i="6200,9189,10225"; a="307213930" X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="307213930" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2022 14:16:07 -0800 X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="490907336" Received: from otc-tsn-4.jf.intel.com ([10.23.153.135]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2022 14:16:07 -0800 From: Kishen Maloor To: kishen.maloor@intel.com, mptcp@lists.linux.dev Subject: [PATCH mptcp-next v2 03/21] mptcp: reflect remote port (not 0) in ANNOUNCED events Date: Wed, 12 Jan 2022 17:15:05 -0500 Message-Id: <20220112221523.1829397-4-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220112221523.1829397-1-kishen.maloor@intel.com> References: <20220112221523.1829397-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 --- net/mptcp/options.c | 2 +- net/mptcp/pm.c | 5 +++-- net/mptcp/pm_netlink.c | 8 ++++++-- net/mptcp/protocol.h | 6 ++++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 7a6a39b71633..cceba8c7806d 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1123,7 +1123,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(msk, &mp_opt.addr, sk); 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 5f35fe8a5e82..db889ff60326 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -204,14 +204,15 @@ void mptcp_pm_subflow_check_next(struct mptcp_sock *m= sk, const struct sock *ssk, } =20 void mptcp_pm_add_addr_received(struct mptcp_sock *msk, - const struct mptcp_addr_info *addr) + const struct mptcp_addr_info *addr, + const struct sock *ssk) { 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(msk, addr, ssk); =20 spin_lock_bh(&pm->lock); =20 diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index f12effa71942..fc07ab9a53ba 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1933,7 +1933,8 @@ void mptcp_event_addr_removed(const struct mptcp_sock= *msk, uint8_t id) } =20 void mptcp_event_addr_announced(const struct mptcp_sock *msk, - const struct mptcp_addr_info *info) + const struct mptcp_addr_info *info, + const struct sock *ssk) { struct net *net =3D sock_net((const struct sock *)msk); struct nlmsghdr *nlh; @@ -1957,7 +1958,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 ? + ((struct inet_sock *)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 d1b46c0d8c40..e2a67d3469f6 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -752,7 +752,8 @@ 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, - const struct mptcp_addr_info *addr); + const struct mptcp_addr_info *addr, + const struct sock *ssk); void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, struct mptcp_addr_info *addr); void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk); @@ -780,7 +781,8 @@ 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 mptcp_sock *msk, const struct= mptcp_addr_info *info, + const struct sock *ssk); void mptcp_event_addr_removed(const struct mptcp_sock *msk, u8 id); =20 static inline bool mptcp_pm_should_add_signal(struct mptcp_sock *msk) --=20 2.31.1