From nobody Tue May 13 10:19:28 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 0F8D113C3C2
for <mptcp@lists.linux.dev>; Tue, 11 Mar 2025 06:32:24 +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=1741674745; cv=none;
b=UE5stW9bjCkA4B7Vjup+7Hlze94avD31Qi8v9nTKZ7bScFtF9YUY2FbEZxnHVzCYHxsgCcH1ybRj8pXilXtKNpa3jxP+iuoAu+CN6OWC7t0sLax1Q2jB6nEObTCXYFkQ2VxQI6ZvmrGzX2PPFLTGVgoyxfmbXlIjTGZqyI6iFrQ=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1741674745; c=relaxed/simple;
bh=3pSdRl72NPBSLmsNzmBbIGDRz8yVC91f/w9oeV51xjo=;
h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:
MIME-Version;
b=W9otSge8I6NxMdOo52qiDWNWQUWTn3QToZFP+a82/RS72o5mUJ85NrW7H7bZPRtm+vwTIUiRKMqLNDH7N3jruHeUh2f83gDwzPs6rmkn3McVe3QkjoqK7li0/C7S7x9Fh3biyH0VeH5nSZvEKZ9Vzqe0dsR6Um+CZUBIbmu7Mx0=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org
header.b=KJrucjHm; 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="KJrucjHm"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 760EBC4CEE9;
Tue, 11 Mar 2025 06:32:23 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
s=k20201202; t=1741674744;
bh=3pSdRl72NPBSLmsNzmBbIGDRz8yVC91f/w9oeV51xjo=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=KJrucjHmUzKQdUVww3gZLa3Th/xupe9m/QObDin6Y99GdweluDSrNndgry6pJ7w7j
kFZI6njMFM022qmpCOnyLS/se8+yx20Bq25GnspXSHC4inXauD70uZUFX6iBiNxKb2
hpx6HSy7ddhk2OeZkcmyeJA+0CmIQjhDwgSTK1AL66C41+S2V237shvsANrr4ZDPYO
A55zEuACvOXxHm44mroSG5KeO+Ut8zea1epfNC0MdWUo4/odRj918Zkhv5kuED+p1b
xKPO+ZILMu09W5l7CEqvvEjHMLtM2swLGAgPZ4fNQIIRhdtwXStmjvtpFBSetAxLOT
ICvYljcD8C1fA==
From: Geliang Tang <geliang@kernel.org>
To: mptcp@lists.linux.dev
Cc: Geliang Tang <tanggeliang@kylinos.cn>
Subject: [PATCH mptcp-next v11 05/10] mptcp: pm: add get_local_id() interface
Date: Tue, 11 Mar 2025 14:31:57 +0800
Message-ID:
<061e62fc02eb7944356ffd49cbcf202d833e65e0.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>
This patch adds get_local_id() interface for struct mptcp_sched_ops,
then mptcp_pm_get_local_id() can directly invoke get_local_id() interface
through "ops" of "msk->pm". Instead of using mptcp_pm_is_userspace() to
check which get_local_id() helper to invoke.
Also rename mptcp_pm_nl_get_local_id() to mptcp_pm_kernel_get_local_id()
and mptcp_userspace_pm_get_local_id() to mptcp_pm_userspace_get_local_id(),
and make them static.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
include/net/mptcp.h | 3 +++
net/mptcp/pm.c | 9 ++++++---
net/mptcp/pm_kernel.c | 5 +++--
net/mptcp/pm_userspace.c | 5 +++--
net/mptcp/protocol.h | 4 ----
5 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index 69f7b35e57c3..169e19440b03 100644
--- a/include/net/mptcp.h
+++ b/include/net/mptcp.h
@@ -116,6 +116,9 @@ struct mptcp_sched_ops {
#define MPTCP_PM_NAME_MAX 16
=20
struct mptcp_pm_ops {
+ int (*get_local_id)(struct mptcp_sock *msk,
+ struct mptcp_pm_addr_entry *skc);
+
char name[MPTCP_PM_NAME_MAX];
struct module *owner;
struct list_head list;
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index bf318cecb242..6eaf072a472a 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -872,9 +872,7 @@ int mptcp_pm_get_local_id(struct mptcp_sock *msk, struc=
t sock_common *skc)
skc_local.addr.id =3D 0;
skc_local.flags =3D MPTCP_PM_ADDR_FLAG_IMPLICIT;
=20
- if (mptcp_pm_is_userspace(msk))
- return mptcp_userspace_pm_get_local_id(msk, &skc_local);
- return mptcp_pm_nl_get_local_id(msk, &skc_local);
+ return msk->pm.ops->get_local_id(msk, &skc_local);
}
=20
bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc)
@@ -1052,6 +1050,11 @@ struct mptcp_pm_ops *mptcp_pm_find(const char *name)
=20
int mptcp_pm_validate(struct mptcp_pm_ops *pm_ops)
{
+ if (!pm_ops->get_local_id) {
+ pr_err("%s does not implement required ops\n", pm_ops->name);
+ return -EINVAL;
+ }
+
return 0;
}
=20
diff --git a/net/mptcp/pm_kernel.c b/net/mptcp/pm_kernel.c
index 687a423f5252..1380e529aa02 100644
--- a/net/mptcp/pm_kernel.c
+++ b/net/mptcp/pm_kernel.c
@@ -693,8 +693,8 @@ static int mptcp_pm_nl_create_listen_socket(struct sock=
*sk,
return err;
}
=20
-int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk,
- struct mptcp_pm_addr_entry *skc)
+static int mptcp_pm_kernel_get_local_id(struct mptcp_sock *msk,
+ struct mptcp_pm_addr_entry *skc)
{
struct mptcp_pm_addr_entry *entry;
struct pm_nl_pernet *pernet;
@@ -1419,6 +1419,7 @@ static void mptcp_pm_kernel_init(struct mptcp_sock *m=
sk)
}
=20
struct mptcp_pm_ops mptcp_pm_kernel =3D {
+ .get_local_id =3D mptcp_pm_kernel_get_local_id,
.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 6afab631580f..81ddc14bc273 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -126,8 +126,8 @@ mptcp_userspace_pm_lookup_addr_by_id(struct mptcp_sock =
*msk, unsigned int id)
return NULL;
}
=20
-int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk,
- struct mptcp_pm_addr_entry *skc)
+static int mptcp_pm_userspace_get_local_id(struct mptcp_sock *msk,
+ struct mptcp_pm_addr_entry *skc)
{
__be16 msk_sport =3D ((struct inet_sock *)
inet_sk((struct sock *)msk))->inet_sport;
@@ -689,6 +689,7 @@ static void mptcp_pm_userspace_release(struct mptcp_soc=
k *msk)
}
=20
static struct mptcp_pm_ops mptcp_pm_userspace =3D {
+ .get_local_id =3D mptcp_pm_userspace_get_local_id,
.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 a1670463519f..282067717b39 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -1139,10 +1139,6 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk=
, const struct sk_buff *skb,
bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remainin=
g,
struct mptcp_rm_list *rm_list);
int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc);
-int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk,
- struct mptcp_pm_addr_entry *skc);
-int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk,
- struct mptcp_pm_addr_entry *skc);
bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc);
bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info =
*skc);
bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, struct mptcp_add=
r_info *skc);
--=20
2.43.0