From nobody Tue Sep 08 00:21:16 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 4hf4Ns3jnKz6r3Mm for ; Tue, 08 Sep 2026 00:21:17 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hf4Nr2H65z3y5m for ; Tue, 08 Sep 2026 00:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788826876; 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=0Js7XZ/v2SLU41PNkTjvhGpleAnmgQ9IQNoj7InuY2A=; b=NoS2osf+eMcRtVkVAiQ9OAfrhmjh0xS5EnQNIjqjfsGIqBGB/nsvzsSHFOxEb701QBsS84 9H0U8YOKbeoGG4CUvYZsgTXGZ7BLf2FE3WaXTD3S0XJ8C74L2uAX+7XbFOyvA7FfITs71s IuIaaJaCFgXp98XLQ7tKcT2lF3MIPeHNNT+doLziCszpsvXgQjJZ/JDWXNh2OdAOGNK7Cc i+fdJxEte8eu1D2WO21qlc1WszhRyHtfZTpZ+BojXs+ahs9SXJlofSnf2w9c7vXqudG+pG Ia/llUvPHkOMbc5cQt2FZIHMcHSWv/1L/K4AsLfV/HSnaBmjCvwEZrd8OO6UoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788826876; a=rsa-sha256; cv=none; b=q3zT0V51VLrTN2lKEH5OksKpaXDcDwgFpYpQ+Dvpyae6Q9yfQhAKlQO/lqO5YVvdHxqOf0 T3YBFHHkdWynhfPhcUCTB7Cx18Jfr7Kc+oOyqMvelfuAB1Srh1cAax4t4TQbsJCib54lUm fx3j7Mw9KrUH5/BPfnoOMZtxgOmbTU3VR8X8KywdIckVYUmFgAMd7nLJThrhgHQRk9lY8J KEfRHy1Bn8VePt8iEA7/qqBOsTkKmr+qQEDQku/DCTpLvU5bF48dOFpryAF6NvNS+lp9Z5 BYS1WRb5AQxDlLhBFROVgPpsjZbZfVgWtHfUXUXXgSf1amp+q0lP4rvPUVGtow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788826876; 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=0Js7XZ/v2SLU41PNkTjvhGpleAnmgQ9IQNoj7InuY2A=; b=a1BYcYuBxTj3lrXGnnqrMTYVozGcx0spwhFNlT9kpj7OwSE7paNyJc7uqTSAbkhk9rs4Xf MYkoSk6Uazca/rdJPm+LtIkQn0htgKmY/lafwQcyndkhfLbvCvtX8aoqpOLk094vbFQhwV VVfHfA+nQBw3iHgHXVMhRuZG7WxTenc3Y4sdBXE1HgwkR705yvnt4WWzn2na1LjpJIGpye cOtz7zabbXqrGzA1n59uBoTfTys00wiooKxaQABZBikFh7a8QUYHP/rYZ6AGKBAXunkDQj JiSgVLGVACg8w7LrFmYJaZs/kNvG20xLgTT9MI2lGJsroVFPSGPkToAHcSyuaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hf4Nr11WWzhLj for ; Tue, 08 Sep 2026 00:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34840 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 08 Sep 2026 00:21:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: 82f70a0070a3 - main - nvme: name the Create I/O queue cdw11 fields, use Medium QPRIO List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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: 82f70a0070a30a448eeeb47471749c8b382273c3 Auto-Submitted: auto-generated Date: Tue, 08 Sep 2026 00:21:16 +0000 Message-Id: <6a9f54fc.34840.73ea7a2d@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=82f70a0070a30a448eeeb47471749c8b382273c3 commit 82f70a0070a30a448eeeb47471749c8b382273c3 Author: Abdelkader Boudih AuthorDate: 2026-09-08 00:20:16 +0000 Commit: Abdelkader Boudih CommitDate: 2026-09-08 00:20:16 +0000 nvme: name the Create I/O queue cdw11 fields, use Medium QPRIO The Create I/O queue commands carried magic 0x1/0x3 cdw11 values, and the implicit QPRIO of zero classifies every I/O queue Urgent the moment weighted round robin arbitration is enabled. No functional change with the round robin default. Approved by: ngie (co-mentor) Reviewed by: ngie, imp, adrian Differential Revision: https://reviews.freebsd.org/D59153 --- sys/dev/nvme/nvme.h | 14 ++++++++++++++ sys/dev/nvme/nvme_ctrlr_cmd.c | 9 +++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index fb2c26b1f344..b7e82e83a13f 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -234,6 +234,20 @@ enum nvme_psdt { #define NVME_CMD_PSDT_SHIFT (6) #define NVME_CMD_PSDT_MASK (0x3) +/* Create I/O Submission Queue, cdw11 */ +#define NVME_CREATE_IO_SQ_PC (0x1) +#define NVME_CREATE_IO_SQ_QPRIO_SHIFT (1) +#define NVME_CREATE_IO_SQ_QPRIO_MASK (0x3) + +/* Create I/O Completion Queue, cdw11 */ +#define NVME_CREATE_IO_CQ_PC (0x1) +#define NVME_CREATE_IO_CQ_IEN (0x2) + +/* Queue priority classes, used with weighted round robin arbitration. */ +#define NVME_QPRIO_URGENT (0) +#define NVME_QPRIO_HIGH (1) +#define NVME_QPRIO_MEDIUM (2) +#define NVME_QPRIO_LOW (3) #define NVME_STATUS_P_SHIFT (0) #define NVME_STATUS_P_MASK (0x1) diff --git a/sys/dev/nvme/nvme_ctrlr_cmd.c b/sys/dev/nvme/nvme_ctrlr_cmd.c index 1a48a058edd8..728b49f5e41d 100644 --- a/sys/dev/nvme/nvme_ctrlr_cmd.c +++ b/sys/dev/nvme/nvme_ctrlr_cmd.c @@ -89,8 +89,8 @@ nvme_ctrlr_cmd_create_io_cq(struct nvme_controller *ctrlr, * structure. */ cmd->cdw10 = htole32(((io_que->num_entries-1) << 16) | io_que->id); - /* 0x3 = interrupts enabled | physically contiguous */ - cmd->cdw11 = htole32((io_que->vector << 16) | 0x3); + cmd->cdw11 = htole32((io_que->vector << 16) | + NVME_CREATE_IO_CQ_IEN | NVME_CREATE_IO_CQ_PC); cmd->prp1 = htole64(io_que->cpl_bus_addr); nvme_ctrlr_submit_admin_request(ctrlr, req); @@ -113,8 +113,9 @@ nvme_ctrlr_cmd_create_io_sq(struct nvme_controller *ctrlr, * structure. */ cmd->cdw10 = htole32(((io_que->num_entries-1) << 16) | io_que->id); - /* 0x1 = physically contiguous */ - cmd->cdw11 = htole32((io_que->id << 16) | 0x1); + cmd->cdw11 = htole32((io_que->id << 16) | + NVMEF(NVME_CREATE_IO_SQ_QPRIO, NVME_QPRIO_MEDIUM) | + NVME_CREATE_IO_SQ_PC); cmd->prp1 = htole64(io_que->cmd_bus_addr); nvme_ctrlr_submit_admin_request(ctrlr, req);