From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mta1.migadu.com (out-29.mta1.migadu.com [95.215.58.29]) (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 BBCB153E0B for ; Fri, 28 Aug 2026 06:07:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.29 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787897235; cv=none; b=Rnv+88Fk1Kq74Lfmbt+PsmsS3ID6MZKz/feKIkxaTA3qu3Ki6S4mKtUXnMud5XdzI0gZ3Duqi6IzjtQMq9lhm4Dwc0S0UVcIevvr40E+qeCLWvVTZ0kyQsarj4PppIftbYxYWQuodfJRbXg/kkwVYaFDFqOEyX9PVCGGPAHWk38= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787897235; c=relaxed/simple; bh=MWkfzdXUA3anTL4B19YqXVRqG1xlLuV3CR13ZNh1w7U=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KP2CO44X0yhaOQ23pn/Lf/sq3TbbB8+I0glJu4hC5BgoieuRAoMijJ6HKsYSnKXl6iVsNpbq06BBWt0TLP21G/hbX4KRF2e5vVgmOifcOU1b9jUGBFAzFPwtl5BO3UwgLzJMRRYG/5DNFYXpgjAzvYT71fd0/CNS8Uvzt1/EQb4= 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=FEgFag5M; arc=none smtp.client-ip=95.215.58.29 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="FEgFag5M" X-Envelope-To: mptcp@lists.linux.dev DKIM-Signature: a=rsa-sha256; bh=MWkfzdXUA3anTL4B19YqXVRqG1xlLuV3CR13ZNh1w7U=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787897231; v=1; x=1788502031; b=FEgFag5M1NVw/u64iEMVzNa1VTPmjK9fV6DNoKBZyoahng1UmSCf7oucuN+q++ZxQ5QNF64h OxrlPMiXFiPfize5Ci+pY2j5VclHddcj1ol/oHzPSGxPeG+0bFSzFS57f+eycdEwxuHFgyZtM1N t76p/z6JbyzzqBz9rZKFJrdM= X-Envelope-To: mptcp@lists.linux.dev Received: by smtp.migadu.com with ESMTPS id 6a5529530caa526a; Fri, 28 Aug 2026 06:07:11 +0000 X-Mizu-Trace-ID: 6a5529530caa526a X-Migadu-Flow: FLOW_OUT From: Gang Yan To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v5 5/6] Squash-to "mptcp: pm: init and release mptcp_pm_ops" Date: Fri, 28 Aug 2026 14:06:42 +0800 Message-ID: <20260828060643.14397-6-gang.yan@linux.dev> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260828060643.14397-1-gang.yan@linux.dev> References: <20260828060643.14397-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: 8bit 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; } -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)); } static struct mptcp_sched_ops *mptcp_pernet_sched(struct mptcp_pernet *pernet) @@ -135,7 +132,8 @@ static void mptcp_pernet_set_defaults(struct mptcp_pernet *pernet) if (bpf_try_module_get(&mptcp_sched_default, mptcp_sched_default.owner)) RCU_INIT_POINTER(pernet->scheduler, &mptcp_sched_default); - 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); pernet->add_addr_v6_port_drop_ts = 1; } @@ -224,15 +222,22 @@ static int proc_blackhole_detect_timeout(const struct ctl_table *table, 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 = 0; rcu_read_lock(); pm_ops = 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 = xchg(&pernet->path_manager, pm_ops); + if (prev) + bpf_module_put(prev, prev->owner); + } else { + ret = -EBUSY; + } + } else { ret = -ENOENT; + } rcu_read_unlock(); return ret; @@ -611,10 +616,15 @@ static int __net_init mptcp_net_init(struct net *net) ret = mptcp_pernet_new_table(net, pernet); if (ret) { struct mptcp_sched_ops *sched; + struct mptcp_pm_ops *pm; sched = rcu_dereference_protected(pernet->scheduler, true); if (sched) bpf_module_put(sched, sched->owner); + + pm = rcu_dereference_protected(pernet->path_manager, true); + if (pm) + bpf_module_put(pm, pm->owner); } return ret; @@ -625,12 +635,17 @@ static void __net_exit mptcp_net_exit(struct net *net) { struct mptcp_pernet *pernet = mptcp_get_pernet(net); struct mptcp_sched_ops *sched; + struct mptcp_pm_ops *pm; mptcp_pernet_del_table(pernet); sched = rcu_dereference_protected(pernet->scheduler, true); if (sched) bpf_module_put(sched, sched->owner); + + pm = rcu_dereference_protected(pernet->path_manager, true); + if (pm) + bpf_module_put(pm, pm->owner); } static struct pernet_operations mptcp_pernet_ops = { diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 69a38cb48977..64244a1a01bc 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); } -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 = 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 = &mptcp_pm_kernel; } @@ -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 = sock_net((struct sock *)msk); - char pm_name[MPTCP_PM_NAME_MAX]; u8 pm_type = mptcp_get_pm_type(net); struct mptcp_pm_data *pm = &msk->pm; @@ -1213,9 +1210,8 @@ void mptcp_pm_data_reset(struct mptcp_sock *msk) pm->rm_list_rx.nr = 0; WRITE_ONCE(pm->pm_type, pm_type); - 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(); } diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index c15c96f410f1..af0c36155c4c 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); -- 2.43.0