From nobody Mon Jul 20 12:38:18 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 4h3g6S1Tnrz6lvHl for ; Mon, 20 Jul 2026 12:38:24 +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 4h3g6R6V7dz3ZyW for ; Mon, 20 Jul 2026 12:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784551103; 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=lHVKMda3S0eX6P85bSp/GL6R9QKiZDmrFgIDnrpZFLJ8nb96Uezb2y4YHfcMUQt4T7DqLA NV0HnZHQTXGgj2M8i+1ibEFDl6tHxIs1HDlZ39NadvhiAnwxPMNg6kTnxODybag+l0RGe+ 0eJTRW4yuiXj4J7V6wSrU9LvAxWMsHDIHRUGiso3GJx8puD48uSTTmhz93WhPH8XWIDj9U 0QsQstbZtDYtDhqmuKZJnfL9Eo/Hy6CakhFfpDrBtwIaX0V4LKBsc2NMGqw2FgQ2CCkbMM uSJ3N7Cf+IGoctEKlumFu1Kor5zsbBaP7bNogp07H92MLAHNX5CvbahnmndPPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784551103; a=rsa-sha256; cv=none; b=T4gjh4eonzSFQNVJ8M9jvVfxdpcPAPb2dZdOU/SqGcGW/XYN42CzHIm2SCg4vEIUKE3BSE VwWGhrRv2aJc/BanL76NNZO1/9nhsHq6o1plmtd/fEmQZbUBmhEAtwOWmvbbdF2TlZhgay gAuVF8hfVlSgldSY3ognkb7LBxRYkVFpFDb33BlM00P6FdXTvi0KzIdpCoBWVuRquPsO4Q mAKR5E8tw9WmUhLJG96ONyStNC1RHGw7wNVH87neRLrUxEajdyu2nLDK6K6xRMhTSi+huH xEySkI2m73h2cD9KmDKIsZqn/8KMy/AuJmwbF6sg+tcJv9qUEwjOs6kLEBX1WA== 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=1784551103; 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=vljLmLPD39fob6O1+I675q6aXUuWXuxLpo+OHlzoIV4QIaMmKUEdENMWv7NhGWNuigMtfE V3rynWZQRxWen+vwowCU3t3U0LAGNxZqvrx1Qxx9jPEXpwtzSRhnuneLss3McXIgj0IMsn VsnmyJ7s6C4qvPuotCqZ8B/lfbZQ0z+hhTk+WLZYj1uvWg6Buv2fGcLehPb0MBVTdWmH2l GB7YukSCX/ShBZkvQMf6IvodTeJcjUVZpZVOJnY7HJw3WGk3aNh1u8xwzPdVjib4BvNdkN xts7D7gbNeJ+UvJ9Tjp7uXGzvkk5MIljaZfiV9esjAwBtSe+Ox/uMmkNAtZ62Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h3g6R568Yz1277 for ; Mon, 20 Jul 2026 12:38:23 +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 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: 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;