[PATCH mptcp-next] Squash to "mptcp: handle local addrs announced by userspace PMs"

Matthieu Baerts posted 1 patch 2 years ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/20220415104550.1037339-1-matthieu.baerts@tessares.net
Maintainers: Paolo Abeni <pabeni@redhat.com>, "David S. Miller" <davem@davemloft.net>, Matthieu Baerts <matthieu.baerts@tessares.net>, Mat Martineau <mathew.j.martineau@linux.intel.com>, Jakub Kicinski <kuba@kernel.org>
net/mptcp/pm_netlink.c | 8 --------
net/mptcp/protocol.h   | 8 ++++++++
2 files changed, 8 insertions(+), 8 deletions(-)
[PATCH mptcp-next] Squash to "mptcp: handle local addrs announced by userspace PMs"
Posted by Matthieu Baerts 2 years ago
Move mptcp_pm_addr_entry structure to protocol.h as this commit exports
a new function having a parameter using this structure.

This was causing the CI to complain about this commit (and the 2 next
ones). Fixing it here instead of modifying the CI not to complain about
that.

Note: compared to what Kishen did in commit "mptcp: netlink: Add
MPTCP_PM_CMD_ANNOUNCE", I moved the new structure with other mptcp_pm
ones.

Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---

Notes:
    to be squashed in "mptcp: handle local addrs announced by userspace PMs"

 net/mptcp/pm_netlink.c | 8 --------
 net/mptcp/protocol.h   | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 92d47e8e8983..9d515c3e0b16 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -22,14 +22,6 @@ static struct genl_family mptcp_genl_family;
 
 static int pm_nl_pernet_id;
 
-struct mptcp_pm_addr_entry {
-	struct list_head	list;
-	struct mptcp_addr_info	addr;
-	u8			flags;
-	int			ifindex;
-	struct socket		*lsk;
-};
-
 struct mptcp_pm_add_entry {
 	struct list_head	list;
 	struct mptcp_addr_info	addr;
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 40dabf9462a8..f41089e54555 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -229,6 +229,14 @@ struct mptcp_pm_data {
 	struct mptcp_rm_list rm_list_rx;
 };
 
+struct mptcp_pm_addr_entry {
+	struct list_head	list;
+	struct mptcp_addr_info	addr;
+	u8			flags;
+	int			ifindex;
+	struct socket		*lsk;
+};
+
 struct mptcp_data_frag {
 	struct list_head list;
 	u64 data_seq;
-- 
2.34.1


Re: Squash to "mptcp: handle local addrs announced by userspace PMs": Tests Results
Posted by MPTCP CI 2 years ago
Hi Matthieu,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal:
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/4810986858217472
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/4810986858217472/summary/summary.txt

- KVM Validation: debug:
  - Critical: KMemLeak ❌:
  - Task: https://cirrus-ci.com/task/5936886765060096
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5936886765060096/summary/summary.txt

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/0e3466dbb11f


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-debug

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (Tessares)