From nobody Wed Dec 4 19:11:28 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 D1BDD17B418; Mon, 12 Aug 2024 12:38:41 +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=1723466323; cv=none; b=XozM2p5Jf590172G+ujMwZnMPTYmqx8JU+4dYqkWvRNdhWk4dvlckoM3xWm92/UjaxI6bg92sqPOTgLoDjxweZEO9SpC5Kuju6H5NbbzqM5hBY2Wl/MOuQGQUX/8CNSuDdJfSyZiBJ75ar6rBFatsNn2LElgLpiTGXjs9jLl7ME= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723466323; c=relaxed/simple; bh=eQJLbMCUfJNOipPY5/M1AZOC0spPktkcBzZQGD+4/rU=; h=Subject:To:Cc:From:Date:In-Reply-To:Message-ID:MIME-Version: Content-Type; b=t+hZLLDQLB81PlTBKR2rRVzplX0svYeaSjm1enx43l91Frvds7phdzR0qSUDJkPx1KAbBWIBb8oJm0n5Grpcw7fDrIHjnPBrMX9782Cp0vkW54DDxq0Ua/glLvg4LnkMwCVIfYH026bAmCUaXbvKHFp/UjYrCIwNn5unCrq+OIY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yIf05Wy/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="yIf05Wy/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0513AC32782; Mon, 12 Aug 2024 12:38:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723466321; bh=eQJLbMCUfJNOipPY5/M1AZOC0spPktkcBzZQGD+4/rU=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=yIf05Wy/e7OmS2IQdYiw5bjhphFSwyUk9goTccjm8zFsTjNUS9+pbEBNfH4jbH8Lq ZR3UALmGE6biTK0phFYNv6lo58qgEDilKT7aIE7tDqqw5GrBAGwvZCK51dAg+Thx39 qNIf4/0RYk9qlo4lAA+VH2CtB3OmTKtc3PKt3wFc= Subject: Patch "mptcp: export local_address" has been added to the 5.15-stable tree To: geliang.tang@suse.com,gregkh@linuxfoundation.org,kuba@kernel.org,larysa.zaremba@intel.com,matthieu.baerts@tessares.net,matttbe@kernel.org,mptcp@lists.linux.dev Cc: From: Date: Mon, 12 Aug 2024 14:38:27 +0200 In-Reply-To: <20240809090912.2701580-3-matttbe@kernel.org> Message-ID: <2024081227-thing-amiss-8ae6@gregkh> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-stable: commit X-Patchwork-Hint: ignore Content-Type: text/plain; charset="utf-8" This is a note to let you know that I've just added the patch titled mptcp: export local_address to the 5.15-stable tree which can be found at: http://www.kernel.org/git/?p=3Dlinux/kernel/git/stable/stable-queue.git= ;a=3Dsummary The filename of the patch is: mptcp-export-local_address.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. From stable+bounces-66133-greg=3Dkroah.com@vger.kernel.org Fri Aug 9 11:09= :34 2024 From: "Matthieu Baerts (NGI0)" Date: Fri, 9 Aug 2024 11:09:13 +0200 Subject: mptcp: export local_address To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: MPTCP Upstream , Geliang Tang , Matthieu Baerts , Larysa Zaremba , Jakub Kicinski , Matthieu Baerts Message-ID: <20240809090912.2701580-3-matttbe@kernel.org> From: Geliang Tang commit dc886bce753cc2cf3c88ec5c7a6880a4e17d65ba upstream. Rename local_address() with "mptcp_" prefix and export it in protocol.h. This function will be re-used in the common PM code (pm.c) in the following commit. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts Signed-off-by: Matthieu Baerts Reviewed-by: Larysa Zaremba Signed-off-by: Jakub Kicinski Stable-dep-of: 6834097fc38c ("mptcp: pm: fix backup support in signal endpo= ints") [ Conflicts in pm_netlink.c and protocol.h, because the context has changed in commit 4638de5aefe5 ("mptcp: handle local addrs announced by userspace PMs") which is not in this version. This commit is unrelated to this modification. ] Signed-off-by: Matthieu Baerts (NGI0) Signed-off-by: Greg Kroah-Hartman --- net/mptcp/pm_netlink.c | 15 +++++++-------- net/mptcp/protocol.h | 1 + 2 files changed, 8 insertions(+), 8 deletions(-) --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -97,8 +97,7 @@ static bool address_zero(const struct mp return addresses_equal(addr, &zero, true); } =20 -static void local_address(const struct sock_common *skc, - struct mptcp_addr_info *addr) +void mptcp_local_address(const struct sock_common *skc, struct mptcp_addr_= info *addr) { addr->family =3D skc->skc_family; addr->port =3D htons(skc->skc_num); @@ -133,7 +132,7 @@ static bool lookup_subflow_by_saddr(cons list_for_each_entry(subflow, list, node) { skc =3D (struct sock_common *)mptcp_subflow_tcp_sock(subflow); =20 - local_address(skc, &cur); + mptcp_local_address(skc, &cur); if (addresses_equal(&cur, saddr, saddr->port)) return true; } @@ -286,7 +285,7 @@ bool mptcp_pm_sport_in_anno_list(struct struct mptcp_addr_info saddr; bool ret =3D false; =20 - local_address((struct sock_common *)sk, &saddr); + mptcp_local_address((struct sock_common *)sk, &saddr); =20 spin_lock_bh(&msk->pm.lock); list_for_each_entry(entry, &msk->pm.anno_list, list) { @@ -693,7 +692,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct struct sock *sk =3D (struct sock *)msk; struct mptcp_addr_info local; =20 - local_address((struct sock_common *)ssk, &local); + mptcp_local_address((struct sock_common *)ssk, &local); if (!addresses_equal(&local, addr, addr->port)) continue; =20 @@ -976,8 +975,8 @@ int mptcp_pm_nl_get_local_id(struct mptc /* The 0 ID mapping is defined by the first subflow, copied into the msk * addr */ - local_address((struct sock_common *)msk, &msk_local); - local_address((struct sock_common *)skc, &skc_local); + mptcp_local_address((struct sock_common *)msk, &msk_local); + mptcp_local_address((struct sock_common *)skc, &skc_local); if (addresses_equal(&msk_local, &skc_local, false)) return 0; =20 @@ -1388,7 +1387,7 @@ static int mptcp_nl_remove_id_zero_addre if (list_empty(&msk->conn_list)) goto next; =20 - local_address((struct sock_common *)msk, &msk_local); + mptcp_local_address((struct sock_common *)msk, &msk_local); if (!addresses_equal(&msk_local, addr, addr->port)) goto next; =20 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -583,6 +583,7 @@ void mptcp_subflow_send_ack(struct sock void mptcp_subflow_reset(struct sock *ssk); void mptcp_sock_graft(struct sock *sk, struct socket *parent); struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk); +void mptcp_local_address(const struct sock_common *skc, struct mptcp_addr_= info *addr); =20 /* called with sk socket lock held */ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info = *loc, Patches currently in stable-queue which might be from kroah.com@vger.kernel= .org are queue-5.15/mptcp-fix-nl-pm-announced-address-accounting.patch queue-5.15/mptcp-distinguish-rcv-vs-sent-backup-flag-in-requests.patch queue-5.15/mptcp-pm-fix-backup-support-in-signal-endpoints.patch queue-5.15/mptcp-mib-count-mpj-with-backup-flag.patch queue-5.15/selftests-mptcp-join-validate-backup-in-mpj.patch queue-5.15/mptcp-export-local_address.patch queue-5.15/mptcp-pm-only-set-request_bkup-flag-when-sending-mp_prio.patch queue-5.15/mptcp-fix-bad-rcvpruned-mib-accounting.patch