git: e6fc1765bd34 - main - nvme: drop the S3X single-outstanding-I/O quirk

From: Abdelkader Boudih <seuros_at_FreeBSD.org>
Date: Fri, 06 Nov 2026 09:07:15 UTC
The branch main has been updated by seuros:

URL: https://cgit.FreeBSD.org/src/commit/?id=e6fc1765bd34e4e1a2b56fddfdf4eccc218c2ff9

commit e6fc1765bd34e4e1a2b56fddfdf4eccc218c2ff9
Author:     Abdelkader Boudih <seuros@FreeBSD.org>
AuthorDate: 2026-08-24 18:15:16 +0000
Commit:     Abdelkader Boudih <seuros@FreeBSD.org>
CommitDate: 2026-11-06 08:59:18 +0000

    nvme: drop the S3X single-outstanding-I/O quirk
    
    The quirk's 8KB transfer clamp exposed raw character-device I/O to
    the oversized-mapping stall fixed earlier, and its single tracker
    turned a stranded request into a complete I/O stall. Without it an
    S3X controller runs 128 trackers at its MDTS-derived transfer size
    with no retries, failures, or timeouts, at about seven times the
    serialized throughput.
    
    Reviewed by:    imp, adrian, ngie
    Approved by:    ngie (co-mentor)
    Differential Revision:  https://reviews.freebsd.org/D59156
---
 sys/dev/nvme/nvme_ctrlr.c   | 4 ----
 sys/dev/nvme/nvme_pci.c     | 3 +--
 sys/dev/nvme/nvme_private.h | 1 -
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
index 03f24a01c7ca..16deec4c1bb8 100644
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -201,8 +201,6 @@ nvme_ctrlr_construct_io_qpairs(struct nvme_controller *ctrlr)
 	if (ctrlr->quirks & QUIRK_APPLE_SHARED_CID_SPACE)
 		num_trackers = min(num_trackers,
 		    NVME_ADMIN_ENTRIES - ctrlr->adminq.num_trackers);
-	if (ctrlr->quirks & QUIRK_APPLE_S3X_SERIALIZE)
-		num_trackers = 1;
 
 	/*
 	 * Our best estimate for the maximum number of I/Os that we should
@@ -538,8 +536,6 @@ nvme_ctrlr_identify(struct nvme_controller *ctrlr)
 		ctrlr->max_xfer_size = min(ctrlr->max_xfer_size,
 		    1 << (ctrlr->cdata.mdts + NVME_MPS_SHIFT +
 			NVME_CAP_HI_MPSMIN(ctrlr->cap_hi)));
-	if (ctrlr->quirks & QUIRK_APPLE_S3X_SERIALIZE)
-		ctrlr->max_xfer_size = min(ctrlr->max_xfer_size, 8192U);
 
 	return (0);
 }
diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c
index cdc60f4a9a3c..06f6dc6185f8 100644
--- a/sys/dev/nvme/nvme_pci.c
+++ b/sys/dev/nvme/nvme_pci.c
@@ -99,8 +99,7 @@ static struct _pcsid
 	{ 0x07f015ad,		0, 0, "VMware NVMe Controller" },
 	{ 0x2003106b,		0, 0, "Apple S3X NVMe Controller",
 	    QUIRK_APPLE_NO_ASYNC_EVENT | QUIRK_APPLE_S3X_NS1_ONLY |
-	    QUIRK_PCIE_FLR_ON_FATAL | QUIRK_APPLE_S3X_SERIALIZE |
-	    QUIRK_IGNORE_RAB },
+	    QUIRK_PCIE_FLR_ON_FATAL | QUIRK_IGNORE_RAB },
 	{ 0x2005106b,		0, 0, "Apple ANS2 NVMe Controller (T2)",
 	    QUIRK_APPLE_IDENTIFY_CNS_BROKEN | QUIRK_APPLE_SHARED_CID_SPACE |
 	    QUIRK_APPLE_NO_ASYNC_EVENT | QUIRK_APPLE_SINGLE_VECTOR |
diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h
index aad9c2b7d7d8..7ed3d61bd6ce 100644
--- a/sys/dev/nvme/nvme_private.h
+++ b/sys/dev/nvme/nvme_private.h
@@ -248,7 +248,6 @@ struct nvme_controller {
 #define	QUIRK_APPLE_S3X_NS1_ONLY		0x200	/* Ignore Apple-internal namespace 2 */
 #define	QUIRK_APPLE_128_BYTE_SQES		0x400	/* T2 uses 128-byte I/O SQEs */
 #define	QUIRK_PCIE_FLR_ON_FATAL			0x800	/* Use FLR for a fatal controller */
-#define	QUIRK_APPLE_S3X_SERIALIZE		0x1000	/* One S3X I/O at a time */
 #define	QUIRK_IGNORE_RAB			0x2000	/* Don't configure AB from RAB */
 
 /* Values programmed into CC.IOSQES (log2 of the SQE size in bytes). */