diff for duplicates of <20241119083547.3234013-10-matttbe@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 533244a..5082247 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,46 +1,66 @@ -From: Paolo Abeni <pabeni@redhat.com> - -commit ce7356ae35943cc6494cc692e62d51a734062b7d upstream. - -Additional active subflows - i.e. created by the in kernel path -manager - are included into the subflow list before starting the -3whs. - -A racing recvmsg() spooling data received on an already established -subflow would unconditionally call tcp_cleanup_rbuf() on all the -current subflows, potentially hitting a divide by zero error on -the newly created ones. - -Explicitly check that the subflow is in a suitable state before -invoking tcp_cleanup_rbuf(). - -Fixes: c76c6956566f ("mptcp: call tcp_cleanup_rbuf on subflows") -Signed-off-by: Paolo Abeni <pabeni@redhat.com> -Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> -Link: https://patch.msgid.link/02374660836e1b52afc91966b7535c8c5f7bafb0.1731060874.git.pabeni@redhat.com -Signed-off-by: Jakub Kicinski <kuba@kernel.org> -[ Conflicts in protocol.c, because commit f410cbea9f3d ("tcp: annotate - data-races around tp->window_clamp") has not been backported to this - version. The conflict is easy to resolve, because only the context is - different, but not the line to modify. ] -Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> +[ Sasha's backport helper bot ] + +Hi, + +The upstream commit SHA1 provided is correct: ce7356ae35943cc6494cc692e62d51a734062b7d + +WARNING: Author mismatch between patch and upstream commit: +Backport author: "Matthieu Baerts (NGI0)" <matttbe@kernel.org> +Commit author: Paolo Abeni <pabeni@redhat.com> + + +Status in newer kernel trees: +6.11.y | Present (different SHA1: 8cccaf4eb99b) +6.6.y | Present (different SHA1: 4e86acecbba9) +6.1.y | Not found + +Note: The patch differs from the upstream commit: +--- +--- - 2024-11-19 08:38:07.302555583 -0500 ++++ /tmp/tmp.UE8LSqsrXJ 2024-11-19 08:38:07.300507479 -0500 +@@ -1,3 +1,5 @@ ++commit ce7356ae35943cc6494cc692e62d51a734062b7d upstream. ++ + Additional active subflows - i.e. created by the in kernel path + manager - are included into the subflow list before starting the + 3whs. +@@ -15,21 +17,29 @@ + Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> + Link: https://patch.msgid.link/02374660836e1b52afc91966b7535c8c5f7bafb0.1731060874.git.pabeni@redhat.com + Signed-off-by: Jakub Kicinski <kuba@kernel.org> ++[ Conflicts in protocol.c, because commit f410cbea9f3d ("tcp: annotate ++ data-races around tp->window_clamp") has not been backported to this ++ version. The conflict is easy to resolve, because only the context is ++ different, but not the line to modify. ] ++Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> + --- + net/mptcp/protocol.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + + diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c +-index 95a5a3da39447..48d480982b787 100644 ++index 78ac5c538e13..1acd4e37a0ea 100644 + --- a/net/mptcp/protocol.c + +++ b/net/mptcp/protocol.c +-@@ -2082,7 +2082,8 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied) ++@@ -2057,7 +2057,8 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied) + slow = lock_sock_fast(ssk); + WRITE_ONCE(ssk->sk_rcvbuf, rcvbuf); +- WRITE_ONCE(tcp_sk(ssk)->window_clamp, window_clamp); ++ tcp_sk(ssk)->window_clamp = window_clamp; + - tcp_cleanup_rbuf(ssk, 1); + + if (tcp_can_send_ack(ssk)) + + tcp_cleanup_rbuf(ssk, 1); + unlock_sock_fast(ssk, slow); + } + } ++-- ++2.45.2 ++ --- - net/mptcp/protocol.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c -index 78ac5c538e13..1acd4e37a0ea 100644 ---- a/net/mptcp/protocol.c -+++ b/net/mptcp/protocol.c -@@ -2057,7 +2057,8 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied) - slow = lock_sock_fast(ssk); - WRITE_ONCE(ssk->sk_rcvbuf, rcvbuf); - tcp_sk(ssk)->window_clamp = window_clamp; -- tcp_cleanup_rbuf(ssk, 1); -+ if (tcp_can_send_ack(ssk)) -+ tcp_cleanup_rbuf(ssk, 1); - unlock_sock_fast(ssk, slow); - } - } --- -2.45.2 + +Results of testing on various branches: + +| Branch | Patch Apply | Build Test | +|---------------------------|-------------|------------| +| stable/linux-6.1.y | Success | Success | diff --git a/a/content_digest b/N1/content_digest index 5924dfb..4495430 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,61 +1,76 @@ - "ref\020241119083547.3234013-9-matttbe@kernel.org\0" - "From\0Matthieu Baerts (NGI0) <matttbe@kernel.org>\0" - "Subject\0[PATCH 6.1.y 1/7] mptcp: cope racing subflow creation in mptcp_rcv_space_adjust\0" - "Date\0Tue, 19 Nov 2024 09:35:49 +0100\0" - "To\0mptcp@lists.linux.dev" - stable@vger.kernel.org - " gregkh@linuxfoundation.org\0" - "Cc\0Paolo Abeni <pabeni@redhat.com>" - sashal@kernel.org - Matthieu Baerts <matttbe@kernel.org> - " Jakub Kicinski <kuba@kernel.org>\0" + "From\0Sasha Levin <sashal@kernel.org>\0" + "Subject\0Re: [PATCH 6.1.y 1/7] mptcp: cope racing subflow creation in mptcp_rcv_space_adjust\0" + "Date\0Tue, 19 Nov 2024 09:46:47 -0500\0" + "To\0stable@vger.kernel.org\0" + "Cc\0Matthieu Baerts (NGI0) <matttbe@kernel.org>" + " Sasha Levin <sashal@kernel.org>\0" "\00:1\0" "b\0" - "From: Paolo Abeni <pabeni@redhat.com>\n" - "\n" - "commit ce7356ae35943cc6494cc692e62d51a734062b7d upstream.\n" - "\n" - "Additional active subflows - i.e. created by the in kernel path\n" - "manager - are included into the subflow list before starting the\n" - "3whs.\n" - "\n" - "A racing recvmsg() spooling data received on an already established\n" - "subflow would unconditionally call tcp_cleanup_rbuf() on all the\n" - "current subflows, potentially hitting a divide by zero error on\n" - "the newly created ones.\n" - "\n" - "Explicitly check that the subflow is in a suitable state before\n" - "invoking tcp_cleanup_rbuf().\n" - "\n" - "Fixes: c76c6956566f (\"mptcp: call tcp_cleanup_rbuf on subflows\")\n" - "Signed-off-by: Paolo Abeni <pabeni@redhat.com>\n" - "Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" - "Link: https://patch.msgid.link/02374660836e1b52afc91966b7535c8c5f7bafb0.1731060874.git.pabeni@redhat.com\n" - "Signed-off-by: Jakub Kicinski <kuba@kernel.org>\n" - "[ Conflicts in protocol.c, because commit f410cbea9f3d (\"tcp: annotate\n" - " data-races around tp->window_clamp\") has not been backported to this\n" - " version. The conflict is easy to resolve, because only the context is\n" - " different, but not the line to modify. ]\n" - "Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" + "[ Sasha's backport helper bot ]\n" + "\n" + "Hi,\n" + "\n" + "The upstream commit SHA1 provided is correct: ce7356ae35943cc6494cc692e62d51a734062b7d\n" + "\n" + "WARNING: Author mismatch between patch and upstream commit:\n" + "Backport author: \"Matthieu Baerts (NGI0)\" <matttbe@kernel.org>\n" + "Commit author: Paolo Abeni <pabeni@redhat.com>\n" + "\n" + "\n" + "Status in newer kernel trees:\n" + "6.11.y | Present (different SHA1: 8cccaf4eb99b)\n" + "6.6.y | Present (different SHA1: 4e86acecbba9)\n" + "6.1.y | Not found\n" + "\n" + "Note: The patch differs from the upstream commit:\n" + "---\n" + "--- -\t2024-11-19 08:38:07.302555583 -0500\n" + "+++ /tmp/tmp.UE8LSqsrXJ\t2024-11-19 08:38:07.300507479 -0500\n" + "@@ -1,3 +1,5 @@\n" + "+commit ce7356ae35943cc6494cc692e62d51a734062b7d upstream.\n" + "+\n" + " Additional active subflows - i.e. created by the in kernel path\n" + " manager - are included into the subflow list before starting the\n" + " 3whs.\n" + "@@ -15,21 +17,29 @@\n" + " Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" + " Link: https://patch.msgid.link/02374660836e1b52afc91966b7535c8c5f7bafb0.1731060874.git.pabeni@redhat.com\n" + " Signed-off-by: Jakub Kicinski <kuba@kernel.org>\n" + "+[ Conflicts in protocol.c, because commit f410cbea9f3d (\"tcp: annotate\n" + "+ data-races around tp->window_clamp\") has not been backported to this\n" + "+ version. The conflict is easy to resolve, because only the context is\n" + "+ different, but not the line to modify. ]\n" + "+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" + " ---\n" + " net/mptcp/protocol.c | 3 ++-\n" + " 1 file changed, 2 insertions(+), 1 deletion(-)\n" + " \n" + " diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c\n" + "-index 95a5a3da39447..48d480982b787 100644\n" + "+index 78ac5c538e13..1acd4e37a0ea 100644\n" + " --- a/net/mptcp/protocol.c\n" + " +++ b/net/mptcp/protocol.c\n" + "-@@ -2082,7 +2082,8 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied)\n" + "+@@ -2057,7 +2057,8 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied)\n" + " \t\t\t\tslow = lock_sock_fast(ssk);\n" + " \t\t\t\tWRITE_ONCE(ssk->sk_rcvbuf, rcvbuf);\n" + "- \t\t\t\tWRITE_ONCE(tcp_sk(ssk)->window_clamp, window_clamp);\n" + "+ \t\t\t\ttcp_sk(ssk)->window_clamp = window_clamp;\n" + " -\t\t\t\ttcp_cleanup_rbuf(ssk, 1);\n" + " +\t\t\t\tif (tcp_can_send_ack(ssk))\n" + " +\t\t\t\t\ttcp_cleanup_rbuf(ssk, 1);\n" + " \t\t\t\tunlock_sock_fast(ssk, slow);\n" + " \t\t\t}\n" + " \t\t}\n" + "+-- \n" + "+2.45.2\n" + "+\n" "---\n" - " net/mptcp/protocol.c | 3 ++-\n" - " 1 file changed, 2 insertions(+), 1 deletion(-)\n" - "\n" - "diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c\n" - "index 78ac5c538e13..1acd4e37a0ea 100644\n" - "--- a/net/mptcp/protocol.c\n" - "+++ b/net/mptcp/protocol.c\n" - "@@ -2057,7 +2057,8 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied)\n" - " \t\t\t\tslow = lock_sock_fast(ssk);\n" - " \t\t\t\tWRITE_ONCE(ssk->sk_rcvbuf, rcvbuf);\n" - " \t\t\t\ttcp_sk(ssk)->window_clamp = window_clamp;\n" - "-\t\t\t\ttcp_cleanup_rbuf(ssk, 1);\n" - "+\t\t\t\tif (tcp_can_send_ack(ssk))\n" - "+\t\t\t\t\ttcp_cleanup_rbuf(ssk, 1);\n" - " \t\t\t\tunlock_sock_fast(ssk, slow);\n" - " \t\t\t}\n" - " \t\t}\n" - "-- \n" - 2.45.2 + "\n" + "Results of testing on various branches:\n" + "\n" + "| Branch | Patch Apply | Build Test |\n" + "|---------------------------|-------------|------------|\n" + | stable/linux-6.1.y | Success | Success | -0f3244fe575e02e9ac8faa80951e1b4527d81553deb524e47d7f12265b5493dd +0c79c50381fbbed52a357b52e6633ed3538f4b8b8d26a1e764c16cc20f58f844
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.