From nobody Mon Aug 24 02:55:03 2026 Received: from mta0.migadu.com (out-232.mta0.migadu.com [91.218.175.232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE1A42DC76A for ; Wed, 19 Aug 2026 12:56:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787144204; cv=none; b=Ek7G+mfMdvsM/OOCHmPNCUIUgFhhLBFKakt3sxxsLtsjBo15Cmebpi/6FcEmklLOnqxiBxb6NgV8QfIoN5vqS3Bz4Ks1R+Ppk3F3Ktvsay9dyaTPScpQLKoTNRGaeQ1wZ+fPpdTfSpewKcQY6SzEIvss/+cPGAHhb59CojvW73U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787144204; c=relaxed/simple; bh=Rx+8knskNmihSGb6korL7LNY0joo8oWTFuW5ntGSOno=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m0XnRhwjDrgUsabdfmqywmSp1vFnRO1/c292TPAZHyRUMMKKCuiyvKvt2jVugzgddyUzbLN6WM0Ml6SBrcBFwhF/Os/Ru4KE69IU/d3+3GJAgHpfvgxZ1zEGPCpcPZMcSPZnUN5sUY+Pce0L4Nn7d3fy87+mn/be5xhQdWxmqUY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=rYU3tde+; arc=none smtp.client-ip=91.218.175.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="rYU3tde+" X-Envelope-To: mptcp@lists.linux.dev DKIM-Signature: a=rsa-sha256; bh=Rx+8knskNmihSGb6korL7LNY0joo8oWTFuW5ntGSOno=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787144200; v=1; x=1787749000; b=rYU3tde+riMLuGolrHXFc3QDwxoIXlXb8ql4nml0c617uTFZFaOvOWGmfQFsD4ZZ+XAJPa5Y yPgg8SMptsEtseXpdyOUghRkx+/wTrAz5t2p/KmYemtk94zFWgaDfYw4d7msOP+sLnSRKsRWR81 kbRvxWBOtr5mMMFR8LY9qtv4= X-Envelope-To: mptcp@lists.linux.dev Received: from thinkbook16p.. (223.70.160.239) by smtp.migadu.com with ESMTPS id 6ecd9101be94d749; Wed, 19 Aug 2026 12:56:40 +0000 X-Migadu-Flow: FLOW_OUT From: Gang Yan To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v3 1/5] mptcp: sched: change scheduler sysctl atomically Date: Wed, 19 Aug 2026 20:56:25 +0800 Message-ID: <20260819125629.49823-2-gang.yan@linux.dev> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260819125629.49823-1-gang.yan@linux.dev> References: <20260819125629.49823-1-gang.yan@linux.dev> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gang Yan The per-netns scheduler name is stored as an inline char[] buffer and updated via strscpy() from the sysctl handler. A concurrent reader (e.g. mptcp_init_sock() resolving the default scheduler) can observe a half-written name, which is also flagged by KCSAN. READ_ONCE() does not help here as it cannot read a multi-byte string atomically. Following the tcp_congestion_control() model, store a pointer to the immutable struct mptcp_sched_ops instead of the name string. A pointer store is a single atomic word, so readers always observe a consistent value, and mptcp_get_scheduler() can now return the ops directly instead of going through mptcp_sched_find() again. Assisted-by: Claude:GLM5.2 Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/626 Co-developed-by: Tao Cui Signed-off-by: Tao Cui Signed-off-by: Gang Yan --- net/mptcp/ctrl.c | 63 +++++++++++++++++++++++++++++++++++--------- net/mptcp/protocol.c | 3 +-- net/mptcp/protocol.h | 3 ++- net/mptcp/sched.c | 2 +- 4 files changed, 54 insertions(+), 17 deletions(-) diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c index 63c5747f0f63..7d0f3421bd04 100644 --- a/net/mptcp/ctrl.c +++ b/net/mptcp/ctrl.c @@ -39,7 +39,7 @@ struct mptcp_pernet { u8 allow_join_initial_addr_port; u8 pm_type; u8 add_addr_v6_port_drop_ts; - char scheduler[MPTCP_SCHED_NAME_MAX]; + struct mptcp_sched_ops __rcu *scheduler; char path_manager[MPTCP_PM_NAME_MAX]; }; =20 @@ -90,9 +90,17 @@ const char *mptcp_get_path_manager(const struct net *net) return mptcp_get_pernet(net)->path_manager; } =20 -const char *mptcp_get_scheduler(const struct net *net) +static struct mptcp_sched_ops *mptcp_pernet_sched(struct mptcp_pernet *per= net) { - return mptcp_get_pernet(net)->scheduler; + struct mptcp_sched_ops *sched; + + sched =3D rcu_dereference(pernet->scheduler); + return sched ? sched : &mptcp_sched_default; +} + +struct mptcp_sched_ops *mptcp_get_scheduler(const struct net *net) +{ + return mptcp_pernet_sched(mptcp_get_pernet(net)); } =20 unsigned int mptcp_add_addr_v6_port_drop_ts(const struct net *net) @@ -112,23 +120,33 @@ static void mptcp_pernet_set_defaults(struct mptcp_pe= rnet *pernet) pernet->allow_join_initial_addr_port =3D 1; pernet->stale_loss_cnt =3D 4; pernet->pm_type =3D MPTCP_PM_TYPE_KERNEL; - strscpy(pernet->scheduler, "default", sizeof(pernet->scheduler)); + + if (bpf_try_module_get(&mptcp_sched_default, mptcp_sched_default.owner)) + RCU_INIT_POINTER(pernet->scheduler, &mptcp_sched_default); + strscpy(pernet->path_manager, "kernel", sizeof(pernet->path_manager)); pernet->add_addr_v6_port_drop_ts =3D 1; } =20 #ifdef CONFIG_SYSCTL -static int mptcp_set_scheduler(char *scheduler, const char *name) +static int mptcp_set_scheduler(struct mptcp_pernet *pernet, const char *na= me) { - struct mptcp_sched_ops *sched; + struct mptcp_sched_ops *sched, *prev; int ret =3D 0; =20 rcu_read_lock(); sched =3D mptcp_sched_find(name); - if (sched) - strscpy(scheduler, name, MPTCP_SCHED_NAME_MAX); - else + if (sched) { + if (bpf_try_module_get(sched, sched->owner)) { + prev =3D xchg(&pernet->scheduler, sched); + if (prev) + bpf_module_put(prev, prev->owner); + } else { + ret =3D -EBUSY; + } + } else { ret =3D -ENOENT; + } rcu_read_unlock(); =20 return ret; @@ -137,7 +155,9 @@ static int mptcp_set_scheduler(char *scheduler, const c= har *name) static int proc_scheduler(const struct ctl_table *ctl, int write, void *buffer, size_t *lenp, loff_t *ppos) { - char (*scheduler)[MPTCP_SCHED_NAME_MAX] =3D ctl->data; + struct mptcp_pernet *pernet =3D container_of(ctl->data, + struct mptcp_pernet, + scheduler); char val[MPTCP_SCHED_NAME_MAX]; struct ctl_table tbl =3D { .data =3D val, @@ -145,11 +165,13 @@ static int proc_scheduler(const struct ctl_table *ctl= , int write, }; int ret; =20 - strscpy(val, *scheduler, MPTCP_SCHED_NAME_MAX); + rcu_read_lock(); + strscpy(val, mptcp_pernet_sched(pernet)->name, MPTCP_SCHED_NAME_MAX); + rcu_read_unlock(); =20 ret =3D proc_dostring(&tbl, write, buffer, lenp, ppos); if (write && ret =3D=3D 0) - ret =3D mptcp_set_scheduler(*scheduler, val); + ret =3D mptcp_set_scheduler(pernet, val); =20 return ret; } @@ -563,18 +585,33 @@ void mptcp_active_detect_blackhole(struct sock *ssk, = bool expired) static int __net_init mptcp_net_init(struct net *net) { struct mptcp_pernet *pernet =3D mptcp_get_pernet(net); + int ret; =20 mptcp_pernet_set_defaults(pernet); =20 - return mptcp_pernet_new_table(net, pernet); + ret =3D mptcp_pernet_new_table(net, pernet); + if (ret) { + struct mptcp_sched_ops *sched; + + sched =3D rcu_dereference_protected(pernet->scheduler, true); + if (sched) + bpf_module_put(sched, sched->owner); + } + + return ret; } =20 /* Note: the callback will only be called per extra netns */ static void __net_exit mptcp_net_exit(struct net *net) { struct mptcp_pernet *pernet =3D mptcp_get_pernet(net); + struct mptcp_sched_ops *sched; =20 mptcp_pernet_del_table(pernet); + + sched =3D rcu_dereference_protected(pernet->scheduler, true); + if (sched) + bpf_module_put(sched, sched->owner); } =20 static struct pernet_operations mptcp_pernet_ops =3D { diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index f879b1061f2d..1cbc6b1448bc 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3271,8 +3271,7 @@ static int mptcp_init_sock(struct sock *sk) return -ENOMEM; =20 rcu_read_lock(); - ret =3D mptcp_init_sched(mptcp_sk(sk), - mptcp_sched_find(mptcp_get_scheduler(net))); + ret =3D mptcp_init_sched(mptcp_sk(sk), mptcp_get_scheduler(net)); rcu_read_unlock(); if (ret) return ret; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 7e168e450fb0..6447945be93c 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -803,7 +803,7 @@ unsigned int mptcp_stale_loss_cnt(const struct net *net= ); unsigned int mptcp_close_timeout(const struct sock *sk); int mptcp_get_pm_type(const struct net *net); const char *mptcp_get_path_manager(const struct net *net); -const char *mptcp_get_scheduler(const struct net *net); +struct mptcp_sched_ops *mptcp_get_scheduler(const struct net *net); unsigned int mptcp_add_addr_v6_port_drop_ts(const struct net *net); =20 void mptcp_active_disable(struct sock *sk); @@ -1155,6 +1155,7 @@ int mptcp_pm_remove_addr(struct mptcp_sock *msk, cons= t struct mptcp_rm_list *rm_ =20 /* the default path manager, used in mptcp_pm_unregister */ extern struct mptcp_pm_ops mptcp_pm_kernel; +extern struct mptcp_sched_ops mptcp_sched_default; =20 struct mptcp_pm_ops *mptcp_pm_find(const char *name); int mptcp_pm_register(struct mptcp_pm_ops *pm_ops); diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 1e59072d478c..0d13ee46ffdf 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -40,7 +40,7 @@ static int mptcp_sched_default_get_retrans(struct mptcp_s= ock *msk) return 0; } =20 -static struct mptcp_sched_ops mptcp_sched_default =3D { +struct mptcp_sched_ops mptcp_sched_default =3D { .get_send =3D mptcp_sched_default_get_send, .get_retrans =3D mptcp_sched_default_get_retrans, .name =3D "default", --=20 2.43.0 From nobody Mon Aug 24 02:55:03 2026 Received: from mta0.migadu.com (out-233.mta0.migadu.com [91.218.175.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CDBE6223708 for ; Wed, 19 Aug 2026 12:56:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.233 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787144205; cv=none; b=iPvTaYLzg6K5HakeW0lJu9MSBC1EMl3UagEDxuBEJRebAPhW27OBqGGn9LEMcYo6XY6rgq09ghy1yLH2nFemYIfOseM0l0El2lOCJj7v3CnCTkdY8De7PDHj/j7ZmXdBhXLq5jniFAalf08T5Ds+hYpWZgq59cZf+cLh0YU9OdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787144205; c=relaxed/simple; bh=Ho+lqZhyxkHvmJxHUtGDboXCe42DE+eO8ypgyWG0A0Q=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RGm7m9YV5TDGzQsPvtUiIAq+8+ZWOYffyavzF2OxpWsA6xQV+wlPK1yU1ppqmHgXhiUsWgwsiumUFZXmfR+PCrN4su51pAAhfIV6RXUEQSPM3ibA1MWisYMUbVXa7ID2hawM6SQwTU47UwIw9ApndYay7NUHG5Ih0LdOy7whs2Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=U9RwvgS6; arc=none smtp.client-ip=91.218.175.233 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="U9RwvgS6" X-Envelope-To: mptcp@lists.linux.dev DKIM-Signature: a=rsa-sha256; bh=Ho+lqZhyxkHvmJxHUtGDboXCe42DE+eO8ypgyWG0A0Q=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787144201; v=1; x=1787749001; b=U9RwvgS6F0GTfCcD7QHIHjVpO3uv9nKYNzXSoXRsIsnKNTbGZEbjUfyRmCm1rQ/ijVQMsKLE FrY67OVGCkRQV86uJV1775lmuWHc3G40dHJvCOJEj0GGS/hL8XF8kxO/EsGKIOKwTgmhsP589jq rYFWE6+d1LXKla1rEzKy5/mY= X-Envelope-To: mptcp@lists.linux.dev Received: from thinkbook16p.. (223.70.160.239) by smtp.migadu.com with ESMTPS id 3366343d6d054415; Wed, 19 Aug 2026 12:56:41 +0000 X-Migadu-Flow: FLOW_OUT From: Gang Yan To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v3 2/5] mptcp: pm: change path_manager sysctl atomically Date: Wed, 19 Aug 2026 20:56:26 +0800 Message-ID: <20260819125629.49823-3-gang.yan@linux.dev> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260819125629.49823-1-gang.yan@linux.dev> References: <20260819125629.49823-1-gang.yan@linux.dev> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gang Yan The per-netns path manager name is stored as an inline char[] buffer and updated via strscpy() from the sysctl handler. A concurrent reader can observe a half-written name (KCSAN), which READ_ONCE() cannot fix for a multi-byte string. Following the tcp_congestion_control() model (and the scheduler change in the previous patch), store a pointer to the immutable struct mptcp_pm_ops instead of the name string. No module reference is taken on the path manager ops for now, as they can only be registered from built-in code on one side, and on the other side the reference counting will be introduced by the last patch of this series, together with the BPF path manager support. Assisted-by: Claude:GLM5.2 Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/626 Co-developed-by: Tao Cui Signed-off-by: Tao Cui Signed-off-by: Gang Yan --- net/mptcp/ctrl.c | 33 +++++++++++++++++++++++---------- net/mptcp/pm.c | 3 ++- net/mptcp/protocol.h | 3 +-- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c index 7d0f3421bd04..76ff2a41ba38 100644 --- a/net/mptcp/ctrl.c +++ b/net/mptcp/ctrl.c @@ -40,7 +40,7 @@ struct mptcp_pernet { u8 pm_type; u8 add_addr_v6_port_drop_ts; struct mptcp_sched_ops __rcu *scheduler; - char path_manager[MPTCP_PM_NAME_MAX]; + struct mptcp_pm_ops __rcu *path_manager; }; =20 static struct mptcp_pernet *mptcp_get_pernet(const struct net *net) @@ -85,9 +85,20 @@ int mptcp_get_pm_type(const struct net *net) return mptcp_get_pernet(net)->pm_type; } =20 -const char *mptcp_get_path_manager(const struct net *net) +static struct mptcp_pm_ops *mptcp_pernet_pm(struct mptcp_pernet *pernet) { - return mptcp_get_pernet(net)->path_manager; + struct mptcp_pm_ops *pm_ops; + + pm_ops =3D rcu_dereference(pernet->path_manager); + return pm_ops ? pm_ops : &mptcp_pm_kernel; +} + +void mptcp_get_path_manager(const struct net *net, char *name) +{ + rcu_read_lock(); + strscpy(name, mptcp_pernet_pm(mptcp_get_pernet(net))->name, + MPTCP_PM_NAME_MAX); + rcu_read_unlock(); } =20 static struct mptcp_sched_ops *mptcp_pernet_sched(struct mptcp_pernet *per= net) @@ -124,7 +135,8 @@ static void mptcp_pernet_set_defaults(struct mptcp_pern= et *pernet) if (bpf_try_module_get(&mptcp_sched_default, mptcp_sched_default.owner)) RCU_INIT_POINTER(pernet->scheduler, &mptcp_sched_default); =20 - strscpy(pernet->path_manager, "kernel", sizeof(pernet->path_manager)); + RCU_INIT_POINTER(pernet->path_manager, &mptcp_pm_kernel); + pernet->add_addr_v6_port_drop_ts =3D 1; } =20 @@ -210,7 +222,7 @@ static int proc_blackhole_detect_timeout(const struct c= tl_table *table, return ret; } =20 -static int mptcp_set_path_manager(char *path_manager, const char *name) +static int mptcp_set_path_manager(struct mptcp_pernet *pernet, const char = *name) { struct mptcp_pm_ops *pm_ops; int ret =3D 0; @@ -218,7 +230,7 @@ static int mptcp_set_path_manager(char *path_manager, c= onst char *name) rcu_read_lock(); pm_ops =3D mptcp_pm_find(name); if (pm_ops) - strscpy(path_manager, name, MPTCP_PM_NAME_MAX); + xchg(&pernet->path_manager, pm_ops); else ret =3D -ENOENT; rcu_read_unlock(); @@ -232,7 +244,6 @@ static int proc_path_manager(const struct ctl_table *ct= l, int write, struct mptcp_pernet *pernet =3D container_of(ctl->data, struct mptcp_pernet, path_manager); - char (*path_manager)[MPTCP_PM_NAME_MAX] =3D ctl->data; char pm_name[MPTCP_PM_NAME_MAX]; const struct ctl_table tbl =3D { .data =3D pm_name, @@ -240,11 +251,13 @@ static int proc_path_manager(const struct ctl_table *= ctl, int write, }; int ret; =20 - strscpy(pm_name, *path_manager, MPTCP_PM_NAME_MAX); + rcu_read_lock(); + strscpy(pm_name, mptcp_pernet_pm(pernet)->name, MPTCP_PM_NAME_MAX); + rcu_read_unlock(); =20 ret =3D proc_dostring(&tbl, write, buffer, lenp, ppos); if (write && ret =3D=3D 0) { - ret =3D mptcp_set_path_manager(*path_manager, pm_name); + ret =3D mptcp_set_path_manager(pernet, pm_name); if (ret =3D=3D 0) { u8 pm_type =3D __MPTCP_PM_TYPE_NR; =20 @@ -276,7 +289,7 @@ static int proc_pm_type(const struct ctl_table *ctl, in= t write, pm_name =3D "kernel"; else if (pm_type =3D=3D MPTCP_PM_TYPE_USERSPACE) pm_name =3D "userspace"; - mptcp_set_path_manager(pernet->path_manager, pm_name); + mptcp_set_path_manager(pernet, pm_name); } =20 return ret; diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index ba7c6f80a183..09f99bcd827c 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -1204,7 +1204,7 @@ void mptcp_pm_destroy(struct mptcp_sock *msk) void mptcp_pm_data_reset(struct mptcp_sock *msk) { const struct net *net =3D sock_net((struct sock *)msk); - const char *pm_name =3D mptcp_get_path_manager(net); + char pm_name[MPTCP_PM_NAME_MAX]; u8 pm_type =3D mptcp_get_pm_type(net); struct mptcp_pm_data *pm =3D &msk->pm; =20 @@ -1213,6 +1213,7 @@ void mptcp_pm_data_reset(struct mptcp_sock *msk) pm->rm_list_rx.nr =3D 0; WRITE_ONCE(pm->pm_type, pm_type); =20 + mptcp_get_path_manager(net, pm_name); rcu_read_lock(); mptcp_pm_ops_init(msk, pm_name); rcu_read_unlock(); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 6447945be93c..bbcf0ecd72d1 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -802,7 +802,7 @@ int mptcp_allow_join_id0(const struct net *net); unsigned int mptcp_stale_loss_cnt(const struct net *net); unsigned int mptcp_close_timeout(const struct sock *sk); int mptcp_get_pm_type(const struct net *net); -const char *mptcp_get_path_manager(const struct net *net); +void mptcp_get_path_manager(const struct net *net, char *name); struct mptcp_sched_ops *mptcp_get_scheduler(const struct net *net); unsigned int mptcp_add_addr_v6_port_drop_ts(const struct net *net); =20 @@ -1153,7 +1153,6 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, bool echo); int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_lis= t *rm_list); =20 -/* the default path manager, used in mptcp_pm_unregister */ extern struct mptcp_pm_ops mptcp_pm_kernel; extern struct mptcp_sched_ops mptcp_sched_default; =20 --=20 2.43.0 From nobody Mon Aug 24 02:55:03 2026 Received: from mta0.migadu.com (out-234.mta0.migadu.com [91.218.175.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CDC0021767D for ; Wed, 19 Aug 2026 12:56:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.234 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787144210; cv=none; b=j5u21Hpuivbc4ZCofk9GMfFEHViMiFS43KE7RrhaFJhrEj8eHOhgZ+K1Cr8Fg1MMpxvqjsJEfzDbBV7CbHLyYsXKQlzw9bNpp5t/ULKODtY7xT0XjPF068C7hL7sJ0ELxtVxawd9zFGBuitJREXX4EIM076tU8ScCxGaUipetxE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787144210; c=relaxed/simple; bh=f8tgCjT83aIcTUbhHk9sOl+jqy/sFiMJokips0njS/M=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BImEbgdcuWerxOLjtHt/7P1fwBkdmTR2OnLEOZZlSwF8gdTuS5rhHlgBfSmWfb9fisvYsnAnawy2TJzyuckjUvx3mxxC+O+PtfMssZHAhYLdbiOvfhT4N9tPXtGHeOGXBUdlV1mTOxmuiMeYuzHbG4RDIdS25AJd/ljUHX2ofwI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=EPJsYEej; arc=none smtp.client-ip=91.218.175.234 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="EPJsYEej" X-Envelope-To: mptcp@lists.linux.dev DKIM-Signature: a=rsa-sha256; bh=f8tgCjT83aIcTUbhHk9sOl+jqy/sFiMJokips0njS/M=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787144206; v=1; x=1787749006; b=EPJsYEejn8N5+jnynmsSgWl2VfT+q+DfuEN57Uo+qZl5ZDpRYiGLwLp5tMnH3RMl++nLfHDq AjkYBUEia2qCfs0Uaw70gBH00eIepyLAoxgbsniF4/acH5Ra99LcxDk9HJDRDPBGrRG+W1SkvAr 04QwXjfhRHb1KnNiSNURYk4M= X-Envelope-To: mptcp@lists.linux.dev Received: from thinkbook16p.. (223.70.160.239) by smtp.migadu.com with ESMTPS id 23b6609a52672812; Wed, 19 Aug 2026 12:56:46 +0000 X-Migadu-Flow: FLOW_OUT From: Gang Yan To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v3 3/5] mptcp: use READ_ONCE() over sysctls Date: Wed, 19 Aug 2026 20:56:27 +0800 Message-ID: <20260819125629.49823-4-gang.yan@linux.dev> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260819125629.49823-1-gang.yan@linux.dev> References: <20260819125629.49823-1-gang.yan@linux.dev> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Matthieu Baerts (NGI0)" To avoid KCSAN issues. This patch is in theory for -net, and will need to be split in multiple patches, with different Fixes tags. But I prefer to wait for Eric's patches, as I noticed he already started to modify mptcp_is_enabled: https://lore.kernel.org/CANn89iLdwhhwLyO6zRjWMEY3t9g60ZE8ZhOVx33ucg_uRETb= mQ@mail.gmail.com Still, keeping this patch in this series, not to forget about it. Reported-by: Eric Dumazet Closes: https://lore.kernel.org/CANn89iL=3Dos-60kDKqMDdyiXuPF5CG=3DeejS0vmt= hwpDGXz_Bp8A@mail.gmail.com Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/ctrl.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c index 76ff2a41ba38..5a75f9b76d15 100644 --- a/net/mptcp/ctrl.c +++ b/net/mptcp/ctrl.c @@ -50,39 +50,39 @@ static struct mptcp_pernet *mptcp_get_pernet(const stru= ct net *net) =20 int mptcp_is_enabled(const struct net *net) { - return mptcp_get_pernet(net)->mptcp_enabled; + return READ_ONCE(mptcp_get_pernet(net)->mptcp_enabled); } =20 unsigned int mptcp_get_add_addr_timeout(const struct net *net) { - return mptcp_get_pernet(net)->add_addr_timeout; + return READ_ONCE(mptcp_get_pernet(net)->add_addr_timeout); } =20 int mptcp_is_checksum_enabled(const struct net *net) { - return mptcp_get_pernet(net)->checksum_enabled; + return READ_ONCE(mptcp_get_pernet(net)->checksum_enabled); } =20 int mptcp_allow_join_id0(const struct net *net) { - return mptcp_get_pernet(net)->allow_join_initial_addr_port; + return READ_ONCE(mptcp_get_pernet(net)->allow_join_initial_addr_port); } =20 unsigned int mptcp_stale_loss_cnt(const struct net *net) { - return mptcp_get_pernet(net)->stale_loss_cnt; + return READ_ONCE(mptcp_get_pernet(net)->stale_loss_cnt); } =20 unsigned int mptcp_close_timeout(const struct sock *sk) { if (sock_flag(sk, SOCK_DEAD)) return TCP_TIMEWAIT_LEN; - return mptcp_get_pernet(sock_net(sk))->close_timeout; + return READ_ONCE(mptcp_get_pernet(sock_net(sk))->close_timeout); } =20 int mptcp_get_pm_type(const struct net *net) { - return mptcp_get_pernet(net)->pm_type; + return READ_ONCE(mptcp_get_pernet(net)->pm_type); } =20 static struct mptcp_pm_ops *mptcp_pernet_pm(struct mptcp_pernet *pernet) @@ -586,7 +586,7 @@ void mptcp_active_detect_blackhole(struct sock *ssk, bo= ol expired) =20 net =3D sock_net(ssk); timeouts =3D inet_csk(ssk)->icsk_retransmits; - to_max =3D mptcp_get_pernet(net)->syn_retrans_before_tcp_fallback; + to_max =3D READ_ONCE(mptcp_get_pernet(net)->syn_retrans_before_tcp_fallba= ck); =20 if (timeouts =3D=3D to_max || (timeouts < to_max && expired)) { subflow->mpc_drop =3D 1; --=20 2.43.0 From nobody Mon Aug 24 02:55:03 2026 Received: from mta1.migadu.com (out-147.mta1.migadu.com [95.215.58.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A866221767D for ; Wed, 19 Aug 2026 12:56:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.147 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787144212; cv=none; b=c7xrWyjYknNICMavRDVv+Vd2SQxx9JMS9vKYEIWzWppqWwoTmx+8ywbfaqxxXOF0FD5Q/1hEU8pqQQHnMV4N/fLJeG4MxFIPFhFutUilRNOvE3rfRoKOb/6X6CWMAJ3UiNEPumnu2xzOiWXd3dWIHjX5yHbxbck8tGN9d9xxbSc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787144212; c=relaxed/simple; bh=rtw1YyrIvzIHYWYdRXpdAafdWLiYM50DLewJZDMU6SY=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZtpN+QZdYFb4gtFGQDFtxjXT0TzT+LkHccG2vAupikA2ev1yrOBA7/hprVk6BlsHXvJTLzZqMrs0bP0DdbbZZvONLcUdU2PKoc7mkjNOvZGwXBGYusquxd2HpNw/LKi5IjYn9I7upHtjavhsz5qPznlhjfrtZ2jztqttXMHbHiM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=E/0QD/fV; arc=none smtp.client-ip=95.215.58.147 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="E/0QD/fV" X-Envelope-To: mptcp@lists.linux.dev DKIM-Signature: a=rsa-sha256; bh=rtw1YyrIvzIHYWYdRXpdAafdWLiYM50DLewJZDMU6SY=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787144207; v=1; x=1787749007; b=E/0QD/fVeq8/NprMDSXUjH4SL/hZX2TpcJ2vx+6OltMsj/o8pRZPnDb/auivj56pjJVNg2ur znsuNg+snguwTDg1e5j9ZFPaATCmW6Lg2EOQg7N6y8JNlTdahyidShJfIcLE/Xjm5ITn/o7pSfx NDeEQYIyDdQ18CQ2vs/wep7I= X-Envelope-To: mptcp@lists.linux.dev Received: from thinkbook16p.. (223.70.160.239) by smtp.migadu.com with ESMTPS id 1bd71ac4e5c7521a; Wed, 19 Aug 2026 12:56:47 +0000 X-Migadu-Flow: FLOW_OUT From: Gang Yan To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v3 4/5] mptcp: pm: use WRITE_ONCE() for the pm_type sysctl Date: Wed, 19 Aug 2026 20:56:28 +0800 Message-ID: <20260819125629.49823-5-gang.yan@linux.dev> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260819125629.49823-1-gang.yan@linux.dev> References: <20260819125629.49823-1-gang.yan@linux.dev> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gang Yan Write pernet->pm_type with WRITE_ONCE() in proc_path_manager(), pairing it with the READ_ONCE() readers introduced earlier in this series. Note that updating net.mptcp.path_manager swaps the ops pointer first, then writes the derived pm_type: a socket created in between may see the new ops with the old pm_type. As the net.mptcp.pm_type knob is deprecated since v6.15 and will be removed, the race is not fixed on purpose; document it above the assignment so it does not get reported again. Suggested-by: Matthieu Baerts Assisted-by: Claude:GLM5.2 Co-developed-by: Tao Cui Signed-off-by: Tao Cui Signed-off-by: Gang Yan --- net/mptcp/ctrl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c index 5a75f9b76d15..87491b961bf2 100644 --- a/net/mptcp/ctrl.c +++ b/net/mptcp/ctrl.c @@ -265,7 +265,13 @@ static int proc_path_manager(const struct ctl_table *c= tl, int write, pm_type =3D MPTCP_PM_TYPE_KERNEL; else if (strncmp(pm_name, "userspace", MPTCP_PM_NAME_MAX) =3D=3D 0) pm_type =3D MPTCP_PM_TYPE_USERSPACE; - pernet->pm_type =3D pm_type; + + /* Pre-existing race: two sequential writes, a socket + * created in between may see the new ops with the old + * pm_type. The knob is deprecated since v6.15 and will + * be removed: not fixed on purpose. + */ + WRITE_ONCE(pernet->pm_type, pm_type); } } =20 --=20 2.43.0 From nobody Mon Aug 24 02:55:03 2026 Received: from mta1.migadu.com (out-148.mta1.migadu.com [95.215.58.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 092AA21767D for ; Wed, 19 Aug 2026 12:56:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.148 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787144217; cv=none; b=FQrlrBF0nedYM5eEIW86XtBRDL9JZylXUXNJKBEZfqKQVLTd2JL9K9RDj73q7RQsGen63/P89zXRpsaeAZkGac3YgCJ0q4J+TatEqjsQ07evsyXNxEXNmUXg3vKrOWOpAuoA7I1JngYvY97INpA3UvEhkoi/W6JDdsevYSTCJQg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787144217; c=relaxed/simple; bh=6YFddDS4cFvpLVFAU88j4fEOAciCasvr3nl3gU4RJVM=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kMpKrmJydEMvZdK0h4XwTIAjWEBTe6qv2K2oW6iJvmf8/1OxkKxtTnh3fJaQ4mjHS6bXcYKAFl5YBEZEB/++jCpC6c7E5QXlwOpLRJ2wpu2vWDMk6ZIj4DF5+p1k7jyV8cFYQ8pRfWYmDtQOFth2W4slfDQJYtNNXU4oCqGAC64= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=LpokEZ+O; arc=none smtp.client-ip=95.215.58.148 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="LpokEZ+O" X-Envelope-To: mptcp@lists.linux.dev DKIM-Signature: a=rsa-sha256; bh=6YFddDS4cFvpLVFAU88j4fEOAciCasvr3nl3gU4RJVM=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787144212; v=1; x=1787749012; b=LpokEZ+OCGl9eHPf5domm/jNOEFd+X+vKLn5PHBdJin3XZ6e1PQD0cOF+KSIH3GkXKtZXJfc GLpSyNZd/WekeCdMS3bRewAXCRYZZSNm6E1eNlqTc0fTMGCNsWL21NHkPQVGpjWK5dAeBJoAgBt AKwoRgdGjPjDlxKv+QvAa78k= X-Envelope-To: mptcp@lists.linux.dev Received: from thinkbook16p.. (223.70.160.239) by smtp.migadu.com with ESMTPS id ea02641fcab58808; Wed, 19 Aug 2026 12:56:52 +0000 X-Migadu-Flow: FLOW_OUT From: Gang Yan To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v3 5/5] Squash to "mptcp: pm: init and release mptcp_pm_ops" Date: Wed, 19 Aug 2026 20:56:29 +0800 Message-ID: <20260819125629.49823-6-gang.yan@linux.dev> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260819125629.49823-1-gang.yan@linux.dev> References: <20260819125629.49823-1-gang.yan@linux.dev> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gang Yan This commit introduces the mptcp_pm_ops lifetime handling on sockets (mptcp_pm_ops_init/release taking a module reference), and would then be the first one whose per-net path managers can be unloaded while a pernet still stores them. mptcp_pm_ops_init() also takes the ops pointer directly instead of the name, and mptcp_get_path_manager() returns the ops: the redundant mptcp_pm_find() list walk from the name is avoided, as done for the scheduler side earlier in this series. Assisted-by: Claude:GLM5.2 Co-developed-by: Tao Cui Signed-off-by: Tao Cui Signed-off-by: Gang Yan --- net/mptcp/ctrl.c | 35 +++++++++++++++++++++++++---------- net/mptcp/pm.c | 12 ++++-------- net/mptcp/protocol.h | 2 +- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c index 87491b961bf2..6379a9f481ac 100644 --- a/net/mptcp/ctrl.c +++ b/net/mptcp/ctrl.c @@ -93,12 +93,9 @@ static struct mptcp_pm_ops *mptcp_pernet_pm(struct mptcp= _pernet *pernet) return pm_ops ? pm_ops : &mptcp_pm_kernel; } =20 -void mptcp_get_path_manager(const struct net *net, char *name) +struct mptcp_pm_ops *mptcp_get_path_manager(const struct net *net) { - rcu_read_lock(); - strscpy(name, mptcp_pernet_pm(mptcp_get_pernet(net))->name, - MPTCP_PM_NAME_MAX); - rcu_read_unlock(); + return mptcp_pernet_pm(mptcp_get_pernet(net)); } =20 static struct mptcp_sched_ops *mptcp_pernet_sched(struct mptcp_pernet *per= net) @@ -135,7 +132,8 @@ static void mptcp_pernet_set_defaults(struct mptcp_pern= et *pernet) if (bpf_try_module_get(&mptcp_sched_default, mptcp_sched_default.owner)) RCU_INIT_POINTER(pernet->scheduler, &mptcp_sched_default); =20 - RCU_INIT_POINTER(pernet->path_manager, &mptcp_pm_kernel); + if (bpf_try_module_get(&mptcp_pm_kernel, mptcp_pm_kernel.owner)) + RCU_INIT_POINTER(pernet->path_manager, &mptcp_pm_kernel); =20 pernet->add_addr_v6_port_drop_ts =3D 1; } @@ -224,15 +222,22 @@ static int proc_blackhole_detect_timeout(const struct= ctl_table *table, =20 static int mptcp_set_path_manager(struct mptcp_pernet *pernet, const char = *name) { - struct mptcp_pm_ops *pm_ops; + struct mptcp_pm_ops *pm_ops, *prev; int ret =3D 0; =20 rcu_read_lock(); pm_ops =3D mptcp_pm_find(name); - if (pm_ops) - xchg(&pernet->path_manager, pm_ops); - else + if (pm_ops) { + if (bpf_try_module_get(pm_ops, pm_ops->owner)) { + prev =3D xchg(&pernet->path_manager, pm_ops); + if (prev) + bpf_module_put(prev, prev->owner); + } else { + ret =3D -EBUSY; + } + } else { ret =3D -ENOENT; + } rcu_read_unlock(); =20 return ret; @@ -611,10 +616,15 @@ static int __net_init mptcp_net_init(struct net *net) ret =3D mptcp_pernet_new_table(net, pernet); if (ret) { struct mptcp_sched_ops *sched; + struct mptcp_pm_ops *pm; =20 sched =3D rcu_dereference_protected(pernet->scheduler, true); if (sched) bpf_module_put(sched, sched->owner); + + pm =3D rcu_dereference_protected(pernet->path_manager, true); + if (pm) + bpf_module_put(pm, pm->owner); } =20 return ret; @@ -625,12 +635,17 @@ static void __net_exit mptcp_net_exit(struct net *net) { struct mptcp_pernet *pernet =3D mptcp_get_pernet(net); struct mptcp_sched_ops *sched; + struct mptcp_pm_ops *pm; =20 mptcp_pernet_del_table(pernet); =20 sched =3D rcu_dereference_protected(pernet->scheduler, true); if (sched) bpf_module_put(sched, sched->owner); + + pm =3D rcu_dereference_protected(pernet->path_manager, true); + if (pm) + bpf_module_put(pm, pm->owner); } =20 static struct pernet_operations mptcp_pernet_ops =3D { diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 09f99bcd827c..76158f0ac5a0 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -1155,13 +1155,11 @@ void mptcp_pm_worker(struct mptcp_sock *msk) spin_unlock_bh(&msk->pm.lock); } =20 -static void mptcp_pm_ops_init(struct mptcp_sock *msk, const char *pm_name) +static void mptcp_pm_ops_init(struct mptcp_sock *msk, + struct mptcp_pm_ops *pm_ops) { - struct mptcp_pm_ops *pm_ops; - - pm_ops =3D mptcp_pm_find(pm_name); if (!pm_ops || !bpf_try_module_get(pm_ops, pm_ops->owner)) { - pr_warn_once("pm %s fails, fallback to default pm", pm_name); + pr_warn_once("pm %s fails, fallback to default pm", pm_ops->name); pm_ops =3D &mptcp_pm_kernel; } =20 @@ -1204,7 +1202,6 @@ void mptcp_pm_destroy(struct mptcp_sock *msk) void mptcp_pm_data_reset(struct mptcp_sock *msk) { const struct net *net =3D sock_net((struct sock *)msk); - char pm_name[MPTCP_PM_NAME_MAX]; u8 pm_type =3D mptcp_get_pm_type(net); struct mptcp_pm_data *pm =3D &msk->pm; =20 @@ -1213,9 +1210,8 @@ void mptcp_pm_data_reset(struct mptcp_sock *msk) pm->rm_list_rx.nr =3D 0; WRITE_ONCE(pm->pm_type, pm_type); =20 - mptcp_get_path_manager(net, pm_name); rcu_read_lock(); - mptcp_pm_ops_init(msk, pm_name); + mptcp_pm_ops_init(msk, mptcp_get_path_manager(net)); rcu_read_unlock(); } =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index bbcf0ecd72d1..1deefb8d3fcc 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -802,7 +802,7 @@ int mptcp_allow_join_id0(const struct net *net); unsigned int mptcp_stale_loss_cnt(const struct net *net); unsigned int mptcp_close_timeout(const struct sock *sk); int mptcp_get_pm_type(const struct net *net); -void mptcp_get_path_manager(const struct net *net, char *name); +struct mptcp_pm_ops *mptcp_get_path_manager(const struct net *net); struct mptcp_sched_ops *mptcp_get_scheduler(const struct net *net); unsigned int mptcp_add_addr_v6_port_drop_ts(const struct net *net); =20 --=20 2.43.0