From nobody Fri Nov 06 09:07:15 2026 X-Original-To: dev-commits-src-all@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 4jLYGX0vf0z709CC for ; Fri, 06 Nov 2026 09:07:16 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jLYGW4lBpz4tYN for ; Fri, 06 Nov 2026 09:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793956035; 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=V+h5RfTrTBFS36vV71O6Q/7Z+L6hcZD269W8H3v/ZF8=; b=gPLqxuFkkqGCLOH4xNjPpIN6Hxr+P8O3cWh6dvKUTF+SUi61yc7Yr44xYEquUmsmv44q7k j3ovDIv4OEqMxJjrA6v5aL2bnZJuGKFh08ZEVfEIqM7XE8MKhlbjvG6Px5l+da61bpLTRz oJfzzq7JnSFYjwsbnAvUKRVPxvjHCmKESzORHh+Tav6eMtnYaSUIdRL8jlsub0qOuOKHQ3 PJvwgwd2wPgUl7X5Mwjdhie/k8qpDxyie0nRcDwdi6ntT3+8v8fIHkO4SkUzm8kYAMCEXa DHjQ1xfvEsNQa09q6DW6aGyJEfrUWFTBV9UzEdMBTiLFlElZDV8EgyGfpUR8Pw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793956035; b=lJpXguTrXF8NBk+f3BzLU3VLVffvswPaPSqn53hSV806xgcfFwqZCyAmAL6kF4i2skeskM GvgPMsvL6mkSeD3jE92yk4v3G0IMlmx86f0GTgQGFnAenfRuyRoxD+h63mVB4zvx9XSs/O Hi3+S1UTZR4biNhuStFL7EkDDZWa4gSC814hf0p4xizQpFVLLegCh5pTevQqOc4a2A9zgR xSgOE3w3IW0sWrXyQyeIEcrx0nqCvxVn62DKs5pXJNGPEyjlEOeQ7rVOKZeUhrdgqQnvfB XwO0hJ6s3I/zL7A162a8d1hcAbUodXcPu7+j8rl0fajUVV3gmNMStbLmkRC0SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793956035; 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=V+h5RfTrTBFS36vV71O6Q/7Z+L6hcZD269W8H3v/ZF8=; b=LB2gdE9LCvBr9zs5V5uZd1Gb8zKrrLod6p1qrR5KHSILn4Bpp5osDMfw34FVWAlSoIWNh0 D4LOrO3at7y8QFe9QNBBDiC/d8v1TroB3+AaZTJnUY4xgS2YtT4YxFdhXHrTJkUApg0FbS ZTEGU5yrefLSWaJj5H7/7OOeWunOajf0naYAYZ5oqgBxLB1OP/wV6oNgs1wcRjlvW0Fvqc N9FulPw5Ys1sLuQoimEha1RGe/l7GcTop6cuPHquFsAIxH28QY6EFuUbghLM89dyjYiw2r 1TM9niJg3hhSAa/NaI3jKFPzjSHMFgGEA5EydbL/01erlCY0Qdl6R5LuthH2YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jLYGW2cNWzTRL for ; Fri, 06 Nov 2026 09:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27f09 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Nov 2026 09:07:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: e6fc1765bd34 - main - nvme: drop the S3X single-outstanding-I/O quirk List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: seuros X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6fc1765bd34e4e1a2b56fddfdf4eccc218c2ff9 Auto-Submitted: auto-generated Date: Fri, 06 Nov 2026 09:07:15 +0000 Message-Id: <6aed98c3.27f09.71cf112b@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=e6fc1765bd34e4e1a2b56fddfdf4eccc218c2ff9 commit e6fc1765bd34e4e1a2b56fddfdf4eccc218c2ff9 Author: Abdelkader Boudih AuthorDate: 2026-08-24 18:15:16 +0000 Commit: Abdelkader Boudih 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). */