From nobody Tue May 13 02:44:47 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 9290013C3C2
for <mptcp@lists.linux.dev>; Tue, 11 Mar 2025 06:32:21 +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=1741674741; cv=none;
b=sCoF+Y+ZKl3gWpSR+Xl2UGfVNFTxdOhmiXhkXnhHmfIR0KdbkCgcn+gufQPUCojfvbpsJoVrrW78xROk7Ggc7vPQwchCsbGzbRzkY2HOEYiCZRVom/BHNLicoaqHpcXZKE7HpA8WptS1CnF0dH6TzU8tMHV9qaOuMoHRH/f5yPo=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1741674741; c=relaxed/simple;
bh=8SsJ9KVEkwGUkJeMETXL31Tp1CKNe4rdjqdtmGvRkP8=;
h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:
MIME-Version;
b=gKkrjNqj2/NkM3C4Fj8UPJq62WF281OrhB+VaY2DbEEcvraIb9oTKli6Hz+GTXD9/G36JsbB62ho6z6t4NecB8IVGruFa6WW8RdxvfU9UyGpJ+Bw+iikLjmz5MP+WYhm8k9s68YRjlgK7il0uH8UpRdXXYR6qweSgAvxSDmQlPg=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org
header.b=M6CQZoRI; 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="M6CQZoRI"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0994C4CEE9;
Tue, 11 Mar 2025 06:32:19 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
s=k20201202; t=1741674741;
bh=8SsJ9KVEkwGUkJeMETXL31Tp1CKNe4rdjqdtmGvRkP8=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=M6CQZoRIsmZmtbXcOwWYkxKMO9z+0xI9OSvK++PP9j19Ozc+vqkEMmj7BcQvczlbo
C1FUW78j+809mHmJEaax+ukcz5KHuwGx1s3AkiqDrogkW01pmfuBlh4CVxCBfl3UG9
XY10swJrxtcyaF9fmjOR6C8j+oLXPeIaW9ZDw9CboQZt5MtT571exvmqoDHbJqgpUC
y1isVaOXizdUxwViFTKGn10wAgt+OI3K8u+yWmhz9k6y4KLmNHltd7GJtCJLn7Y+D5
fK4i7OBvuKS1RBi1/JN69bB+u0EDal1waRF/uFKCyKl2XE3+yPxxvthD+dz6XZ0v9m
rPNPfV3Fwn2kQ==
From: Geliang Tang <geliang@kernel.org>
To: mptcp@lists.linux.dev
Cc: Geliang Tang <tanggeliang@kylinos.cn>
Subject: [PATCH mptcp-next v11 03/10] mptcp: sysctl: set path manager by name
Date: Tue, 11 Mar 2025 14:31:55 +0800
Message-ID:
<dc2565380dec346172e90bc10ab2bf76e69160c0.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>
A new net.mptcp.path_manager sysctl is added to determine which path
manager will be used by each newly-created MPTCP socket by setting the
name of it.
This sysctl makes the old one "pm_type" deprecated.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
Documentation/networking/mptcp-sysctl.rst | 19 +++++++++
net/mptcp/ctrl.c | 50 +++++++++++++++++++++++
net/mptcp/protocol.h | 1 +
3 files changed, 70 insertions(+)
diff --git a/Documentation/networking/mptcp-sysctl.rst b/Documentation/netw=
orking/mptcp-sysctl.rst
index 03e1d3610333..b78a2254d452 100644
--- a/Documentation/networking/mptcp-sysctl.rst
+++ b/Documentation/networking/mptcp-sysctl.rst
@@ -72,6 +72,23 @@ enabled - BOOLEAN
=20
Default: 1 (enabled)
=20
+path_manager - STRING
+ Set the default path manager name to use for each new MPTCP
+ socket. In-kernel path management will control subflow
+ connections and address advertisements according to
+ per-namespace values configured over the MPTCP netlink
+ API. Userspace path management puts per-MPTCP-connection subflow
+ connection decisions and address advertisements under control of
+ a privileged userspace program, at the cost of more netlink
+ traffic to propagate all of the related events and commands.
+
+ This is a per-namespace sysctl.
+
+ * "kernel" - In-kernel path manager
+ * "userspace" - Userspace path manager
+
+ Default: "kernel"
+
pm_type - INTEGER
Set the default path manager type to use for each new MPTCP
socket. In-kernel path management will control subflow
@@ -84,6 +101,8 @@ pm_type - INTEGER
=20
This is a per-namespace sysctl.
=20
+ Deprecated since v6.15, use path_manager instead.
+
* 0 - In-kernel path manager
* 1 - Userspace path manager
=20
diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c
index be6c0237e10b..4209dc7f9704 100644
--- a/net/mptcp/ctrl.c
+++ b/net/mptcp/ctrl.c
@@ -39,6 +39,7 @@ struct mptcp_pernet {
u8 allow_join_initial_addr_port;
u8 pm_type;
char scheduler[MPTCP_SCHED_NAME_MAX];
+ char path_manager[MPTCP_PM_NAME_MAX];
};
=20
static struct mptcp_pernet *mptcp_get_pernet(const struct net *net)
@@ -83,6 +84,11 @@ 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)
+{
+ return mptcp_get_pernet(net)->path_manager;
+}
+
const char *mptcp_get_scheduler(const struct net *net)
{
return mptcp_get_pernet(net)->scheduler;
@@ -101,6 +107,7 @@ static void mptcp_pernet_set_defaults(struct mptcp_pern=
et *pernet)
pernet->stale_loss_cnt =3D 4;
pernet->pm_type =3D MPTCP_PM_TYPE_KERNEL;
strscpy(pernet->scheduler, "default", sizeof(pernet->scheduler));
+ strscpy(pernet->path_manager, "kernel", sizeof(pernet->path_manager));
}
=20
#ifdef CONFIG_SYSCTL
@@ -174,6 +181,42 @@ 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)
+{
+ struct mptcp_pm_ops *pm_ops;
+ int ret =3D 0;
+
+ rcu_read_lock();
+ pm_ops =3D mptcp_pm_find(name);
+ if (pm_ops)
+ strscpy(path_manager, name, MPTCP_PM_NAME_MAX);
+ else
+ ret =3D -ENOENT;
+ rcu_read_unlock();
+
+ return ret;
+}
+
+static int proc_path_manager(const struct ctl_table *ctl, int write,
+ void *buffer, size_t *lenp, loff_t *ppos)
+{
+ char (*path_manager)[MPTCP_PM_NAME_MAX] =3D ctl->data;
+ char pm_name[MPTCP_PM_NAME_MAX];
+ const struct ctl_table tbl =3D {
+ .data =3D pm_name,
+ .maxlen =3D MPTCP_PM_NAME_MAX,
+ };
+ int ret;
+
+ strscpy(pm_name, *path_manager, MPTCP_PM_NAME_MAX);
+
+ 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);
+
+ return ret;
+}
+
static struct ctl_table mptcp_sysctl_table[] =3D {
{
.procname =3D "enabled",
@@ -253,6 +296,12 @@ static struct ctl_table mptcp_sysctl_table[] =3D {
.mode =3D 0644,
.proc_handler =3D proc_dou8vec_minmax,
},
+ {
+ .procname =3D "path_manager",
+ .maxlen =3D MPTCP_PM_NAME_MAX,
+ .mode =3D 0644,
+ .proc_handler =3D proc_path_manager,
+ },
};
=20
static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pe=
rnet)
@@ -278,6 +327,7 @@ static int mptcp_pernet_new_table(struct net *net, stru=
ct mptcp_pernet *pernet)
table[8].data =3D &pernet->close_timeout;
table[9].data =3D &pernet->blackhole_timeout;
table[10].data =3D &pernet->syn_retrans_before_tcp_fallback;
+ table[11].data =3D &pernet->path_manager;
=20
hdr =3D register_net_sysctl_sz(net, MPTCP_SYSCTL_PATH, table,
ARRAY_SIZE(mptcp_sysctl_table));
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index f87c71550394..d5eaf78c041f 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -699,6 +699,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);
const char *mptcp_get_scheduler(const struct net *net);
=20
void mptcp_active_disable(struct sock *sk);
--=20
2.43.0