From nobody Mon Nov 10 15:51:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d4vKS5N3dz6GtSx; Mon, 10 Nov 2025 15:51:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d4vKS0ClBz43bb; Mon, 10 Nov 2025 15:51:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762789884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/+OUS4dz2G8wRIQ1ykRbYToCC5A+cIXvEpAy83Vj4U0=; b=asBjsLvtTVhz4l9uIAE7aCE3eoh1ekVCmnFKNX8QIybZBa/LO2ib3litfNmU0UVcaG9sDP aYG2GMq/+MxN3bObbzR3UAvfrRz/FXKa/Jk2tGa77TptmIK97brl8++ay9T4i3JbP6+9Yp skqLnuyb1hnX1Jh+SCWQW26VpFJ4uUgqHUdDA74HfzE5OH5aMa4aCRgTpCJsl26itdSIwS aSHaOMbd2TA9pEIdrmz6ig+Ra1S9pVQb8Ct4nPO10iZanTO9wY5n7I6jbIDhJNYrU/R2Ph wTvGVbRz7jfvVxmlIlZNxp5R9mC8LjlCE9UnOUUb+/+MeHUcjk16LbVnDgPDKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762789884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/+OUS4dz2G8wRIQ1ykRbYToCC5A+cIXvEpAy83Vj4U0=; b=HSc4PzYvLLGGdPF1jDGdOXXkT536bNIfSsrltwn0MYeacIQZD37oEvp7K4M2HNNEaKZTXW S+eyrqlA4C+KO/M9Ub3yOIXkHO9nND60OLdIK5UPbdNncnuKxlc46t7RyqCpBkc5tw6TiZ dmAoEj6frBfwkzvrz0w6prY55prvf5PAHdO1oefyN7rMg+H1fw74WVgnUzn/+gxK4oKUHY rBMJ5dvli1hQDoJZiNCRc3/dGTnQVyar5zzQCrtpnP5oJ3aJTpBh+DtBgh7V8jQMAikoAF BPgCS+0ZKnf720hUh/ndUVe6wjgW3/qZfnj7R2lh5ltm4GyKa4Mhs+pOU7rigg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762789884; a=rsa-sha256; cv=none; b=FhYC8l/61hMNxIEvJde+tVWihS60BhACqs7ualeaktgOmYN51tJ82Q6Lv0gPzS7QlqL4dI 1MslNH5O5fOmqClx0ZICUSYqhhhtjRnyZGRpQT4hB1ixSsq2h+xwwmtlE5wP7oLpTSZpAw 7JTOmvlBaMhgUjss1mkvrVDcHgm+2f3GY8yXtktntNXFtCQR66BCV7+a3X00nGK4Ztqovv 9hfTELTmrAm9ZeNbnXP9Al6DsCRwSvIxSls1/owRQzxqpw+OYevDYFhyY5K/5BSKw0vcD0 N/DOOzPqvZCOlXV5jtvrklPyfFLhuzhxdqn+J4iTwa/xduYrhSALlkFv/zj4mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d4vKR6sJlz8YJ; Mon, 10 Nov 2025 15:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AAFpNEQ048052; Mon, 10 Nov 2025 15:51:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAFpNtl048049; Mon, 10 Nov 2025 15:51:23 GMT (envelope-from git) Date: Mon, 10 Nov 2025 15:51:23 GMT Message-Id: <202511101551.5AAFpNtl048049@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c1b3c5f5f3fa - main - nvmf: Add a transport hook to limit the maximum command capsule size List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1b3c5f5f3fab895df3d2e75ac3edee4e9aa6432 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c1b3c5f5f3fab895df3d2e75ac3edee4e9aa6432 commit c1b3c5f5f3fab895df3d2e75ac3edee4e9aa6432 Author: John Baldwin AuthorDate: 2025-11-10 15:50:47 +0000 Commit: John Baldwin CommitDate: 2025-11-10 15:50:47 +0000 nvmf: Add a transport hook to limit the maximum command capsule size NVMe controllers advertise the largest supported size of a command capsule in the controller data (IOCCSZ). Smart NIC offload transports may have a cap on the size of the largest data PDU that can be received. These transports can implement this hook to limit the advertised IOCCSZ to limit the in-capsule-data payload sent by remote hosts. Sponsored by: Chelsio Communications --- sys/dev/nvmf/nvmf_tcp.c | 7 +++++++ sys/dev/nvmf/nvmf_transport.c | 6 ++++++ sys/dev/nvmf/nvmf_transport.h | 6 ++++++ sys/dev/nvmf/nvmf_transport_internal.h | 3 +++ 4 files changed, 22 insertions(+) diff --git a/sys/dev/nvmf/nvmf_tcp.c b/sys/dev/nvmf/nvmf_tcp.c index 0e31c0495775..481c769cedcb 100644 --- a/sys/dev/nvmf/nvmf_tcp.c +++ b/sys/dev/nvmf/nvmf_tcp.c @@ -1602,6 +1602,12 @@ tcp_free_qpair(struct nvmf_qpair *nq) tcp_release_qpair(qp); } +static uint32_t +tcp_max_ioccsz(struct nvmf_qpair *nq) +{ + return (0); +} + static uint64_t tcp_max_xfer_size(struct nvmf_qpair *nq) { @@ -1878,6 +1884,7 @@ tcp_send_controller_data(struct nvmf_capsule *nc, uint32_t data_offset, struct nvmf_transport_ops tcp_ops = { .allocate_qpair = tcp_allocate_qpair, .free_qpair = tcp_free_qpair, + .max_ioccsz = tcp_max_ioccsz, .max_xfer_size = tcp_max_xfer_size, .allocate_capsule = tcp_allocate_capsule, .free_capsule = tcp_free_capsule, diff --git a/sys/dev/nvmf/nvmf_transport.c b/sys/dev/nvmf/nvmf_transport.c index d552393f7adf..92d71d1b13fd 100644 --- a/sys/dev/nvmf/nvmf_transport.c +++ b/sys/dev/nvmf/nvmf_transport.c @@ -194,6 +194,12 @@ nvmf_max_xfer_size(struct nvmf_qpair *qp) return (qp->nq_ops->max_xfer_size(qp)); } +uint32_t +nvmf_max_ioccsz(struct nvmf_qpair *qp) +{ + return (qp->nq_ops->max_ioccsz(qp)); +} + uint8_t nvmf_validate_command_capsule(struct nvmf_capsule *nc) { diff --git a/sys/dev/nvmf/nvmf_transport.h b/sys/dev/nvmf/nvmf_transport.h index 38b661ab3c91..495e0dbc8c37 100644 --- a/sys/dev/nvmf/nvmf_transport.h +++ b/sys/dev/nvmf/nvmf_transport.h @@ -91,6 +91,12 @@ uint64_t nvmf_max_xfer_size(struct nvmf_qpair *qp); /* Controller-specific APIs. */ +/* + * Largest I/O command capsule size (IOCCSZ) supported by the + * transport. If the transport does not have a limit, returns 0. + */ +uint32_t nvmf_max_ioccsz(struct nvmf_qpair *qp); + /* * A controller calls this function to check for any * transport-specific errors (invalid fields) in a received command diff --git a/sys/dev/nvmf/nvmf_transport_internal.h b/sys/dev/nvmf/nvmf_transport_internal.h index 511aac120fdc..9b459716168a 100644 --- a/sys/dev/nvmf/nvmf_transport_internal.h +++ b/sys/dev/nvmf/nvmf_transport_internal.h @@ -25,6 +25,9 @@ struct nvmf_transport_ops { const nvlist_t *nvl); void (*free_qpair)(struct nvmf_qpair *qp); + /* Limit on I/O command capsule size. */ + uint32_t (*max_ioccsz)(struct nvmf_qpair *qp); + /* Limit on transfer size. */ uint64_t (*max_xfer_size)(struct nvmf_qpair *qp);