diff for duplicates of <20241118182718.3011097-10-matttbe@kernel.org> diff --git a/a/1.txt b/N1/1.txt index d8b3491..b05013f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,84 +1,79 @@ -From: Geliang Tang <tanggeliang@kylinos.cn> +[ Sasha's backport helper bot ] -commit 06afe09091ee69dc7ab058b4be9917ae59cc81e5 upstream. +Hi, -Corresponding __lookup_addr_by_id() helper in the in-kernel netlink PM, -this patch adds a new helper mptcp_userspace_pm_lookup_addr_by_id() to -lookup the address entry with the given id on the userspace pm local -address list. +The upstream commit SHA1 provided is correct: 06afe09091ee69dc7ab058b4be9917ae59cc81e5 -Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> -Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> -Reviewed-by: Mat Martineau <martineau@kernel.org> -Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> -Signed-off-by: David S. Miller <davem@davemloft.net> -Stable-dep-of: f642c5c4d528 ("mptcp: hold pm lock when deleting entry") -Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> ---- - net/mptcp/pm_userspace.c | 31 ++++++++++++++++--------------- - 1 file changed, 16 insertions(+), 15 deletions(-) +WARNING: Author mismatch between patch and upstream commit: +Backport author: "Matthieu Baerts (NGI0)" <matttbe@kernel.org> +Commit author: Geliang Tang <tanggeliang@kylinos.cn> -diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c -index eded0f9c0b6f..23e362c11801 100644 ---- a/net/mptcp/pm_userspace.c -+++ b/net/mptcp/pm_userspace.c -@@ -107,19 +107,26 @@ static int mptcp_userspace_pm_delete_local_addr(struct mptcp_sock *msk, - return -EINVAL; - } - -+static struct mptcp_pm_addr_entry * -+mptcp_userspace_pm_lookup_addr_by_id(struct mptcp_sock *msk, unsigned int id) -+{ -+ struct mptcp_pm_addr_entry *entry; -+ -+ list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { -+ if (entry->addr.id == id) -+ return entry; -+ } -+ return NULL; -+} +Commit in newer trees: + +|-----------------|----------------------------------------------| +| 6.11.y | Present (exact SHA1) | +| 6.6.y | Not found | +|-----------------|----------------------------------------------| + +Note: The patch differs from the upstream commit: +--- +--- - 2024-11-19 01:03:18.229030137 -0500 ++++ /tmp/tmp.cXmNHAm0RR 2024-11-19 01:03:18.223800931 -0500 +@@ -1,3 +1,5 @@ ++commit 06afe09091ee69dc7ab058b4be9917ae59cc81e5 upstream. + - int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, - unsigned int id, - u8 *flags, int *ifindex) - { -- struct mptcp_pm_addr_entry *entry, *match = NULL; -+ struct mptcp_pm_addr_entry *match; + Corresponding __lookup_addr_by_id() helper in the in-kernel netlink PM, + this patch adds a new helper mptcp_userspace_pm_lookup_addr_by_id() to + lookup the address entry with the given id on the userspace pm local +@@ -8,15 +10,17 @@ + Reviewed-by: Mat Martineau <martineau@kernel.org> + Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> + Signed-off-by: David S. Miller <davem@davemloft.net> ++Stable-dep-of: f642c5c4d528 ("mptcp: hold pm lock when deleting entry") ++Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> + --- + net/mptcp/pm_userspace.c | 31 ++++++++++++++++--------------- + 1 file changed, 16 insertions(+), 15 deletions(-) - spin_lock_bh(&msk->pm.lock); -- list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { -- if (id == entry->addr.id) { -- match = entry; -- break; -- } -- } -+ match = mptcp_userspace_pm_lookup_addr_by_id(msk, id); - spin_unlock_bh(&msk->pm.lock); - if (match) { - *flags = match->flags; -@@ -280,7 +287,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) - { - struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN]; - struct nlattr *id = info->attrs[MPTCP_PM_ATTR_LOC_ID]; -- struct mptcp_pm_addr_entry *match = NULL; -+ struct mptcp_pm_addr_entry *match; - struct mptcp_pm_addr_entry *entry; - struct mptcp_sock *msk; - LIST_HEAD(free_list); -@@ -317,13 +324,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) - - lock_sock(sk); - -- list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { -- if (entry->addr.id == id_val) { -- match = entry; -- break; -- } -- } -- -+ match = mptcp_userspace_pm_lookup_addr_by_id(msk, id_val); - if (!match) { - GENL_SET_ERR_MSG(info, "address with specified id not found"); - release_sock(sk); --- -2.45.2 + diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c +-index 3bd13e94b5687..20cbcb62cd8c5 100644 ++index eded0f9c0b6f..23e362c11801 100644 + --- a/net/mptcp/pm_userspace.c + +++ b/net/mptcp/pm_userspace.c +-@@ -106,19 +106,26 @@ static int mptcp_userspace_pm_delete_local_addr(struct mptcp_sock *msk, ++@@ -107,19 +107,26 @@ static int mptcp_userspace_pm_delete_local_addr(struct mptcp_sock *msk, + return -EINVAL; + } + +@@ -50,7 +54,7 @@ + spin_unlock_bh(&msk->pm.lock); + if (match) { + *flags = match->flags; +-@@ -261,7 +268,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) ++@@ -280,7 +287,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) + { + struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN]; + struct nlattr *id = info->attrs[MPTCP_PM_ATTR_LOC_ID]; +@@ -59,7 +63,7 @@ + struct mptcp_pm_addr_entry *entry; + struct mptcp_sock *msk; + LIST_HEAD(free_list); +-@@ -298,13 +305,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) ++@@ -317,13 +324,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) + + lock_sock(sk); + +@@ -74,3 +78,6 @@ + if (!match) { + GENL_SET_ERR_MSG(info, "address with specified id not found"); + release_sock(sk); ++-- ++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 287df2a..0bd3113 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,100 +1,89 @@ - "ref\020241118182718.3011097-8-matttbe@kernel.org\0" - "From\0Matthieu Baerts (NGI0) <matttbe@kernel.org>\0" - "Subject\0[PATCH 6.6.y 2/6] mptcp: add userspace_pm_lookup_addr_by_id helper\0" - "Date\0Mon, 18 Nov 2024 19:27:20 +0100\0" - "To\0mptcp@lists.linux.dev" - stable@vger.kernel.org - " gregkh@linuxfoundation.org\0" - "Cc\0Geliang Tang <tanggeliang@kylinos.cn>" - sashal@kernel.org - Matthieu Baerts <matttbe@kernel.org> - Mat Martineau <martineau@kernel.org> - " David S . Miller <davem@davemloft.net>\0" + "From\0Sasha Levin <sashal@kernel.org>\0" + "Subject\0Re: [PATCH 6.6.y 2/6] mptcp: add userspace_pm_lookup_addr_by_id helper\0" + "Date\0Tue, 19 Nov 2024 07:31:12 -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: Geliang Tang <tanggeliang@kylinos.cn>\n" + "[ Sasha's backport helper bot ]\n" "\n" - "commit 06afe09091ee69dc7ab058b4be9917ae59cc81e5 upstream.\n" + "Hi,\n" "\n" - "Corresponding __lookup_addr_by_id() helper in the in-kernel netlink PM,\n" - "this patch adds a new helper mptcp_userspace_pm_lookup_addr_by_id() to\n" - "lookup the address entry with the given id on the userspace pm local\n" - "address list.\n" + "The upstream commit SHA1 provided is correct: 06afe09091ee69dc7ab058b4be9917ae59cc81e5\n" "\n" - "Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>\n" - "Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" - "Reviewed-by: Mat Martineau <martineau@kernel.org>\n" - "Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" - "Signed-off-by: David S. Miller <davem@davemloft.net>\n" - "Stable-dep-of: f642c5c4d528 (\"mptcp: hold pm lock when deleting entry\")\n" - "Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" - "---\n" - " net/mptcp/pm_userspace.c | 31 ++++++++++++++++---------------\n" - " 1 file changed, 16 insertions(+), 15 deletions(-)\n" + "WARNING: Author mismatch between patch and upstream commit:\n" + "Backport author: \"Matthieu Baerts (NGI0)\" <matttbe@kernel.org>\n" + "Commit author: Geliang Tang <tanggeliang@kylinos.cn>\n" "\n" - "diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c\n" - "index eded0f9c0b6f..23e362c11801 100644\n" - "--- a/net/mptcp/pm_userspace.c\n" - "+++ b/net/mptcp/pm_userspace.c\n" - "@@ -107,19 +107,26 @@ static int mptcp_userspace_pm_delete_local_addr(struct mptcp_sock *msk,\n" - " \treturn -EINVAL;\n" - " }\n" - " \n" - "+static struct mptcp_pm_addr_entry *\n" - "+mptcp_userspace_pm_lookup_addr_by_id(struct mptcp_sock *msk, unsigned int id)\n" - "+{\n" - "+\tstruct mptcp_pm_addr_entry *entry;\n" - "+\n" - "+\tlist_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) {\n" - "+\t\tif (entry->addr.id == id)\n" - "+\t\t\treturn entry;\n" - "+\t}\n" - "+\treturn NULL;\n" - "+}\n" + "Commit in newer trees:\n" + "\n" + "|-----------------|----------------------------------------------|\n" + "| 6.11.y | Present (exact SHA1) |\n" + "| 6.6.y | Not found |\n" + "|-----------------|----------------------------------------------|\n" + "\n" + "Note: The patch differs from the upstream commit:\n" + "---\n" + "--- -\t2024-11-19 01:03:18.229030137 -0500\n" + "+++ /tmp/tmp.cXmNHAm0RR\t2024-11-19 01:03:18.223800931 -0500\n" + "@@ -1,3 +1,5 @@\n" + "+commit 06afe09091ee69dc7ab058b4be9917ae59cc81e5 upstream.\n" "+\n" - " int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk,\n" - " \t\t\t\t\t\t unsigned int id,\n" - " \t\t\t\t\t\t u8 *flags, int *ifindex)\n" - " {\n" - "-\tstruct mptcp_pm_addr_entry *entry, *match = NULL;\n" - "+\tstruct mptcp_pm_addr_entry *match;\n" + " Corresponding __lookup_addr_by_id() helper in the in-kernel netlink PM,\n" + " this patch adds a new helper mptcp_userspace_pm_lookup_addr_by_id() to\n" + " lookup the address entry with the given id on the userspace pm local\n" + "@@ -8,15 +10,17 @@\n" + " Reviewed-by: Mat Martineau <martineau@kernel.org>\n" + " Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" + " Signed-off-by: David S. Miller <davem@davemloft.net>\n" + "+Stable-dep-of: f642c5c4d528 (\"mptcp: hold pm lock when deleting entry\")\n" + "+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" + " ---\n" + " net/mptcp/pm_userspace.c | 31 ++++++++++++++++---------------\n" + " 1 file changed, 16 insertions(+), 15 deletions(-)\n" " \n" - " \tspin_lock_bh(&msk->pm.lock);\n" - "-\tlist_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) {\n" - "-\t\tif (id == entry->addr.id) {\n" - "-\t\t\tmatch = entry;\n" - "-\t\t\tbreak;\n" - "-\t\t}\n" - "-\t}\n" - "+\tmatch = mptcp_userspace_pm_lookup_addr_by_id(msk, id);\n" - " \tspin_unlock_bh(&msk->pm.lock);\n" - " \tif (match) {\n" - " \t\t*flags = match->flags;\n" - "@@ -280,7 +287,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" - " {\n" - " \tstruct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN];\n" - " \tstruct nlattr *id = info->attrs[MPTCP_PM_ATTR_LOC_ID];\n" - "-\tstruct mptcp_pm_addr_entry *match = NULL;\n" - "+\tstruct mptcp_pm_addr_entry *match;\n" - " \tstruct mptcp_pm_addr_entry *entry;\n" - " \tstruct mptcp_sock *msk;\n" - " \tLIST_HEAD(free_list);\n" - "@@ -317,13 +324,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" - " \n" - " \tlock_sock(sk);\n" - " \n" - "-\tlist_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) {\n" - "-\t\tif (entry->addr.id == id_val) {\n" - "-\t\t\tmatch = entry;\n" - "-\t\t\tbreak;\n" - "-\t\t}\n" - "-\t}\n" - "-\n" - "+\tmatch = mptcp_userspace_pm_lookup_addr_by_id(msk, id_val);\n" - " \tif (!match) {\n" - " \t\tGENL_SET_ERR_MSG(info, \"address with specified id not found\");\n" - " \t\trelease_sock(sk);\n" - "-- \n" - 2.45.2 + " diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c\n" + "-index 3bd13e94b5687..20cbcb62cd8c5 100644\n" + "+index eded0f9c0b6f..23e362c11801 100644\n" + " --- a/net/mptcp/pm_userspace.c\n" + " +++ b/net/mptcp/pm_userspace.c\n" + "-@@ -106,19 +106,26 @@ static int mptcp_userspace_pm_delete_local_addr(struct mptcp_sock *msk,\n" + "+@@ -107,19 +107,26 @@ static int mptcp_userspace_pm_delete_local_addr(struct mptcp_sock *msk,\n" + " \treturn -EINVAL;\n" + " }\n" + " \n" + "@@ -50,7 +54,7 @@\n" + " \tspin_unlock_bh(&msk->pm.lock);\n" + " \tif (match) {\n" + " \t\t*flags = match->flags;\n" + "-@@ -261,7 +268,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)\n" + "+@@ -280,7 +287,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" + " {\n" + " \tstruct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN];\n" + " \tstruct nlattr *id = info->attrs[MPTCP_PM_ATTR_LOC_ID];\n" + "@@ -59,7 +63,7 @@\n" + " \tstruct mptcp_pm_addr_entry *entry;\n" + " \tstruct mptcp_sock *msk;\n" + " \tLIST_HEAD(free_list);\n" + "-@@ -298,13 +305,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)\n" + "+@@ -317,13 +324,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)\n" + " \n" + " \tlock_sock(sk);\n" + " \n" + "@@ -74,3 +78,6 @@\n" + " \tif (!match) {\n" + " \t\tGENL_SET_ERR_MSG(info, \"address with specified id not found\");\n" + " \t\trelease_sock(sk);\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 | -34d927e322d3785e8a6e5d4ea2ba78d6f8a5e4bbdc6f8dc7b7a1a5ebb1ab6607 +39a27f3d31d0ffd8255587f37e5508a84eb5a6a9aa13e7e38675c23ecfe17d2d
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.