From nobody Mon May 25 18:05:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78FF02ED84A for ; Mon, 18 May 2026 07:01:41 +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=1779087701; cv=none; b=ZKH65dhJj5U1ALDlWK3xXnn6yEV6b1dhPr9Bbf1JtLXXYYfeJclt8tkHq9RwVyu5eIz27vZk1XfsJgd4hIViqhVJPLsB0+T/BWyjJKetWcjzXa6vLzSG5W56vSIXORtEM4P0v9wEXfQ1YcbmeL2Y4mXx5otYeSbkmUidnc0iFGk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779087701; c=relaxed/simple; bh=l76T53aM27a7tQgBdTbwNsKLyspVBk+M6RWAIoCG25A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gOvYCNg8aY2kYMRlk5T5zoVqOE89A9E8kdcL47aWBl/0T7To2x/5RYTDV+3yGQOK84qmJsRlpO8DcBgMVDKZmQNHR7bFGvXrXrH4BnjzSz/JdVOOkrNIbHmH9l84wZhXae3YbeEcOu+mTC3KBqsZaDvi4GvagJ8XDJGaPf5nyBU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ogQUrUJg; 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="ogQUrUJg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FB52C2BCB7; Mon, 18 May 2026 07:01:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779087701; bh=l76T53aM27a7tQgBdTbwNsKLyspVBk+M6RWAIoCG25A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ogQUrUJgxsH4DUhgRzxpp9FsOC63iQTLmfxuPTupWibgYo04gJF2cXAMKL5utJ9Sr MKkU8O9dAm/MyZQ8p3PVhp8+dO1pPjguwhbRMosZjLxOFlyJOP+vQcXxGukkUyJzld nZu+SZYp4YTtelgA3xkfvkp/h+AgDOHnycxGwHCjwVbtqKSrJ6KC0ZS6eA9DAV/yWH jEdwjEJDhc5VHMvRcsOSwKdhaQOjnexO3t+Z1MoIKsQvSC7LsBPWCD9ehjR26oVlVz q1QW5ZgT3xoxTsZAcUmlY0Mk6Awq8b0lTBRC7/YHfjMMMvvyVmTAGL9MevDbLsWWN6 5j9ZVQrxFaOyQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v12 01/11] nvmet-tcp: use tr_ops from nport in done_recv_pdu Date: Mon, 18 May 2026 15:01:20 +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_done_recv_pdu(), nvmet_req_init() should use the transport operations (tr_ops) from the nport structure instead of the hardcoded nvmet_tcp_ops. This is necessary to support multiple transport types (e.g., TCP and MPTCP) where different operations may be required. Cc: Hannes Reinecke Cc: zhenwei pi Cc: Hui Zhu Cc: Gang Yan Signed-off-by: Geliang Tang --- drivers/nvme/target/tcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 164a564ba3b4..ebd7aa689c5a 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -211,7 +211,6 @@ static LIST_HEAD(nvmet_tcp_queue_list); static DEFINE_MUTEX(nvmet_tcp_queue_mutex); =20 static struct workqueue_struct *nvmet_tcp_wq; -static const struct nvmet_fabrics_ops nvmet_tcp_ops; static void nvmet_tcp_free_cmd(struct nvmet_tcp_cmd *c); static void nvmet_tcp_free_cmd_buffers(struct nvmet_tcp_cmd *cmd); =20 @@ -1081,7 +1080,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->nport->tr_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, --=20 2.53.0 From nobody Mon May 25 18:05:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 633E43C76AD for ; Mon, 18 May 2026 07:01:44 +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=1779087704; cv=none; b=oNiMypADZilUpTOwZgk6QbgS567q58z77c0/fIwyVbszS3x66CItyEz3dg656j2RAilXjgorzsqdl4cHiux9RWcxhDLgs/yGr1nP+HsiQ/ur7XS/Gkdf8j8EXTvdtFcfFSSlGXc2b0CZnCWci+i6HYq2w25Ru46h9wcJAdYCmaw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779087704; c=relaxed/simple; bh=Lpr1vvBxQBeRt+BzId8G5mZKquLQCqxEKb2bblqzH6w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eRsWYouhGG70cWvxlnV0ooEnPulF+me/PDoQZ6xfbImr5KLMoF7l4T79WgAU6fHrvnOVPf2zceQR2tZZekoYX/lMDiWprjeq+ZHH5w1SUR4+scoEuFdW3kmqip9rzagUOX+oXOpBonsfEkXHVTftKaT1xKrrg3Gc8eNSQ4nLYcI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eBE9d0Mr; 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="eBE9d0Mr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 871B5C2BCC6; Mon, 18 May 2026 07:01:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779087704; bh=Lpr1vvBxQBeRt+BzId8G5mZKquLQCqxEKb2bblqzH6w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eBE9d0MrQknym086w9y3tVy7fmWG1AKrZCEO1kFiHXM7h9wePlQrwMsIPkHVzpEc2 mtydvTOnxaQC/gPRpFHKZZZbWv+GNA9v6ZZ4p5RbNTNp+v17dFKpqTw4x19u/Kk4CL x5h/y7QB+LCM/WZbsf7CGq6uf3na5vn6canW75AYH25+GYMqmNJzr9d+RgoUdtugK1 p4OMG3em7UomgF59udj5BN/GPy6r8dJXPqIGevjl6vICSmrjVWv8cRmjDz5GXgQ/D1 jiOQ7m5+AK3/QRD7tYO9Fx2X/+oqI7oF2d4NopIeXV4RbJlOBel130khyvm/S1P0UP GKG0bE2CotY+g== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v12 02/11] nvmet-tcp: define target tcp_proto struct Date: Mon, 18 May 2026 15:01:21 +0800 Message-ID: <376df73086d11f059258149fb8cb0a7b79d7e4f2.1779087443.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_queue directly, rather than to struct nvmet_tcp_port. This avoids the need for RCU protection when accessing proto, as it points to static const data that never changes during the queue's lifetime. The proto pointer is determined based on port->sock->sk->sk_protocol during queue allocation, and stored in the queue for subsequent use. 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 | 47 +++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index ebd7aa689c5a..1cf5a27063d1 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -145,6 +145,15 @@ enum nvmet_tcp_queue_state { NVMET_TCP_Q_FAILED, }; =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, int val); +}; + struct nvmet_tcp_queue { struct socket *sock; struct nvmet_tcp_port *port; @@ -196,6 +205,7 @@ struct nvmet_tcp_queue { void (*data_ready)(struct sock *); void (*state_change)(struct sock *); void (*write_space)(struct sock *); + const struct nvmet_tcp_proto *proto; }; =20 struct nvmet_tcp_port { @@ -1714,14 +1724,14 @@ 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->proto->no_linger(sock->sk); =20 if (so_priority > 0) - sock_set_priority(sock->sk, so_priority); + queue->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->proto->set_tos(sock->sk, inet->rcv_tos); =20 ret =3D 0; write_lock_bh(&sock->sk->sk_callback_lock); @@ -1904,6 +1914,15 @@ static int nvmet_tcp_tls_handshake(struct nvmet_tcp_= queue *queue) static void nvmet_tcp_tls_handshake_timeout(struct work_struct *w) {} #endif =20 +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 ip_sock_set_tos, +}; + static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port, struct socket *newsock) { @@ -1923,6 +1942,12 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_p= ort *port, queue->sock =3D newsock; queue->port =3D port; queue->nr_cmds =3D 0; + if (port->sock->sk->sk_protocol =3D=3D IPPROTO_TCP) { + queue->proto =3D &nvmet_tcp_proto; + } else { + ret =3D -EINVAL; + goto out_free_queue; + } spin_lock_init(&queue->state_lock); if (queue->port->nport->disc_addr.tsas.tcp.sectype =3D=3D NVMF_TCP_SECTYPE_TLS13) @@ -2043,6 +2068,7 @@ static void nvmet_tcp_listen_data_ready(struct sock *= sk) =20 static int nvmet_tcp_add_port(struct nvmet_port *nport) { + const struct nvmet_tcp_proto *proto; struct nvmet_tcp_port *port; __kernel_sa_family_t af; int ret; @@ -2065,6 +2091,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) { + 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 +2112,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); + proto->protocol, &port->sock); if (ret) { pr_err("failed to create a socket\n"); goto err_port; @@ -2088,10 +2121,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); + proto->set_reuseaddr(port->sock->sk); + proto->set_nodelay(port->sock->sk); if (so_priority > 0) - sock_set_priority(port->sock->sk, so_priority); + 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-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 5F78430F7EB for ; Mon, 18 May 2026 07:01:46 +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=1779087706; cv=none; b=F58350UI7rh+wx0fzy8JgVRcu0ilVlQz+n8i4fVTKncSJOgwmK+Gz0dVHBMK3QnnyTA2DaovDTZqQGe4DImONKGvVnPLuuWEyx+33Unsqd/wNXTQ9wFzrMcJxSRHmCV0E478PZBy1vwNVKcZTlMOMJlKonnrNrMUpk9bZ6KRWoc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779087706; c=relaxed/simple; bh=T5PVauYpREm5lqGwNK4PCnlzussYDdqpb0FkkaPF9UI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jy6Lr1JnIYhWzVKKkAzSyHda8P36yv+NqX74Q2JDU8GslDGJ7c/qZIchK+kwM9BuOokRrYyNVW/qW53gkoPz6G8dU9NqXP+eugjaagzas1Bq3aFYDdAL3NkqQTgyLICMPjXR/BDKFNkDg2PubCvSj5d85CrniluVzzRCmDSpL3I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LnxdpwsI; 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="LnxdpwsI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8EF15C2BCB7; Mon, 18 May 2026 07:01:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779087706; bh=T5PVauYpREm5lqGwNK4PCnlzussYDdqpb0FkkaPF9UI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LnxdpwsIVmUGiUxePDqemaLKoroAcGOO0TIQDSSg+rG/FqMjy4Xb0vD8dRo3MkEVQ AX5sQclF1jfKgBnuP5tZWRBsx0x8dmh8qQ10FSbSQUeA7JQK99zcitOxpAfNvSoKgB SNuWRjOwO/lbnic6hVK8ZTgLnXoqIWmxivEthxs202E13MJod8Ut+KsjsOCDGi62QF 4a3EcMVri8uSI5+duIY/hpO++annTAcxWt5pYc+n2yAMddkXfPJI5GfxyALOnpVLPv LQDUno0cUIY48D5COwSBCqjcJwBCzKl+V7Y0TOxJgNlObmfvEpE4Qxx6G2GR2bWZB/ hqZ2jLrDNUsGg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v12 03/11] nvmet-tcp: register target mptcp transport Date: Mon, 18 May 2026 15:01:22 +0800 Message-ID: <2de5a32abe33bc38c0cbfbdd6ce86266314b39fb.1779087443.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 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 1cf5a27063d1..858d62e4ceab 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -2264,6 +2264,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; @@ -2277,6 +2294,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); @@ -2287,6 +2309,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); @@ -2306,3 +2332,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-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 41F522ED84A for ; Mon, 18 May 2026 07:01:49 +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=1779087709; cv=none; b=hSj0W3JgRpP4FlYrx7ked1LlplWGBE/OjjB97jEBnvw6ShyCHo9hzfEBrR9bQNUmglerBbg8BNZTF22JT8b77RoC6KWSc0Cif6gfOVO2xoH96QWBSq893qBAVUnumvvxECNzASpxxD9XV0kfPQmDYAMc9ymdni89cAMpKbce+XU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779087709; c=relaxed/simple; bh=LX+iS0XDWy8NS6c2f39Ze+NUQqdhEOxQmiSXB3pORT0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FdFyaEoSIDdkxGYBdHjzJcPus8PH+l1PGy3wCrfpxCztAVTWvZ4cPfxPacfw5qS6OFXxHJrtm0ZiMjJuLdMm8HddSzpBgiWN0B7PvXtxIjVLtkcFtQGov/N1FjHx2K57Y+hv9TIj9pTd5aos6oxTch1tCfRcLjPPqQxQEnZacbg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=l+NlRt6k; 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="l+NlRt6k" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC97DC2BCB7; Mon, 18 May 2026 07:01:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779087709; bh=LX+iS0XDWy8NS6c2f39Ze+NUQqdhEOxQmiSXB3pORT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l+NlRt6kNpBoQHKmS2PaFnpb3QXc5Lojaq2w/EZjeMxalD784Pv111GjI2FzejYRd MJ0l0a22+Qcn5WvVWNEZT/PxuGIfLP+KXkSZmI5j5VOYhYzDWdzG59KY7JSlU8y5kc GQc32LoUQcGQ8Hj4EyLptFEibDpW7BmliEWC1K5znE+VcJjr//7rSFqh0pUHFDEAcY xuClA1VS2W4OV1OzloS1d4TxYK4dmDoSYZ8spUtre94NZdBhc69rDMO3jTEyeBwq+E TuGkL1beWWOtcgWPD1AiLhpfQbwWvnFZhW4UdW/0PHyt5ip/rsIGjzyyvPr8W21Ow7 mX3w3OCW3Vplw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v12 04/11] nvmet-tcp: implement target mptcp proto Date: Mon, 18 May 2026 15:01:23 +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 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 (based on port->sock->sk->sk_protocol). Dedicated MPTCP helpers are introduced for setting socket options. These helpers set the values on all existing subflows of an MPTCP connection. 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 | 107 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+) diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 858d62e4ceab..a987e0613485 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -1923,6 +1923,17 @@ static const struct nvmet_tcp_proto nvmet_tcp_proto = =3D { .set_tos =3D ip_sock_set_tos, }; =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, +}; +#endif + static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port, struct socket *newsock) { @@ -1944,6 +1955,10 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_p= ort *port, queue->nr_cmds =3D 0; if (port->sock->sk->sk_protocol =3D=3D IPPROTO_TCP) { queue->proto =3D &nvmet_tcp_proto; +#ifdef CONFIG_MPTCP + } else if (port->sock->sk->sk_protocol =3D=3D IPPROTO_MPTCP) { + queue->proto =3D &nvmet_mptcp_proto; +#endif } else { ret =3D -EINVAL; goto out_free_queue; @@ -2093,6 +2108,10 @@ static int nvmet_tcp_add_port(struct nvmet_port *npo= rt) =20 if (nport->disc_addr.trtype =3D=3D NVMF_TRTYPE_TCP) { proto =3D &nvmet_tcp_proto; +#ifdef CONFIG_MPTCP + } else if (nport->disc_addr.trtype =3D=3D NVMF_TRTYPE_MPTCP) { + 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..91ce7b9b639d 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, int val); #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, int val) { } #endif /* CONFIG_MPTCP */ =20 #if IS_ENABLED(CONFIG_MPTCP_IPV6) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 87b5796d0135..6100aa58a061 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,108 @@ 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); + +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); +} +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-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 6934C2ED84A for ; Mon, 18 May 2026 07:01:52 +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=1779087712; cv=none; b=FiozMzBCVfDMWwXcsMOCnPQST1vZSoXaTfVu/qkVLLr77kCyNGKgxkfF9XteMqFdEUX/IxWX97PzWyDvaAMwnKcnq4RMISDt+NQZWZfgT7fsyANzVU7/L+CaSFPDw5ACms44jyIpwlZhkBWo1dXhglsICkeJXj6b8bMmhSvreAk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779087712; c=relaxed/simple; bh=X20vd858hBkWwzd6klZZrl3GT1J1lmrDnbvu6XDA0Wc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tIvkWj9YDLAtp5xrrRssKO83wwmv9zv1j5aFrnuk+CQb41oEanE0iAFNluDPDeOjxGmLQniq1dNh9rwFpl419UFNgvplUDclYqG9uu75YtvytzsRXYrzcPDv1Be8s8Mpdn0H7GBSa3g2fAXPeoIoz23mTnXg20UEHO6hzJw5r4c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sCP51/xC; 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="sCP51/xC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E0D1C2BCB7; Mon, 18 May 2026 07:01:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779087712; bh=X20vd858hBkWwzd6klZZrl3GT1J1lmrDnbvu6XDA0Wc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sCP51/xCJXMKI0cvQ3Rkdr6B3jrMnkXJRBd1PmM/b2wKgwYhO9Jo6WMRJ1+Emvwuv THwEw7DqecFB/RriVtYbs6EyozINy+4LyrQ+MkZn3v4sbKNZeSXefkJQPhkZpiMU17 jFdd09T+Iaz8sDK8UiCy/38SxYSUBsUv0HGq8t1Rd8UpKL7Garvxk4dk527KTRp/jR OeuwkUh1oSsf31Ql4zsUONC8k9KfxUYZR5lD6dY3dTRoyaTnY2t2kjFUPMXAWoA25x ZeARrw5baOjfHq3i7d7gOLP2zbknkcUr0+p03yDEiyDABprYUUKKxL9xDSjguAf39M MT1JY7dvMPFjA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v12 05/11] nvme-tcp: define host tcp_proto struct Date: Mon, 18 May 2026 15:01:24 +0800 Message-ID: <64bcdc14f30a7d79568297b8d8fb74f2cf068982.1779087443.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-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 30C9030F7EB for ; Mon, 18 May 2026 07:01:55 +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=1779087715; cv=none; b=e5lTyXdogsYJhQDnXTGU7Iym8FlvtsQfaUJGE3PEj9UcUfFF72M19ZSuPXQ5R7v54PaMcCQQ4FQ2r5Q5hKgrtAktvYwzwoCtw5BKaQt9Qan00j5tLS5tNBma93D34LedPDYWCmO3VbmpsN0itDEDIeCqdBGxa5XgZEnOcuaoxvo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779087715; c=relaxed/simple; bh=oHDCNEo3iYt4BG+CJdcbZfI/c/bqJ8AlcmMy5W07fyM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hgcX33i8WS4av/g1Onq8EqORnfvyCc4k0yZmwmVvfuGTeindkC4oVICkOuHzN7FizASN+eZQDW67YQBbdhu/KzATnt8ofksykPNtEkuL3lRDKPKTGkuI6VBQccUD252pmhEogHH+ROxOW4KCDezuQqfWi7/YDA4Hh4CaNNJvx7Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pl4UcUM4; 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="pl4UcUM4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDEF7C2BCF5; Mon, 18 May 2026 07:01:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779087715; bh=oHDCNEo3iYt4BG+CJdcbZfI/c/bqJ8AlcmMy5W07fyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pl4UcUM4MhxtGR/EQswO6HqXFNfleiurTnYSqr8qskyVokE0MEZLYIVCtbF9T4t8U fnWUerFzlsrcKdtrPHC62ZAAhbdZH6BHXoRxFkFI6tUpPc3iL0TMPhGnxZQ5kFqvGO WZNdQblY33NGKFWV3Y4zSEYq6RpR07KjKkbc0BU4pLPxXpnqP7FEtw6aZYLmoExbhG M+Ju55Yatd/rMoHQJxdxL334YfB97Ft3u538buFoQLgCL6cn3TNd1hQ/eXEGVBAFvd dZCP76k0DI6vFWqXaA9JbfdZQNNhDRPHWclAWWzqXUVjGQwxbcOZulGj64V6+DJXiO vGvKLAqfg33mQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v12 06/11] nvme-tcp: register host mptcp transport Date: Mon, 18 May 2026 15:01:25 +0800 Message-ID: <831829cc5a814f1d94bee6611a6141cd519c36aa.1779087443.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 .type 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-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 BE8AA388E6B for ; Mon, 18 May 2026 07:01:58 +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=1779087718; cv=none; b=eum+yhsOCfbsUCZH6Z0rsLisfuTM/dQeUYDv9OpvPhV8aqBjsPtaxc+bjRm+2VPnrfLbUI0mmq9hQLExYqJMXcaYHSKbciYMRTkBQgpdi0oZeQEzveOq9/CBRMYDEvyI62mV9nF540kr/xzTLjlWifLzqZ6ZiQ11W8N1tpo2lro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779087718; c=relaxed/simple; bh=pQf+davY/M2k5d5lfXPM30zZjMgd8gWNbWf0ZnpbxpI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uKTvmae36QriegbA6A9HkBrxpugGSyHY/3tT6ey7lPejw0jVinqe7aSE64++acqscMOf1rQofqZra8HbaRwXucNLR4xlEy2lkm+3/pNI2SW96xcHkEHZABSb09JGPx53j6dLlJKKY3F6ZOZuOL0Ulx2MEitEE2S5OSThnHMTsg0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YTMtVXm2; 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="YTMtVXm2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7230C2BCB7; Mon, 18 May 2026 07:01:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779087718; bh=pQf+davY/M2k5d5lfXPM30zZjMgd8gWNbWf0ZnpbxpI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YTMtVXm2jPjr3R1ZvXue5xW3w3ysekb4wJOblwg/yqt+PkXJY3Hla5tesQrJmQB5x TYsOXyRhceTHi66a0l9cyzTWsUufvGmg+TSu7q2+0TfcyGQGUHNYyFnJu71wlkJK4R mm/G+GsbxHxt0Yc4WO2/ExHnMPsKrSGGYjYvbwl+nim8aHSXYQ0D6KPR4eQ4oHNj3w wU/82lXpKfgnA76Y0Rj/HlRKppUFf63lz8ix+wGS3FMxlq2vsJkKWcZseH5q7I0FBY UROPAyDZrsQXKU4PJk6kgFuhNw+yuXTmGxGtjgaQ59862oP3SdvS+tPrmPnlaI65wg bhYZQpnXYuzbw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v12 07/11] nvme-tcp: implement host mptcp proto Date: Mon, 18 May 2026 15:01:26 +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. 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. 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 | 7 +++++++ net/mptcp/protocol.h | 1 + net/mptcp/sockopt.c | 21 +++++++++++++++++++++ 4 files changed, 63 insertions(+) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 305624d59c50..8816e98f4282 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 91ce7b9b639d..49031a111e69 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -247,6 +247,8 @@ void mptcp_sock_set_priority(struct sock *sk, u32 prior= ity); void mptcp_sock_no_linger(struct sock *sk); =20 void mptcp_sock_set_tos(struct sock *sk, int val); + +int mptcp_sock_set_syncnt(struct sock *sk, int val); #else =20 static inline void mptcp_init(void) @@ -343,6 +345,11 @@ static inline void mptcp_sock_set_priority(struct sock= *sk, u32 priority) { } 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 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/protocol.h b/net/mptcp/protocol.h index 661600f8b573..0096cabdccd2 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -336,6 +336,7 @@ struct mptcp_sock { int keepalive_idle; int keepalive_intvl; int maxseg; + int icsk_syn_retries; struct work_struct work; struct sk_buff *ooo_last_skb; struct rb_root out_of_order_queue; diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 6100aa58a061..dbd60ea254ae 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 (msk->icsk_syn_retries > 0) + tcp_sock_set_syncnt(ssk, msk->icsk_syn_retries); } =20 void mptcp_sockopt_sync_locked(struct mptcp_sock *msk, struct sock *ssk) @@ -1769,3 +1771,22 @@ void mptcp_sock_set_tos(struct sock *sk, int val) release_sock(sk); } 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 sock *ssk; + + if (val < 1 || val > MAX_TCP_SYNCNT) + return -EINVAL; + + lock_sock(sk); + sockopt_seq_inc(msk); + msk->icsk_syn_retries =3D val; + ssk =3D __mptcp_nmpc_sk(msk); + if (!IS_ERR(ssk)) + tcp_sock_set_syncnt(ssk, val); + 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-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 90DF52ED84A for ; Mon, 18 May 2026 07:02:01 +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=1779087721; cv=none; b=EXALYg3ETpBNK5ZO4zXrF5jckM14xw+0OEXot3dQLvPgNeQchOHwLWX06avSkStZjCWM8SzHxPD3ZKzmfpyXXn0kcDdfesG/9QCLE22LjvYEUTTao3ENCo+Naoaah6uh41y8wyEWnaciBZ2q7wB1k29x8mNnP5MoniL44mfOhQw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779087721; c=relaxed/simple; bh=/aUAzhOv/cVudvy0jGLxHBUVp5TYVyz2/AQ+H6hqcJM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FEhhk278bCEwUtpo+YHFMO6h5gFfP+Aen+QYvgxwDkbZEwEl7ZEyqpiVpa0NLS4mRYZMJIYTl8hitIdIwbghnO9bvcmUXx8Q55PrG0PRuNaOi2AcXGQfZj2RxqrbdrP32De4k2kpRp3yEfX9OGgkeoHVOf1pXFnTtIjmInT5HPg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GYg9SVcz; 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="GYg9SVcz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0953C2BCB7; Mon, 18 May 2026 07:01:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779087721; bh=/aUAzhOv/cVudvy0jGLxHBUVp5TYVyz2/AQ+H6hqcJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GYg9SVczEBfSSS0J0WCwhrWk2I1MnacrZnNdH+ln6GN0HeiwRQUd/+8fOn2SpHJco 6sOAo39C1Fr0rXHLDyhIi2WqG8AzLbsz/HHZheLUc0rPishVjxnOCmkkAgFDNmaJ7y uSXZEFrnnT/fxQ6y14BASEjticVPtQu/OUaqDyL5jsV37rajopsuY2ZMxStpTzF6lw XpTSecgFBHRjPvpwQe6QIS0XMLlinOVV5dYGFbFEzcynw36vht03q8ADAW2i0HIsY5 sSstABHv707q9F3hVJvx+h4Gi/+Aw7CwXAILyJSqxA/X3HBzr1stnafAtYjtK4QSnz tUchBt2YTOYZw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v12 08/11] selftests: mptcp: add nvme over mptcp test Date: Mon, 18 May 2026 15:01:27 +0800 Message-ID: <41ea2970ab4ac1fc62a50946f67069485028da70.1779087443.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 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 | 7 + .../testing/selftests/net/mptcp/mptcp_lib.sh | 12 + .../testing/selftests/net/mptcp/mptcp_nvme.sh | 342 ++++++++++++++++++ 4 files changed, 362 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..0eee348eff8b 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -34,3 +34,10 @@ CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_TPROXY=3Dm CONFIG_SYN_COOKIES=3Dy CONFIG_VETH=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..3da5d07056f2 --- /dev/null +++ b/tools/testing/selftests/net/mptcp/mptcp_nvme.sh @@ -0,0 +1,342 @@ +#!/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 0 +} + +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" + echo -n 0 > "subsystems/${nqn}/namespaces/${ns}/device_path" + 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" + + kill "$monitor_pid_ns1" 2>/dev/null + wait "$monitor_pid_ns1" 2>/dev/null + + kill "$monitor_pid_ns2" 2>/dev/null + wait "$monitor_pid_ns2" 2>/dev/null + + 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 + + ip -n "${ns1}" mptcp monitor & + monitor_pid_ns1=3D$! + ip -n "${ns2}" mptcp monitor & + monitor_pid_ns2=3D$! +} + +# 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 4 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 /dev/nvme*cn1; 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 /tmp/nvme_test.XXXXXX.raw); then + echo "Failed to create temp file" + exit 1 +fi + +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 + rm -f "${temp_file}" + exit 1 +fi + +if ! loop_dev=3D$(losetup -f --show "${temp_file}"); then + echo "Failed to create loop device" >&2 + rm -f "${temp_file}" + exit 1 +fi + +trap cleanup EXIT +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-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 630AE3DEADC for ; Mon, 18 May 2026 07:02:04 +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=1779087724; cv=none; b=A/HRE8PiqKFNPVQocHpvIQYFJNIg5x80z1xl2JPQ3emzyqbeZVepFajSjeKpddHKJcQuZHfoYUoCpyHzYesdeNhV4dJBO2MN8c157wteTS27aCQB8/jI5j+dSMsGONHWpyUVSD2JdoL6Xy5Uz7pSnZEk4RCQ0YqY+41JkseXSzI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779087724; c=relaxed/simple; bh=AmKQNDkgjMpB1B5wkBsjjrkE3Rhd+Qgas52byMpTYdo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WXH1U1r3OYGOcE0Ku4vDT7+h28m0WsH2iQmb52f9yf8QuwVazo/Idx48hUOT9sgNopQBhpzTluehFPZLD5OOJkNArGSltGmpUs7/eN5cmO8uHdJO0IqYY4amYATKZi4CxlzcrRsuo4Kwm6SJkQl78VwfncP2ciUgN+vPhYK1Th8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lBPsEqkk; 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="lBPsEqkk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17506C2BCF5; Mon, 18 May 2026 07:02:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779087724; bh=AmKQNDkgjMpB1B5wkBsjjrkE3Rhd+Qgas52byMpTYdo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lBPsEqkk0Nm8oVZrnZ9UWRrHBbv9tn7vtN/CZWTURiA9cVvb60g/cq7gtUJRfVtT9 KExbVoRxjk5f9FssnQgH5+RJoOY7KKCktsejnFUbPVX0GIF+BSKPfF88gFNX2rz66g sd8TOhDOQ/Z8x0RH+h2EGW5hrsY0B8OddzU33oEggLR5RQhYHK7XcaOGfGs3XBoD9l z8gE/im5IY0r7Ph94Hh4nLtT/vlOppgLGcHUJnkQkaFio2/hRKbxw8OtycS/OCbbQ5 c0oai0rvYxvMMPBuBTcS/2hlBvD02561Oz/j7Pde/OWL8BYOIbhC0n4vBiaFdA+GrL NCf+JrxladtGA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v12 09/11] selftests: mptcp: nvme: add iopolicy tests Date: Mon, 18 May 2026 15:01:28 +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 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 3da5d07056f2..af8db2812849 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 0 @@ -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 @@ -112,6 +127,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 @@ -120,6 +136,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 @@ -205,6 +225,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() @@ -254,6 +316,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}" @@ -319,6 +386,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-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 6B0062ED84A for ; Mon, 18 May 2026 07:02:07 +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=1779087727; cv=none; b=aQEvTYgO8N/S7k63iTebEkdIOIZ4ZvqEQMddq6OFjMW2Jhu5ppgQJYeObUWFJ75ubhPjgIK7siu9QF1kWr1FYToyrsw0WTpx1ijmnLNhAZOSgzoptvK6YI9GthtTp4nCR4y6ITcNtJHOLGePIlZ0g/EdplcPHVC2h/bY7iHEZ8Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779087727; c=relaxed/simple; bh=A+QUifIVHjK0upOv1x/JIEROItV+orxcwY30N8gxpUk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FOdVeQHvwotor095yhAte5atWbvNM/mkv5GxAobu2xhFDL7GjB+C3DuW323IdIO/ePtDdNyavd+uCTmcSqTr6pn8h1eSjuByTBLH0ByQqtgf3SSFNptTVRe+gvBGqRv+3+VCEGsDzf+UEy1wUJyHa15m/N97Epu8aKEAXfSGN2U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RSy4GWIt; 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="RSy4GWIt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A001CC2BCC6; Mon, 18 May 2026 07:02:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779087727; bh=A+QUifIVHjK0upOv1x/JIEROItV+orxcwY30N8gxpUk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RSy4GWItPzRx9ECij4GyXU0urwDY50HNZecKSpsCH6TWZaDT3obINlWpge2hin1jI 3hPtYlMS6q2/aMAdR2YfLDU8AXGAuhaGpdm6eMZY5mIx85wAHBkSDngkFCD8BUAcnF emPGPsp+RNE7Fn3HkK03WUTYhRkk2gmZZEjTepHqjH4PIlQbeIjV/O36tbSVgE0Ufn bvwTAddCbIvV1MTzY0krWgHc2iihlsj/fQc+a9KE8EdPKFDMCRAPCccDN46sSY+Zy+ lO2SujHb/Y2aAz2ugnbKinHFxmVhUA57ojA0LR0U+LWvMU7QpkBfone9VUPqiUMuF5 nWZDs2GSlPnJw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v12 10/11] nvmet-tcp: check return value of set_queue_sock Date: Mon, 18 May 2026 15:01:29 +0800 Message-ID: <94eb75bda87e1dc12b38022fb3314781b105fa09.1779087443.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 concurrent port removal), 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 a987e0613485..943e866506cc 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -1852,10 +1852,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-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 466FC3C76A0 for ; Mon, 18 May 2026 07:02:10 +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=1779087730; cv=none; b=fikEHUzFFusl5n/DpXWOJNDmavF9UmbkBNOvsJRfF3bx+DX6yPMG2+J3JthPIlnuPlrdw70VvaahBGpImI+5XAMhSc+soOk1kvggw8mAZsoQkjR7XKof6hV0U4ICU60mtt50/ioCLSsWyhT3po8X9nAa5MmDFuoPVCTrhJtUnlM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779087730; c=relaxed/simple; bh=luxA/o3wJAhLv3r13hvUhK0hRhdT9n4Zba7jE298N5s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hrBMFkb9e3+Pq7DRZdigchb6yrmtpv0eQMCnDMFxgBnOtjDuyDlKaevp0217JABzavMMZONO8EfXOCVobGRrpfBYJWOGKpXE5FCfwAwmQigQEVdx68W9sostaCGA0QXUtZz4r3PH86dBlJy2p6o1YbG/C+XT83Yimk3QAwJ1Z6M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=B39hYLFg; 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="B39hYLFg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F144C2BCB7; Mon, 18 May 2026 07:02:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779087729; bh=luxA/o3wJAhLv3r13hvUhK0hRhdT9n4Zba7jE298N5s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B39hYLFgi48QKb5ovuD6PxgYZQ/nQml+mUqR0YSSv/PKg/BHiS6CoIgadG/UJ5d4J LwHzGBTsj5QslC00Eqr/7pc8ZL6XQkXc1N/9fx632SAUVPUdYoceuyNpvm0lKvXpLn 8/YlOR/QVklWFhnJVHwapUdPDAepbyY+vRBd2jc5OWKeWWTAf0IlkFhkQgDFwM7qY2 mM04T7bWNQoJPpO7tfbAflk5lxETrF9mzaXsjo6YQQyIgRLVDRaBTFGf+v8QRMZR6x IPlEr9ceIQqI3SgmIbExJOsqFsXgaxcLGdrVIkkd+MPZdcQat3pdg56tmtTYRcVaJb dVPNPgXCPmwGA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke , zhenwei pi , Hui Zhu , Gang Yan Subject: [RFC mptcp-next v12 11/11] nvme-tcp: add RCU protection for host_iface validation Date: Mon, 18 May 2026 15:01:30 +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 When the host_iface option is specified, nvme_tcp_alloc_ctrl() calls __dev_get_by_name() to validate the network interface exists. However, __dev_get_by_name() requires RCU read lock protection as it traverses the RCU-protected device hash table. Without RCU read lock, the thread can be preempted during traversal. If a concurrent device unregistration occurs, the hash node can be freed via kfree_rcu() and the RCU grace period could end before the thread resumes, leading to a use-after-free when the freed memory is dereferenced. Fix this by using dev_get_by_name_rcu() instead of __dev_get_by_name() and wrapping the lookup with rcu_read_lock()/rcu_read_unlock(). Cc: Hannes Reinecke Cc: zhenwei pi Cc: Hui Zhu Cc: Gang Yan Fixes: 3ede8f72a9a2 ("nvme-tcp: allow selecting the network interface for c= onnections") Signed-off-by: Geliang Tang --- drivers/nvme/host/tcp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 8816e98f4282..08ba99f1a3a8 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -3004,12 +3005,15 @@ static struct nvme_tcp_ctrl *nvme_tcp_alloc_ctrl(st= ruct device *dev, } =20 if (opts->mask & NVMF_OPT_HOST_IFACE) { - if (!__dev_get_by_name(&init_net, opts->host_iface)) { + rcu_read_lock(); + if (!dev_get_by_name_rcu(&init_net, opts->host_iface)) { + rcu_read_unlock(); pr_err("invalid interface passed: %s\n", opts->host_iface); ret =3D -ENODEV; goto out_free_ctrl; } + rcu_read_unlock(); } =20 if (!opts->duplicate_connect && nvme_tcp_existing_controller(opts)) { --=20 2.53.0