From nobody Mon Jul 20 12:38:18 2026 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 4h3g6L4r8fz6lvCc for ; Mon, 20 Jul 2026 12:38:18 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h3g6L45b7z3ZxW for ; Mon, 20 Jul 2026 12:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784551098; 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=OjQ9u7MdGLhjRjh64aMKiGbwU2WyzWEhB94kRG6UXjU=; b=MWbI92r/yHh8mDr8ZOCZvjpbprAXNzDRi1ptzdEbRJ/JbbSeSSHW+r3+jOZ8FvsoR+yXv5 KXk+hGE/YRriEGF0AQyBSKNeOsEzPcQW+qxqZviUl0VvoSd3ft1D7YXPyrHT6PRdU/vEWY 5P+5XC71PYo7TqfsFY7ljCzK9e7Ng8ylI0XqbHNQlVEN8a2xD3nfCGfIid1JzN+zfhphwn CMAxuINZo5n2Rc0ndgrpnQc4piKIVan0DojaMEaKYYI56kGOBLW/C2X6ZB3Z40xYwgEqOc MgX3jIr0uFkJRv7+O3KjvLqI4aZA8Lwamr+W1Ei0x8NWEaxzlaks5XnL170ZyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784551098; a=rsa-sha256; cv=none; b=obkIu5HbeOFPK4K1IqqmKffMfuL8r6eZo7BKMqi+IfA43mWsuENnkYVLvCsYX2wZ5XLSKm i5vVvCNiYCJxicK1pDL/ea3cSiCRw9cB9V21IKVPZnd06UWoAA1BCkkZiIe2QqHBSWvhbx h0kpaRjUhC7nwCagNIQXD4mVRlc77UmsgnhQCZJFyFqHa81cOBts9fCN4W28DzmpvsEEu7 baLhWs7zUZqEX2D26ed7GxeZuoDGSCV81yZaQLXM7CBpsHmFqG7w4dZQ1PeA0o6QHZZtrP cIXAjIZZlR69IHG36X8GVW5cnUjeM+tuK7IJQdALzY/imDSGUGu2LsLe+fM91A== 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=1784551098; 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=OjQ9u7MdGLhjRjh64aMKiGbwU2WyzWEhB94kRG6UXjU=; b=SQrwtC9JR1vzUhQfQPARzjE7qIJtdkB9ZfJkLKe4QGMgOmuNjIw7lwdSADZtJCJX8FLO8P ZIxwaEuvhFuZ0Ok+zNucC0FDstqodiW8mkPRcu6W9pUUqh+wh1RaY7VbEQ2lCoiehEAhyA SG4STt9IycP7HFJPxBB4DA5VDiaR9hi5o8KmTqcuwDYUNzfrC07UjUFX+uLpn1D0dS5PJP m38iclBdYeFoRev66kWM4t7PhbrDHQzsGFkQpbuQUa/qFTsZwRDog9SgaTpgSF4r7fXo0Y kR4KOKRDdL+K3Ss8rDWpobmxeL+m+l9+4k5t+VFBPzBF+v5TtgMEMGHrAGk7ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h3g6L2vLkz12Tw for ; Mon, 20 Jul 2026 12:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fd30 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Jul 2026 12:38:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6671bbf2f9bb - main - nda: Tag the command set used for devctl errors 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 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6671bbf2f9bb130129a4896bca7edb9e0a638e9f Auto-Submitted: auto-generated Date: Mon, 20 Jul 2026 12:38:18 +0000 Message-Id: <6a5e16ba.3fd30.48709ba2@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6671bbf2f9bb130129a4896bca7edb9e0a638e9f commit 6671bbf2f9bb130129a4896bca7edb9e0a638e9f Author: Warner Losh AuthorDate: 2026-07-20 12:36:43 +0000 Commit: Warner Losh CommitDate: 2026-07-20 12:37:10 +0000 nda: Tag the command set used for devctl errors Different command sets have different encoding for op codes, etc. While one can normally puzzle out which is which, it's better to explicitly tag the command set used. Sponsored by: Netflix --- sys/cam/cam_periph.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index 91ec7a71f612..6fa5fa4a60d6 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -2187,9 +2187,10 @@ cam_periph_devctl_notify(union ccb *ccb) struct nvme_command *cmd = &n->cmd; // XXX Likely should be nvme_cmd_sbuf - sbuf_printf(&sb, "opc=\"%02x\" fuse=\"%02x\" cid=\"%04x\" " + sbuf_printf(&sb, "cmdset=\"%s\" opc=\"%02x\" fuse=\"%02x\" cid=\"%04x\" " "nsid=\"%08x\" cdw10=\"%08x\" cdw11=\"%08x\" cdw12=\"%08x\" " "cdw13=\"%08x\" cdw14=\"%08x\" cdw15=\"%08x\" ", + ccb->ccb_h.func_code == XPT_NVME_ADMIN ? "admin" : "io", cmd->opc, cmd->fuse, cmd->cid, cmd->nsid, cmd->cdw10, cmd->cdw11, cmd->cdw12, cmd->cdw13, cmd->cdw14, cmd->cdw15); break;