mptcp: Implement interim path manager
Subsystems (2)
Peter Krystad
RFC 1/1 mptcp: Implement interim path manager
Two features: 1) When an incoming connection is received announce a local address and 2) When an outgoing connection is fully established and a remote address has been received initiate a secondary subflow.
The second local address must be hard-coded for now.
--- net/mptcp/pm.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 4 deletions(-)
net/mptcp/pm.c +53 -4
@@ -8,6 +8,10 @@#include <net/mptcp.h> #include "protocol.h" +struct workqueue_struct *mptcp_wq; +static void announce_addr_worker (struct work_struct *work); +static void create_subflow_worker (struct work_struct *work); +/* path manager command handlers */ int pm_announce_addr(u32 token, sa_family_t family, u8 local_id,
@@ -91,16 +95,32 @@ int pm_remove_subflow(u32 token, u8 remote_id)void pm_new_connection (struct mptcp_sock *msk,int server_side) { -pr_debug ("msk=%p" , msk); +struct mptcp_pm_data *pm = &msk->pm; + +pr_debug ("msk=%p, token=%u" , msk, msk->token); - msk->pm.server_side = server_side; + pm->server_side = server_side; + pm->token = msk->token; + +/* trigger announce address in interim local path manager */ +if (pm->server_side) { +INIT_WORK (&pm->addr_work, announce_addr_worker); +queue_work (mptcp_wq, &pm->addr_work); + } }void pm_fully_established (struct mptcp_sock *msk) { +struct mptcp_pm_data *pm = &msk->pm; +pr_debug ("msk=%p" , msk); - msk->pm.fully_established =1 ; +/* trigger create subflow in interim local path manager */ +if (!pm->server_side && !pm->fully_established && pm->remote_valid) { +INIT_WORK (&pm->subflow_work, create_subflow_worker); +queue_work (mptcp_wq, &pm->subflow_work); + } + pm->fully_established =1 ; }void pm_connection_closed (struct mptcp_sock *msk)
@@ -120,12 +140,20 @@ void pm_subflow_closed(struct mptcp_sock *msk, u8 id)void pm_add_addr (struct mptcp_sock *msk,const struct in_addr *addr,u8 id) { +struct mptcp_pm_data *pm = &msk->pm; +pr_debug ("msk=%p, addr=%x, remote_id=%d" , msk, addr->s_addr, id); msk->pm.remote_addr.s_addr = addr->s_addr; msk->pm.remote_id = id; msk->pm.remote_family =AF_INET ; - msk->pm.remote_valid =1 ; + +/* trigger create subflow in interim local path manager */ +if (!pm->server_side && !pm->remote_valid && pm->fully_established) { +INIT_WORK (&pm->subflow_work, create_subflow_worker); +queue_work (mptcp_wq, &pm->subflow_work); + } + pm->remote_valid =1 ; }void pm_add_addr6 (struct mptcp_sock *msk,const struct in6_addr *addr,u8 id)
@@ -177,4 +205,25 @@ int pm_get_local_id(struct request_sock *req, struct sock *sk,void pm_init (void ) { + mptcp_wq =alloc_workqueue ("mptcp_wq" ,WQ_UNBOUND |WQ_MEM_RECLAIM ,8 ); +if (!mptcp_wq) +panic ("Failed to allocate workqueue" ); +} + +static void announce_addr_worker (struct work_struct *work) +{ + struct mptcp_pm_data *pm = container_of(work, struct mptcp_pm_data, + addr_work); +struct in_addr addr; + +/* @@ hard-code address to announce here... */ +pm_announce_addr (pm->token,AF_INET ,1 , &addr); +} + +static void create_subflow_worker (struct work_struct *work) +{ + struct mptcp_pm_data *pm = container_of(work, struct mptcp_pm_data, + subflow_work); + +pm_create_subflow (pm->token, pm->remote_id); }
Signature · 1 line
2.17.2
Paolo Abeni
Quoted 7 lines · Peter Krystad
net/mptcp/pm.c +2
-1@@ -91,16 +95,32 @@ int pm_remove_subflow(u32 token, u8 remote_id)void pm_new_connection (struct mptcp_sock *msk,int server_side) { -pr_debug ("msk=%p" , msk); +struct mptcp_pm_data *pm = &msk->pm; +
net/mptcp/pm.c int pm_remove_subflow(u32 token, u8 remote_id) · line 108
Quoted 10 lines
net/mptcp/pm.c +8
-1+pr_debug ("msk=%p, token=%u" , msk, msk->token); - msk->pm.server_side = server_side; + pm->server_side = server_side; + pm->token = msk->token; + +/* trigger announce address in interim local path manager */ +if (pm->server_side) { +INIT_WORK (&pm->addr_work, announce_addr_worker); +queue_work (mptcp_wq, &pm->addr_work);
I think that here we need to acquire a reference to the related msk socket, or we can get use-after-free depending on socket shutdown and workqueue scheduling.
Such reference should be releases by the worker itself.
Other workqueue usage below should need a similar change.
Cheers,
Paolo
Peter Krystad
Hi Paolo -
Quoted 10 lines · Paolo Abeni
Quoted 9 lines · Peter Krystad
net/mptcp/pm.c +3
-1@@ -91,16 +95,32 @@ int pm_remove_subflow(u32 token, u8 remote_id)void pm_new_connection (struct mptcp_sock *msk,int server_side) { -pr_debug ("msk=%p" , msk); +struct mptcp_pm_data *pm = &msk->pm; + +pr_debug ("msk=%p, token=%u" , msk, msk->token);
Quoted 12 lines
net/mptcp/pm.c int pm_remove_subflow(u32 token, u8 remote_id) · line 108
Quoted 8 lines
net/mptcp/pm.c +7
-1- msk->pm.server_side = server_side; + pm->server_side = server_side; + pm->token = msk->token; + +/* trigger announce address in interim local path manager */ +if (pm->server_side) { +INIT_WORK (&pm->addr_work, announce_addr_worker); +queue_work (mptcp_wq, &pm->addr_work);I think that here we need to acquire a reference to the related msk socket, or we can get use-after-free depending on socket shutdown and workqueue scheduling.
Thanks for the review, I'll add this and submit a v2.
Peter.
Quoted 8 lines
Such reference should be releases by the worker itself.
Other workqueue usage below should need a similar change.
Cheers,
Paolo