diff for duplicates of <20241119083547.3234013-13-matttbe@kernel.org> diff --git a/a/1.txt b/N1/1.txt index f44200c..0cab3d2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,60 +1,87 @@ -From: Geliang Tang <tanggeliang@kylinos.cn> - -commit e0266319413d5d687ba7b6df7ca99e4b9724a4f2 upstream. - -Just like in-kernel pm, when userspace pm does set_flags, it needs to send -out MP_PRIO signal, and also modify the flags of the corresponding address -entry in the local address list. This patch implements the missing logic. - -Traverse all address entries on userspace_pm_local_addr_list to find the -local address entry, if bkup is true, set the flags of this entry with -FLAG_BACKUP, otherwise, clear FLAG_BACKUP. - -Fixes: 892f396c8e68 ("mptcp: netlink: issue MP_PRIO signals from userspace PMs") -Cc: stable@vger.kernel.org -Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> -Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> -Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> -Link: https://patch.msgid.link/20241112-net-mptcp-misc-6-12-pm-v1-1-b835580cefa8@kernel.org -Signed-off-by: Jakub Kicinski <kuba@kernel.org> -[ Conflicts in pm_userspace.c, because commit 6a42477fe449 ("mptcp: - update set_flags interfaces"), is not in this version, and causes too - many conflicts when backporting it. The same code can still be added - at the same place, before sending the ACK. ] -Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> +[ Sasha's backport helper bot ] + +Hi, + +The upstream commit SHA1 provided is correct: e0266319413d5d687ba7b6df7ca99e4b9724a4f2 + +WARNING: Author mismatch between patch and upstream commit: +Backport author: "Matthieu Baerts (NGI0)" <matttbe@kernel.org> +Commit author: Geliang Tang <tanggeliang@kylinos.cn> + + +Status in newer kernel trees: +6.11.y | Present (different SHA1: a2062ee787b2) +6.6.y | Not found +6.1.y | Not found + +Note: The patch differs from the upstream commit: --- - net/mptcp/pm_userspace.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c -index ca3e452d4edb..195f84f16b97 100644 ---- a/net/mptcp/pm_userspace.c -+++ b/net/mptcp/pm_userspace.c -@@ -565,6 +565,7 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, - struct mptcp_pm_addr_entry *loc, - struct mptcp_pm_addr_entry *rem, u8 bkup) - { -+ struct mptcp_pm_addr_entry *entry; - struct mptcp_sock *msk; - int ret = -EINVAL; - struct sock *sk; -@@ -585,6 +586,17 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, - rem->addr.family == AF_UNSPEC) - goto set_flags_err; +--- - 2024-11-19 09:05:50.733275277 -0500 ++++ /tmp/tmp.PYLoTfPdIR 2024-11-19 09:05:50.728073161 -0500 +@@ -1,3 +1,5 @@ ++commit e0266319413d5d687ba7b6df7ca99e4b9724a4f2 upstream. ++ + Just like in-kernel pm, when userspace pm does set_flags, it needs to send + out MP_PRIO signal, and also modify the flags of the corresponding address + entry in the local address list. This patch implements the missing logic. +@@ -13,29 +15,34 @@ + Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> + Link: https://patch.msgid.link/20241112-net-mptcp-misc-6-12-pm-v1-1-b835580cefa8@kernel.org + Signed-off-by: Jakub Kicinski <kuba@kernel.org> ++[ Conflicts in pm_userspace.c, because commit 6a42477fe449 ("mptcp: ++ update set_flags interfaces"), is not in this version, and causes too ++ many conflicts when backporting it. The same code can still be added ++ at the same place, before sending the ACK. ] ++Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> + --- + net/mptcp/pm_userspace.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) -+ spin_lock_bh(&msk->pm.lock); -+ list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { -+ if (mptcp_addresses_equal(&entry->addr, &loc->addr, false)) { -+ if (bkup) -+ entry->flags |= MPTCP_PM_ADDR_FLAG_BACKUP; -+ else -+ entry->flags &= ~MPTCP_PM_ADDR_FLAG_BACKUP; -+ } -+ } -+ spin_unlock_bh(&msk->pm.lock); + diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c +-index 56dfea9862b7b..3f888bfe1462e 100644 ++index ca3e452d4edb..195f84f16b97 100644 + --- a/net/mptcp/pm_userspace.c + +++ b/net/mptcp/pm_userspace.c +-@@ -560,6 +560,7 @@ int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info) +- struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN]; +- struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR]; +- struct net *net = sock_net(skb->sk); ++@@ -565,6 +565,7 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, ++ struct mptcp_pm_addr_entry *loc, ++ struct mptcp_pm_addr_entry *rem, u8 bkup) ++ { + + struct mptcp_pm_addr_entry *entry; + struct mptcp_sock *msk; + int ret = -EINVAL; + struct sock *sk; +-@@ -601,6 +602,17 @@ int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info) +- if (loc.flags & MPTCP_PM_ADDR_FLAG_BACKUP) +- bkup = 1; ++@@ -585,6 +586,17 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, ++ rem->addr.family == AF_UNSPEC) ++ goto set_flags_err; + + + spin_lock_bh(&msk->pm.lock); + + list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { +-+ if (mptcp_addresses_equal(&entry->addr, &loc.addr, false)) { +++ if (mptcp_addresses_equal(&entry->addr, &loc->addr, false)) { + + if (bkup) + + entry->flags |= MPTCP_PM_ADDR_FLAG_BACKUP; + + else +@@ -45,5 +52,8 @@ + + spin_unlock_bh(&msk->pm.lock); + + + lock_sock(sk); +- ret = mptcp_pm_nl_mp_prio_send_ack(msk, &loc.addr, &rem.addr, bkup); ++ ret = mptcp_pm_nl_mp_prio_send_ack(msk, &loc->addr, &rem->addr, bkup); + release_sock(sk); ++-- ++2.45.2 + - lock_sock(sk); - ret = mptcp_pm_nl_mp_prio_send_ack(msk, &loc->addr, &rem->addr, bkup); - release_sock(sk); --- -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 1f025f7..410a135 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,75 +1,97 @@ - "ref\020241119083547.3234013-9-matttbe@kernel.org\0" - "From\0Matthieu Baerts (NGI0) <matttbe@kernel.org>\0" - "Subject\0[PATCH 6.1.y 4/7] mptcp: update local address flags when setting it\0" - "Date\0Tue, 19 Nov 2024 09:35:52 +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> - " Jakub Kicinski <kuba@kernel.org>\0" + "From\0Sasha Levin <sashal@kernel.org>\0" + "Subject\0Re: [PATCH 6.1.y 4/7] mptcp: update local address flags when setting it\0" + "Date\0Tue, 19 Nov 2024 09:46:55 -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 e0266319413d5d687ba7b6df7ca99e4b9724a4f2 upstream.\n" + "Hi,\n" "\n" - "Just like in-kernel pm, when userspace pm does set_flags, it needs to send\n" - "out MP_PRIO signal, and also modify the flags of the corresponding address\n" - "entry in the local address list. This patch implements the missing logic.\n" + "The upstream commit SHA1 provided is correct: e0266319413d5d687ba7b6df7ca99e4b9724a4f2\n" "\n" - "Traverse all address entries on userspace_pm_local_addr_list to find the\n" - "local address entry, if bkup is true, set the flags of this entry with\n" - "FLAG_BACKUP, otherwise, clear FLAG_BACKUP.\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" - "Fixes: 892f396c8e68 (\"mptcp: netlink: issue MP_PRIO signals from userspace PMs\")\n" - "Cc: stable@vger.kernel.org\n" - "Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>\n" - "Reviewed-by: Matthieu Baerts (NGI0) <matttbe@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-1-b835580cefa8@kernel.org\n" - "Signed-off-by: Jakub Kicinski <kuba@kernel.org>\n" - "[ Conflicts in pm_userspace.c, because commit 6a42477fe449 (\"mptcp:\n" - " update set_flags interfaces\"), is not in this version, and causes too\n" - " many conflicts when backporting it. The same code can still be added\n" - " at the same place, before sending the ACK. ]\n" - "Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" - "---\n" - " net/mptcp/pm_userspace.c | 12 ++++++++++++\n" - " 1 file changed, 12 insertions(+)\n" "\n" - "diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c\n" - "index ca3e452d4edb..195f84f16b97 100644\n" - "--- a/net/mptcp/pm_userspace.c\n" - "+++ b/net/mptcp/pm_userspace.c\n" - "@@ -565,6 +565,7 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,\n" - " \t\t\t\t struct mptcp_pm_addr_entry *loc,\n" - " \t\t\t\t struct mptcp_pm_addr_entry *rem, u8 bkup)\n" - " {\n" - "+\tstruct mptcp_pm_addr_entry *entry;\n" - " \tstruct mptcp_sock *msk;\n" - " \tint ret = -EINVAL;\n" - " \tstruct sock *sk;\n" - "@@ -585,6 +586,17 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,\n" - " \t rem->addr.family == AF_UNSPEC)\n" - " \t\tgoto set_flags_err;\n" + "Status in newer kernel trees:\n" + "6.11.y | Present (different SHA1: a2062ee787b2)\n" + "6.6.y | Not found\n" + "6.1.y | Not found\n" + "\n" + "Note: The patch differs from the upstream commit:\n" + "---\n" + "--- -\t2024-11-19 09:05:50.733275277 -0500\n" + "+++ /tmp/tmp.PYLoTfPdIR\t2024-11-19 09:05:50.728073161 -0500\n" + "@@ -1,3 +1,5 @@\n" + "+commit e0266319413d5d687ba7b6df7ca99e4b9724a4f2 upstream.\n" + "+\n" + " Just like in-kernel pm, when userspace pm does set_flags, it needs to send\n" + " out MP_PRIO signal, and also modify the flags of the corresponding address\n" + " entry in the local address list. This patch implements the missing logic.\n" + "@@ -13,29 +15,34 @@\n" + " Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" + " Link: https://patch.msgid.link/20241112-net-mptcp-misc-6-12-pm-v1-1-b835580cefa8@kernel.org\n" + " Signed-off-by: Jakub Kicinski <kuba@kernel.org>\n" + "+[ Conflicts in pm_userspace.c, because commit 6a42477fe449 (\"mptcp:\n" + "+ update set_flags interfaces\"), is not in this version, and causes too\n" + "+ many conflicts when backporting it. The same code can still be added\n" + "+ at the same place, before sending the ACK. ]\n" + "+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>\n" + " ---\n" + " net/mptcp/pm_userspace.c | 12 ++++++++++++\n" + " 1 file changed, 12 insertions(+)\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 (mptcp_addresses_equal(&entry->addr, &loc->addr, false)) {\n" - "+\t\t\tif (bkup)\n" - "+\t\t\t\tentry->flags |= MPTCP_PM_ADDR_FLAG_BACKUP;\n" - "+\t\t\telse\n" - "+\t\t\t\tentry->flags &= ~MPTCP_PM_ADDR_FLAG_BACKUP;\n" - "+\t\t}\n" - "+\t}\n" - "+\tspin_unlock_bh(&msk->pm.lock);\n" + " diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c\n" + "-index 56dfea9862b7b..3f888bfe1462e 100644\n" + "+index ca3e452d4edb..195f84f16b97 100644\n" + " --- a/net/mptcp/pm_userspace.c\n" + " +++ b/net/mptcp/pm_userspace.c\n" + "-@@ -560,6 +560,7 @@ int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info)\n" + "- \tstruct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN];\n" + "- \tstruct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR];\n" + "- \tstruct net *net = sock_net(skb->sk);\n" + "+@@ -565,6 +565,7 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,\n" + "+ \t\t\t\t struct mptcp_pm_addr_entry *loc,\n" + "+ \t\t\t\t struct mptcp_pm_addr_entry *rem, u8 bkup)\n" + "+ {\n" + " +\tstruct mptcp_pm_addr_entry *entry;\n" + " \tstruct mptcp_sock *msk;\n" + " \tint ret = -EINVAL;\n" + " \tstruct sock *sk;\n" + "-@@ -601,6 +602,17 @@ int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info)\n" + "- \tif (loc.flags & MPTCP_PM_ADDR_FLAG_BACKUP)\n" + "- \t\tbkup = 1;\n" + "+@@ -585,6 +586,17 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,\n" + "+ \t rem->addr.family == AF_UNSPEC)\n" + "+ \t\tgoto set_flags_err;\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 (mptcp_addresses_equal(&entry->addr, &loc.addr, false)) {\n" + "++\t\tif (mptcp_addresses_equal(&entry->addr, &loc->addr, false)) {\n" + " +\t\t\tif (bkup)\n" + " +\t\t\t\tentry->flags |= MPTCP_PM_ADDR_FLAG_BACKUP;\n" + " +\t\t\telse\n" + "@@ -45,5 +52,8 @@\n" + " +\tspin_unlock_bh(&msk->pm.lock);\n" + " +\n" + " \tlock_sock(sk);\n" + "- \tret = mptcp_pm_nl_mp_prio_send_ack(msk, &loc.addr, &rem.addr, bkup);\n" + "+ \tret = mptcp_pm_nl_mp_prio_send_ack(msk, &loc->addr, &rem->addr, bkup);\n" + " \trelease_sock(sk);\n" + "+-- \n" + "+2.45.2\n" "+\n" - " \tlock_sock(sk);\n" - " \tret = mptcp_pm_nl_mp_prio_send_ack(msk, &loc->addr, &rem->addr, bkup);\n" - " \trelease_sock(sk);\n" - "-- \n" - 2.45.2 + "---\n" + "\n" + "Results of testing on various branches:\n" + "\n" + "| Branch | Patch Apply | Build Test |\n" + "|---------------------------|-------------|------------|\n" + | stable/linux-6.1.y | Success | Success | -286d3af2def603c80cd3cec2e18d1362a0b9f0410ab425032a18df5d2d797319 +65bc5f00ae0fa04a4066310ff443413d70ec366138785c26c6e7e9a7bb12c068
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.