From nobody Tue May 6 23:45:08 2025
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 33B3C17D8A3;
Mon, 12 Aug 2024 15:11:19 +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=1723475480; cv=none;
b=nybLZgnIh0RM8M+j7pWKZ+KIZMj2rwz5IiH1hC6PksFqkS62C2PrQLYZ7rHZyC04ueQtX3fzClvJtrrHqL0XxusHv6/vVeOVhxPwWmlXdftTaudTDoi0GMc5cNuFCMms6NUzoenyWjDtZlFOvbFXpQALCc78uvr+qBVOu3dMhu8=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1723475480; c=relaxed/simple;
bh=ixJ6DHNDMHfjKuQGOCu5L0wIWuvUTVXXnqMkp7ogBPU=;
h=Subject:To:Cc:From:Date:In-Reply-To:Message-ID:MIME-Version:
Content-Type;
b=N4y/ar1lCezGBvTxHfG+dLi8ZHLIRcKhULb/sAm9ITuYEK1AtRupOprDm40CAEqaSmRiOjsd4r/pW3s5VzQzyQ1viOJeflYnlKWRNYsDNfuZzWOuD7eh3/MYwYnmqy9HQYPH/DMcXY82CS1/boWJ48WctGxzJnjBXdr2gxi6bAw=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dkim=pass (1024-bit key) header.d=linuxfoundation.org
header.i=@linuxfoundation.org header.b=QAYv5K3Y;
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="QAYv5K3Y"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2480EC32782;
Mon, 12 Aug 2024 15:11:18 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org;
s=korg; t=1723475479;
bh=ixJ6DHNDMHfjKuQGOCu5L0wIWuvUTVXXnqMkp7ogBPU=;
h=Subject:To:Cc:From:Date:In-Reply-To:From;
b=QAYv5K3Yutt7b/bK4ceAtsDxtIC6dcE7qCZOFbTvYeGVhiiuFi633EyirBC7e6U+Y
/clJeeKACJmVuA+N5eQIMdcgTeBg4I2tDyD1ikpByJEYA7H38onKKVbRKQtJY2/I2J
Z0Yxbj/+HZ7WcxbnVVQtddZHbGzlF0Gxztrwterk=
Subject: Patch "mptcp: pm: don't try to create sf if alloc failed" has been
added to the 6.10-stable tree
To:
gregkh@linuxfoundation.org,kuba@kernel.org,martineau@kernel.org,matttbe@kernel.org,mptcp@lists.linux.dev,pabeni@redhat.com
Cc: <stable-commits@vger.kernel.org>
From: <gregkh@linuxfoundation.org>
Date: Mon, 12 Aug 2024 17:11:08 +0200
In-Reply-To: <20240812150213.489098-9-matttbe@kernel.org>
Message-ID: <2024081208-staple-wildcat-e149@gregkh>
Precedence: bulk
X-Mailing-List: mptcp@lists.linux.dev
List-Id: <mptcp.lists.linux.dev>
List-Subscribe: <mailto:mptcp+subscribe@lists.linux.dev>
List-Unsubscribe: <mailto:mptcp+unsubscribe@lists.linux.dev>
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: pm: don't try to create sf if alloc failed
to the 6.10-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-pm-don-t-try-to-create-sf-if-alloc-failed.patch
and it can be found in the queue-6.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
From stable+bounces-66731-greg=3Dkroah.com@vger.kernel.org Mon Aug 12 17:03=
:18 2024
From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
Date: Mon, 12 Aug 2024 17:02:16 +0200
Subject: mptcp: pm: don't try to create sf if alloc failed
To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.o=
rg
Cc: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>, Paolo Abeni <pabeni@redh=
at.com>, Mat Martineau <martineau@kernel.org>, Jakub Kicinski <kuba@kernel.=
org>
Message-ID: <20240812150213.489098-9-matttbe@kernel.org>
From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
commit cd7c957f936f8cb80d03e5152f4013aae65bd986 upstream.
It sounds better to avoid wasting cycles and / or put extreme memory
pressure on the system by trying to create new subflows if it was not
possible to add a new item in the announce list.
While at it, a warning is now printed if the entry was already in the
list as it should not happen with the in-kernel path-manager. With this
PM, mptcp_pm_alloc_anno_list() should only fail in case of memory
pressure.
Fixes: b6c08380860b ("mptcp: remove addr and subflow in PM netlink")
Cc: stable@vger.kernel.org
Suggested-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240731-upstream-net-20240731-mptcp-endp-su=
bflow-signal-v1-4-c8a9b036493b@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/mptcp/pm_netlink.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -348,7 +348,7 @@ bool mptcp_pm_alloc_anno_list(struct mpt
add_entry =3D mptcp_lookup_anno_list_by_saddr(msk, addr);
=20
if (add_entry) {
- if (mptcp_pm_is_kernel(msk))
+ if (WARN_ON_ONCE(mptcp_pm_is_kernel(msk)))
return false;
=20
sk_reset_timer(sk, &add_entry->add_timer,
@@ -555,8 +555,6 @@ static void mptcp_pm_create_subflow_or_s
=20
/* check first for announce */
if (msk->pm.add_addr_signaled < add_addr_signal_max) {
- local =3D select_signal_address(pernet, msk);
-
/* due to racing events on both ends we can reach here while
* previous add address is still running: if we invoke now
* mptcp_pm_announce_addr(), that will fail and the
@@ -567,11 +565,15 @@ static void mptcp_pm_create_subflow_or_s
if (msk->pm.addr_signal & BIT(MPTCP_ADD_ADDR_SIGNAL))
return;
=20
+ local =3D select_signal_address(pernet, msk);
if (!local)
goto subflow;
=20
+ /* If the alloc fails, we are on memory pressure, not worth
+ * continuing, and trying to create subflows.
+ */
if (!mptcp_pm_alloc_anno_list(msk, &local->addr))
- goto subflow;
+ return;
=20
__clear_bit(local->addr.id, msk->pm.id_avail_bitmap);
msk->pm.add_addr_signaled++;
Patches currently in stable-queue which might be from kroah.com@vger.kernel=
.org are
queue-6.10/mptcp-pm-don-t-try-to-create-sf-if-alloc-failed.patch
queue-6.10/selftests-mptcp-join-ability-to-invert-add_addr-check.patch
queue-6.10/mptcp-pm-do-not-ignore-subflow-if-signal-flag-is-also-set.patch
queue-6.10/selftests-mptcp-join-test-both-signal-subflow.patch
queue-6.10/mptcp-pm-reduce-indentation-blocks.patch