Skip to contentSkip to conversation

BPF path manager, part 7

PATCH In review Geliang Tang 2 participants 6 messages Apr 1, 2025

Subsystems (2)
lore
Share & tools
lore

Geliang Tang

author reviewer
#0 lore raw

cover BPF path manager, part 7

From: Geliang Tang <[email protected]>

- add_addr_received/rm_addr_received interfaces are added.
- a new interface accept_new_address() is added intead of add_addr_echo() in "BPF path manager, part 6" v4.

Depends on:
- BPF path manager, part 6, v6

Based-on: <[email protected]>

Geliang Tang (4):
mptcp: pm: add accept_address helper
mptcp: pm: add accept_new_address() interface
mptcp: pm: add add_addr_received() interface
mptcp: pm: add rm_addr_received() interface

 include/net/mptcp.h      |  8 +++++++
 net/mptcp/pm.c           | 45 ++++++++++++++++++----------------------
 net/mptcp/pm_kernel.c    | 34 +++++++++++++++---------------
 net/mptcp/pm_userspace.c |  7 +++++++
 net/mptcp/protocol.h     | 12 +++++++++--
 5 files changed, 62 insertions(+), 44 deletions(-)
Signature · 1 line
2.43.0
author reviewer
#1 lore raw

PATCH 1/4 mptcp: pm: add accept_address helper

From: Geliang Tang <[email protected]>

Extract the code in mptcp_pm_add_addr_received() to test whether the address can be accepted into a new helper mptcp_pm_accept_address() to simplify the code.

For this, mptcp_pm_is_init_remote_addr() needs to be exported in protocol.h.

---
 net/mptcp/pm.c       |  8 +++-----
 net/mptcp/protocol.h | 10 ++++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)
net/mptcp/pm.c +3 -5
index d576b03a64e1..f37ddd6111de 100644
@@ -104,8 +104,8 @@ void mptcp_remote_address(const struct sock_common *skc,
 #endif
 }
 
-static bool mptcp_pm_is_init_remote_addr(struct mptcp_sock *msk,
-					 const struct mptcp_addr_info *remote)
+bool mptcp_pm_is_init_remote_addr(struct mptcp_sock *msk,
+				  const struct mptcp_addr_info *remote)
 {
 	struct mptcp_addr_info mpc_remote;
 
@@ -598,9 +598,7 @@ void mptcp_pm_add_addr_received(const struct sock *ssk,
 		} else {
 			__MPTCP_INC_STATS(sock_net((struct sock *)msk), MPTCP_MIB_ADDADDRDROP);
 		}
-	/* id0 should not have a different address */
-	} else if ((addr->id == 0 && !mptcp_pm_is_init_remote_addr(msk, addr)) ||
-		   (addr->id > 0 && !READ_ONCE(pm->accept_addr))) {
+	} else if (!mptcp_pm_accept_address(msk, addr)) {
 		mptcp_pm_announce_addr(msk, addr, true);
 		mptcp_pm_add_addr_send_ack(msk);
 	} else if (mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_RECEIVED)) {
net/mptcp/protocol.h +10 -0
index 134b46b53014..910d422d64fa 100644
@@ -1015,6 +1015,8 @@ void mptcp_pm_subflow_established(struct mptcp_sock *msk);
 bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk);
 void mptcp_pm_subflow_check_next(struct mptcp_sock *msk,
 				 const struct mptcp_subflow_context *subflow);
+bool mptcp_pm_is_init_remote_addr(struct mptcp_sock *msk,
+				  const struct mptcp_addr_info *remote);
 void mptcp_pm_add_addr_received(const struct sock *ssk,
 				const struct mptcp_addr_info *addr);
 void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk,
@@ -1209,6 +1211,14 @@ static inline bool mptcp_pm_accept_subflow(struct mptcp_sock *msk)
 	return ret;
 }
 
+static inline bool mptcp_pm_accept_address(struct mptcp_sock *msk,
+					   const struct mptcp_addr_info *addr)
+{
+	/* id0 should not have a different address */
+	return !((addr->id == 0 && !mptcp_pm_is_init_remote_addr(msk, addr)) ||
+		 (addr->id > 0 && !READ_ONCE(msk->pm.accept_addr)));
+}
+
 void mptcp_sockopt_sync_locked(struct mptcp_sock *msk, struct sock *ssk);
 
 static inline struct mptcp_ext *mptcp_get_ext(const struct sk_buff *skb)
Signature · 1 line
2.43.0
author reviewer
#2 lore raw

PATCH 2/4 mptcp: pm: add accept_new_address() interface

In reply to Geliang Tang

From: Geliang Tang <[email protected]>

Similar to the accept_new_subflow() interface, this patch adds a mandatory accept_new_address() interface for struct mptcp_pm_ops, which is used to determine whether an ADD_ADDR address is accepted by PM.

This interface is called in mptcp_pm_add_addr_received(). If the address is not accepted, increase MPTCP_MIB_ADDADDRDROP counter and return.

---
 include/net/mptcp.h      |  4 ++++
 net/mptcp/pm.c           | 17 ++++++++---------
 net/mptcp/pm_kernel.c    |  8 ++++++++
 net/mptcp/pm_userspace.c |  7 +++++++
 4 files changed, 27 insertions(+), 9 deletions(-)
include/net/mptcp.h +4 -0
index 1eae68c9e662..d6bb030b14c6 100644
@@ -129,6 +129,10 @@ struct mptcp_pm_ops {
 	void (*established)(struct mptcp_sock *msk);
 	void (*subflow_established)(struct mptcp_sock *msk);
 
+	/* required */
+	bool (*accept_new_address)(struct mptcp_sock *msk,
+				   const struct mptcp_addr_info *addr);
+
 	char			name[MPTCP_PM_NAME_MAX];
 	struct module		*owner;
 	struct list_head	list;
net/mptcp/pm.c +8 -9
index f37ddd6111de..519beb8cadfa 100644
@@ -589,22 +589,21 @@ void mptcp_pm_add_addr_received(const struct sock *ssk,
 
 	mptcp_event_addr_announced(ssk, addr);
 
+	if (!pm->ops->accept_new_address(msk, addr)) {
+		MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_ADDADDRDROP);
+		return;
+	}
+
 	spin_lock_bh(&pm->lock);
 
 	if (mptcp_pm_is_userspace(msk)) {
-		if (mptcp_userspace_pm_active(msk)) {
-			mptcp_pm_announce_addr(msk, addr, true);
-			mptcp_pm_add_addr_send_ack(msk);
-		} else {
-			__MPTCP_INC_STATS(sock_net((struct sock *)msk), MPTCP_MIB_ADDADDRDROP);
-		}
+		mptcp_pm_announce_addr(msk, addr, true);
+		mptcp_pm_add_addr_send_ack(msk);
 	} else if (!mptcp_pm_accept_address(msk, addr)) {
 		mptcp_pm_announce_addr(msk, addr, true);
 		mptcp_pm_add_addr_send_ack(msk);
 	} else if (mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_RECEIVED)) {
 		pm->remote = *addr;
-	} else {
-		__MPTCP_INC_STATS(sock_net((struct sock *)msk), MPTCP_MIB_ADDADDRDROP);
 	}
 
 	spin_unlock_bh(&pm->lock);
@@ -1046,7 +1045,7 @@ struct mptcp_pm_ops *mptcp_pm_find(const char *name)
 int mptcp_pm_validate(struct mptcp_pm_ops *pm_ops)
 {
 	if (!pm_ops->get_local_id || !pm_ops->get_priority ||
-	    !pm_ops->accept_new_subflow) {
+	    !pm_ops->accept_new_subflow || !pm_ops->accept_new_address) {
 		pr_err("%s does not implement required ops\n", pm_ops->name);
 		return -EINVAL;
 	}
net/mptcp/pm_kernel.c +8 -0
index 000f4f173ad5..defd8312a764 100644
@@ -1413,6 +1413,13 @@ static bool mptcp_pm_kernel_accept_new_subflow(struct mptcp_sock *msk,
 	return ret;
 }
 
+static bool mptcp_pm_kernel_accept_new_address(struct mptcp_sock *msk,
+					       const struct mptcp_addr_info *addr)
+{
+	return !(mptcp_pm_accept_address(msk, addr) &&
+		 msk->pm.status & BIT(MPTCP_PM_ADD_ADDR_RECEIVED));
+}
+
 static void mptcp_pm_kernel_init(struct mptcp_sock *msk)
 {
 	bool subflows_allowed = !!mptcp_pm_get_subflows_max(msk);
@@ -1439,6 +1446,7 @@ struct mptcp_pm_ops mptcp_pm_kernel = {
 	.accept_new_subflow	= mptcp_pm_kernel_accept_new_subflow,
 	.established		= mptcp_pm_kernel_established,
 	.subflow_established	= mptcp_pm_kernel_subflow_established,
+	.accept_new_address	= mptcp_pm_kernel_accept_new_address,
 	.init			= mptcp_pm_kernel_init,
 	.name			= "kernel",
 	.owner			= THIS_MODULE,
net/mptcp/pm_userspace.c +7 -0
index 31da3b9f4cc8..b09582c0118d 100644
@@ -689,6 +689,12 @@ static bool mptcp_pm_userspace_accept_new_subflow(struct mptcp_sock *msk,
 	return mptcp_userspace_pm_active(msk);
 }
 
+static bool mptcp_pm_userspace_accept_new_address(struct mptcp_sock *msk,
+						  const struct mptcp_addr_info *addr)
+{
+	return mptcp_userspace_pm_active(msk);
+}
+
 static void mptcp_pm_userspace_release(struct mptcp_sock *msk)
 {
 	mptcp_userspace_pm_free_local_addr_list(msk);
@@ -698,6 +704,7 @@ static struct mptcp_pm_ops mptcp_pm_userspace = {
 	.get_local_id		= mptcp_pm_userspace_get_local_id,
 	.get_priority		= mptcp_pm_userspace_get_priority,
 	.accept_new_subflow	= mptcp_pm_userspace_accept_new_subflow,
+	.accept_new_address	= mptcp_pm_userspace_accept_new_address,
 	.release		= mptcp_pm_userspace_release,
 	.name			= "userspace",
 	.owner			= THIS_MODULE,
Signature · 1 line
2.43.0
author reviewer
#3 lore raw

PATCH 3/4 mptcp: pm: add add_addr_received() interface

In reply to Geliang Tang

From: Geliang Tang <[email protected]>

This patch adds an optional .add_addr_received interface for struct mptcp_pm_ops and invokes it in mptcp_pm_worker().

__mptcp_pm_kernel_worker() helper can be dropped now.

This interface is only implemented in the in-kernel PM as a wrapper of mptcp_pm_nl_add_addr_received().

ADD_ADDR echo is moved forward from mptcp_pm_nl_add_addr_received() to mptcp_pm_add_addr_received().

---
 include/net/mptcp.h   |  3 +++
 net/mptcp/pm.c        | 22 ++++++++++------------
 net/mptcp/pm_kernel.c | 23 +++++++----------------
 net/mptcp/protocol.h  |  1 -
 4 files changed, 20 insertions(+), 29 deletions(-)
include/net/mptcp.h +3 -0
index d6bb030b14c6..d63d251932ac 100644
@@ -133,6 +133,9 @@ struct mptcp_pm_ops {
 	bool (*accept_new_address)(struct mptcp_sock *msk,
 				   const struct mptcp_addr_info *addr);
 
+	/* optional, call from the msk context */
+	void (*add_addr_received)(struct mptcp_sock *msk);
+
 	char			name[MPTCP_PM_NAME_MAX];
 	struct module		*owner;
 	struct list_head	list;
net/mptcp/pm.c +10 -12
index 519beb8cadfa..39d0ad715d26 100644
@@ -596,15 +596,13 @@ void mptcp_pm_add_addr_received(const struct sock *ssk,
 
 	spin_lock_bh(&pm->lock);
 
-	if (mptcp_pm_is_userspace(msk)) {
-		mptcp_pm_announce_addr(msk, addr, true);
-		mptcp_pm_add_addr_send_ack(msk);
-	} else if (!mptcp_pm_accept_address(msk, addr)) {
-		mptcp_pm_announce_addr(msk, addr, true);
-		mptcp_pm_add_addr_send_ack(msk);
-	} else if (mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_RECEIVED)) {
+	mptcp_pm_announce_addr(msk, addr, true);
+	mptcp_pm_add_addr_send_ack(msk);
+
+	if (pm->ops->add_addr_received &&
+	    mptcp_pm_accept_address(msk, addr) &&
+	    mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_RECEIVED))
 		pm->remote = *addr;
-	}
 
 	spin_unlock_bh(&pm->lock);
 }
@@ -932,7 +930,8 @@ void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk)
 
 void mptcp_pm_worker(struct mptcp_sock *msk)
 {
-	u8 status, mask = BIT(MPTCP_PM_ADD_ADDR_SEND_ACK) |
+	u8 status, mask = BIT(MPTCP_PM_ADD_ADDR_RECEIVED) |
+			  BIT(MPTCP_PM_ADD_ADDR_SEND_ACK) |
 			  BIT(MPTCP_PM_RM_ADDR_RECEIVED) |
 			  BIT(MPTCP_PM_ESTABLISHED) |
 			  BIT(MPTCP_PM_SUBFLOW_ESTABLISHED);
@@ -949,6 +948,8 @@ void mptcp_pm_worker(struct mptcp_sock *msk)
 	spin_unlock_bh(&pm->lock);
 
 	pr_debug("msk=%p status=%x\n", msk, status);
+	if (status & BIT(MPTCP_PM_ADD_ADDR_RECEIVED))
+		pm->ops->add_addr_received(msk);
 	if (status & BIT(MPTCP_PM_ADD_ADDR_SEND_ACK))
 		mptcp_pm_addr_send_ack(msk);
 	if (status & BIT(MPTCP_PM_RM_ADDR_RECEIVED))
@@ -957,9 +958,6 @@ void mptcp_pm_worker(struct mptcp_sock *msk)
 		pm->ops->established(msk);
 	if (status & BIT(MPTCP_PM_SUBFLOW_ESTABLISHED))
 		pm->ops->subflow_established(msk);
-	spin_lock_bh(&pm->lock);
-	__mptcp_pm_kernel_worker(msk);
-	spin_unlock_bh(&pm->lock);
 }
 
 static void mptcp_pm_ops_init(struct mptcp_sock *msk,
net/mptcp/pm_kernel.c +7 -16
index defd8312a764..dff880b030d1 100644
@@ -448,7 +448,7 @@ static unsigned int fill_local_addresses_vec(struct mptcp_sock *msk,
 	return i;
 }
 
-static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)
+static void mptcp_pm_kernel_add_addr_received(struct mptcp_sock *msk)
 {
 	struct mptcp_pm_local locals[MPTCP_PM_ADDR_MAX];
 	struct sock *sk = (struct sock *)msk;
@@ -465,12 +465,11 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)
 		 msk->pm.add_addr_accepted, add_addr_accept_max,
 		 msk->pm.remote.family);
 
+	spin_lock_bh(&msk->pm.lock);
 	remote = msk->pm.remote;
-	mptcp_pm_announce_addr(msk, &remote, true);
-	__mptcp_pm_addr_send_ack(msk);
 
 	if (lookup_subflow_by_daddr(&msk->conn_list, &remote))
-		return;
+		goto out;
 
 	/* pick id 0 port, if none is provided the remote address */
 	if (!remote.port)
@@ -481,7 +480,7 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)
 	 */
 	nr = fill_local_addresses_vec(msk, &remote, locals);
 	if (nr == 0)
-		return;
+		goto out;
 
 	spin_unlock_bh(&msk->pm.lock);
 	for (i = 0; i < nr; i++)
@@ -497,6 +496,8 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)
 		    msk->pm.subflows >= subflows_max)
 			WRITE_ONCE(msk->pm.accept_addr, false);
 	}
+out:
+	spin_unlock_bh(&msk->pm.lock);
 }
 
 void mptcp_pm_nl_rm_addr(struct mptcp_sock *msk, u8 rm_id)
@@ -1346,17 +1347,6 @@ bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk)
 	return true;
 }
 
-/* Called under PM lock */
-void __mptcp_pm_kernel_worker(struct mptcp_sock *msk)
-{
-	struct mptcp_pm_data *pm = &msk->pm;
-
-	if (pm->status & BIT(MPTCP_PM_ADD_ADDR_RECEIVED)) {
-		pm->status &= ~BIT(MPTCP_PM_ADD_ADDR_RECEIVED);
-		mptcp_pm_nl_add_addr_received(msk);
-	}
-}
-
 static int __net_init pm_nl_init_net(struct net *net)
 {
 	struct pm_nl_pernet *pernet = pm_nl_get_pernet(net);
@@ -1447,6 +1437,7 @@ struct mptcp_pm_ops mptcp_pm_kernel = {
 	.established		= mptcp_pm_kernel_established,
 	.subflow_established	= mptcp_pm_kernel_subflow_established,
 	.accept_new_address	= mptcp_pm_kernel_accept_new_address,
+	.add_addr_received	= mptcp_pm_kernel_add_addr_received,
 	.init			= mptcp_pm_kernel_init,
 	.name			= "kernel",
 	.owner			= THIS_MODULE,
net/mptcp/protocol.h +0 -1
index 910d422d64fa..128c081810d9 100644
@@ -1167,7 +1167,6 @@ void __init mptcp_pm_kernel_register(void);
 void __init mptcp_pm_userspace_register(void);
 void __init mptcp_pm_nl_init(void);
 void mptcp_pm_worker(struct mptcp_sock *msk);
-void __mptcp_pm_kernel_worker(struct mptcp_sock *msk);
 unsigned int mptcp_pm_get_add_addr_signal_max(const struct mptcp_sock *msk);
 unsigned int mptcp_pm_get_add_addr_accept_max(const struct mptcp_sock *msk);
 unsigned int mptcp_pm_get_subflows_max(const struct mptcp_sock *msk);
Signature · 1 line
2.43.0
author reviewer
#4 lore raw

PATCH 4/4 mptcp: pm: add rm_addr_received() interface

In reply to Geliang Tang

From: Geliang Tang <[email protected]>

This patch adds an optional .rm_addr_received interface for struct mptcp_pm_ops and invokes it in mptcp_pm_rm_addr_or_subflow().

This interface is only implemented in the in-kernel PM as a wrapper of mptcp_pm_nl_rm_addr().

---
 include/net/mptcp.h   | 1 +
 net/mptcp/pm.c        | 4 ++--
 net/mptcp/pm_kernel.c | 3 ++-
 net/mptcp/protocol.h  | 1 -
 4 files changed, 5 insertions(+), 4 deletions(-)
include/net/mptcp.h +1 -0
index d63d251932ac..6d4c9304157b 100644
@@ -135,6 +135,7 @@ struct mptcp_pm_ops {
 
 	/* optional, call from the msk context */
 	void (*add_addr_received)(struct mptcp_sock *msk);
+	void (*rm_addr_received)(struct mptcp_sock *msk, u8 rm_id);
 
 	char			name[MPTCP_PM_NAME_MAX];
 	struct module		*owner;
net/mptcp/pm.c +2 -2
index 39d0ad715d26..07b144ccc9f8 100644
@@ -690,8 +690,8 @@ static void mptcp_pm_rm_addr_or_subflow(struct mptcp_sock *msk,
 
 		if (rm_type == MPTCP_MIB_RMADDR) {
 			__MPTCP_INC_STATS(sock_net(sk), rm_type);
-			if (removed && mptcp_pm_is_kernel(msk))
-				mptcp_pm_nl_rm_addr(msk, rm_id);
+			if (removed && msk->pm.ops->rm_addr_received)
+				msk->pm.ops->rm_addr_received(msk, rm_id);
 		}
 	}
 }
net/mptcp/pm_kernel.c +2 -1
index dff880b030d1..b6c489a29c5d 100644
@@ -500,7 +500,7 @@ static void mptcp_pm_kernel_add_addr_received(struct mptcp_sock *msk)
 	spin_unlock_bh(&msk->pm.lock);
 }
 
-void mptcp_pm_nl_rm_addr(struct mptcp_sock *msk, u8 rm_id)
+static void mptcp_pm_kernel_rm_addr_received(struct mptcp_sock *msk, u8 rm_id)
 {
 	if (rm_id && WARN_ON_ONCE(msk->pm.add_addr_accepted == 0)) {
 		/* Note: if the subflow has been closed before, this
@@ -1438,6 +1438,7 @@ struct mptcp_pm_ops mptcp_pm_kernel = {
 	.subflow_established	= mptcp_pm_kernel_subflow_established,
 	.accept_new_address	= mptcp_pm_kernel_accept_new_address,
 	.add_addr_received	= mptcp_pm_kernel_add_addr_received,
+	.rm_addr_received	= mptcp_pm_kernel_rm_addr_received,
 	.init			= mptcp_pm_kernel_init,
 	.name			= "kernel",
 	.owner			= THIS_MODULE,
net/mptcp/protocol.h +0 -1
index 128c081810d9..70addda39a5f 100644
@@ -1026,7 +1026,6 @@ void mptcp_pm_send_ack(struct mptcp_sock *msk,
 		       struct mptcp_subflow_context *subflow,
 		       bool prio, bool backup);
 void __mptcp_pm_addr_send_ack(struct mptcp_sock *msk);
-void mptcp_pm_nl_rm_addr(struct mptcp_sock *msk, u8 rm_id);
 void mptcp_pm_rm_subflow(struct mptcp_sock *msk,
 			 const struct mptcp_rm_list *rm_list);
 void mptcp_pm_rm_addr_received(struct mptcp_sock *msk,
Signature · 1 line
2.43.0
#5 lore raw
In reply to Geliang Tang

Hi Geliang,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal: Unstable: 2 failed test(s): packetdrill_mp_join packetdrill_sockopts 🔴
- KVM Validation: debug: Unstable: 2 failed test(s): packetdrill_mp_join packetdrill_sockopts 🔴
- KVM Validation: btf-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Unstable: 1 failed test(s): bpftest_test_progs-cpuv4_mptcp 🔴
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/14187422547

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/fc6a4ffc4da4
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=948762

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-normal

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 (NGI0 Core)