From nobody Thu May 1 05:29:43 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 E1AF21BC082;
Wed, 14 Aug 2024 17:44:54 +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=1723657495; cv=none;
b=AaCTJhxprj0p3VHRLtZSh250lsb2HrRVufFvnogou7Ow/EAF2OgfzzqAmV5+n2zTYrlDQVMzxVeP0TdMKYaILB2UTQVXFl0j+SHGhsE3s5VZtAnkHPdGr3J3Pjh9WJAl7qRiGlqw+Cm4B5x+Ka7+H8+jSO6BNB9WmWXRhEWclwI=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1723657495; c=relaxed/simple;
bh=0+rMS5qbjOqCBwD7hbIHVJXIcZM06kDYi8cA0x/bxoo=;
h=Subject:To:Cc:From:Date:In-Reply-To:Message-ID:MIME-Version:
Content-Type;
b=ssk65uPupuT4Wt/+dqj9F9qSq7niGXcRiBTZdYDjeYmrzFAdwSdrey5Fh82CxEYm6n8X5zhEwiUphnaqzyL/OGAfs/kek3d/u3ONvvvBQS+GEnbNtjCoZ1E8/bJc/SvLIy2lyK09L3swVTEORv6evQ4BL7suCJJhiTSCDKs1OCI=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dkim=pass (1024-bit key) header.d=linuxfoundation.org
header.i=@linuxfoundation.org header.b=HrpBdRsS;
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="HrpBdRsS"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C349C116B1;
Wed, 14 Aug 2024 17:44:54 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org;
s=korg; t=1723657494;
bh=0+rMS5qbjOqCBwD7hbIHVJXIcZM06kDYi8cA0x/bxoo=;
h=Subject:To:Cc:From:Date:In-Reply-To:From;
b=HrpBdRsSAvlEPBwBRsoB8Nwyf/sAuMbjQoJza1kk9PWl1oTlad2Uyylqsd8EDMoGP
KWlmNseMgV45EBfOi6S/rqeZOtbKMwYqofQDJr5rXgsLiR6lW4iucVJmevfrVrXrzv
KYBCGEFztkoOQBpIiXDGu/aEMHN+B+YWR+f4ppFg=
Subject: Patch "mptcp: pm: reduce indentation blocks" has been added to the
6.1-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: Wed, 14 Aug 2024 19:44:34 +0200
In-Reply-To: <20240813092815.966749-9-matttbe@kernel.org>
Message-ID: <2024081433-grab-spellbind-a32e@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: reduce indentation blocks
to the 6.1-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-reduce-indentation-blocks.patch
and it can be found in the queue-6.1 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-67438-greg=3Dkroah.com@vger.kernel.org Tue Aug 13 11:28=
:37 2024
From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
Date: Tue, 13 Aug 2024 11:28:18 +0200
Subject: mptcp: pm: reduce indentation blocks
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: <20240813092815.966749-9-matttbe@kernel.org>
From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
commit c95eb32ced823a00be62202b43966b07b2f20b7f upstream.
That will simplify the following commits.
No functional changes intended.
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-3-c8a9b036493b@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: cd7c957f936f ("mptcp: pm: don't try to create sf if alloc fa=
iled")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/mptcp/pm_netlink.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -579,16 +579,19 @@ static void mptcp_pm_create_subflow_or_s
if (msk->pm.addr_signal & BIT(MPTCP_ADD_ADDR_SIGNAL))
return;
=20
- if (local) {
- if (mptcp_pm_alloc_anno_list(msk, &local->addr)) {
- __clear_bit(local->addr.id, msk->pm.id_avail_bitmap);
- msk->pm.add_addr_signaled++;
- mptcp_pm_announce_addr(msk, &local->addr, false);
- mptcp_pm_nl_addr_send_ack(msk);
- }
- }
+ if (!local)
+ goto subflow;
+
+ if (!mptcp_pm_alloc_anno_list(msk, &local->addr))
+ goto subflow;
+
+ __clear_bit(local->addr.id, msk->pm.id_avail_bitmap);
+ msk->pm.add_addr_signaled++;
+ mptcp_pm_announce_addr(msk, &local->addr, false);
+ mptcp_pm_nl_addr_send_ack(msk);
}
=20
+subflow:
/* check if should create a new subflow */
while (msk->pm.local_addr_used < local_addr_max &&
msk->pm.subflows < subflows_max) {
Patches currently in stable-queue which might be from kroah.com@vger.kernel=
.org are
queue-6.1/mptcp-pm-don-t-try-to-create-sf-if-alloc-failed.patch
queue-6.1/mptcp-pass-addr-to-mptcp_pm_alloc_anno_list.patch
queue-6.1/mptcp-pm-do-not-ignore-subflow-if-signal-flag-is-also-set.patch
queue-6.1/selftests-mptcp-join-test-both-signal-subflow.patch
queue-6.1/mptcp-pm-reduce-indentation-blocks.patch