From nobody Mon Feb 9 13:57:26 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:2248:0:0:0:0 with SMTP id m8csp375679jas; Thu, 27 Jan 2022 16:38:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJx3/xDAgRoIjY1tfAEnKi/nh8WJFES2tDAtTk4Eus8F+YHywCV4sRlYja4LwqN0f3s11Cqz X-Received: by 2002:a05:6a00:140d:: with SMTP id l13mr5304608pfu.22.1643330327479; Thu, 27 Jan 2022 16:38:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643330327; cv=none; d=google.com; s=arc-20160816; b=mgfe/YYigGqf6RqXLa4m/NgrKiu2SIaGpPtEByjPqD6qarW9yivrSyX4NdFYz+9O9Y s7GcMG9VCW5+2ufNJD9FCzXF+IqVH6k22JKjf0XKJJfVg6I2Iq3PCPY0CUoY1byr2gkh h0Ry6prddd1pmyRLm0EyVzv8QEIOumBQviXD5SrR0p3F6UDsHqVMAUZKFlayAt6ZSKcT shlwXjv80keb+iumKf8X2QWqwHWG7fB4dwA71qNPbKh/GXtzzt+AUZC0ZSPEMg8BckTs qdxn/0ez/Nm++54RSH4uSW83AGF8YzoZHKan9TAg92GVF99yj1scfwz1U6CzjX1wZFxW x6tA== 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=uhbf2xrlYF5pPPqNhh2qLmdACx+ZsgqlOAlGc1WYjoI=; b=rMHv/wh1x/EGD3XuJkEMyMLPbnBMy13UYys6XH7Jekewyq9XXk/es3E2M57SyJnUgl XU3lIStT6VcY+LIBoC39hbDgSByqqXfAv8ZPvvCIrMcN5MBkQ4+H32no06TRvznRSENz N9Knz4/W9ai4hZpeHigFWsPZYX59GlFEnXms4jdecAhLBrlVQ+eqTDpLseLJeIVPO6jZ vim/Jj59qIJTa+kxuBRJUglxfkFKDvt1xp70TRCXyf01lnkZ1LknTfGnYB49Rr3DlJvI lrsdLDY06QVfycvT5yENOlfjFnrnaD2enjrIfZrOuT5FlJgx4ZW6diVGiPZUE4w122CN /oaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=MzR8h9Zk; spf=pass (google.com: domain of mptcp+bounces-3339-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3339-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id o9si3363199plc.371.2022.01.27.16.38.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Jan 2022 16:38:47 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3339-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=MzR8h9Zk; spf=pass (google.com: domain of mptcp+bounces-3339-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3339-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 sjc.edge.kernel.org (Postfix) with ESMTPS id 485603E0F66 for ; Fri, 28 Jan 2022 00:38:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 21F272C9D; Fri, 28 Jan 2022 00:38:46 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 04CF42CA8 for ; Fri, 28 Jan 2022 00:38:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643330324; x=1674866324; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=cYeX4s+nxyI9LTlzy6F5vVs2+ZHT91AU5jh/Uoo/C5I=; b=MzR8h9ZknljFsHdPCNvs1XeMHC6/MgJe6tFaciBL4L8J/XHKJSOX/pko k7qKFpGY2Mvb0itVpXFu6lVkAswyOQlGymJVdaJIcP4gAAZpceuET6IrY 0aOebeiVb++lZEv11jBq86yS5m8fE6FxWtmPooXHT5pZaCJ8/lukaNtUN sn8akiCnYasx6UtXhHfTwBQ2Q0q4aBXCwthCXXJt0Qr9RUydTryymAgfz Pa6BbsrBYou9ClI39BN6/toplepN+EoTq1aNw8U+3z9peoGZDUvgCQhur BKJM/UwKQZ14anPewYA1qTJyIRowMIJYQyPf8bSp7BvmmKQlCjXyd4uZ6 A==; X-IronPort-AV: E=McAfee;i="6200,9189,10239"; a="245846914" X-IronPort-AV: E=Sophos;i="5.88,322,1635231600"; d="scan'208";a="245846914" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jan 2022 16:38:24 -0800 X-IronPort-AV: E=Sophos;i="5.88,322,1635231600"; d="scan'208";a="564000997" Received: from otc-tsn-4.jf.intel.com ([10.23.153.135]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jan 2022 16:38:20 -0800 From: Kishen Maloor To: kishen.maloor@intel.com, mptcp@lists.linux.dev Subject: [PATCH mptcp-next v3 3/8] mptcp: reflect remote port (not 0) in ANNOUNCED events Date: Thu, 27 Jan 2022 19:38:07 -0500 Message-Id: <20220128003812.2732609-4-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220128003812.2732609-1-kishen.maloor@intel.com> References: <20220128003812.2732609-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 0d0d2eb8c8ca..0d3c8f7e5be6 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1132,7 +1132,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 6b6220895929..e5d5cb847209 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -200,14 +200,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 93800f32fcb6..f90e77c3775d 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1972,7 +1972,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; @@ -1996,7 +1997,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 c47d69a42fcb..d20c65fcba89 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -753,7 +753,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); @@ -781,7 +782,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