From nobody Wed Apr 17 03:33:41 2024 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 4VK62G236Fz5HjR4; Wed, 17 Apr 2024 03:33:42 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VK62G0jLjz4QjK; Wed, 17 Apr 2024 03:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324822; 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=flEUDPJfsOWAZ5dO1QZ1Sug5RP0q7XXZmGt3+Ht+HAI=; b=fVDtbPtYNNKfq6vRpe/0GJj/a9GQ/xrKvXxQ+XN/jCpgi7wMvuo4G2tP6NFQtVFeeiDr67 P9deQyNFgt71G+yrwjkb+3NDKGmBEja7GfbHc/lxwlCj6NvEKBLLEjWK0XXy/rO5mwFOXe /pKYwwuKV88JjFgZt3TauTt9c5ERmt18uOr9fvftoubY++4U+/hSAYc7hsvXDvDAxPEC/6 wC/8GXzFqth0iTRTOosDNoO5a8g/9wEqfbpaoKqLsIypPzHu21huds4EJvAkPGH85ibRl+ 8ev8SZQWYSMcACWB4gvsWtK2UsSGdBmTf6uzpRVOpyxPkbapZCrXeaJ3yJ/KLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324822; a=rsa-sha256; cv=none; b=eIgmAHlDKaTbaTC1OXHvRhJrapQmz4g0m8vBeOlkPICTFdsYGUMaLBWlZIanI/a4I8E8Bg 81IYONTHctNBR+fUhmUnzE7j2rg/bHF4jZx/btmQSokphJYc9vkgB8p6fBpgG9yQDeRFe1 yhLRvoqUPBtHIezKaEa+91ISw3H2gQM9dQgXJscfZq/tZvYRqBsL+R7RbkzPjQBBTv6RZe sJvhDT+UjzOf/MCCGoB9A8XMx1U+sqrtY2iIeReTq+I/+22Gw/oqhLFKP4UvhHzc5xxSra 8k2ZmVJaz4qfY5sNZVu+2FX84tYlJJSv+qox3uTceli17pDffO8sNGzZmtFIgw== 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=1713324822; 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=flEUDPJfsOWAZ5dO1QZ1Sug5RP0q7XXZmGt3+Ht+HAI=; b=uYZxSLbsUhelFgelkdnW8GZgrHvSfPN//7tq5gL08f5MC6m8P3Zan8px5Ew49LSbjE3tu0 qsL/sBMJXO3de5/5JGGsp/i/IrwuL/WuZONkyqygNfGEwWf5AwYPZhwc/OJm7TcPpj2I7d quZ9ibMKhLtZ6qEFyQuvgDPAlX3aYsOh0fS2/zI7Od96JJXmjQzDeN1qklTVRHZPovTkDm w2itaRzKvrY3Wc9gRfAJwrsctAIo1RFuphqMzoh4E2sqcstl7bA0x9D1B1Hxerhnc4N3z0 xAvruobVGX56NF9oE1JF+AWCPLkaPHVMzu8798qEEs4LnPkpEpu5QS6c3bA66Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62G0H7sz19WR; Wed, 17 Apr 2024 03:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43H3XfE9086664; Wed, 17 Apr 2024 03:33:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3XfBo086661; Wed, 17 Apr 2024 03:33:41 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:41 GMT Message-Id: <202404170333.43H3XfBo086661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 85656a9a0153 - main - nvmecontrol: Make the error log page work on native format 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: 85656a9a015339f3d412e5b1888e798bb3e7d4ba Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=85656a9a015339f3d412e5b1888e798bb3e7d4ba commit 85656a9a015339f3d412e5b1888e798bb3e7d4ba Author: Warner Losh AuthorDate: 2024-04-16 22:35:46 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:17 +0000 nvmecontrol: Make the error log page work on native format As the number of page types proliferates, it becomes untennable to convert them in read_logpage (especailly since new UUID page types will need to be supported). Convert the error page printing code to operate on little endian data. Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D44680 --- sbin/nvmecontrol/logpage.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index 0df342fa51e8..276932d363e5 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -193,8 +193,7 @@ read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp, uint16_t lsi, uint8_t rae, void *payload, uint32_t payload_size) { struct nvme_pt_command pt; - struct nvme_error_information_entry *err_entry; - u_int i, err_pages, numd; + u_int numd; numd = payload_size / sizeof(uint32_t) - 1; memset(&pt, 0, sizeof(pt)); @@ -220,12 +219,6 @@ read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp, /* Convert data to host endian */ switch (log_page) { - case NVME_LOG_ERROR: - err_entry = (struct nvme_error_information_entry *)payload; - err_pages = payload_size / sizeof(struct nvme_error_information_entry); - for (i = 0; i < err_pages; i++) - nvme_error_information_entry_swapbytes(err_entry++); - break; case NVME_LOG_HEALTH_INFORMATION: nvme_health_information_page_swapbytes( (struct nvme_health_information_page *)payload); @@ -272,17 +265,17 @@ print_log_error(const struct nvme_controller_data *cdata __unused, void *buf, ui printf("Error Information Log\n"); printf("=====================\n"); - if (entry->error_count == 0) { + if (LE2H(entry->error_count) == 0) { printf("No error entries found\n"); return; } - nentries = size/sizeof(struct nvme_error_information_entry); + nentries = size / sizeof(struct nvme_error_information_entry); for (i = 0; i < nentries; i++, entry++) { - if (entry->error_count == 0) + if (LE2H(entry->error_count) == 0) break; - status = entry->status; + status = LE2H(entry->status); p = NVME_STATUS_GET_P(status); sc = NVME_STATUS_GET_SC(status); @@ -292,9 +285,9 @@ print_log_error(const struct nvme_controller_data *cdata __unused, void *buf, ui printf("Entry %02d\n", i + 1); printf("=========\n"); - printf(" Error count: %ju\n", entry->error_count); - printf(" Submission queue ID: %u\n", entry->sqid); - printf(" Command ID: %u\n", entry->cid); + printf(" Error count: %ju\n", LE2H(entry->error_count)); + printf(" Submission queue ID: %u\n", LE2H(entry->sqid)); + printf(" Command ID: %u\n", LE2H(entry->cid)); /* TODO: Export nvme_status_string structures from kernel? */ printf(" Status:\n"); printf(" Phase tag: %d\n", p); @@ -302,13 +295,13 @@ print_log_error(const struct nvme_controller_data *cdata __unused, void *buf, ui printf(" Status code type: %d\n", sct); printf(" More: %d\n", m); printf(" DNR: %d\n", dnr); - printf(" Error location: %u\n", entry->error_location); - printf(" LBA: %ju\n", entry->lba); - printf(" Namespace ID: %u\n", entry->nsid); - printf(" Vendor specific info: %u\n", entry->vendor_specific); - printf(" Transport type: %u\n", entry->trtype); - printf(" Command specific info:%ju\n", entry->csi); - printf(" Transport specific: %u\n", entry->ttsi); + printf(" Error location: %u\n", LE2H(entry->error_location)); + printf(" LBA: %ju\n", LE2H(entry->lba)); + printf(" Namespace ID: %u\n", LE2H(entry->nsid)); + printf(" Vendor specific info: %u\n", LE2H(entry->vendor_specific)); + printf(" Transport type: %u\n", LE2H(entry->trtype)); + printf(" Command specific info:%ju\n", LE2H(entry->csi)); + printf(" Transport specific: %u\n", LE2H(entry->ttsi)); } }