From nobody Wed May 14 04:58:57 2025
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 5DCE113C3C2
for <mptcp@lists.linux.dev>; Tue, 11 Mar 2025 06:32:23 +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=1741674743; cv=none;
b=iyQE7C5jbQywCIENamwxKU9xuD+Pz+JKa1G1Frf1DPj6g6QQYe3zI+UgyPTbhiG0kZkomecinsrqNJSX0/Y0XJcPuHlyQeQ+JCJMPsWdnJ/ri0yeQxA+0ZVquS+99ZC/C3WW2cNNeTFf+nw3KPcq94y7XV66axWcRM0VYoVxWLg=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1741674743; c=relaxed/simple;
bh=eKkhSvyW4nBiMdbk8iICkik1gxPlOK2XTvR9/zjiP8k=;
h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:
MIME-Version;
b=MqAyBqWugfmWhmyPczmVflrL8EdKzPoDOH9cQ1VIqPBWt4Fp2x7kdkZcAJYTP2aI6ZwMkgIe9k8Prp2+A11ayyrueVfE1Sw2FAi61AYjZOxtQrYhLW+++9XvkOm/6Yc9nBU/LD4lmi6QvjKM1UjjS+OHxoafAK75djmk79AbjYQ=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org
header.b=BdPjoJP4; 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="BdPjoJP4"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA750C4CEEA;
Tue, 11 Mar 2025 06:32:21 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
s=k20201202; t=1741674742;
bh=eKkhSvyW4nBiMdbk8iICkik1gxPlOK2XTvR9/zjiP8k=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=BdPjoJP4aigX+5FhAYwZ8d/7JXyH5ZPUXe+dR+FggO+5ihuoEG/lKhTdJVwhPrH4A
+Ouc+vRotYlJXdtUJmTuujZhzy1lEiVl1elu5QIkA4yGFiXT3HdBZF+3elFGcvL4+S
vCz09rJmkrasuIZMNBg+4XNJAaRukmxfCbBvvx6+M8P/VGquLXclLHLwYhIkmqyppd
4/nxPOl+NxNfvavuYLo7KBjvM1uRU+7fhgnQnDG7FaBp0iV7MB4gDu371vWmJ0xxo7
PCSnXWK13oQzSJxSJuyrCx+DnXp6V8e895wp7dIfirOV8gLepS11tddoSCej6L9I86
hvXtgc7Gpp93A==
From: Geliang Tang <geliang@kernel.org>
To: mptcp@lists.linux.dev
Cc: Geliang Tang <tanggeliang@kylinos.cn>
Subject: [PATCH mptcp-next v11 04/10] mptcp: pm: init and release mptcp_pm_ops
Date: Tue, 11 Mar 2025 14:31:56 +0800
Message-ID:
<18395835fb6c2267c06cac27c3287f331445bc68.1741674285.git.tanggeliang@kylinos.cn>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <cover.1741674285.git.tanggeliang@kylinos.cn>
References: <cover.1741674285.git.tanggeliang@kylinos.cn>
Precedence: bulk
X-Mailing-List: mptcp@lists.linux.dev
List-Id: <mptcp.lists.linux.dev>
List-Subscribe: <mailto:mptcp+subscribe@lists.linux.dev>
List-Unsubscribe: <mailto:mptcp+unsubscribe@lists.linux.dev>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"
From: Geliang Tang <tanggeliang@kylinos.cn>
Add a struct mptcp_pm_ops pointer "ops" in struct mptcp_pm_data, and two
helpers mptcp_pm_ops_init() and mptcp_pm_ops_release(), to set and release
this pointer. mptcp_pm_ops_init() is invoked in mptcp_pm_data_reset(),
while mptcp_pm_ops_release() is invoked in mptcp_pm_destroy().
mptcp_pm_kernel_init() is defined as init() interface of the in-kernel PM,
which sets work_pending, accept_addr and accept_subflow.
mptcp_pm_userspace_is_release() is defined as release() interface of the
userspace PM, which is a wrapper of userspace_pm_free_local_addr_list().
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
net/mptcp/pm.c | 57 +++++++++++++++++++++++++---------------
net/mptcp/pm_kernel.c | 21 +++++++++++++++
net/mptcp/pm_userspace.c | 6 +++++
net/mptcp/protocol.h | 1 +
4 files changed, 64 insertions(+), 21 deletions(-)
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index 3896f21a46bd..bf318cecb242 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -970,17 +970,46 @@ 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,
+ struct mptcp_pm_ops *pm_ops)
+{
+ if (!pm_ops || !bpf_try_module_get(pm_ops, pm_ops->owner)) {
+ pr_warn_once("pm %s fails, fallback to default pm",
+ pm_ops->name);
+ pm_ops =3D &mptcp_pm_kernel;
+ }
+
+ msk->pm.ops =3D pm_ops;
+ if (msk->pm.ops->init)
+ msk->pm.ops->init(msk);
+
+ pr_debug("pm %s initialized\n", pm_ops->name);
+}
+
+static void mptcp_pm_ops_release(struct mptcp_sock *msk)
+{
+ struct mptcp_pm_ops *pm_ops =3D msk->pm.ops;
+
+ msk->pm.ops =3D NULL;
+ if (pm_ops->release)
+ pm_ops->release(msk);
+
+ bpf_module_put(pm_ops, pm_ops->owner);
+
+ pr_debug("pm %s released\n", pm_ops->name);
+}
+
void mptcp_pm_destroy(struct mptcp_sock *msk)
{
mptcp_pm_free_anno_list(msk);
-
- if (mptcp_pm_is_userspace(msk))
- mptcp_userspace_pm_free_local_addr_list(msk);
+ mptcp_pm_ops_release(msk);
}
=20
void mptcp_pm_data_reset(struct mptcp_sock *msk)
{
- u8 pm_type =3D mptcp_get_pm_type(sock_net((struct sock *)msk));
+ const struct net *net =3D sock_net((struct sock *)msk);
+ const char *pm_name =3D mptcp_get_path_manager(net);
+ u8 pm_type =3D mptcp_get_pm_type(net);
struct mptcp_pm_data *pm =3D &msk->pm;
=20
memset(&pm->reset, 0, sizeof(pm->reset));
@@ -988,23 +1017,9 @@ void mptcp_pm_data_reset(struct mptcp_sock *msk)
pm->rm_list_rx.nr =3D 0;
WRITE_ONCE(pm->pm_type, pm_type);
=20
- if (pm_type =3D=3D MPTCP_PM_TYPE_KERNEL) {
- bool subflows_allowed =3D !!mptcp_pm_get_subflows_max(msk);
-
- /* pm->work_pending must be only be set to 'true' when
- * pm->pm_type is set to MPTCP_PM_TYPE_KERNEL
- */
- WRITE_ONCE(pm->work_pending,
- (!!mptcp_pm_get_local_addr_max(msk) &&
- subflows_allowed) ||
- !!mptcp_pm_get_add_addr_signal_max(msk));
- WRITE_ONCE(pm->accept_addr,
- !!mptcp_pm_get_add_addr_accept_max(msk) &&
- subflows_allowed);
- WRITE_ONCE(pm->accept_subflow, subflows_allowed);
-
- bitmap_fill(pm->id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
- }
+ rcu_read_lock();
+ mptcp_pm_ops_init(msk, mptcp_pm_find(pm_name));
+ rcu_read_unlock();
}
=20
void mptcp_pm_data_init(struct mptcp_sock *msk)
diff --git a/net/mptcp/pm_kernel.c b/net/mptcp/pm_kernel.c
index d39e7c178460..687a423f5252 100644
--- a/net/mptcp/pm_kernel.c
+++ b/net/mptcp/pm_kernel.c
@@ -1398,7 +1398,28 @@ static struct pernet_operations mptcp_pm_pernet_ops =
=3D {
.size =3D sizeof(struct pm_nl_pernet),
};
=20
+static void mptcp_pm_kernel_init(struct mptcp_sock *msk)
+{
+ bool subflows_allowed =3D !!mptcp_pm_get_subflows_max(msk);
+ struct mptcp_pm_data *pm =3D &msk->pm;
+
+ /* pm->work_pending must be only be set to 'true' when
+ * pm->pm_type is set to MPTCP_PM_TYPE_KERNEL
+ */
+ WRITE_ONCE(pm->work_pending,
+ (!!mptcp_pm_get_local_addr_max(msk) &&
+ subflows_allowed) ||
+ !!mptcp_pm_get_add_addr_signal_max(msk));
+ WRITE_ONCE(pm->accept_addr,
+ !!mptcp_pm_get_add_addr_accept_max(msk) &&
+ subflows_allowed);
+ WRITE_ONCE(pm->accept_subflow, subflows_allowed);
+
+ bitmap_fill(pm->id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
+}
+
struct mptcp_pm_ops mptcp_pm_kernel =3D {
+ .init =3D mptcp_pm_kernel_init,
.name =3D "kernel",
.owner =3D THIS_MODULE,
};
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index 2cb62f026b1f..6afab631580f 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -683,7 +683,13 @@ int mptcp_userspace_pm_get_addr(u8 id, struct mptcp_pm=
_addr_entry *addr,
return ret;
}
=20
+static void mptcp_pm_userspace_release(struct mptcp_sock *msk)
+{
+ mptcp_userspace_pm_free_local_addr_list(msk);
+}
+
static struct mptcp_pm_ops mptcp_pm_userspace =3D {
+ .release =3D mptcp_pm_userspace_release,
.name =3D "userspace",
.owner =3D THIS_MODULE,
};
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index d5eaf78c041f..a1670463519f 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -220,6 +220,7 @@ struct mptcp_pm_data {
struct mptcp_addr_info remote;
struct list_head anno_list;
struct list_head userspace_pm_local_addr_list;
+ struct mptcp_pm_ops *ops;
=20
spinlock_t lock; /*protects the whole PM data */
=20
--=20
2.43.0