system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-06 09:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

nvmecontrol: Move self test status page printing to little endian orderinng

Browse source 
Also, add printing vnedor_specific field, which doesn't have a valid
bit, so is always valid.

Sponsored by:		Netflix
Reviewed by:		chuck
Differential Revision:	https://reviews.freebsd.org/D44654
This commit is contained in:
Warner Losh 2024-04-16 16:36:19 -06:00
parent acdf72f7bb
commit 98f841efd8
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
sbin/nvmecontrol/logpage.c
View file

@ -219,10 +219,6 @@ read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp,
/* Convert data to host endian */ /* Convert data to host endian */
switch (log_page) { switch (log_page) {
case NVME_LOG_DEVICE_SELF_TEST:
nvme_device_self_test_swapbytes(
(struct nvme_device_self_test_page *)payload);
break;
case NVME_LOG_COMMAND_EFFECT: case NVME_LOG_COMMAND_EFFECT:
nvme_command_effects_page_swapbytes( nvme_command_effects_page_swapbytes(
(struct nvme_command_effects_page *)payload); (struct nvme_command_effects_page *)payload);
@ -573,13 +569,14 @@ print_log_self_test_status(const struct nvme_controller_data *cdata __unused,
{ {
struct nvme_device_self_test_page *dst; struct nvme_device_self_test_page *dst;
uint32_t r; uint32_t r;
uint16_t vs;
dst = buf; dst = buf;
printf("Device Self-test Status\n"); printf("Device Self-test Status\n");
printf("=======================\n"); printf("=======================\n");
printf("Current Operation: "); printf("Current Operation: ");
switch (dst->curr_operation) { switch (letoh(dst->curr_operation)) {
case 0x0: case 0x0:
printf("No device self-test operation in progress\n"); printf("No device self-test operation in progress\n");
break; break;
@ -593,19 +590,20 @@ print_log_self_test_status(const struct nvme_controller_data *cdata __unused,
printf("Vendor specific\n"); printf("Vendor specific\n");
break; break;
default: default:
printf("Reserved (0x%x)\n", dst->curr_operation); printf("Reserved (0x%x)\n", letoh(dst->curr_operation));
} }
if (dst->curr_operation != 0) if (letoh(dst->curr_operation) != 0)
printf("Current Completion: %u%%\n", dst->curr_compl & 0x7f); printf("Current Completion: %u%%\n", letoh(dst->curr_compl) & 0x7f);
printf("Results\n"); printf("Results\n");
for (r = 0; r < 20; r++) { for (r = 0; r < 20; r++) {
uint64_t failing_lba; uint64_t failing_lba;
uint8_t code, res; uint8_t code, res, status;
code = (dst->result[r].status >> 4) & 0xf; status = letoh(dst->result[r].status);
res = dst->result[r].status & 0xf; code = (status >> 4) & 0xf;
res = status & 0xf;
if (res == 0xf) if (res == 0xf)
continue; continue;
@ -630,21 +628,24 @@ print_log_self_test_status(const struct nvme_controller_data *cdata __unused,
printf(" Reserved status 0x%x", res); printf(" Reserved status 0x%x", res);
if (res == 7) if (res == 7)
printf(" starting in segment %u", dst->result[r].segment_num); printf(" starting in segment %u",
letoh(dst->result[r].segment_num));
#define BIT(b) (1 << (b)) #define BIT(b) (1 << (b))
if (dst->result[r].valid_diag_info & BIT(0)) if (letoh(dst->result[r].valid_diag_info) & BIT(0))
printf(" NSID=0x%x", dst->result[r].nsid); printf(" NSID=0x%x", letoh(dst->result[r].nsid));
if (dst->result[r].valid_diag_info & BIT(1)) { if (letoh(dst->result[r].valid_diag_info) & BIT(1)) {
memcpy(&failing_lba, dst->result[r].failing_lba, memcpy(&failing_lba, dst->result[r].failing_lba,
sizeof(failing_lba)); sizeof(failing_lba));
printf(" FLBA=0x%jx", failing_lba); printf(" FLBA=0x%jx", (uintmax_t)letoh(failing_lba));
} }
if (dst->result[r].valid_diag_info & BIT(2)) if (letoh(dst->result[r].valid_diag_info) & BIT(2))
printf(" SCT=0x%x", dst->result[r].status_code_type); printf(" SCT=0x%x", letoh(dst->result[r].status_code_type));
if (dst->result[r].valid_diag_info & BIT(3)) if (letoh(dst->result[r].valid_diag_info) & BIT(3))
printf(" SC=0x%x", dst->result[r].status_code); printf(" SC=0x%x", letoh(dst->result[r].status_code));
#undef BIT #undef BIT
memcpy(&vs, dst->result[r].vendor_specific, sizeof(vs));
printf(" VENDOR_SPECIFIC=0x%x", letoh(vs));
printf("\n"); printf("\n");
} }
} }