From nobody Mon Nov 10 15:51:22 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 4d4vKR2Qzyz6GtFr; Mon, 10 Nov 2025 15:51:23 +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 4d4vKQ6pfXz43hg; Mon, 10 Nov 2025 15:51:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762789883; 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=GM+mar2GY5JPWhZueAkBxw2NOls9AsHZtcDpl424Xk0=; b=VKfb7epoXvVvottVGCGMRH4hLNaHFuoKXrgYaiERs3qGNWPF8PZtMh5k1TQ6VbhBu43IbQ v+8uRkpoXZ6DWNDccH0wNgbk8VylJtj9tgOBEoV/enJgIWGXZ4jAr+0zK6OdC7CwAE6PfM cy9XgNmOx1LjASx/xIhA0+sMcphRcydbufwCnSAwtRRIfXWPj+cAQXh92z0+x7vHuQzxfd KOjnqIxpqbAUuKnkC0WAtSJfL1ajNNDQH+iJNbY71PDkzMYrKh91xNi4pRwtUKVLoWCOyf /foHz0O2i/GsApGKOVp4jaqm5BEd9nU7zsy+ZSFjn35EkdTGxo1ufWckPchnKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762789883; 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=GM+mar2GY5JPWhZueAkBxw2NOls9AsHZtcDpl424Xk0=; b=pnU9q8FCM5R9NJmdxpacJtrIg+ECFfBLf7zqVbw5MHOTY/Whg10OPqhqIIwwsjJqbfg5cu zpQfW5vtw2FSAhPicWI7MRxaH54s7BZYdAUFIXG6kpARzr7fHYsnCteJoy3rJACDWyTEAI hXempjSKAGrARisxWy6E+NRyM1XXyIVPfnAZUur16tahvHzAYgKKKWgt/PtfzSbFSJVf4P vGqd5GGam1uld9SF+EQXlBOH4q8OLp1UIjNM2F9O+LRydliXDk5lSoshyixFwDhO49qeOW d0/z798qbMDFDg6ek9PprysRowEz++TndGC7PiFbDVQVdmJK7bestBlStW7LiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762789883; a=rsa-sha256; cv=none; b=M5kD1rTbJii+OqHNADNmpFjXTARG4O5atU3WsLO9GyED52V/KlOHm2X+seeG+TmugGro0K 3OKj8d10bNJ9/HqbEiVuuMyu/maSpqefo+8YGuDGG0KsJxZ9Tov2vbuGNn+4EzVfXkSiMz MJ3IFP+grvL6712Z6uy4kRcQZyxht6SRuw2kyEGCU2Ezh3cKCLueyhrRsTK0XqQFuRlIdd CBQyxU1VXCRKX2HSOO1N7tmmVhJdXnkhZE57rYR8bPf/lGgRgyFseF2yo7FEtpuUQOfFb4 bwnje7vWtgxW4K8ELvHbpnk3ldtH2V/hkPu8zW75j61r6s6EfR0vWr9CfGhgKg== 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 4d4vKQ5yZTz8bj; Mon, 10 Nov 2025 15:51:22 +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 5AAFpMqr048015; Mon, 10 Nov 2025 15:51:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAFpMJC048012; Mon, 10 Nov 2025 15:51:22 GMT (envelope-from git) Date: Mon, 10 Nov 2025 15:51:22 GMT Message-Id: <202511101551.5AAFpMJC048012@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: 62caae230859 - main - nvmf: Honor any data transfer limit imposed by the transport 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: 62caae230859423ae045b5d754f30d193ca628c0 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=62caae230859423ae045b5d754f30d193ca628c0 commit 62caae230859423ae045b5d754f30d193ca628c0 Author: John Baldwin AuthorDate: 2025-11-10 15:50:47 +0000 Commit: John Baldwin CommitDate: 2025-11-10 15:50:47 +0000 nvmf: Honor any data transfer limit imposed by the transport If the transport has a data transfer limit, restrict I/O transfers to the largest multiple of MPS that fits within the limit. Sponsored by: Chelsio Communications --- sys/dev/nvmf/host/nvmf.c | 13 ++++++++++--- sys/dev/nvmf/host/nvmf_qpair.c | 6 ++++++ sys/dev/nvmf/host/nvmf_var.h | 1 + 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/sys/dev/nvmf/host/nvmf.c b/sys/dev/nvmf/host/nvmf.c index 1ac0d142443b..d6afdce54709 100644 --- a/sys/dev/nvmf/host/nvmf.c +++ b/sys/dev/nvmf/host/nvmf.c @@ -498,7 +498,7 @@ nvmf_attach(device_t dev) nvlist_t *nvl = device_get_ivars(dev); const nvlist_t * const *io; struct sysctl_oid *oid; - uint64_t val; + uint64_t mpsmin, val; u_int i; int error; @@ -545,13 +545,20 @@ nvmf_attach(device_t dev) sc->vs = val; /* Honor MDTS if it is set. */ + mpsmin = (uint64_t)1 << (NVME_MPS_SHIFT + + NVME_CAP_HI_MPSMIN(sc->cap >> 32)); sc->max_xfer_size = maxphys; if (sc->cdata->mdts != 0) { sc->max_xfer_size = ulmin(sc->max_xfer_size, - 1 << (sc->cdata->mdts + NVME_MPS_SHIFT + - NVME_CAP_HI_MPSMIN(sc->cap >> 32))); + mpsmin << sc->cdata->mdts); } + /* Honor any transfer size restriction imposed by the transport. */ + val = nvmf_max_xfer_size_qp(sc->io[0]); + if (val >= mpsmin) + sc->max_xfer_size = ulmin(sc->max_xfer_size, + rounddown2(val, mpsmin)); + io = nvlist_get_nvlist_array(nvl, "io", NULL); sc->max_pending_io = nvlist_get_number(io[0], "qsize") * sc->num_io_queues; diff --git a/sys/dev/nvmf/host/nvmf_qpair.c b/sys/dev/nvmf/host/nvmf_qpair.c index 2f511cf0406d..adb57e52d002 100644 --- a/sys/dev/nvmf/host/nvmf_qpair.c +++ b/sys/dev/nvmf/host/nvmf_qpair.c @@ -416,6 +416,12 @@ nvmf_destroy_qp(struct nvmf_host_qpair *qp) free(qp, M_NVMF); } +uint64_t +nvmf_max_xfer_size_qp(struct nvmf_host_qpair *qp) +{ + return (nvmf_max_xfer_size(qp->qp)); +} + void nvmf_submit_request(struct nvmf_request *req) { diff --git a/sys/dev/nvmf/host/nvmf_var.h b/sys/dev/nvmf/host/nvmf_var.h index 606245b3969c..9190da300d85 100644 --- a/sys/dev/nvmf/host/nvmf_var.h +++ b/sys/dev/nvmf/host/nvmf_var.h @@ -210,6 +210,7 @@ struct nvmf_host_qpair *nvmf_init_qp(struct nvmf_softc *sc, enum nvmf_trtype trtype, const nvlist_t *nvl, const char *name, u_int qid); void nvmf_shutdown_qp(struct nvmf_host_qpair *qp); void nvmf_destroy_qp(struct nvmf_host_qpair *qp); +uint64_t nvmf_max_xfer_size_qp(struct nvmf_host_qpair *qp); struct nvmf_request *nvmf_allocate_request(struct nvmf_host_qpair *qp, void *sqe, nvmf_request_complete_t *cb, void *cb_arg, int how); void nvmf_submit_request(struct nvmf_request *req);