From nobody Mon Aug 24 01:40:33 2026 Received: from mta1.migadu.com (out-16.mta1.migadu.com [95.215.58.16]) (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 DA0A21DA60D for ; Mon, 17 Aug 2026 01:25:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786929903; cv=none; b=P/3dcE9yaf38jsIbYFGsKgGTWUpRlP5v+RNMXQ0nF/fgAdGm7FiidbtBFNTQqnoszQHyxHU+1HR5mPda1F4oO/beZEApJwAMfZHR3rZqonSCrSVofhVHXrDcwDnBjurE7W+C3Y5lkRuey/EuvZbpZ9Hr/YKICw8YA7UnkVEvbRU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786929903; c=relaxed/simple; bh=kPGYUNPDvBkGhKiI8eEN0RoDpJmQxOWaNGkoaK4x3x8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Nbo6hDw+2Ju9OlGLF2c9Sx8/0mCEExAYkUrZKRP+YHqWeVpd3oLY6cFLg4ivrBdhUA9eK8seYDilenuOfN5z6a5+YvpctHE4rFI7nAvb5ZXPJdcv95XgyRVNQaCcaJ1aUnTIVJjJacw7ftGW76l/BG23oFXiehWEO4IieloLeqI= 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=TZASG8x5; arc=none smtp.client-ip=95.215.58.16 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="TZASG8x5" X-Envelope-To: mptcp@lists.linux.dev DKIM-Signature: a=rsa-sha256; bh=kPGYUNPDvBkGhKiI8eEN0RoDpJmQxOWaNGkoaK4x3x8=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1786929898; v=1; x=1787534698; b=TZASG8x5f9vEIxwN5xz3alMhhlIymyg4QwAOjJcsclhxbddTeizqmE+HgxERfMnaeUnx6RGw u2gPE1QNktThOgY+N0j223n2Q7ucNf20VvhtbNXxyE7QsC/HkkIUFIM+OdUomuGRBw8IGr9R5aC EuYvAriX95xg9QBQgkwfKffA= X-Envelope-To: mptcp@lists.linux.dev Received: from thinkbook16p.. (223.70.159.239) by smtp.migadu.com with ESMTPS id bad7012b45d9ee1f; Mon, 17 Aug 2026 01:24:58 +0000 X-Migadu-Flow: FLOW_OUT From: Gang Yan To: mptcp@lists.linux.dev Cc: Gang Yan , Tao Cui Subject: [PATCH mptcp-next 1/3] mptcp: sched: change scheduler sysctl atomically Date: Mon, 17 Aug 2026 09:24:50 +0800 Message-ID: <20260817012452.7519-2-gang.yan@linux.dev> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260817012452.7519-1-gang.yan@linux.dev> References: <20260817012452.7519-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: - mptcp_set_scheduler() now looks the ops up, takes a module reference, and atomically swaps the pernet pointer with xchg(), releasing the previous reference; - mptcp_get_scheduler() copies the ops name out under rcu_read_lock(); - the default reference is taken in mptcp_pernet_set_defaults() and released in mptcp_net_exit(), mirroring tcp_sk_init()/tcp_sk_exit(). A pointer store is a single atomic word, so readers always observe a consistent value. 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 | 50 +++++++++++++++++++++++++++++++++----------- net/mptcp/protocol.c | 5 +++-- net/mptcp/protocol.h | 3 ++- net/mptcp/sched.c | 2 +- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c index 63c5747f0f63..85e9d3e996db 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,14 @@ 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) +void mptcp_get_scheduler(const struct net *net, char *name) { - return mptcp_get_pernet(net)->scheduler; + struct mptcp_sched_ops *sched; + + rcu_read_lock(); + sched =3D rcu_dereference(mptcp_get_pernet(net)->scheduler); + strscpy(name, sched ? sched->name : "default", MPTCP_SCHED_NAME_MAX); + rcu_read_unlock(); } =20 unsigned int mptcp_add_addr_v6_port_drop_ts(const struct net *net) @@ -112,23 +117,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 +152,10 @@ static int mptcp_set_scheduler(char *scheduler, const = char *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); + struct mptcp_sched_ops *sched; char val[MPTCP_SCHED_NAME_MAX]; struct ctl_table tbl =3D { .data =3D val, @@ -145,11 +163,14 @@ static int proc_scheduler(const struct ctl_table *ctl= , int write, }; int ret; =20 - strscpy(val, *scheduler, MPTCP_SCHED_NAME_MAX); + rcu_read_lock(); + sched =3D rcu_dereference(pernet->scheduler); + strscpy(val, sched ? sched->name : "default", 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; } @@ -573,8 +594,13 @@ static int __net_init mptcp_net_init(struct net *net) 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..9d84dd803802 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3260,6 +3260,7 @@ static void mptcp_ca_reset(struct sock *sk) static int mptcp_init_sock(struct sock *sk) { struct net *net =3D sock_net(sk); + char sched_name[MPTCP_SCHED_NAME_MAX]; int ret; =20 __mptcp_init_sock(sk); @@ -3271,8 +3272,8 @@ 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))); + mptcp_get_scheduler(net, sched_name); + ret =3D mptcp_init_sched(mptcp_sk(sk), mptcp_sched_find(sched_name)); rcu_read_unlock(); if (ret) return ret; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 7e168e450fb0..af79b3450ab7 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); +void mptcp_get_scheduler(const struct net *net, char *name); 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 01:40:33 2026 Received: from mta0.migadu.com (out-92.mta0.migadu.com [91.218.175.92]) (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 8E9E1221FC6 for ; Mon, 17 Aug 2026 01:25:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.92 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786929904; cv=none; b=RWWipq+vlBy2Fr6g9X2bgmcQs7zjk15IRgEsfKODfNpLD8dpX9f1HCs/PYUWVbB5L169wh82COSqyNwMmdDsPwi002yP07IspzIjLV464nnhUosSrERbo8ZtZTKQkjXtxDXb1DF6mMGE5KtJFVGnvSA9sHzn8iAUqfdrKsozR14= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786929904; c=relaxed/simple; bh=nMbEZ/NdpJ1iRw121fYzieyuNWpAmqS5DysJWsouQF0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bexeCkOmr0G+LH+hi3PqRp48Sik6EfNG3UJnxPnzVX62NMq7zoKIDrwiXqwBK0kSupXGEuEkj4R3qAemDnECTzf1DTBk0A7oprX/4UI88VvXdA5G78uA5+Eax2m/6LrntClJ3ZAv/YR76Yqiwb7zQvm8W4+hqObzcpKncg54Hl8= 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=umyi/Rej; arc=none smtp.client-ip=91.218.175.92 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="umyi/Rej" X-Envelope-To: mptcp@lists.linux.dev DKIM-Signature: a=rsa-sha256; bh=nMbEZ/NdpJ1iRw121fYzieyuNWpAmqS5DysJWsouQF0=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1786929900; v=1; x=1787534700; b=umyi/RejIyagnr/ViBdY7pxM5kzVUjTyPWxTpKB3D1hQfh7O5aEGUD1FvNYmekIVg3qDKWUE +TxrnjOJZiz3VNuz9ZLWXqWOs+6sFtArmtXi4vAd/JVwTLap6lJnIw8h4FPs1LI8laqpNdiRFJY jVuqEnvtuXN6cewycD+KH21U= X-Envelope-To: mptcp@lists.linux.dev Received: from thinkbook16p.. (223.70.159.239) by smtp.migadu.com with ESMTPS id b2f1d8ce94126654; Mon, 17 Aug 2026 01:24:59 +0000 X-Migadu-Flow: FLOW_OUT From: Gang Yan To: mptcp@lists.linux.dev Cc: Gang Yan , Tao Cui Subject: [PATCH mptcp-next 2/3] mptcp: pm: change path_manager sysctl atomically Date: Mon, 17 Aug 2026 09:24:51 +0800 Message-ID: <20260817012452.7519-3-gang.yan@linux.dev> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260817012452.7519-1-gang.yan@linux.dev> References: <20260817012452.7519-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 (and KCSAN flags the race), 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: - mptcp_set_path_manager() looks the ops up, takes a module reference, and atomically swaps the pernet pointer with xchg(), releasing the previous reference; - mptcp_get_path_manager() copies the ops name out under rcu_read_lock(); - the pm_type field derived from the name is now written with WRITE_ONCE() to pair with its READ_ONCE() readers; - the default reference is taken in mptcp_pernet_set_defaults() and released in mptcp_net_exit(). 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 | 50 +++++++++++++++++++++++++++++++------------- net/mptcp/pm.c | 3 ++- net/mptcp/protocol.h | 3 +-- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c index 85e9d3e996db..fa28aecfb856 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,14 @@ 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) +void mptcp_get_path_manager(const struct net *net, char *name) { - return mptcp_get_pernet(net)->path_manager; + struct mptcp_pm_ops *pm_ops; + + rcu_read_lock(); + pm_ops =3D rcu_dereference(mptcp_get_pernet(net)->path_manager); + strscpy(name, pm_ops ? pm_ops->name : "kernel", MPTCP_PM_NAME_MAX); + rcu_read_unlock(); } =20 void mptcp_get_scheduler(const struct net *net, char *name) @@ -121,7 +126,9 @@ 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)); + if (bpf_try_module_get(&mptcp_pm_kernel, mptcp_pm_kernel.owner)) + RCU_INIT_POINTER(pernet->path_manager, &mptcp_pm_kernel); + pernet->add_addr_v6_port_drop_ts =3D 1; } =20 @@ -209,17 +216,24 @@ static int proc_blackhole_detect_timeout(const struct= ctl_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; + 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) - strscpy(path_manager, name, MPTCP_PM_NAME_MAX); - 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; @@ -231,7 +245,7 @@ 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; + struct mptcp_pm_ops *pm_ops; char pm_name[MPTCP_PM_NAME_MAX]; const struct ctl_table tbl =3D { .data =3D pm_name, @@ -239,11 +253,14 @@ 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(); + pm_ops =3D rcu_dereference(pernet->path_manager); + strscpy(pm_name, pm_ops ? pm_ops->name : "kernel", 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 @@ -251,7 +268,7 @@ static int proc_path_manager(const struct ctl_table *ct= l, 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; + WRITE_ONCE(pernet->pm_type, pm_type); } } =20 @@ -275,7 +292,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; @@ -595,12 +612,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 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 af79b3450ab7..99f447f2808f 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); void mptcp_get_scheduler(const struct net *net, char *name); 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 01:40:33 2026 Received: from mta0.migadu.com (out-94.mta0.migadu.com [91.218.175.94]) (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 D07A91DA60D for ; Mon, 17 Aug 2026 01:25:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.94 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786929905; cv=none; b=fZTIqzG6mQMTWiIEE8dnl2D0kbVHYg6D4ZQ0noryXXhD4ktxRBavplRMy3GuloBMYkQYZjEQ2dZbl6eehvRoXtdYMdnj1xvFY3tSaLqraXOFP2L/8qDGyDn5xOcJBHIbfhWgIla1wPUp2w77GC2EgTpXwFZzON9jr1RUP3gIBCQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786929905; c=relaxed/simple; bh=Nqb9mmwXW1X6inPAqyP+MG9t0GgIXJC/mk9ewJPmndM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u66u5IrTnkNvWYY8yzwWujsRVrxlCgUeydmORaAFdy6OEY7mPYwTUgqPo14DCrdrvfLWtQmsj7CqLWwes2DIDs0NAWJWWK5MQIp76kdLOfOT19rikppgd8Ut2snowJoFi8DJE/zsLvMxU2oSIFJDsc8ypDfG3QW2CZTBaV9GSlo= 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=HkvO5sRF; arc=none smtp.client-ip=91.218.175.94 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="HkvO5sRF" X-Envelope-To: mptcp@lists.linux.dev DKIM-Signature: a=rsa-sha256; bh=Nqb9mmwXW1X6inPAqyP+MG9t0GgIXJC/mk9ewJPmndM=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1786929901; v=1; x=1787534701; b=HkvO5sRFUOCAkZlEsCrSR9A8ZIAp5NjcejIHgQLYauEU53dDV1edO7mvjPN/6WB5kegRZKfT D5h+ptrHuMx9+LXPttuvGm+8E9rymhXpB+elHAYKRO/WHZn2PKY0yiAqFLnF0whEixDHsJZ8P/Q y2HYFSQqoGle0xaJ3VweYXys= X-Envelope-To: mptcp@lists.linux.dev Received: from thinkbook16p.. (223.70.159.239) by smtp.migadu.com with ESMTPS id 088fd7490c298bf8; Mon, 17 Aug 2026 01:25:01 +0000 X-Migadu-Flow: FLOW_OUT From: Gang Yan To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" , Eric Dumazet Subject: [PATCH mptcp-next 3/3] mptcp: use READ_ONCE() over sysctls Date: Mon, 17 Aug 2026 09:24:52 +0800 Message-ID: <20260817012452.7519-4-gang.yan@linux.dev> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260817012452.7519-1-gang.yan@linux.dev> References: <20260817012452.7519-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 fa28aecfb856..309bbb2a4eb0 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 void mptcp_get_path_manager(const struct net *net, char *name) @@ -589,7 +589,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