From nobody Mon Feb 9 22:05:15 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2B3913C3C2 for ; Tue, 11 Mar 2025 06:32:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741674739; cv=none; b=mf46YIwzTRvu20rItWdD+rCyOw/Skp58560a7Bv9uGt7gloNciErcc/CVGHE5DOeepnVvtra4DgXnH7yKZgz74kCDqfkA5tXzfN13VcMWZpfa4nUwEb1Y7sAJURKNKhFwYHHW98dJtj2UVqusRMBCRfSU4Uf+5rwcqum8q89CYQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741674739; c=relaxed/simple; bh=oNWnP3dFUGf54fFAbPaMRgKKSKm2ROkfP3OqKveubjs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qPmtAHifPdujeJcSQNhfspLZGsrlpLFqfI235F/fnZijAfRH5j8pX88pK6THLeO17Rz8yk8iBYxy9NB62XPgkUIt/Buq5YGAj9OZFrxbKgYvDVf8y0r0RNn9vr/TnuBSk9Gsm9TTnO/FBbe4PRdlcZVbm5HcyhoizsajqHEoiSc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YvUCs9dy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YvUCs9dy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02D19C4CEEE; Tue, 11 Mar 2025 06:32:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741674739; bh=oNWnP3dFUGf54fFAbPaMRgKKSKm2ROkfP3OqKveubjs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YvUCs9dymmXoO8Dm7Q2jlQYnOFKqByXmExli7T6oW0O3AGUfwvnud6lV2MvCU6FYo Y014rfUYT6tTuABKn0PlgtibMORvR/1Na5e8UQwx3RskGrJWTe/OHyA8BQ8A2UnBoM 2jaUbUBxPYdehjbsjYIRkvWpDXd7qmRJx+YUMp/lGFXS3tfpqsGSagMvuVq+f6Yovm pUg/iq8KtRx3H31DY1O12dQ5CLgNHAX1L67B1jALaYMqZ9rX1anrgASgI/bAPnoO+o nmoYnR0SZH+dh9nfAHENNIKpD+vpYeMq2Dk5wSCU+IB/EMa5nYbfSzY4fBEqc0UKYg Lve4jAIruC3YA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 02/10] mptcp: pm: register in-kernel and userspace PM Date: Tue, 11 Mar 2025 14:31:54 +0800 Message-ID: <2928be52eee7f083a74c71eeb70c6c046cf5450c.1741674285.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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: Geliang Tang This patch defines the original in-kernel netlink path manager as a new struct mptcp_pm_ops named "mptcp_pm_kernel", and register it in mptcp_pm_kernel_register(). And define the userspace path manager as a new struct mptcp_pm_ops named "mptcp_pm_userspace", and register it in mptcp_pm_init(). To ensure that there's always a valid path manager available, the default path manager "mptcp_pm_kernel" will be skipped in mptcp_pm_unregister(). Signed-off-by: Geliang Tang --- net/mptcp/pm.c | 5 +++++ net/mptcp/pm_kernel.c | 7 +++++++ net/mptcp/pm_userspace.c | 10 ++++++++++ net/mptcp/protocol.h | 4 ++++ 4 files changed, 26 insertions(+) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index f4948a2cf9be..3896f21a46bd 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -1018,6 +1018,7 @@ void mptcp_pm_data_init(struct mptcp_sock *msk) void __init mptcp_pm_init(void) { mptcp_pm_kernel_register(); + mptcp_pm_userspace_register(); mptcp_pm_nl_init(); } =20 @@ -1061,6 +1062,10 @@ int mptcp_pm_register(struct mptcp_pm_ops *pm_ops) =20 void mptcp_pm_unregister(struct mptcp_pm_ops *pm_ops) { + /* skip unregistering the default path manager */ + if (WARN_ON_ONCE(pm_ops =3D=3D &mptcp_pm_kernel)) + return; + spin_lock(&mptcp_pm_list_lock); list_del_rcu(&pm_ops->list); spin_unlock(&mptcp_pm_list_lock); diff --git a/net/mptcp/pm_kernel.c b/net/mptcp/pm_kernel.c index 806a9b5b3c07..d39e7c178460 100644 --- a/net/mptcp/pm_kernel.c +++ b/net/mptcp/pm_kernel.c @@ -1398,8 +1398,15 @@ static struct pernet_operations mptcp_pm_pernet_ops = =3D { .size =3D sizeof(struct pm_nl_pernet), }; =20 +struct mptcp_pm_ops mptcp_pm_kernel =3D { + .name =3D "kernel", + .owner =3D THIS_MODULE, +}; + void __init mptcp_pm_kernel_register(void) { if (register_pernet_subsys(&mptcp_pm_pernet_ops) < 0) panic("Failed to register MPTCP PM pernet subsystem.\n"); + + mptcp_pm_register(&mptcp_pm_kernel); } diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 13856df22673..2cb62f026b1f 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -682,3 +682,13 @@ int mptcp_userspace_pm_get_addr(u8 id, struct mptcp_pm= _addr_entry *addr, sock_put(sk); return ret; } + +static struct mptcp_pm_ops mptcp_pm_userspace =3D { + .name =3D "userspace", + .owner =3D THIS_MODULE, +}; + +void __init mptcp_pm_userspace_register(void) +{ + mptcp_pm_register(&mptcp_pm_userspace); +} diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 2307f2fcbe9d..f87c71550394 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1052,6 +1052,9 @@ int mptcp_pm_remove_addr(struct mptcp_sock *msk, cons= t struct mptcp_rm_list *rm_ void mptcp_pm_remove_addr_entry(struct mptcp_sock *msk, struct mptcp_pm_addr_entry *entry); =20 +/* the default path manager, used in mptcp_pm_unregister */ +extern struct mptcp_pm_ops mptcp_pm_kernel; + struct mptcp_pm_ops *mptcp_pm_find(const char *name); int mptcp_pm_register(struct mptcp_pm_ops *pm_ops); void mptcp_pm_unregister(struct mptcp_pm_ops *pm_ops); @@ -1160,6 +1163,7 @@ static inline u8 subflow_get_local_id(const struct mp= tcp_subflow_context *subflo } =20 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); --=20 2.43.0