From nobody Mon May 25 18:05:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 80D8A23395F for ; Fri, 22 May 2026 02:48:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418121; cv=none; b=FH82n0bPXlB62yVWVdQCEoK2ncs9j3kzbFgVVemxRm19FwVKSaF01JdBHQsfLUlKl7NCRgsP7pjqWhHvPvJthcnMmDcL6ncQiKYswlGjQ+cmmLvNpRyfV5Yckx9tFWX7AQ/0CjdSAMJzE8Zca5O8p7mry4NkMSKxEwIVBqVq7tw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418121; c=relaxed/simple; bh=k9XLsFIXJQ9M7ZzUtSb+GWMMYU82uc2/QsFl6pp+ZXw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LfKskCRovMnkNRFnfHIExW/U+REho4FMwD1CorZfIWFNE5a9sdjBdAz8jogS/mrRInLFhoSExCc7KGH+KMDKDp8BLM1g6XJW+68J15T7esqE77FtTQJMnbfOt5txKbpBRu1awWAsjZX49rh14DNr6LcbXjZ0S9X7pdXghKXNIbM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=F8Z9gDOW; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="F8Z9gDOW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B1361F00A3D; Fri, 22 May 2026 02:48:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779418120; bh=4VA8tM0kRzC/5LAmjHiL1kj+7SlzoiNuS9frNaQdXWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=F8Z9gDOWgaJGXoAtY+y2qWrb1JS3UH1f3NwkSs2rRuucltylbFwvwVygaCTLUfPq2 ADDvZgggVi1rczQYJQ30VrTp/l/TCybqLXiWfN9+cEO+9JISczfYYNXl9f2+HJuBaj Egi4Zo3mM1RNrEuQwj4R3LL/YnoEsxa/wGu4zf77VQaa0/r+5D11berA+GDD6+ymcN VVxmNhem4mwA9JQFhX+KfBql8Uf9WNxP2ZEmB+Oiv3/9vG2WBiW/sdgQvTmbDm9oHd /tL4rmqXhFWATxfECo9FbIPB/4iv1/eYbsvb/qrlDWN/w5FrvgDYMH3nLbhV1AGhUH lifiEsUuX4vyw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v16 01/12] nvmet-tcp: define target tcp_proto struct Date: Fri, 22 May 2026 10:47:59 +0800 Message-ID: <9ed9ef4d1fcc5cb8b898cdb20250c233a97a4c06.1779416980.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 To add MPTCP support in "NVMe over TCP", the target side needs to pass IPPROTO_MPTCP to sock_create() instead of IPPROTO_TCP to create an MPTCP socket. Additionally, the setsockopt operations for this socket need to be switched to a set of MPTCP-specific functions. This patch defines the nvmet_tcp_proto structure, which contains the protocol of the socket and a set of function pointers for these socket operations. A TCP-specific version of struct nvmet_tcp_proto is defined. In nvmet_tcp_add_port(), a local proto variable is set based on trtype. All locations that previously called TCP setsockopt functions are updated to call the corresponding function pointers in the nvmet_tcp_proto structure. A proto field is added to struct nvmet_tcp_port, which points to the appropriate protocol structure. Also validate that the socket protocol matches the port protocol when allocating a new queue. Cc: Hannes Reinecke Co-developed-by: zhenwei pi Signed-off-by: zhenwei pi Co-developed-by: Hui Zhu Signed-off-by: Hui Zhu Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- drivers/nvme/target/tcp.c | 60 ++++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 164a564ba3b4..78043506f444 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -198,12 +198,23 @@ struct nvmet_tcp_queue { void (*write_space)(struct sock *); }; =20 +struct nvmet_tcp_proto { + int protocol; + void (*set_reuseaddr)(struct sock *sk); + void (*set_nodelay)(struct sock *sk); + void (*set_priority)(struct sock *sk, u32 priority); + void (*no_linger)(struct sock *sk); + void (*set_tos)(struct sock *sk); + const struct nvmet_fabrics_ops *ops; +}; + struct nvmet_tcp_port { struct socket *sock; struct work_struct accept_work; struct nvmet_port *nport; struct sockaddr_storage addr; void (*data_ready)(struct sock *); + const struct nvmet_tcp_proto *proto; }; =20 static DEFINE_IDA(nvmet_tcp_queue_ida); @@ -1081,7 +1092,8 @@ static int nvmet_tcp_done_recv_pdu(struct nvmet_tcp_q= ueue *queue) req =3D &queue->cmd->req; memcpy(req->cmd, nvme_cmd, sizeof(*nvme_cmd)); =20 - if (unlikely(!nvmet_req_init(req, &queue->nvme_sq, &nvmet_tcp_ops))) { + if (unlikely(!nvmet_req_init(req, &queue->nvme_sq, + queue->port->proto->ops))) { pr_err("failed cmd %p id %d opcode %d, data_len: %d, status: %04x\n", req->cmd, req->cmd->common.command_id, req->cmd->common.opcode, @@ -1696,7 +1708,6 @@ static void nvmet_tcp_state_change(struct sock *sk) static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) { struct socket *sock =3D queue->sock; - struct inet_sock *inet =3D inet_sk(sock->sk); int ret; =20 ret =3D kernel_getsockname(sock, @@ -1714,14 +1725,13 @@ static int nvmet_tcp_set_queue_sock(struct nvmet_tc= p_queue *queue) * close. This is done to prevent stale data from being sent should * the network connection be restored before TCP times out. */ - sock_no_linger(sock->sk); + queue->port->proto->no_linger(sock->sk); =20 if (so_priority > 0) - sock_set_priority(sock->sk, so_priority); + queue->port->proto->set_priority(sock->sk, so_priority); =20 /* Set socket type of service */ - if (inet->rcv_tos > 0) - ip_sock_set_tos(sock->sk, inet->rcv_tos); + queue->port->proto->set_tos(sock->sk); =20 ret =3D 0; write_lock_bh(&sock->sk->sk_callback_lock); @@ -1911,6 +1921,11 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_p= ort *port, struct file *sock_file =3D NULL; int ret; =20 + if (port->proto->protocol !=3D newsock->sk->sk_protocol) { + ret =3D -EINVAL; + goto out_release; + } + queue =3D kzalloc_obj(*queue); if (!queue) { ret =3D -ENOMEM; @@ -2041,6 +2056,24 @@ static void nvmet_tcp_listen_data_ready(struct sock = *sk) read_unlock_bh(&sk->sk_callback_lock); } =20 +static void tcp_sock_set_tos(struct sock *sk) +{ + struct inet_sock *inet =3D inet_sk(sk); + + if (inet->rcv_tos > 0) + ip_sock_set_tos(sk, inet->rcv_tos); +} + +static const struct nvmet_tcp_proto nvmet_tcp_proto =3D { + .protocol =3D IPPROTO_TCP, + .set_reuseaddr =3D sock_set_reuseaddr, + .set_nodelay =3D tcp_sock_set_nodelay, + .set_priority =3D sock_set_priority, + .no_linger =3D sock_no_linger, + .set_tos =3D tcp_sock_set_tos, + .ops =3D &nvmet_tcp_ops, +}; + static int nvmet_tcp_add_port(struct nvmet_port *nport) { struct nvmet_tcp_port *port; @@ -2065,6 +2098,13 @@ static int nvmet_tcp_add_port(struct nvmet_port *npo= rt) goto err_port; } =20 + if (nport->disc_addr.trtype =3D=3D NVMF_TRTYPE_TCP) { + port->proto =3D &nvmet_tcp_proto; + } else { + ret =3D -EINVAL; + goto err_port; + } + ret =3D inet_pton_with_scope(&init_net, af, nport->disc_addr.traddr, nport->disc_addr.trsvcid, &port->addr); if (ret) { @@ -2079,7 +2119,7 @@ static int nvmet_tcp_add_port(struct nvmet_port *npor= t) port->nport->inline_data_size =3D NVMET_TCP_DEF_INLINE_DATA_SIZE; =20 ret =3D sock_create(port->addr.ss_family, SOCK_STREAM, - IPPROTO_TCP, &port->sock); + port->proto->protocol, &port->sock); if (ret) { pr_err("failed to create a socket\n"); goto err_port; @@ -2088,10 +2128,10 @@ static int nvmet_tcp_add_port(struct nvmet_port *np= ort) port->sock->sk->sk_user_data =3D port; port->data_ready =3D port->sock->sk->sk_data_ready; port->sock->sk->sk_data_ready =3D nvmet_tcp_listen_data_ready; - sock_set_reuseaddr(port->sock->sk); - tcp_sock_set_nodelay(port->sock->sk); + port->proto->set_reuseaddr(port->sock->sk); + port->proto->set_nodelay(port->sock->sk); if (so_priority > 0) - sock_set_priority(port->sock->sk, so_priority); + port->proto->set_priority(port->sock->sk, so_priority); =20 ret =3D kernel_bind(port->sock, (struct sockaddr_unsized *)&port->addr, sizeof(port->addr)); --=20 2.53.0 From nobody Mon May 25 18:05:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 E59C617C203 for ; Fri, 22 May 2026 02:48:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418124; cv=none; b=SsXr3bbFyDOMiDjmcu16DShHHekT3LkYO35mC0PhSZZhvTq2xeokAw9HG/1BITTooWOj+8hWsAIBGjkpVyxV2ZuEQfxFVnFHJvtV3wkBeTwW/+fNBSpaZCUEd2LSdFgBKoNUOEvp61VD7hMqS7Ishar632giP4oeZmE33gayxgU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418124; c=relaxed/simple; bh=j/+BQzwUUFaZmJh3OaTk0+LFpkd1c073HDiRvDr7j3g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Bxge0M+XvxIJj3y5i97e90KkCy0qAVtK/wcEoC3VIlkRp1wzgLVop+mUihqtmvowda8bYJLJ/2MKEPKXTNm55QSt6BDeCil5OxzmFzrt3z9gHA2abVgMGeo0gnDDELSup9fdwgMEPlvdmraGLaAM4GSfjYrKOwdDbxc1o3ulnUI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eVec9qFP; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eVec9qFP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA6681F000E9; Fri, 22 May 2026 02:48:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779418122; bh=FL76HMjukhh4LGWXyMIAWMW5g3XmuO0VUDwpI6vVwJ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eVec9qFPSZzlKhFGRKmJEasvA2UqtqKcg8XQFmzOd0qPmXU9Mf191A8jbRDy3K/oN 0LlAjDzvM9YhboxysCsdhye5AO1nuTA0QfVgI0HzKFwAzJjdtQBoBqQj5XZqtm02Xp rQDlhb9LZDHRJCNFm+zDLWGZE9JynTNxK3uqZ4XB/LMMMmnMFpScmFytgeGCpgsscE AbifggGJFlM8o97IYKpsOdsnm123uwrxLNjRMkQPWFyfr9qv3Qj/b51lvlIOWlEb3y OaFqaqTsvgJr4iJfUL6vVXAL19GQNFPKWJeHlNzWom+8LA8xfPzxkVGbkAm+AMo9Jk bz7+eT28lKuVA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v16 02/12] nvmet-tcp: add kref to struct nvmet_tcp_port Date: Fri, 22 May 2026 10:48:00 +0800 Message-ID: X-Mailer: git-send-email 2.53.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 A proto field is added to struct nvmet_tcp_port, introducing new code paths that access queue->port (e.g., nvmet_tcp_done_recv_pdu uses queue->port->proto->ops). This increases the number of port access points and the risk of use-after-free when a port is removed while queues still hold references to it. Add kref reference counting to struct nvmet_tcp_port to prevent such use-after-free scenarios. The port reference is taken when a queue is allocated and released when the queue is freed. Cc: Hannes Reinecke Co-developed-by: zhenwei pi Signed-off-by: zhenwei pi Co-developed-by: Hui Zhu Signed-off-by: Hui Zhu Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- drivers/nvme/target/tcp.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 78043506f444..e585dd257fdd 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -213,6 +213,7 @@ struct nvmet_tcp_port { struct work_struct accept_work; struct nvmet_port *nport; struct sockaddr_storage addr; + struct kref kref; void (*data_ready)(struct sock *); const struct nvmet_tcp_proto *proto; }; @@ -1609,6 +1610,14 @@ static void nvmet_tcp_free_cmd_data_in_buffers(struc= t nvmet_tcp_queue *queue) nvmet_tcp_free_cmd_buffers(&queue->connect); } =20 +static void nvmet_tcp_release_port(struct kref *kref) +{ + struct nvmet_tcp_port *port =3D + container_of(kref, struct nvmet_tcp_port, kref); + + kfree(port); +} + static void nvmet_tcp_release_queue_work(struct work_struct *w) { struct nvmet_tcp_queue *queue =3D @@ -1635,6 +1644,7 @@ static void nvmet_tcp_release_queue_work(struct work_= struct *w) nvmet_tcp_free_cmds(queue); ida_free(&nvmet_tcp_queue_ida, queue->idx); page_frag_cache_drain(&queue->pf_cache); + kref_put(&queue->port->kref, nvmet_tcp_release_port); kfree(queue); } =20 @@ -1936,6 +1946,7 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_po= rt *port, INIT_WORK(&queue->io_work, nvmet_tcp_io_work); kref_init(&queue->kref); queue->sock =3D newsock; + kref_get(&port->kref); queue->port =3D port; queue->nr_cmds =3D 0; spin_lock_init(&queue->state_lock); @@ -2015,6 +2026,7 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_po= rt *port, out_sock: fput(queue->sock->file); out_free_queue: + kref_put(&queue->port->kref, nvmet_tcp_release_port); kfree(queue); out_release: pr_err("failed to allocate queue, error %d\n", ret); @@ -2084,6 +2096,8 @@ static int nvmet_tcp_add_port(struct nvmet_port *npor= t) if (!port) return -ENOMEM; =20 + kref_init(&port->kref); + switch (nport->disc_addr.adrfam) { case NVMF_ADDR_FAMILY_IP4: af =3D AF_INET; @@ -2186,7 +2200,7 @@ static void nvmet_tcp_remove_port(struct nvmet_port *= nport) nvmet_tcp_destroy_port_queues(port); =20 sock_release(port->sock); - kfree(port); + kref_put(&port->kref, nvmet_tcp_release_port); } =20 static void nvmet_tcp_delete_ctrl(struct nvmet_ctrl *ctrl) --=20 2.53.0 From nobody Mon May 25 18:05:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 2D62117C203 for ; Fri, 22 May 2026 02:48:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418126; cv=none; b=OJj4cnpiXG5x6cZzwUsQ+NxTNjo/rBVMVzFcegdKPEDQui9C9IF4hj6BsCpyVjjU/IHrzPfxlL5ERS7HCodRC5GVUMxbNOJn4QxD7t6gXWfWyPiT+NgyKFzwdobg8X3lP8qFolHrGnEqBzyRrguP/gJ8FwagVNzDc91QAwjBueU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418126; c=relaxed/simple; bh=b/OtppE2phlc7Z5upbRXRRLHHx3xgDVP9J1V8rabvFQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NDeBwPn9f7kalcH7ZPc88am/6ZkHyz/cNZR1SoM1ixHD10fsyRVB6qU1yYkNllFzWvMJKftJJm+O7zBH7aBmHtnXsijyW4IIXvoXzg2Xj7hDnz6b40s8upNIcYnY1I5X8XJm0OYTYTNWZvOqXGsPSrQAKfE0Vo0sBHX9zP13Isw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Rf5J/+aA; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Rf5J/+aA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 218A41F00A3D; Fri, 22 May 2026 02:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779418124; bh=RBkD8RegpDQ7sniGX1HmrQGf82H8xTvStAeCrespgKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Rf5J/+aAbNnydEgPHL1w6nq32Fat0l0CVQDxSAl6XtKAUkboGon0+ASeb+7JfRlGV qFLCSwRrqcdPMwyHuPz5PChYvyYdKhbmgMgqzegbC6FQENtqu2pvSFjzTwvzLc7To8 ivqyghMjHZ8hCxnPh6l/DpTQmGQyJItRCzS3fD04lrdESaxrDNGbAbTgfFqXr1M6K+ Nz8Mm0be7Llr4Nxa8KryHh/vUzQxCydeTUqbyCyRoCNz0uK0MzYwNIC+V3vrLl4imN I8y43EsWGLWwpBnrWdghgqDehMf0ncp77NmxXesR0UTomWREMmr6Wg5XUec6gbc+3a nEe4NYyt0n+EA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v16 03/12] nvmet-tcp: register target mptcp transport Date: Fri, 22 May 2026 10:48:01 +0800 Message-ID: X-Mailer: git-send-email 2.53.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 adds a new nvme target transport type NVMF_TRTYPE_MPTCP for MPTCP. And defines a new nvmet_fabrics_ops named nvmet_mptcp_ops, which is almost the same as nvmet_tcp_ops except .type. It is registered in nvmet_tcp_init() and unregistered in nvmet_tcp_exit(). A MODULE_ALIAS for "nvmet-transport-4" is also added. Note: NVMF_TRTYPE_MPTCP is temporarily assigned 4, a value currently reserved in the NVMe over Fabrics specification. A request will be submitted to the NVMe working group to officially allocate this value for MPTCP. v2: - use trtype instead of tsas (Hannes). v3: - check mptcp protocol from disc_addr.trtype instead of passing a parameter (Hannes). v4: - check CONFIG_MPTCP. Cc: Hannes Reinecke Co-developed-by: zhenwei pi Signed-off-by: zhenwei pi Co-developed-by: Hui Zhu Signed-off-by: Hui Zhu Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- drivers/nvme/target/configfs.c | 1 + drivers/nvme/target/tcp.c | 29 +++++++++++++++++++++++++++++ include/linux/nvme.h | 1 + 3 files changed, 31 insertions(+) diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c index b88f897f06e2..51fc0f4d0c32 100644 --- a/drivers/nvme/target/configfs.c +++ b/drivers/nvme/target/configfs.c @@ -37,6 +37,7 @@ static struct nvmet_type_name_map nvmet_transport[] =3D { { NVMF_TRTYPE_RDMA, "rdma" }, { NVMF_TRTYPE_FC, "fc" }, { NVMF_TRTYPE_TCP, "tcp" }, + { NVMF_TRTYPE_MPTCP, "mptcp" }, { NVMF_TRTYPE_PCI, "pci" }, { NVMF_TRTYPE_LOOP, "loop" }, }; diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index e585dd257fdd..f613302b0ade 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -2285,6 +2285,23 @@ static const struct nvmet_fabrics_ops nvmet_tcp_ops = =3D { .host_traddr =3D nvmet_tcp_host_port_addr, }; =20 +#ifdef CONFIG_MPTCP +static bool nvmet_mptcp_registered; + +static const struct nvmet_fabrics_ops nvmet_mptcp_ops =3D { + .owner =3D THIS_MODULE, + .type =3D NVMF_TRTYPE_MPTCP, + .msdbd =3D 1, + .add_port =3D nvmet_tcp_add_port, + .remove_port =3D nvmet_tcp_remove_port, + .queue_response =3D nvmet_tcp_queue_response, + .delete_ctrl =3D nvmet_tcp_delete_ctrl, + .install_queue =3D nvmet_tcp_install_queue, + .disc_traddr =3D nvmet_tcp_disc_port_addr, + .host_traddr =3D nvmet_tcp_host_port_addr, +}; +#endif + static int __init nvmet_tcp_init(void) { int ret; @@ -2298,6 +2315,11 @@ static int __init nvmet_tcp_init(void) if (ret) goto err; =20 +#ifdef CONFIG_MPTCP + if (!nvmet_register_transport(&nvmet_mptcp_ops)) + nvmet_mptcp_registered =3D true; +#endif + return 0; err: destroy_workqueue(nvmet_tcp_wq); @@ -2308,6 +2330,10 @@ static void __exit nvmet_tcp_exit(void) { struct nvmet_tcp_queue *queue; =20 +#ifdef CONFIG_MPTCP + if (nvmet_mptcp_registered) + nvmet_unregister_transport(&nvmet_mptcp_ops); +#endif nvmet_unregister_transport(&nvmet_tcp_ops); =20 flush_workqueue(nvmet_wq); @@ -2327,3 +2353,6 @@ module_exit(nvmet_tcp_exit); MODULE_DESCRIPTION("NVMe target TCP transport driver"); MODULE_LICENSE("GPL v2"); MODULE_ALIAS("nvmet-transport-3"); /* 3 =3D=3D NVMF_TRTYPE_TCP */ +#ifdef CONFIG_MPTCP +MODULE_ALIAS("nvmet-transport-4"); /* 4 =3D=3D NVMF_TRTYPE_MPTCP */ +#endif diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 041f30931a90..0eada1e0c652 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -68,6 +68,7 @@ enum { NVMF_TRTYPE_RDMA =3D 1, /* RDMA */ NVMF_TRTYPE_FC =3D 2, /* Fibre Channel */ NVMF_TRTYPE_TCP =3D 3, /* TCP/IP */ + NVMF_TRTYPE_MPTCP =3D 4, /* Multipath TCP */ NVMF_TRTYPE_LOOP =3D 254, /* Reserved for host usage */ NVMF_TRTYPE_MAX, }; --=20 2.53.0 From nobody Mon May 25 18:05:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 60B0917C203 for ; Fri, 22 May 2026 02:48:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418128; cv=none; b=kqSRpp/hGICEsDaxq0eYoNk/fgM1sJzkiPj6QET+udRJwYVICZpvnFEpQH7mhBch0F6fJpG6+N4K1Lc0ID4B2wKJ797bd2xlIS4Bfc4HqFOeTgWmMCIYfdgES14Kw6cWVYY7r7kttPzo46azBt1ARRan0Eu+JwdG5o3MynA0bVE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418128; c=relaxed/simple; bh=I2UobFFpv981nkvnU7bjWg34F4F5UNfXXtMWaCPbvas=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=owfE/ums/p8PxT1flwfAx4AE4O7Pxx93QIwkqxDpqCGoaBeF2dA7X+YDsRhq0guNAKCxt2RPOjY6VmUwV7TpgZKBLqq2hHhx/1U5m4732PSB5R4Yppm04zZW21cW58LGAaaBRjb9EuY9uY3mbSU5WXlPkwZEiWBa5TXhHVkuC1I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=i/H3kMM/; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="i/H3kMM/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4CE691F000E9; Fri, 22 May 2026 02:48:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779418127; bh=GqeMN5F9tr/18oYZRTqGoyidXJKOrpmOjPy2BxKBl5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=i/H3kMM/znwv1CDVBkGKUt700pMKJXguRJvmlhtjuN0AuieyJgmvT5kDOf0FbGfhG fhKRN/9DDMajMt1NEdCofkqOQYk4AVQ5FAuY7nY9Pj5GxgA7BQWqSbq2JQ1mU95+lL BW7JycSGyDgj58yyWhrbznMOmHbDAsznIgv39YY/e5HXESnrSDXJKz6uGPfKgWHlOE Yk0lLjSA3UbkJLNLIn3f0IAornCY4/k77lWLeKWtsrzs6Ufv86aMuDtGuWD8V0oD58 m9XOa5I/Z6frQXUB7AK/70rhkqLRzjP63rOo8L1ltOthNkSIhpj26EIGf+vqtksudw NHtIMKH/7rStw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v16 04/12] nvmet-tcp: implement target mptcp proto Date: Fri, 22 May 2026 10:48:02 +0800 Message-ID: <70880cc6d7ac94957e615c0bd6da6bf9360e5d02.1779416980.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 introduces a new NVMe target transport type NVMF_TRTYPE_MPTCP to support MPTCP. An MPTCP-specific version of struct nvmet_tcp_proto is implemented, and it is assigned to queue->proto when the transport type is MPTCP. Dedicated MPTCP helpers are introduced for setting socket options. Most of these helpers (set_nodelay, set_priority, no_linger, set_tos) set the values on all existing subflows using mptcp_for_each_subflow(). The set_reuseaddr helper only applies to the first subflow. The values are then synchronized to other newly created subflows in sync_socket_options(). Cc: Hannes Reinecke Co-developed-by: zhenwei pi Signed-off-by: zhenwei pi Co-developed-by: Hui Zhu Signed-off-by: Hui Zhu Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- drivers/nvme/target/tcp.c | 19 ++++++ include/net/mptcp.h | 20 +++++++ net/mptcp/sockopt.c | 121 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+) diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index f613302b0ade..7138f0885829 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -224,6 +224,9 @@ static DEFINE_MUTEX(nvmet_tcp_queue_mutex); =20 static struct workqueue_struct *nvmet_tcp_wq; static const struct nvmet_fabrics_ops nvmet_tcp_ops; +#ifdef CONFIG_MPTCP +static const struct nvmet_fabrics_ops nvmet_mptcp_ops; +#endif static void nvmet_tcp_free_cmd(struct nvmet_tcp_cmd *c); static void nvmet_tcp_free_cmd_buffers(struct nvmet_tcp_cmd *cmd); =20 @@ -2086,6 +2089,18 @@ static const struct nvmet_tcp_proto nvmet_tcp_proto = =3D { .ops =3D &nvmet_tcp_ops, }; =20 +#ifdef CONFIG_MPTCP +static const struct nvmet_tcp_proto nvmet_mptcp_proto =3D { + .protocol =3D IPPROTO_MPTCP, + .set_reuseaddr =3D mptcp_sock_set_reuseaddr, + .set_nodelay =3D mptcp_sock_set_nodelay, + .set_priority =3D mptcp_sock_set_priority, + .no_linger =3D mptcp_sock_no_linger, + .set_tos =3D mptcp_sock_set_tos, + .ops =3D &nvmet_mptcp_ops, +}; +#endif + static int nvmet_tcp_add_port(struct nvmet_port *nport) { struct nvmet_tcp_port *port; @@ -2114,6 +2129,10 @@ static int nvmet_tcp_add_port(struct nvmet_port *npo= rt) =20 if (nport->disc_addr.trtype =3D=3D NVMF_TRTYPE_TCP) { port->proto =3D &nvmet_tcp_proto; +#ifdef CONFIG_MPTCP + } else if (nport->disc_addr.trtype =3D=3D NVMF_TRTYPE_MPTCP) { + port->proto =3D &nvmet_mptcp_proto; +#endif } else { ret =3D -EINVAL; goto err_port; diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 4cf59e83c1c5..8eacb9424b37 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -237,6 +237,16 @@ static inline __be32 mptcp_reset_option(const struct s= k_buff *skb) } =20 void mptcp_active_detect_blackhole(struct sock *sk, bool expired); + +void mptcp_sock_set_reuseaddr(struct sock *sk); + +void mptcp_sock_set_nodelay(struct sock *sk); + +void mptcp_sock_set_priority(struct sock *sk, u32 priority); + +void mptcp_sock_no_linger(struct sock *sk); + +void mptcp_sock_set_tos(struct sock *sk); #else =20 static inline void mptcp_init(void) @@ -323,6 +333,16 @@ static inline struct request_sock *mptcp_subflow_reqsk= _alloc(const struct reques static inline __be32 mptcp_reset_option(const struct sk_buff *skb) { retu= rn htonl(0u); } =20 static inline void mptcp_active_detect_blackhole(struct sock *sk, bool exp= ired) { } + +static inline void mptcp_sock_set_reuseaddr(struct sock *sk) { } + +static inline void mptcp_sock_set_nodelay(struct sock *sk) { } + +static inline void mptcp_sock_set_priority(struct sock *sk, u32 priority) = { } + +static inline void mptcp_sock_no_linger(struct sock *sk) { } + +static inline void mptcp_sock_set_tos(struct sock *sk) { } #endif /* CONFIG_MPTCP */ =20 #if IS_ENABLED(CONFIG_MPTCP_IPV6) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 87b5796d0135..730e945bf8cd 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -1596,6 +1596,8 @@ static void sync_socket_options(struct mptcp_sock *ms= k, struct sock *ssk) inet_assign_bit(FREEBIND, ssk, inet_test_bit(FREEBIND, sk)); inet_assign_bit(BIND_ADDRESS_NO_PORT, ssk, inet_test_bit(BIND_ADDRESS_NO_= PORT, sk)); WRITE_ONCE(inet_sk(ssk)->local_port_range, READ_ONCE(inet_sk(sk)->local_p= ort_range)); + + ssk->sk_reuse =3D sk->sk_reuse; } =20 void mptcp_sockopt_sync_locked(struct mptcp_sock *msk, struct sock *ssk) @@ -1662,3 +1664,122 @@ int mptcp_set_rcvlowat(struct sock *sk, int val) } return 0; } + +void mptcp_sock_set_reuseaddr(struct sock *sk) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct sock *ssk; + + lock_sock(sk); + sockopt_seq_inc(msk); + sk->sk_reuse =3D SK_CAN_REUSE; + ssk =3D __mptcp_nmpc_sk(msk); + if (IS_ERR(ssk)) + goto unlock; + lock_sock_nested(ssk, SINGLE_DEPTH_NESTING); + ssk->sk_reuse =3D SK_CAN_REUSE; + release_sock(ssk); +unlock: + release_sock(sk); +} +EXPORT_SYMBOL(mptcp_sock_set_reuseaddr); + +void mptcp_sock_set_nodelay(struct sock *sk) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; + struct sock *ssk; + + lock_sock(sk); + sockopt_seq_inc(msk); + msk->nodelay =3D true; + mptcp_for_each_subflow(msk, subflow) { + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (ssk) { + lock_sock_nested(ssk, SINGLE_DEPTH_NESTING); + __tcp_sock_set_nodelay(ssk, true); + release_sock(ssk); + } + } + release_sock(sk); +} +EXPORT_SYMBOL(mptcp_sock_set_nodelay); + +void mptcp_sock_set_priority(struct sock *sk, u32 priority) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; + struct sock *ssk; + + lock_sock(sk); + sockopt_seq_inc(msk); + sock_set_priority(sk, priority); + mptcp_for_each_subflow(msk, subflow) { + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (ssk) { + lock_sock_nested(ssk, SINGLE_DEPTH_NESTING); + sock_set_priority(ssk, priority); + release_sock(ssk); + } + } + release_sock(sk); +} +EXPORT_SYMBOL(mptcp_sock_set_priority); + +void mptcp_sock_no_linger(struct sock *sk) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; + struct sock *ssk; + + lock_sock(sk); + sockopt_seq_inc(msk); + WRITE_ONCE(sk->sk_lingertime, 0); + sock_set_flag(sk, SOCK_LINGER); + mptcp_for_each_subflow(msk, subflow) { + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (ssk) { + lock_sock_nested(ssk, SINGLE_DEPTH_NESTING); + WRITE_ONCE(ssk->sk_lingertime, 0); + sock_set_flag(ssk, SOCK_LINGER); + release_sock(ssk); + } + } + release_sock(sk); +} +EXPORT_SYMBOL(mptcp_sock_no_linger); + +static void __mptcp_sock_set_tos(struct sock *sk, int val) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; + struct sock *ssk; + + lock_sock(sk); + sockopt_seq_inc(msk); + __ip_sock_set_tos(sk, val); + mptcp_for_each_subflow(msk, subflow) { + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (ssk) { + lock_sock_nested(ssk, SINGLE_DEPTH_NESTING); + __ip_sock_set_tos(ssk, val); + release_sock(ssk); + } + } + release_sock(sk); +} + +void mptcp_sock_set_tos(struct sock *sk) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + int val =3D 0; + + lock_sock(sk); + if (msk->first) + val =3D inet_sk(msk->first)->rcv_tos; + release_sock(sk); + + if (val > 0) + __mptcp_sock_set_tos(sk, val); +} +EXPORT_SYMBOL(mptcp_sock_set_tos); --=20 2.53.0 From nobody Mon May 25 18:05:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 949F517C203 for ; Fri, 22 May 2026 02:48:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418130; cv=none; b=JxvdwUBJ/SfhspIgSv1IOXcuNDAM3EwHix5rKiNf7bAqcmrH1LRe0+Q2jFXaSoeqM7yHxHut9ZqQ4O/r13xeSul1XQx4e5U0C4diNzV49ZVuMZSGk+gJimP7L6sOQ1mrcG3vhM0PL+YA6iTO1SGZCM0d0yV6KSLccmjCR+s2W2Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418130; c=relaxed/simple; bh=X20vd858hBkWwzd6klZZrl3GT1J1lmrDnbvu6XDA0Wc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IWSPFZ/tu60xGay+jVobARsjDTkrFV8cLZPs8RDER+r7I7bULZu2qYjK2o272W3zfjFy98amfxQrTzB1+f1+4uxttGP6uZwLA94FKaBq5+cAAzsV7TjK2M0c1tdC5irv3xbENGjyfFF3Dvu6wSn9VKflChaK+2x1yweyCj5n3N0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GddeZ+NU; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GddeZ+NU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8421F1F00A3D; Fri, 22 May 2026 02:48:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779418129; bh=rUV0uMBobR1YMg+bNxGATwf3pdpTpJJH7++xYn9+pvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GddeZ+NUnS/WxrWDo6Bsf593z1HXM8lCsPt1ayPHIQf9hozmMAjB/xEHr0gDtLnxq QpmyQpIluKDIc70KPumtD4G/EtwhNrtIOTuI0Lfvcq9b+yNo09jTlfkrPxs2u8kNZm KtXedVZKy2iPykY06tsphYuogrggCbd4wtZeDtlZjASQY303CDB1/C6cnz/6ArDsCG F2uzb7KIDIgK1LueeYZ3BVNu/7LecJSN9QmWwVtbxH43ETzykK6DTvYniFGT+f2xQx 1D4St/WLtRYMJ62X/9DxQF9F/f4LY3LFaO9LrepomRm6iGItb2QKOcsCD5sHvqLN+C DEt98vPRigs9A== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v16 05/12] nvme-tcp: define host tcp_proto struct Date: Fri, 22 May 2026 10:48:03 +0800 Message-ID: <74804da3318d6de2ba2c4e58d75740a83684b1d0.1779416980.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 To add MPTCP support in "NVMe over TCP", the host side needs to pass IPPROTO_MPTCP to sock_create_kern() instead of IPPROTO_TCP to create an MPTCP socket. Similar to the target-side nvmet_tcp_proto, this patch defines the host-side nvme_tcp_proto structure, which contains the protocol of the socket and a set of function pointers for socket operations. The only difference is that it defines .set_syncnt instead of .set_reuseaddr. A TCP-specific version of this structure is defined, and a proto field is added to nvme_tcp_ctrl. When the transport string is "tcp", it is assigned to ctrl->proto. All locations that previously called TCP setsockopt functions are updated to call the corresponding function pointers in the nvme_tcp_proto structure. The controller's proto pointer is set during initialization and remains valid throughout the controller's lifetime. Cc: Hannes Reinecke Co-developed-by: zhenwei pi Signed-off-by: zhenwei pi Co-developed-by: Hui Zhu Signed-off-by: Hui Zhu Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- drivers/nvme/host/tcp.c | 44 ++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 15d36d6a728e..13a5240623ef 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -182,6 +182,16 @@ struct nvme_tcp_queue { void (*write_space)(struct sock *); }; =20 +struct nvme_tcp_proto { + int protocol; + int (*set_syncnt)(struct sock *sk, int val); + void (*set_nodelay)(struct sock *sk); + void (*no_linger)(struct sock *sk); + void (*set_priority)(struct sock *sk, u32 priority); + void (*set_tos)(struct sock *sk, int val); + const struct nvme_ctrl_ops *ops; +}; + struct nvme_tcp_ctrl { /* read only in the hot path */ struct nvme_tcp_queue *queues; @@ -198,6 +208,8 @@ struct nvme_tcp_ctrl { struct delayed_work connect_work; struct nvme_tcp_request async_req; u32 io_queues[HCTX_MAX_TYPES]; + + const struct nvme_tcp_proto *proto; }; =20 static LIST_HEAD(nvme_tcp_ctrl_list); @@ -1799,7 +1811,7 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nct= rl, int qid, =20 ret =3D sock_create_kern(current->nsproxy->net_ns, ctrl->addr.ss_family, SOCK_STREAM, - IPPROTO_TCP, &queue->sock); + ctrl->proto->protocol, &queue->sock); if (ret) { dev_err(nctrl->device, "failed to create socket: %d\n", ret); @@ -1816,24 +1828,24 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *n= ctrl, int qid, nvme_tcp_reclassify_socket(queue->sock); =20 /* Single syn retry */ - tcp_sock_set_syncnt(queue->sock->sk, 1); + ctrl->proto->set_syncnt(queue->sock->sk, 1); =20 /* Set TCP no delay */ - tcp_sock_set_nodelay(queue->sock->sk); + ctrl->proto->set_nodelay(queue->sock->sk); =20 /* * Cleanup whatever is sitting in the TCP transmit queue on socket * close. This is done to prevent stale data from being sent should * the network connection be restored before TCP times out. */ - sock_no_linger(queue->sock->sk); + ctrl->proto->no_linger(queue->sock->sk); =20 if (so_priority > 0) - sock_set_priority(queue->sock->sk, so_priority); + ctrl->proto->set_priority(queue->sock->sk, so_priority); =20 /* Set socket type of service */ if (nctrl->opts->tos >=3D 0) - ip_sock_set_tos(queue->sock->sk, nctrl->opts->tos); + ctrl->proto->set_tos(queue->sock->sk, nctrl->opts->tos); =20 /* Set 10 seconds timeout for icresp recvmsg */ queue->sock->sk->sk_rcvtimeo =3D 10 * HZ; @@ -2900,6 +2912,17 @@ nvme_tcp_existing_controller(struct nvmf_ctrl_option= s *opts) return found; } =20 +static const struct nvme_tcp_proto nvme_tcp_proto =3D { + .protocol =3D IPPROTO_TCP, + .set_syncnt =3D tcp_sock_set_syncnt, + .set_nodelay =3D tcp_sock_set_nodelay, + .no_linger =3D sock_no_linger, + .set_priority =3D sock_set_priority, + .set_tos =3D ip_sock_set_tos, + .ops =3D &nvme_tcp_ctrl_ops, + +}; + static struct nvme_tcp_ctrl *nvme_tcp_alloc_ctrl(struct device *dev, struct nvmf_ctrl_options *opts) { @@ -2964,13 +2987,20 @@ static struct nvme_tcp_ctrl *nvme_tcp_alloc_ctrl(st= ruct device *dev, goto out_free_ctrl; } =20 + if (!strcmp(ctrl->ctrl.opts->transport, "tcp")) { + ctrl->proto =3D &nvme_tcp_proto; + } else { + ret =3D -EINVAL; + goto out_free_ctrl; + } + ctrl->queues =3D kzalloc_objs(*ctrl->queues, ctrl->ctrl.queue_count); if (!ctrl->queues) { ret =3D -ENOMEM; goto out_free_ctrl; } =20 - ret =3D nvme_init_ctrl(&ctrl->ctrl, dev, &nvme_tcp_ctrl_ops, 0); + ret =3D nvme_init_ctrl(&ctrl->ctrl, dev, ctrl->proto->ops, 0); if (ret) goto out_kfree_queues; =20 --=20 2.53.0 From nobody Mon May 25 18:05:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 889BB17C203 for ; Fri, 22 May 2026 02:48:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418132; cv=none; b=f52vcn9oa/d6Pz/2WGdlH5oTAIthWb2EJVGYDjrXNhAYnFM/obh5poJP+dhJvxVjAkC58rG2deeAYN0xsJMXUED3jNylOLS0OiiATkvOIJOcVZCKATnsnGgs47AdhHdAoXGdbGttmakQYG00Ph26TZCeNqPLM54OHvSb4mVhOUk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418132; c=relaxed/simple; bh=sjnq+9QgTwsffJJ6lQeClsZKTL2GJeyvyjlpyUvSwe8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iPWveS5p4EexuBY+B7AA80C7eU4f5W1FQ2RFTv/kl4bMOa+65uRvYC9KQiTs4qXtErqzxiU7CDA58+5aK38mpzS3dKEZzLHCDZK9NKOC5CEA6mRXTDcgonsXrwYKRkPAaB1MQim3CjqAyaOonxtjk5Nch+e4vSSKpPhzt42DV/w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iyTXRa3Z; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iyTXRa3Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C10BE1F000E9; Fri, 22 May 2026 02:48:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779418131; bh=PAXVfS9xrFRog445posgVo0t5kyZk2jApUDLB5PxYxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iyTXRa3ZXPENi7VF1kjlLo4uaaZz6qqHZ83SwC/ggpElGF8xSt1BMFIQZrv86xqif CDRomQu3W7R+A0VeZTY1GKNP8hWZNMGyUeMmyaoT2qK5crObFSaX4OMUT3ZYFoJAv4 UOV+JAryGvzxFKKTOuD/7QWiBCjZRjVGACMvWvmds3NtrG+DuCS2cKnybyF+iGmp8x fezw7nae6NKII7x2Q5blI2of9N+rYK9gLPvyJ1/8ZddqfHVhhrryVrFPPnVkDaB5Eb K4sAHm2qzVBHBDVJ2GoltHorg5YCvEHHRieHpLmZGhrrdHLAXaakef2Ed9uYLaB0IX TVvcFFrUqRWgQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v16 06/12] nvme-tcp: register host mptcp transport Date: Fri, 22 May 2026 10:48:04 +0800 Message-ID: <20a594d50a4a39468c98830def9d0357b5edfcee.1779416980.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 a new nvmf_transport_ops named nvme_mptcp_transport, which is almost the same as nvme_tcp_transport except .name and .allowed_opts. MPTCP currently does not support TLS. The four TLS-related options (NVMF_OPT_TLS, NVMF_OPT_KEYRING, NVMF_OPT_TLS_KEY, and NVMF_OPT_CONCAT) have been removed from allowed_opts. They will be added back once MPTCP TLS is supported. It is registered in nvme_tcp_init_module() and unregistered in nvme_tcp_cleanup_module(). A MODULE_ALIAS("nvme-mptcp") declaration is added at the end of the file. v2: - use 'trtype' instead of '--mptcp' (Hannes) v3: - check mptcp protocol from opts->transport instead of passing a parameter (Hannes). v4: - check CONFIG_MPTCP. Cc: Hannes Reinecke Co-developed-by: zhenwei pi Signed-off-by: zhenwei pi Co-developed-by: Hui Zhu Signed-off-by: Hui Zhu Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- drivers/nvme/host/tcp.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 13a5240623ef..305624d59c50 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -3067,6 +3067,20 @@ static struct nvmf_transport_ops nvme_tcp_transport = =3D { .create_ctrl =3D nvme_tcp_create_ctrl, }; =20 +#ifdef CONFIG_MPTCP +static struct nvmf_transport_ops nvme_mptcp_transport =3D { + .name =3D "mptcp", + .module =3D THIS_MODULE, + .required_opts =3D NVMF_OPT_TRADDR, + .allowed_opts =3D NVMF_OPT_TRSVCID | NVMF_OPT_RECONNECT_DELAY | + NVMF_OPT_HOST_TRADDR | NVMF_OPT_CTRL_LOSS_TMO | + NVMF_OPT_HDR_DIGEST | NVMF_OPT_DATA_DIGEST | + NVMF_OPT_NR_WRITE_QUEUES | NVMF_OPT_NR_POLL_QUEUES | + NVMF_OPT_TOS | NVMF_OPT_HOST_IFACE, + .create_ctrl =3D nvme_tcp_create_ctrl, +}; +#endif + static int __init nvme_tcp_init_module(void) { unsigned int wq_flags =3D WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_SYSFS; @@ -3092,6 +3106,9 @@ static int __init nvme_tcp_init_module(void) atomic_set(&nvme_tcp_cpu_queues[cpu], 0); =20 nvmf_register_transport(&nvme_tcp_transport); +#ifdef CONFIG_MPTCP + nvmf_register_transport(&nvme_mptcp_transport); +#endif return 0; } =20 @@ -3099,6 +3116,9 @@ static void __exit nvme_tcp_cleanup_module(void) { struct nvme_tcp_ctrl *ctrl; =20 +#ifdef CONFIG_MPTCP + nvmf_unregister_transport(&nvme_mptcp_transport); +#endif nvmf_unregister_transport(&nvme_tcp_transport); =20 mutex_lock(&nvme_tcp_ctrl_mutex); @@ -3116,3 +3136,6 @@ module_exit(nvme_tcp_cleanup_module); MODULE_DESCRIPTION("NVMe host TCP transport driver"); MODULE_LICENSE("GPL v2"); MODULE_ALIAS("nvme-tcp"); +#ifdef CONFIG_MPTCP +MODULE_ALIAS("nvme-mptcp"); +#endif --=20 2.53.0 From nobody Mon May 25 18:05:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 0656A17C203 for ; Fri, 22 May 2026 02:48:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418135; cv=none; b=FAq3J+55pH6olBPhxdboDfLC8et5phrW06BOxVjXfkvfmgSgHj9IcpEGYjfC3Edu73eAGZF46+eNGKb46KKhy256mT94bP/WJ9p8r37ZLd334AUfNhLQiSiUrbbI3/UMiSMEuZzFdAXQae3WCCjzMkyE5Zp7qysdMEX4cHM/M08= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418135; c=relaxed/simple; bh=aYHWoIXanMnv7qBBelhKhdB6SGqkDGOrxdzo8PJoaL8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iDqT8P2aSyARBE4PQpYHva+RlQYLSA7yOppDxoiNp0TcobU/WJlgLIfCUklkhS2TybIqhYcldvyVcJJIDxBYmfJjx3ZM9vaR0OExdKJFaihHEos9kK+IR/iOQscBuDNYE39+uN/3Les0LnC9WQj+QUFYK9M3D3KQwCPzbycO7Hs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Cyt8Kha6; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Cyt8Kha6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F227A1F00A3D; Fri, 22 May 2026 02:48:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779418133; bh=77zcnKNMFNSyGnZK3VynpGkDJG1w0Yt2ls1JAkvUxZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Cyt8Kha6mOV3SO4B6RzrbtWt4goQzRCe85WIeew7ItsEjE3Ut9OiCR/gBp3GWJds2 ShGoOcLEPz9AE0H1rISEV8hlk3iOkfFtjZOKKFdal9XdvJl0NX8WIxJxpF8mYIbUwj 3PP2XzkHHax5huzwDxPQXaMeJthTCjHUb7S+4O5WSL6WpSm10XLSz9LJhD9YVdSgyB 86WHrC9vM1FfDx6hE5jId8bn3v3IIHY/edmmEzhBaXskD5uH0MZJdInx92N3Z07Lir uFHEZN5hFD7Oo3O0dKZE0eLF39I3AUVo9cKmo5VIpYOMty92p1+xiRJPWL+0lpnS8h Clo+9IHynHdEQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v16 07/12] nvme-tcp: implement host mptcp proto Date: Fri, 22 May 2026 10:48:05 +0800 Message-ID: X-Mailer: git-send-email 2.53.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 An MPTCP-specific version of struct nvme_tcp_proto is implemented, and it is assigned to ctrl->proto when the transport string is "mptcp". The socket option setting logic is similar to the target side, except that mptcp_sock_set_syncnt is newly defined for the host side. These helpers set the values on all existing subflows of an MPTCP connection, except for set_reuseaddr which only applies to the first subflow. The values are then synchronized to other newly created subflows in sync_socket_options(). A separate nvme_mptcp_ctrl_ops structure with .name =3D "mptcp" is defined and used for MPTCP controllers. "mptcp" is planned to be introduced as a new NVMe transport type into the NVMe Base Specification in the future. Currently, the Discovery Log does not yet recognize trtype=3D4 (MPTCP), and will show "trtype: unrecognized" for such entries: =3D=3D=3D=3D=3DDiscovery Log Entry 0=3D=3D=3D=3D=3D=3D trtype: unrecognized adrfam: ipv4 subtype: current discovery subsystem treq: not specified, sq flow control disable supported portid: 23106 trsvcid: 23601 subnqn: nqn.2014-08.org.nvmexpress.discovery traddr: 10.1.1.1 eflags: none Cc: Hannes Reinecke Co-developed-by: zhenwei pi Signed-off-by: zhenwei pi Co-developed-by: Hui Zhu Signed-off-by: Hui Zhu Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- drivers/nvme/host/tcp.c | 34 ++++++++++++++++++++++++++++++++++ include/net/mptcp.h | 11 +++++++++++ net/mptcp/sockopt.c | 30 +++++++++++++++++++++++++++++- 3 files changed, 74 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 305624d59c50..2388a8c443cc 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -2895,6 +2895,24 @@ static const struct nvme_ctrl_ops nvme_tcp_ctrl_ops = =3D { .get_virt_boundary =3D nvmf_get_virt_boundary, }; =20 +#ifdef CONFIG_MPTCP +static const struct nvme_ctrl_ops nvme_mptcp_ctrl_ops =3D { + .name =3D "mptcp", + .module =3D THIS_MODULE, + .flags =3D NVME_F_FABRICS | NVME_F_BLOCKING, + .reg_read32 =3D nvmf_reg_read32, + .reg_read64 =3D nvmf_reg_read64, + .reg_write32 =3D nvmf_reg_write32, + .subsystem_reset =3D nvmf_subsystem_reset, + .free_ctrl =3D nvme_tcp_free_ctrl, + .submit_async_event =3D nvme_tcp_submit_async_event, + .delete_ctrl =3D nvme_tcp_delete_ctrl, + .get_address =3D nvme_tcp_get_address, + .stop_ctrl =3D nvme_tcp_stop_ctrl, + .get_virt_boundary =3D nvmf_get_virt_boundary, +}; +#endif + static bool nvme_tcp_existing_controller(struct nvmf_ctrl_options *opts) { @@ -2923,6 +2941,18 @@ static const struct nvme_tcp_proto nvme_tcp_proto = =3D { =20 }; =20 +#ifdef CONFIG_MPTCP +static const struct nvme_tcp_proto nvme_mptcp_proto =3D { + .protocol =3D IPPROTO_MPTCP, + .set_syncnt =3D mptcp_sock_set_syncnt, + .set_nodelay =3D mptcp_sock_set_nodelay, + .no_linger =3D mptcp_sock_no_linger, + .set_priority =3D mptcp_sock_set_priority, + .set_tos =3D __mptcp_sock_set_tos, + .ops =3D &nvme_mptcp_ctrl_ops, +}; +#endif + static struct nvme_tcp_ctrl *nvme_tcp_alloc_ctrl(struct device *dev, struct nvmf_ctrl_options *opts) { @@ -2989,6 +3019,10 @@ static struct nvme_tcp_ctrl *nvme_tcp_alloc_ctrl(str= uct device *dev, =20 if (!strcmp(ctrl->ctrl.opts->transport, "tcp")) { ctrl->proto =3D &nvme_tcp_proto; +#ifdef CONFIG_MPTCP + } else if (!strcmp(ctrl->ctrl.opts->transport, "mptcp")) { + ctrl->proto =3D &nvme_mptcp_proto; +#endif } else { ret =3D -EINVAL; goto out_free_ctrl; diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 8eacb9424b37..9d5f0bf49d31 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -246,7 +246,11 @@ void mptcp_sock_set_priority(struct sock *sk, u32 prio= rity); =20 void mptcp_sock_no_linger(struct sock *sk); =20 +void __mptcp_sock_set_tos(struct sock *sk, int val); + void mptcp_sock_set_tos(struct sock *sk); + +int mptcp_sock_set_syncnt(struct sock *sk, int val); #else =20 static inline void mptcp_init(void) @@ -342,7 +346,14 @@ static inline void mptcp_sock_set_priority(struct sock= *sk, u32 priority) { } =20 static inline void mptcp_sock_no_linger(struct sock *sk) { } =20 +static inline void __mptcp_sock_set_tos(struct sock *sk, int val) { } + static inline void mptcp_sock_set_tos(struct sock *sk) { } + +static inline int mptcp_sock_set_syncnt(struct sock *sk, int val) +{ + return 0; +} #endif /* CONFIG_MPTCP */ =20 #if IS_ENABLED(CONFIG_MPTCP_IPV6) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 730e945bf8cd..8ed7c8b875ed 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -1598,6 +1598,8 @@ static void sync_socket_options(struct mptcp_sock *ms= k, struct sock *ssk) WRITE_ONCE(inet_sk(ssk)->local_port_range, READ_ONCE(inet_sk(sk)->local_p= ort_range)); =20 ssk->sk_reuse =3D sk->sk_reuse; + if (inet_csk(sk)->icsk_syn_retries > 0) + tcp_sock_set_syncnt(ssk, inet_csk(sk)->icsk_syn_retries); } =20 void mptcp_sockopt_sync_locked(struct mptcp_sock *msk, struct sock *ssk) @@ -1749,7 +1751,7 @@ void mptcp_sock_no_linger(struct sock *sk) } EXPORT_SYMBOL(mptcp_sock_no_linger); =20 -static void __mptcp_sock_set_tos(struct sock *sk, int val) +void __mptcp_sock_set_tos(struct sock *sk, int val) { struct mptcp_sock *msk =3D mptcp_sk(sk); struct mptcp_subflow_context *subflow; @@ -1768,6 +1770,7 @@ static void __mptcp_sock_set_tos(struct sock *sk, int= val) } release_sock(sk); } +EXPORT_SYMBOL(__mptcp_sock_set_tos); =20 void mptcp_sock_set_tos(struct sock *sk) { @@ -1783,3 +1786,28 @@ void mptcp_sock_set_tos(struct sock *sk) __mptcp_sock_set_tos(sk, val); } EXPORT_SYMBOL(mptcp_sock_set_tos); + +int mptcp_sock_set_syncnt(struct sock *sk, int val) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; + struct sock *ssk; + + if (val < 1 || val > MAX_TCP_SYNCNT) + return -EINVAL; + + lock_sock(sk); + sockopt_seq_inc(msk); + inet_csk(sk)->icsk_syn_retries =3D val; + mptcp_for_each_subflow(msk, subflow) { + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (ssk) { + lock_sock_nested(ssk, SINGLE_DEPTH_NESTING); + tcp_sock_set_syncnt(ssk, val); + release_sock(ssk); + } + } + release_sock(sk); + return 0; +} +EXPORT_SYMBOL(mptcp_sock_set_syncnt); --=20 2.53.0 From nobody Mon May 25 18:05:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 E711A17C203 for ; Fri, 22 May 2026 02:48:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418137; cv=none; b=hcOsJe7GCCQ1dW1WnniKoZ4egrJrXn864zcyJjXkzVyjhUqxj3wyHRcIx4H3YCMGYKxF3nVR0D4dBzCIg4xDIja9MyQ8a3U+dN+JywwU2lfsLAxZqLxU00t1S5ZzS7J0YMj9VC2kS4ESfe0+MLVP6ekRl0hoedhhyaX9QF+xM2E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418137; c=relaxed/simple; bh=sPCvndLtC4IDi+Y1nU54FY1r59m530pzpVWMvk1DBEI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZPke1jsXVHZPSw+NcRgK+izotT2hJVeFMYQBNkXn8cfASEKraq1Nh3MWEWx5TxGQCqJmQrjc/YEnQS1yVRg5hsksNtJngAKD4vk0XcniI9uf3idibFPJhHj22sJ3KAph52TNKWIIpGMK1qKHMdGJmvwLlLodT9CD+V2qFJ/cx7k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EInGnnKV; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EInGnnKV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3AA141F000E9; Fri, 22 May 2026 02:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779418135; bh=by91ApEM8gvLFvbo0HM1CsSaGopdTBbRJHx2NM4gPpw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EInGnnKVSGlkWFG51BRiQyopEqOwS3ZVawvi2hbKyA/fMMJ907Jnzvunk+Cji117N 7m2mKPeaPSfCnH05KdUR8v1kqGbAnEL4cj03o55DzG4Xm/UoGHtb05iXVW/Ygx9Nax pCTQ3IqqZU0/d/aP/iLMJyJz8OKhckuaG+XbhGaeRFE+UJzQZtQmtbcwzwZdTJYCzb qKLNtvGwL7odgQUpIQmglfs8+D3POu3jEZK5/T55n63xOgrHgwX3gsfUanZKAMUfx3 u94NjxLxpE2oo3sRSkBeSQ+1VAsCbdUWHyxlr4RL86NcsSqf9MIciclJGANS6WnuBo NcHAhSRL+TTYA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v16 08/12] selftests: mptcp: add nvme over mptcp test Date: Fri, 22 May 2026 10:48:06 +0800 Message-ID: X-Mailer: git-send-email 2.53.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 A test case for NVMe over MPTCP has been implemented. It verifies the proper functionality of nvme discover and connect commands to establish NVMe over MPTCP connections. The test then evaluates read/write performance using fio, and ensures proper cleanup with nvme disconnect. This script accepts two positional parameters: trtype - Transport type (mptcp|tcp). Default: mptcp path - Number of multipath (1-4). Default: 1 This test simulates four NICs on both target and host sides, each limited to 125MB/s. It shows that 'NVMe over MPTCP' delivered bandwidth up to four times that of standard TCP with a single NVMe multipath configuration: # ./mptcp_nvme.sh tcp READ: bw=3D112MiB/s (118MB/s), 112MiB/s-112MiB/s (118MB/s-118MB/s), io=3D1123MiB (1177MB), run=3D10018-10018msec WRITE: bw=3D112MiB/s (117MB/s), 112MiB/s-112MiB/s (117MB/s-117MB/s), io=3D1118MiB (1173MB), run=3D10018-10018msec # ./mptcp_nvme.sh mptcp READ: bw=3D427MiB/s (448MB/s), 427MiB/s-427MiB/s (448MB/s-448MB/s), io=3D4286MiB (4494MB), run=3D10039-10039msec WRITE: bw=3D387MiB/s (406MB/s), 387MiB/s-387MiB/s (406MB/s-406MB/s), io=3D3885MiB (4073MB), run=3D10043-10043msec It reflects that MPTCP has the same multi-interface bandwidth aggregation capability as NVMe multipath. Cc: Hannes Reinecke Co-developed-by: zhenwei pi Signed-off-by: zhenwei pi Co-developed-by: Hui Zhu Signed-off-by: Hui Zhu Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/Makefile | 1 + tools/testing/selftests/net/mptcp/config | 8 + .../testing/selftests/net/mptcp/mptcp_lib.sh | 12 + .../testing/selftests/net/mptcp/mptcp_nvme.sh | 329 ++++++++++++++++++ 4 files changed, 350 insertions(+) create mode 100755 tools/testing/selftests/net/mptcp/mptcp_nvme.sh diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/sel= ftests/net/mptcp/Makefile index 22ba0da2adb8..7b308447a58b 100644 --- a/tools/testing/selftests/net/mptcp/Makefile +++ b/tools/testing/selftests/net/mptcp/Makefile @@ -13,6 +13,7 @@ TEST_PROGS :=3D \ mptcp_connect_sendfile.sh \ mptcp_connect_splice.sh \ mptcp_join.sh \ + mptcp_nvme.sh \ mptcp_sockopt.sh \ pm_netlink.sh \ simult_flows.sh \ diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selft= ests/net/mptcp/config index 59051ee2a986..e59cf7398f19 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -34,3 +34,11 @@ CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_TPROXY=3Dm CONFIG_SYN_COOKIES=3Dy CONFIG_VETH=3Dy +CONFIG_BLK_DEV_LOOP=3Dy +CONFIG_CONFIGFS_FS=3Dy +CONFIG_NVME_CORE=3Dy +CONFIG_NVME_FABRICS=3Dy +CONFIG_NVME_TCP=3Dy +CONFIG_NVME_TARGET=3Dy +CONFIG_NVME_TARGET_TCP=3Dy +CONFIG_NVME_MULTIPATH=3Dy diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 5ef6033775c8..e08854ba42bd 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -530,6 +530,18 @@ mptcp_lib_check_tools() { exit ${KSFT_SKIP} fi ;; + "nvme") + if ! nvme --version &> /dev/null; then + mptcp_lib_pr_skip "nvme tool not found" + exit ${KSFT_SKIP} + fi + ;; + "fio") + if ! fio -h &> /dev/null; then + mptcp_lib_pr_skip "fio tool not found" + exit ${KSFT_SKIP} + fi + ;; *) mptcp_lib_pr_fail "Internal error: unsupported tool: ${tool}" exit ${KSFT_FAIL} diff --git a/tools/testing/selftests/net/mptcp/mptcp_nvme.sh b/tools/testin= g/selftests/net/mptcp/mptcp_nvme.sh new file mode 100755 index 000000000000..5b1133dbc2d5 --- /dev/null +++ b/tools/testing/selftests/net/mptcp/mptcp_nvme.sh @@ -0,0 +1,329 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +. "$(dirname "$0")/mptcp_lib.sh" + +ret=3D0 +trtype=3D"${1:-mptcp}" +path=3D"${2:-1}" +nqn=3D"nqn.2014-08.org.nvmexpress.${trtype}dev.$$.${RANDOM}" +ns=3D1 +port=3D$((RANDOM % 10000 + 20000)) +trsvcid=3D$((RANDOM % 64512 + 1024)) +ns1=3D"" +ns2=3D"" +temp_file=3D"" +loop_dev=3D"" + +export trtype path nqn ns port trsvcid +export loop_dev temp_file + +usage() +{ + cat << EOF + +Usage: + + $(basename "$0") [trtype] [path] + + trtype Transport type (tcp|mptcp) - default: mptcp + path Number of multipath (1-4) - default: 1 + +EOF +exit ${KSFT_FAIL} +} + +validate_params() +{ + if [[ ! "${trtype}" =3D~ ^(tcp|mptcp)$ ]]; then + echo "Invalid trtype ${trtype}. Must be tcp or mptcp" + usage + fi + + if [[ ! "${path}" =3D~ ^[1-4]$ ]]; then + echo "Invalid path count ${path}. Must be between 1 and 4" + usage + fi +} + +# This function is invoked indirectly +#shellcheck disable=3DSC2317,SC2329 +ns1_cleanup() +{ + pushd /sys/kernel/config/nvmet || exit 1 + + for i in $(seq 1 "${path}"); do + local portdir=3D$((port + i)) + + rm -rf "ports/${portdir}/subsystems/${nqn}" + rmdir "ports/${portdir}" + done + + echo 0 > "subsystems/${nqn}/namespaces/${ns}/enable" + rmdir "subsystems/${nqn}/namespaces/${ns}" + rmdir "subsystems/${nqn}" + + popd || exit 1 +} + +# This function is invoked indirectly +#shellcheck disable=3DSC2317,SC2329 +ns2_cleanup() +{ + nvme disconnect -n "${nqn}" || true +} + +# This function is used in the cleanup trap +#shellcheck disable=3DSC2317,SC2329 +cleanup() +{ + if ! ip netns exec "$ns2" bash <<- EOF + $(declare -f ns2_cleanup) + ns2_cleanup + EOF + then + echo "ns2_cleanup failed" >&2 + fi + + sleep 1 + + if ! ip netns exec "$ns1" unshare -m bash <<- EOF + mount -t configfs none /sys/kernel/config + $(declare -f ns1_cleanup) + ns1_cleanup + EOF + then + echo "ns1_cleanup failed" >&2 + fi + + if [ -n "${loop_dev}" ] && [ -b "${loop_dev}" ]; then + losetup -d "${loop_dev}" 2>/dev/null || true + fi + rm -rf "${temp_file}" + + mptcp_lib_ns_exit "$ns1" "$ns2" + + unset -v trtype path nqn ns port trsvcid + unset -v loop_dev temp_file +} + +# $tc_args needs word splitting to pass multiple arguments to netem +# shellcheck disable=3DSC2086 +init() +{ + local tc_args=3D"rate 1000mbit" + + mptcp_lib_ns_init ns1 ns2 + + # ns1 ns2 + # 10.1.1.1 10.1.1.2 + # 10.1.2.1 10.1.2.2 + # 10.1.3.1 10.1.3.2 + # 10.1.4.1 10.1.4.2 + for i in {1..4}; do + ip link add ns1eth"$i" netns "$ns1" type veth peer \ + name ns2eth"$i" netns "$ns2" + ip -net "$ns1" addr add 10.1."$i".1/24 dev ns1eth"$i" + ip -net "$ns1" addr add dead:beef:"$i"::1/64 \ + dev ns1eth"$i" nodad + ip -net "$ns1" link set ns1eth"$i" up + ip -net "$ns2" addr add 10.1."$i".2/24 dev ns2eth"$i" + ip -net "$ns2" addr add dead:beef:"$i"::2/64 \ + dev ns2eth"$i" nodad + ip -net "$ns2" link set ns2eth"$i" up + ip -net "$ns2" route add default via 10.1."$i".1 \ + dev ns2eth"$i" metric 10"$i" + ip -net "$ns2" route add default via dead:beef:"$i"::1 \ + dev ns2eth"$i" metric 10"$i" + + # Add tc qdisc to both namespaces for bandwidth limiting + tc -n "$ns1" qdisc add dev ns1eth"$i" root netem $tc_args + tc -n "$ns2" qdisc add dev ns2eth"$i" root netem $tc_args + + tc -n "$ns1" qdisc show dev ns1eth"$i" + tc -n "$ns2" qdisc show dev ns2eth"$i" + done + + mptcp_lib_pm_nl_set_limits "${ns1}" 8 8 + + mptcp_lib_pm_nl_add_endpoint "$ns1" 10.1.1.1 flags signal + mptcp_lib_pm_nl_add_endpoint "$ns1" 10.1.2.1 flags signal + mptcp_lib_pm_nl_add_endpoint "$ns1" 10.1.3.1 flags signal + mptcp_lib_pm_nl_add_endpoint "$ns1" 10.1.4.1 flags signal + + mptcp_lib_pm_nl_set_limits "${ns2}" 8 8 + + mptcp_lib_pm_nl_add_endpoint "$ns2" 10.1.1.2 flags subflow + mptcp_lib_pm_nl_add_endpoint "$ns2" 10.1.2.2 flags subflow + mptcp_lib_pm_nl_add_endpoint "$ns2" 10.1.3.2 flags subflow + mptcp_lib_pm_nl_add_endpoint "$ns2" 10.1.4.2 flags subflow +} + +# This function is invoked indirectly +#shellcheck disable=3DSC2317,SC2329 +run_target() +{ + cd /sys/kernel/config/nvmet/subsystems || exit + mkdir -p "${nqn}" + cd "${nqn}" || exit + echo 1 > attr_allow_any_host + mkdir -p namespaces/"${ns}" + echo "${loop_dev}" > namespaces/"${ns}"/device_path + echo 1 > namespaces/"${ns}"/enable + + # Create ${path} ports, each on a different IP address + for i in $(seq 1 "${path}"); do + local portdir=3D$((port + i)) + + cd /sys/kernel/config/nvmet/ports || exit + mkdir -p "${portdir}" + cd "${portdir}" || exit 1 + echo "${trtype}" > addr_trtype + echo ipv4 > addr_adrfam + if [ "${path}" -eq 1 ]; then + echo "0.0.0.0" > addr_traddr + else + echo "10.1.${i}.1" > addr_traddr + fi + echo "${trsvcid}" > addr_trsvcid + + mkdir -p subsystems + ln -sf "../../subsystems/${nqn}" "subsystems/${nqn}" + cd - >/dev/null || exit + done +} + +# This function is invoked indirectly +#shellcheck disable=3DSC2317,SC2329 +run_host() +{ + local traddr=3D10.1.1.1 + local devname + + echo "nvme discover -a ${traddr}" + if ! nvme discover -t "${trtype}" -a "${traddr}" \ + -s "${trsvcid}"; then + echo "Failed to discover ${traddr}" + return 1 + fi + + for i in $(seq 1 "${path}"); do + traddr=3D10.1.${i}.1 + echo "Connecting to ${traddr}:${trsvcid}" + if ! nvme connect -t "${trtype}" -a "${traddr}" \ + -s "${trsvcid}" -n "${nqn}"; then + echo "Failed to connect to ${traddr}" + return 1 + fi + done + + for i in $(seq 1 10); do + for dev in /dev/nvme*n1; do + if [ -b "$dev" ] 2>/dev/null; then + if nvme id-ctrl "$dev" 2>/dev/null | + grep -q "${nqn}"; then + devname=3D$(basename "$dev") + break 2 + fi + fi + done 2>/dev/null + [ -n "$devname" ] && break + sleep 1 + done + + if [ -z "$devname" ]; then + echo "No block device found for NQN ${nqn}" >&2 + return 1 + fi + + echo "nvme list" + if ! nvme list; then + echo "nvme list failed" >&2 + return 1 + fi + + sleep 1 + + echo "fio randread /dev/${devname}" + if ! fio --name=3Dglobal --direct=3D1 --norandommap --randrepeat=3D0 \ + --ioengine=3Dlibaio --thread=3D1 --blocksize=3D128k --runtime=3D10 \ + --time_based --rw=3Drandread --numjobs=3D4 --iodepth=3D256 \ + --group_reporting --size=3D100% \ + --name=3Dlibaio_4_256_128k_randread \ + --filename=3D"/dev/${devname}"; then + echo "fio randread failed" + return 1 + fi + + sleep 1 + + echo "fio randwrite /dev/${devname}" + if ! fio --name=3Dglobal --direct=3D1 --norandommap --randrepeat=3D0 \ + --ioengine=3Dlibaio --thread=3D1 --blocksize=3D128k --runtime=3D10 \ + --time_based --rw=3Drandwrite --numjobs=3D4 --iodepth=3D256 \ + --group_reporting --size=3D100% \ + --name=3Dlibaio_4_256_128k_randwrite \ + --filename=3D"/dev/${devname}"; then + echo "fio randwrite failed" + return 1 + fi + + nvme flush "/dev/${devname}" +} + +mptcp_lib_check_tools nvme fio +validate_params + +if ! temp_file=3D$(mktemp --suffix=3D.raw /tmp/nvme_test.XXXXXX); then + echo "Failed to create temp file" + exit 1 +fi + +trap cleanup EXIT + +if ! dd if=3D/dev/zero of=3D"${temp_file}" bs=3D1M count=3D0 seek=3D512; t= hen + echo "Failed to create backing file" >&2 + exit 1 +fi + +if ! loop_dev=3D$(losetup -f --show "${temp_file}"); then + echo "Failed to create loop device" >&2 + exit 1 +fi + +init + +run_test() +{ + if ! ip netns exec "$ns1" unshare -m bash <<- EOF + mount -t configfs none /sys/kernel/config + $(declare -f run_target) + run_target + exit \$? + EOF + then + ret=3D"${KSFT_FAIL}" + fi + + if ! ip netns exec "$ns2" bash <<- EOF + $(declare -f run_host) + run_host + exit \$? + EOF + then + ret=3D"${KSFT_FAIL}" + fi + + sleep 1 +} + +run_test "$@" + +if [ "${ret}" -eq 0 ]; then + mptcp_lib_result_pass "nvme over ${trtype} test" +else + mptcp_lib_result_fail "nvme over ${trtype} test" +fi + +mptcp_lib_result_print_all_tap +exit "$ret" --=20 2.53.0 From nobody Mon May 25 18:05:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 4BC3F17C203 for ; Fri, 22 May 2026 02:48:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418139; cv=none; b=J+ruWYllwHs+qBr8K2tiaq9jRxjKYuG4wKyLACQksPQFBtN8VchJYeuhGP8LfrORJdwBAA41tIJcd7SiJOuDEaFQvFeC1C3IdsjR/271NFilLb1Kmc8HPd9oLUzmivJb5CHg049xPvPxhcGCqUUmdpBdMOc3T0tELlQQCKXMb+I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418139; c=relaxed/simple; bh=0s7T3WkqK9bn/FdcmLdBcpEzRbaP8esJ8c0EGQL1GTE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OvybwiOieYOv0NcBGA5tGdK0bC/UsADdzch/5sqgjenSuRb5CRiVoO5SVk3pQbnYJHadq/o4LDmFQiefRQ5Kk9qhzYQKP+4Mpun4CRqFPBPk7qy15eDeGJy7DS2hZZtA8FCMXS9Or7OUN/jO1p4fFhOHHNVi9kcRDIGSG/tRLNk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=o0ZJJzFU; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="o0ZJJzFU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56D6E1F00A3D; Fri, 22 May 2026 02:48:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779418138; bh=z9wY9Ma0QN9MHEczeDOxCGf47kMA502HbBeSGdtk7rk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=o0ZJJzFUcLGx31u2Tvjz6eKyrXsHyc1/8mfqB7Qm8Y2tBWULKCK8jJ2NYpGAXy8d1 7bLHG3gO66x4KqqNyo5WHB/VYtMVV/oML4n1viv0VUkriWrvses5+5FY0qQ7XFpNGv cztd+wiPRyCBEyIhyhxpzQxduhv94j1XIHlSzFM6aqJVjJMZkzKfLKJdbU1tP7IskJ nTJ1CCeRBG/XbearCdhi3CbB5Xa6ngWb+bEuDDNEpHqJ0z1PXpN6S0zMfyRgsn2PEM 1a7koYUcc6+CFxZQdc/RrH5oARTflrmrGBbx8TNwwMmEP4/8Wx9ZDfrpFm73SEx96v hEcah0hOALLmg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v16 09/12] selftests: mptcp: nvme: add iopolicy tests Date: Fri, 22 May 2026 10:48:07 +0800 Message-ID: <05acd36c84cfa9f3fed86fe24cc701c996b7f662.1779416980.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 Add NVMe iopolicy testing to mptcp_nvme.sh, with the default set to "numa". It can be set to "round-robin" or "queue-depth". Test results with 4 NVMe multipath paths and round-robin iopolicy show that TCP and MPTCP achieve similar bandwidth: # ./mptcp_nvme.sh tcp 4 round-robin READ: bw=3D455MiB/s (478MB/s), 455MiB/s-455MiB/s (478MB/s-478MB/s), io=3D4665MiB (4891MB), run=3D10242-10242msec WRITE: bw=3D455MiB/s (477MB/s), 455MiB/s-455MiB/s (477MB/s-477MB/s), io=3D4633MiB (4858MB), run=3D10184-10184msec # ./mptcp_nvme.sh mptcp 4 round-robin READ: bw=3D445MiB/s (466MB/s), 445MiB/s-445MiB/s (466MB/s-466MB/s), io=3D4575MiB (4797MB), run=3D10287-10287msec WRITE: bw=3D445MiB/s (467MB/s), 445MiB/s-445MiB/s (467MB/s-467MB/s), io=3D4572MiB (4794MB), run=3D10267-10267msec A "loss" argument is added to simulate network packet loss. When loss=3D1, each veth interface is configured with "delay 5ms loss 0.5%" using tc qdisc. Under this scenario, TCP performance is reduced by multiples compared to MPTCP: # ./mptcp_nvme.sh tcp 4 round-robin 1 READ: bw=3D144MiB/s (151MB/s), 144MiB/s-144MiB/s (151MB/s-151MB/s), io=3D1909MiB (2001MB), run=3D13231-13231msec WRITE: bw=3D100.0MiB/s (105MB/s), 100.0MiB/s-100.0MiB/s (105MB/s-105MB/s), io=3D1397MiB (1465MB), run=3D13980-13980msec # ./mptcp_nvme.sh mptcp 4 round-robin 1 READ: bw=3D428MiB/s (449MB/s), 428MiB/s-428MiB/s (449MB/s-449MB/s), io=3D4524MiB (4743MB), run=3D10564-10564msec WRITE: bw=3D431MiB/s (452MB/s), 431MiB/s-431MiB/s (452MB/s-452MB/s), io=3D4513MiB (4732MB), run=3D10481-10481msec These results demonstrate that MPTCP has better resilience against packet loss compared to TCP, as it can leverage multiple subflows to mitigate network degradation. Cc: Hannes Reinecke Co-developed-by: zhenwei pi Signed-off-by: zhenwei pi Co-developed-by: Hui Zhu Signed-off-by: Hui Zhu Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_nvme.sh | 70 ++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_nvme.sh b/tools/testin= g/selftests/net/mptcp/mptcp_nvme.sh index 5b1133dbc2d5..3ab04be05dff 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_nvme.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_nvme.sh @@ -6,6 +6,8 @@ ret=3D0 trtype=3D"${1:-mptcp}" path=3D"${2:-1}" +iopolicy=3D${3:-"numa"} # round-robin, queue-depth +loss=3D${4:-0} nqn=3D"nqn.2014-08.org.nvmexpress.${trtype}dev.$$.${RANDOM}" ns=3D1 port=3D$((RANDOM % 10000 + 20000)) @@ -17,6 +19,7 @@ loop_dev=3D"" =20 export trtype path nqn ns port trsvcid export loop_dev temp_file +export iopolicy loss =20 usage() { @@ -24,10 +27,12 @@ usage() =20 Usage: =20 - $(basename "$0") [trtype] [path] + $(basename "$0") [trtype] [path] [iopolicy] [loss] =20 trtype Transport type (tcp|mptcp) - default: mptcp path Number of multipath (1-4) - default: 1 + iopolicy I/O policy (numa|round-robin|queue-depth) - default: numa + loss Enable packet loss (0|1) - default: 0 =20 EOF exit ${KSFT_FAIL} @@ -44,6 +49,16 @@ validate_params() echo "Invalid path count ${path}. Must be between 1 and 4" usage fi + + if [[ ! "${iopolicy}" =3D~ ^(numa|round-robin|queue-depth)$ ]]; then + echo "Invalid iopolicy ${iopolicy}." + usage + fi + + if [[ ! "${loss}" =3D~ ^[01]$ ]]; then + echo "Invalid loss value ${loss}. Must be 0 or 1" + usage + fi } =20 # This function is invoked indirectly @@ -105,6 +120,7 @@ cleanup() =20 unset -v trtype path nqn ns port trsvcid unset -v loop_dev temp_file + unset -v iopolicy loss } =20 # $tc_args needs word splitting to pass multiple arguments to netem @@ -113,6 +129,10 @@ init() { local tc_args=3D"rate 1000mbit" =20 + if [ "${loss}" -eq 1 ]; then + tc_args+=3D" delay 5ms loss 0.5%" + fi + mptcp_lib_ns_init ns1 ns2 =20 # ns1 ns2 @@ -193,6 +213,48 @@ run_target() done } =20 +# This function is invoked indirectly +#shellcheck disable=3DSC2317,SC2329 +set_io_policy() +{ + local nqn=3D"$1" + local iopolicy=3D"$2" + local subname + local policy + local current + + subname=3D$(nvme list-subsys 2>/dev/null | grep "${nqn}" | + grep -o 'nvme-subsys[0-9]*' | head -1) + if [ -z "$subname" ]; then + return 1 + fi + + policy=3D"/sys/class/nvme-subsystem/${subname}/iopolicy" + if [ ! -e "$policy" ]; then + # NVMe multipath not supported, skip iopolicy setting + return 0 + fi + + if [ ! -w "$policy" ]; then + return 1 + fi + + if ! echo "${iopolicy}" > "$policy" 2>/dev/null; then + return 1 + fi + + current=3D$(cat "$policy" 2>/dev/null) + if [ -z "$current" ]; then + return 1 + fi + + if [[ "$current" !=3D *"${iopolicy}"* ]]; then + return 1 + fi + + return 0 +} + # This function is invoked indirectly #shellcheck disable=3DSC2317,SC2329 run_host() @@ -242,6 +304,11 @@ run_host() return 1 fi =20 + if ! set_io_policy "${nqn}" "${iopolicy}"; then + echo "Failed to set I/O policy to ${iopolicy}" + return 1 + fi + sleep 1 =20 echo "fio randread /dev/${devname}" @@ -306,6 +373,7 @@ run_test() fi =20 if ! ip netns exec "$ns2" bash <<- EOF + $(declare -f set_io_policy) $(declare -f run_host) run_host exit \$? --=20 2.53.0 From nobody Mon May 25 18:05:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 8109E17C203 for ; Fri, 22 May 2026 02:49:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418141; cv=none; b=o56ug+KKj+5n7BrRbv3++ZnUj3mHzPQNKcAMfLK9gtDXG2UtITMbi0ds8baCawubWlbtXZQvYuardmEquj2SGBoCGsJcfpe9nJn60laHP2eUGmONgAbXrO3JprFEHR+b4hfi86ZeXd0mQtIUlrZylAoyyQlADT9O8XYNK8veohA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418141; c=relaxed/simple; bh=4eJbTuLXs11DoeswH/+v2+GJJabFVJmPhVZaIk95L6U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q7bFeztWpN0T0Qsf9ybIyDohuJtV7X8bzBk6ZXwd8SCTvCudhtUTQzt+d2QS1r/7+ZzKdTFBVr+jofuGOgkvXfWiENltVghcAP0Bb1KkrkJT7+vZy+DSJc2J+VGdrMC3KtrUBvDRXa4moC3/a88/wXVhJHu3Bfiws4/E3p+ouo4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fWCd6sW0; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fWCd6sW0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 729F21F000E9; Fri, 22 May 2026 02:48:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779418140; bh=eLHthSbsjQoeDjBWux0GVxej5NwjPLq1lMcZS982e2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fWCd6sW0FoTQsMA6HB4liTiTvnpE5Ak5Hi1fLNWKpgy9rK4LTjTPvPvBCz1B9Y/zq kw/qObuQ71+hnCwX6nTGOifFiBP6yoV10fEKC6PsXkOQ5KI+lkZQb+b3mNwbxyEf5j wAhRDSO+B+H54tj3uvJ0HdD0wIqhYbzCA4yr6g1isF7ujMmYPuFo1xGHTRM+a+VsLe rvergfrHZsF05xWjHgDJWydirYrdfhSLM3oTMbbbdlwp393zph8j/G68SZVZ8m3D7L 3xHcIn2/hLgfVd7ZCdSWBXQuilCTu0ZwGuOVNY29OnOQl5viClHfUsJNnlgr43fDpJ b3lq1BwoQkkRw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v16 10/12] nvmet-tcp: check return value of nvmet_tcp_set_queue_sock Date: Fri, 22 May 2026 10:48:08 +0800 Message-ID: <6061adf7916f993e437e841aa3e56998c62742db.1779416980.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 The return value of nvmet_tcp_set_queue_sock() is currently ignored in nvmet_tcp_tls_handshake_done(). If it fails (e.g., due to the socket not being in TCP_ESTABLISHED state), the socket callbacks will not be properly set, leading to queue and socket leakage. Fix this by capturing the return value and calling nvmet_tcp_schedule_release_queue() on failure to ensure proper cleanup. Cc: Hannes Reinecke Cc: zhenwei pi Cc: Hui Zhu Cc: Gang Yan Fixes: 675b453e0241 ("nvmet-tcp: enable TLS handshake upcall") Signed-off-by: Geliang Tang --- drivers/nvme/target/tcp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 7138f0885829..92f7df2b62a9 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -1865,10 +1865,11 @@ static void nvmet_tcp_tls_handshake_done(void *data= , int status, if (!status) status =3D nvmet_tcp_tls_key_lookup(queue, peerid); =20 + if (!status) + status =3D nvmet_tcp_set_queue_sock(queue); + if (status) nvmet_tcp_schedule_release_queue(queue); - else - nvmet_tcp_set_queue_sock(queue); kref_put(&queue->kref, nvmet_tcp_release_queue); } =20 --=20 2.53.0 From nobody Mon May 25 18:05:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 6237017C203 for ; Fri, 22 May 2026 02:49:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418143; cv=none; b=t9hp8pRCszn6tx7NHAoNHCDJvIzMaIL3QT5Bw7pcfjk+kWwEjHISXkSaiQcptRrZP3szSWQZ/gPjWg1elLZ4PeMWSbpDHX1wAvB2LUKAz5ZHQabktjsbkhjm0UZFcFtF0ghmMgd7u5aztFIkFv7CPOY1SuwmFe2ZxlYsTPYp0Oo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418143; c=relaxed/simple; bh=b6wRUNtsVjyjxSgItyRFQmM5Gw/S3U3tU5wTgvqCFfo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T/m0K8B+N6aKt5qbfLW2ASTXhmTXgta5Re4KRgEwDj2S8a7wwKYFW8oaAyMs4AF07HnJ5JFXXZKsafz/+UspgK41TVWFgKUcrRP00hAqB0l9E3goLobn64R3gH/V/ViIZ4Q4KTHZcS5+KRaJW17FqdPVCiXedYezE/lXzCnuTPU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WKJW+Bpd; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WKJW+Bpd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA5551F00A3D; Fri, 22 May 2026 02:49:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779418142; bh=gsSUtvnpXHTwvXRxaN3efsNrFVO1DlOVqm5yitZqssM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WKJW+BpdekAMwO2ZS9vNIx+6olUnp06etmbsryEh9eURlFQjLgB5Y6sBSsJxZT2Eg TYNxVoOYf7W8AqzpWKsZi9w+jM9O7FckleRkgK/FqTJ6xqvO3vFYblQ4ls9NqfynLj LMkdBel+5MUd0A79ysvE7ZaN3bV+mhfTMWmm2qgUQrBR4JMOCpB2gYDWnErgHOMmPj AoSZNJ+nz8kbbNmZMsYT1MqCo8cBptDZVlA7DopHNdQ8qulBxODNw/Az8eHrXKDSEv n1s0Glhixaxgq/zdWLhtRvOVI0RB42NcNTXBUrP2vRQt/k67uh+VEogGi32EWQ5BsB EYX+CRpelRnCw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v16 11/12] nvmet-tcp: fix page fragment cache leak in error path Date: Fri, 22 May 2026 10:48:09 +0800 Message-ID: X-Mailer: git-send-email 2.53.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 In nvmet_tcp_alloc_queue(), when a connection is closed during the allocation process (e.g., nvmet_tcp_set_queue_sock() returns -ENOTCONN), the error handling jumps to out_free_queue without draining the page fragment cache. Although nvmet_tcp_free_cmd() is called in some error paths to release individual page fragments, the underlying page cache reference held by queue->pf_cache is never released. This results in a page leak each time a connection fails during allocation, which could lead to memory exhaustion over time if connections are repeatedly opened and closed. Fix this by calling page_frag_cache_drain() before freeing the queue structure in the out_free_queue label. Cc: Hannes Reinecke Cc: zhenwei pi Cc: Hui Zhu Cc: Gang Yan Fixes: 872d26a391da ("nvmet-tcp: add NVMe over TCP target driver") Signed-off-by: Geliang Tang --- drivers/nvme/target/tcp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 92f7df2b62a9..8dd8f740c8b6 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -2030,6 +2030,7 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_po= rt *port, out_sock: fput(queue->sock->file); out_free_queue: + page_frag_cache_drain(&queue->pf_cache); kref_put(&queue->port->kref, nvmet_tcp_release_port); kfree(queue); out_release: --=20 2.53.0 From nobody Mon May 25 18:05:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 CED5C23395F for ; Fri, 22 May 2026 02:49:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418145; cv=none; b=XN7zSNyp93iLxJwN+TiGB48ZcVFodU9QX+K9l781P2WD5gF3V+V5hVEjcsKgjJc9vkuEW9NuYPAPE0QdeWDkmGv+WLAg/OWOCrwG/xBrFWu6DOvZ0isT+xOnfVXN5MxY6CfmRNeVWdjhHxrh/M3JSdsnEfBBR36+DaE3N/MQGmg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779418145; c=relaxed/simple; bh=De+OrxRj+YZV/A+zrsE1Ri6V568Fp5NN5qxZKsjNlas=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=vCV+qdDZth8Aq55/ZyWWT5kG7vBrUr+DI7rEPahekPCoJU/Muy8YXJw/GkPIudWIH6cu+2LwnvJLPpS2l6pJm5XDTJ8NwoWoNWXMPI5RBJfairTFM4VkRImAwDBbOM1Fj7fYC+41LqkqgrbotTifJbOdSoNHE0l1zinIoOr/OEk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UqCm/oRe; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UqCm/oRe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5E9A1F000E9; Fri, 22 May 2026 02:49:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779418144; bh=Lhx8GllVG4InKsHTGUuMhdm/QTZ9D7Bdrm3S8Mtjq1M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UqCm/oRea5zsNdQLtna98IPvKzhvAfGOMfmAXgTylimWEsdpeYrgDnWcP7KQyQ398 GEouK3t0ianpMXjmq0kORRzEuXu7YwIGRlsNiRhiIYye70BHz9v2MgcWiOqMmYnQtM oVUU7HwFDF81fUD2GYuj4xUXF8uKqMb98qLoHyFBdaOIBmc2LgEpOuouMXX20oCJyT PKXcLRcMBxUpy7TGjb16BwQG1DiqYQkexcf4vzYR5BfnmxInHNPtqGwqhnHQNUByC/ 7BmnC3eoL7wkp1dphwdePmY/I6kbnRGd6n+PtUmCdKWEq3tOfEuHg7qTbceQgXyN5H ncSsroO3aEePA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v16 12/12] nvme-tcp: use netdev_name_in_use for host_iface validation Date: Fri, 22 May 2026 10:48:10 +0800 Message-ID: <191789c3365a98fa27ec2e534f4a0d6a1834425d.1779416980.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 When the host_iface option is specified, nvme_tcp_alloc_ctrl() uses __dev_get_by_name(&init_net, opts->host_iface) to validate the interface. This has two issues: it hardcodes init_net instead of using the caller's network namespace, and it lacks RCU protection required by __dev_get_by_nam= e(). Fix by using netdev_name_in_use() with current->nsproxy->net_ns, which handles both namespace correctness and locking internally. Cc: Hannes Reinecke Cc: zhenwei pi Cc: Hui Zhu Cc: Gang Yan Fixes: 8b43ced64d2b ("nvme-tcp: use __dev_get_by_name instead dev_get_by_na= me for OPT_HOST_IFACE") Signed-off-by: Geliang Tang --- drivers/nvme/host/tcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 2388a8c443cc..b3ca1ba06641 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -3004,7 +3004,8 @@ static struct nvme_tcp_ctrl *nvme_tcp_alloc_ctrl(stru= ct device *dev, } =20 if (opts->mask & NVMF_OPT_HOST_IFACE) { - if (!__dev_get_by_name(&init_net, opts->host_iface)) { + if (netdev_name_in_use(current->nsproxy->net_ns, + opts->host_iface)) { pr_err("invalid interface passed: %s\n", opts->host_iface); ret =3D -ENODEV; --=20 2.53.0