From nobody Thu Dec 4 06:15:21 2025 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 4dMPPj6Fkfz6JdgQ for ; Thu, 04 Dec 2025 06:15:21 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMPPj5SS6z3FWQ for ; Thu, 04 Dec 2025 06:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764828921; 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=5t3v1w/kgJyaRCjgHHus67Xj8d65ckKcbzMIXqXnaw4=; b=GaTta3YgcevLOioa0eobzFPIDdBMUNcEPj1LGEDGm1XVc9dWK1mZPayyimOADLIwqzxOMU ElBSAJVTnVcS2OhVNc/Hox3Te5Bsd2ZSn18NsiWLOkiJzfByghM9jARCD6DMpA2ixyI5eD r4M2WxMDn4+0e9jolGKw9okkU1RsflXWOXI2Y2RVsanQPmk642PA/99FXfoasJl66QU6bu QjfWuEmooywA8ejBCZGVggBWJDrV3RlZrL7gP5WFmK7ole3Z4r7D82Yz4SKkytJU5IiVGf x3nJ7+bPbmhpJeF2E5NXxmwsuhufULa4YqRRUXComgzMCEwnoi6v9d+aUeQjYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764828921; 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=5t3v1w/kgJyaRCjgHHus67Xj8d65ckKcbzMIXqXnaw4=; b=xB5U0vChd2V8DFbQoPaLzmQ0+LI+oydX2o68NPadaPcRJFsKBhY0nqmpZ80HJe2lVqVmNY zXQdnAFJOB2Nv8+j6rZ0x79T5sRJqqv2iRPm1IMXGU6ckGcvdo3FfhuslPb8OafEoNgOJ7 HvlGudUKn8y4MrgUHjqQExaHmcjr6KdfAtuQkZU5XP4rBLOtCL0TgNPpEra4LVAu8cWT+X QRvj+AJ5WcCgWEgLmEohCOL4Wp4Ofu7IR8bdiIUc5kM5JPdRcOUmld0jByIFrVM2uWGdsc hZ4m9oukZHhB1GVg2nMMdcKZrGO8MG94keE9xwmhDPKnEUii8aX0HVAr4PlQvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764828921; a=rsa-sha256; cv=none; b=PohZUjLq7GkyRBGGkJmSwCkd5/b21HkflWnuLnV8SZqbm3dn8CEIIdorbaocj1+Jq7sLRe vyQC+E1x0jHZbzbUQiupbGZfe0gwf7AhRiprvNjOPsb3Pv7NXe0tcappeY7uFwgLYCIh/h f1QDOvPwhA5AIT2YCwzVjpJ2MLGz86Rw5CDSjfD/l1FWSAfj7ufhc+zFOnENsMWMGwIRv7 pnotal6kzrGmYTQUzs5Doqf6And2An1UCz2iPp57jkfXQHSv/XzJB5ffRm/86U38P/ZHvE zQU3Z8IdyCiQM9M/wxphK+/0Oe8ecZtGb5q6vT8TgoDJqKmDUKnEtKfqyRYUaw== 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 4dMPPj53nYz19bn for ; Thu, 04 Dec 2025 06:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23083 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 06:15:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a8b0208e7e98 - main - nvme: Fix devd logging of SMART_ERROR 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 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: a8b0208e7e989c0876f73e1953f66542678b9004 Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 06:15:21 +0000 Message-Id: <693126f9.23083.6299254e@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a8b0208e7e989c0876f73e1953f66542678b9004 commit a8b0208e7e989c0876f73e1953f66542678b9004 Author: Warner Losh AuthorDate: 2025-12-04 04:05:06 +0000 Commit: Warner Losh CommitDate: 2025-12-04 06:04:34 +0000 nvme: Fix devd logging of SMART_ERROR Remove extra arg so that we have type=SMART_ERROR rather than an invalid message. Also log all aens. Sponsored by: Netflix --- sys/dev/nvme/nvme_ctrlr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 1ad4735cbef8..55b6d6b745cf 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -677,7 +677,7 @@ nvme_ctrlr_log_critical_warnings(struct nvme_controller *ctrlr, nvme_printf(ctrlr, "SMART WARNING: unknown critical warning(s): state = 0x%02x\n", state & NVME_CRIT_WARN_ST_RESERVED_MASK); - nvme_ctrlr_devctl(ctrlr, "critical", "SMART_ERROR", "state=0x%02x", state); + nvme_ctrlr_devctl(ctrlr, "SMART_ERROR", "state=0x%02x", state); } static void @@ -1143,6 +1143,10 @@ nvme_ctrlr_aer_task(void *arg, int pending) goto out; } + nvme_ctrlr_devctl(ctrlr, "aen", "type=0x%x info=0x%x page=0x%x", + NVMEV(NVME_ASYNC_EVENT_TYPE, aer->cpl.cdw0), + NVMEV(NVME_ASYNC_EVENT_INFO, aer->cpl.cdw0), aer->log_page_id); + aer->log_page_size = 0; len = nvme_ctrlr_get_log_page_size(aer->ctrlr, aer->log_page_id); nvme_ctrlr_cmd_get_log_page(aer->ctrlr, aer->log_page_id,