diff for duplicates of <20241118182718.3011097-14-matttbe@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 4cda5d5..e899dd1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,40 +1,54 @@ -commit db3eab8110bc0520416101b6a5b52f44a43fb4cf upstream. - -In mptcp_pm_create_subflow_or_signal_addr(), rcu_read_(un)lock() are -used as expected to iterate over the list of local addresses, but -list_for_each_entry() was used instead of list_for_each_entry_rcu() in -__lookup_addr(). It is important to use this variant which adds the -required READ_ONCE() (and diagnostic checks if enabled). - -Because __lookup_addr() is also used in mptcp_pm_nl_set_flags() where it -is called under the pernet->lock and not rcu_read_lock(), an extra -condition is then passed to help the diagnostic checks making sure -either the associated spin lock or the RCU lock is held. - -Fixes: 86e39e04482b ("mptcp: keep track of local endpoint still available for each msk") -Cc: stable@vger.kernel.org -Reviewed-by: Geliang Tang <geliang@kernel.org> -Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> -Link: https://patch.msgid.link/20241112-net-mptcp-misc-6-12-pm-v1-3-b835580cefa8@kernel.org -Signed-off-by: Jakub Kicinski <kuba@kernel.org> -Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> +[ Sasha's backport helper bot ] + +Hi, + +The upstream commit SHA1 provided is correct: db3eab8110bc0520416101b6a5b52f44a43fb4cf + +WARNING: Author mismatch between patch and upstream commit: +Backport author: "Matthieu Baerts (NGI0)" <matttbe@kernel.org> +Commit author: Matthieu Baerts (NGI0) <matttbe@kernel.org> + +Commit in newer trees: + +|-----------------|----------------------------------------------| +| 6.11.y | Present (different SHA1: b5e96b7d3dea) | +| 6.6.y | Not found | +|-----------------|----------------------------------------------| + +Note: The patch differs from the upstream commit: --- - net/mptcp/pm_netlink.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c -index 76be4f4412df..2cf4393e48dc 100644 ---- a/net/mptcp/pm_netlink.c -+++ b/net/mptcp/pm_netlink.c -@@ -525,7 +525,8 @@ __lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info) - { - struct mptcp_pm_addr_entry *entry; +--- - 2024-11-19 01:23:44.789483772 -0500 ++++ /tmp/tmp.5L1iL6LFxQ 2024-11-19 01:23:44.782305743 -0500 +@@ -15,15 +15,16 @@ + Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> + Link: https://patch.msgid.link/20241112-net-mptcp-misc-6-12-pm-v1-3-b835580cefa8@kernel.org + Signed-off-by: Jakub Kicinski <kuba@kernel.org> ++Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> + --- + net/mptcp/pm_netlink.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -- list_for_each_entry(entry, &pernet->local_addr_list, list) { -+ list_for_each_entry_rcu(entry, &pernet->local_addr_list, list, -+ lockdep_is_held(&pernet->lock)) { - if (mptcp_addresses_equal(&entry->addr, info, entry->addr.port)) - return entry; - } --- -2.45.2 + diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c +-index db586a5b3866f..45a2b5f05d38b 100644 ++index 76be4f4412df..2cf4393e48dc 100644 + --- a/net/mptcp/pm_netlink.c + +++ b/net/mptcp/pm_netlink.c +-@@ -524,7 +524,8 @@ __lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info) ++@@ -525,7 +525,8 @@ __lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info) + { + struct mptcp_pm_addr_entry *entry; + +@@ -33,3 +34,6 @@ + if (mptcp_addresses_equal(&entry->addr, info, entry->addr.port)) + return entry; + } ++-- ++2.45.2 ++ +--- + +Results of testing on various branches: + +| Branch | Patch Apply | Build Test | +|---------------------------|-------------|------------| +| stable/linux-6.6.y | Success | Success | diff --git a/a/content_digest b/N1/content_digest index 072f848..72081d8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,55 +1,64 @@ - "ref\020241118182718.3011097-8-matttbe@kernel.org\0" - "From\0Matthieu Baerts (NGI0) <matttbe@kernel.org>\0" - "Subject\0[PATCH 6.6.y 6/6] mptcp: pm: use _rcu variant under rcu_read_lock\0" - "Date\0Mon, 18 Nov 2024 19:27:24 +0100\0" - "To\0mptcp@lists.linux.dev" - stable@vger.kernel.org - " gregkh@linuxfoundation.org\0" + "From\0Sasha Levin <sashal@kernel.org>\0" + "Subject\0Re: [PATCH 6.6.y 6/6] mptcp: pm: use _rcu variant under rcu_read_lock\0" + "Date\0Tue, 19 Nov 2024 07:30:45 -0500\0" + "To\0stable@vger.kernel.org\0" "Cc\0Matthieu Baerts (NGI0) <matttbe@kernel.org>" - sashal@kernel.org - Geliang Tang <geliang@kernel.org> - " Jakub Kicinski <kuba@kernel.org>\0" + " Sasha Levin <sashal@kernel.org>\0" "\00:1\0" "b\0" - "commit db3eab8110bc0520416101b6a5b52f44a43fb4cf upstream.\n" - "\n" - "In mptcp_pm_create_subflow_or_signal_addr(), rcu_read_(un)lock() are\n" - "used as expected to iterate over the list of local addresses, but\n" - "list_for_each_entry() was used instead of list_for_each_entry_rcu() in\n" - "__lookup_addr(). It is important to use this variant which adds the\n" - "required READ_ONCE() (and diagnostic checks if enabled).\n" - "\n" - "Because __lookup_addr() is also used in mptcp_pm_nl_set_flags() where it\n" - "is called under the pernet->lock and not rcu_read_lock(), an extra\n" - "condition is then passed to help the diagnostic checks making sure\n" - "either the associated spin lock or the RCU lock is held.\n" - "\n" - "Fixes: 86e39e04482b (\"mptcp: keep track of local endpoint still available for each msk\")\n" - "Cc: stable@vger.kernel.org\n" - "Reviewed-by: Geliang Tang <geliang@kernel.org>\n" - "Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" - "Link: https://patch.msgid.link/20241112-net-mptcp-misc-6-12-pm-v1-3-b835580cefa8@kernel.org\n" - "Signed-off-by: Jakub Kicinski <kuba@kernel.org>\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: db3eab8110bc0520416101b6a5b52f44a43fb4cf\n" + "\n" + "WARNING: Author mismatch between patch and upstream commit:\n" + "Backport author: \"Matthieu Baerts (NGI0)\" <matttbe@kernel.org>\n" + "Commit author: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" + "\n" + "Commit in newer trees:\n" + "\n" + "|-----------------|----------------------------------------------|\n" + "| 6.11.y | Present (different SHA1: b5e96b7d3dea) |\n" + "| 6.6.y | Not found |\n" + "|-----------------|----------------------------------------------|\n" + "\n" + "Note: The patch differs from the upstream commit:\n" "---\n" - " net/mptcp/pm_netlink.c | 3 ++-\n" - " 1 file changed, 2 insertions(+), 1 deletion(-)\n" - "\n" - "diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c\n" - "index 76be4f4412df..2cf4393e48dc 100644\n" - "--- a/net/mptcp/pm_netlink.c\n" - "+++ b/net/mptcp/pm_netlink.c\n" - "@@ -525,7 +525,8 @@ __lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info)\n" - " {\n" - " \tstruct mptcp_pm_addr_entry *entry;\n" + "--- -\t2024-11-19 01:23:44.789483772 -0500\n" + "+++ /tmp/tmp.5L1iL6LFxQ\t2024-11-19 01:23:44.782305743 -0500\n" + "@@ -15,15 +15,16 @@\n" + " Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" + " Link: https://patch.msgid.link/20241112-net-mptcp-misc-6-12-pm-v1-3-b835580cefa8@kernel.org\n" + " Signed-off-by: Jakub Kicinski <kuba@kernel.org>\n" + "+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" + " ---\n" + " net/mptcp/pm_netlink.c | 3 ++-\n" + " 1 file changed, 2 insertions(+), 1 deletion(-)\n" " \n" - "-\tlist_for_each_entry(entry, &pernet->local_addr_list, list) {\n" - "+\tlist_for_each_entry_rcu(entry, &pernet->local_addr_list, list,\n" - "+\t\t\t\tlockdep_is_held(&pernet->lock)) {\n" - " \t\tif (mptcp_addresses_equal(&entry->addr, info, entry->addr.port))\n" - " \t\t\treturn entry;\n" - " \t}\n" - "-- \n" - 2.45.2 + " diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c\n" + "-index db586a5b3866f..45a2b5f05d38b 100644\n" + "+index 76be4f4412df..2cf4393e48dc 100644\n" + " --- a/net/mptcp/pm_netlink.c\n" + " +++ b/net/mptcp/pm_netlink.c\n" + "-@@ -524,7 +524,8 @@ __lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info)\n" + "+@@ -525,7 +525,8 @@ __lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info)\n" + " {\n" + " \tstruct mptcp_pm_addr_entry *entry;\n" + " \n" + "@@ -33,3 +34,6 @@\n" + " \t\tif (mptcp_addresses_equal(&entry->addr, info, entry->addr.port))\n" + " \t\t\treturn entry;\n" + " \t}\n" + "+-- \n" + "+2.45.2\n" + "+\n" + "---\n" + "\n" + "Results of testing on various branches:\n" + "\n" + "| Branch | Patch Apply | Build Test |\n" + "|---------------------------|-------------|------------|\n" + | stable/linux-6.6.y | Success | Success | -54ea190fb174fb647fa372e47340ea02558775604600648f6246c8310ebba97e +8bd3af6477e6ce367dd8aafbc6cd9182c7ac04c5a6c660adf0dbfd834d05f9fb
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.