From nobody Fri Nov 22 01:34:06 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 A0EA617C23D; Mon, 12 Aug 2024 15:11:23 +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=1723475483; cv=none; b=eQBpj5gqcl+Wua1lIxjhT5PZfriwt+JWj76QQ1lSkpkjBA3FsplunnyxmCnDXJ7TqGjw+TUh+TccZfv/yxEoSAUnIzJiTTqUXrFaa1L5x7ix8Qb4niTC+7ABKld4IL5rh4nFX3++7OdEQuWRbCRRIZ8USMni/lOoX0HSjveD3K4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723475483; c=relaxed/simple; bh=uw4E2HdIhAgcbxRpifPQ+xUuJaINft4hHuuACU9CRLY=; h=Subject:To:Cc:From:Date:In-Reply-To:Message-ID:MIME-Version: Content-Type; b=Vb3Ken2farHVMxslqNJdTLf6PpL2vt5IL+uVW5RweG3TsJz/Y8hIOlKsiwFkmuVHmENcy+F+tAr7g0oB9a8uXlWkWku2X4SVQU0P8/nT/l0+QSX9f+Q2hfoa9IiBnDNKakn5BGd5ZjMXjcCu7m4Bpr6ubybUhsU0ASKbDkT24pc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VoyI+88T; 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="VoyI+88T" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA27CC4AF09; Mon, 12 Aug 2024 15:11:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723475483; bh=uw4E2HdIhAgcbxRpifPQ+xUuJaINft4hHuuACU9CRLY=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=VoyI+88TadPL5gId/HrX+g64UZznq2kr9U612xEyrKARi0kl6M4lTQAc9R3N7XukY 7hNqoYlhCLIHbOcsj8T0NIo/KFiwzac5Wvd9LXsuaItpgRI6YdRUyzQEVjFvRNF79E MxEgS+qVuDhlH3TXGwgP0Qum0pqZHrdeSFt4Syn0= Subject: Patch "mptcp: pm: reduce indentation blocks" 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: From: Date: Mon, 12 Aug 2024 17:11:09 +0200 In-Reply-To: <20240812150213.489098-8-matttbe@kernel.org> Message-ID: <2024081208-scabbed-unpainted-0e28@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: pm: reduce indentation blocks 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-reduce-indentation-blocks.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 know about it. From stable+bounces-66730-greg=3Dkroah.com@vger.kernel.org Mon Aug 12 17:02= :58 2024 From: "Matthieu Baerts (NGI0)" Date: Mon, 12 Aug 2024 17:02:15 +0200 Subject: mptcp: pm: reduce indentation blocks To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.o= rg Cc: "Matthieu Baerts (NGI0)" , Paolo Abeni , Mat Martineau , Jakub Kicinski Message-ID: <20240812150213.489098-8-matttbe@kernel.org> From: "Matthieu Baerts (NGI0)" commit c95eb32ced823a00be62202b43966b07b2f20b7f upstream. That will simplify the following commits. No functional changes intended. Suggested-by: Paolo Abeni Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20240731-upstream-net-20240731-mptcp-endp-su= bflow-signal-v1-3-c8a9b036493b@kernel.org Signed-off-by: Jakub Kicinski Stable-dep-of: cd7c957f936f ("mptcp: pm: don't try to create sf if alloc fa= iled") Signed-off-by: Matthieu Baerts (NGI0) Signed-off-by: Greg Kroah-Hartman --- 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 @@ -567,16 +567,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.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