d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Print few more useful identify fields.

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Alexander Motin 2019-08-14 17:36:26 +00:00
parent 4ef280656c
commit 4035e778f8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=351038
2 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sbin/nvmecontrol/identify.c
View File

@ -62,6 +62,7 @@ static struct options {
void void
print_namespace(struct nvme_namespace_data *nsdata) print_namespace(struct nvme_namespace_data *nsdata)
{ {
char cbuf[UINT128_DIG + 1];
uint32_t i; uint32_t i;
uint32_t lbaf, lbads, ms, rp; uint32_t lbaf, lbads, ms, rp;
uint8_t thin_prov, ptype; uint8_t thin_prov, ptype;
@ -73,15 +74,12 @@ print_namespace(struct nvme_namespace_data *nsdata)
flbas_fmt = (nsdata->flbas >> NVME_NS_DATA_FLBAS_FORMAT_SHIFT) & flbas_fmt = (nsdata->flbas >> NVME_NS_DATA_FLBAS_FORMAT_SHIFT) &
NVME_NS_DATA_FLBAS_FORMAT_MASK; NVME_NS_DATA_FLBAS_FORMAT_MASK;
printf("Size (in LBAs): %lld (%lldM)\n", printf("Size: %lld blocks\n",
(long long)nsdata->nsze, (long long)nsdata->nsze);
(long long)nsdata->nsze / 1024 / 1024); printf("Capacity: %lld blocks\n",
printf("Capacity (in LBAs): %lld (%lldM)\n", (long long)nsdata->ncap);
(long long)nsdata->ncap, printf("Utilization: %lld blocks\n",
(long long)nsdata->ncap / 1024 / 1024); (long long)nsdata->nuse);
printf("Utilization (in LBAs): %lld (%lldM)\n",
(long long)nsdata->nuse,
(long long)nsdata->nuse / 1024 / 1024);
printf("Thin Provisioning: %s\n", printf("Thin Provisioning: %s\n",
thin_prov ? "Supported" : "Not Supported"); thin_prov ? "Supported" : "Not Supported");
printf("Number of LBA Formats: %d\n", nsdata->nlbaf+1); printf("Number of LBA Formats: %d\n", nsdata->nlbaf+1);
@ -148,7 +146,22 @@ print_namespace(struct nvme_namespace_data *nsdata)
NVME_NS_DATA_DLFEAT_DWZ_MASK ? ", Write Zero" : "", NVME_NS_DATA_DLFEAT_DWZ_MASK ? ", Write Zero" : "",
(nsdata->dlfeat >> NVME_NS_DATA_DLFEAT_GCRC_SHIFT) & (nsdata->dlfeat >> NVME_NS_DATA_DLFEAT_GCRC_SHIFT) &
NVME_NS_DATA_DLFEAT_GCRC_MASK ? ", Guard CRC" : ""); NVME_NS_DATA_DLFEAT_GCRC_MASK ? ", Guard CRC" : "");
printf("Optimal I/O Boundary (LBAs): %u\n", nsdata->noiob); printf("Optimal I/O Boundary: %u blocks\n", nsdata->noiob);
printf("NVM Capacity: %s bytes\n",
uint128_to_str(to128(nsdata->nvmcap), cbuf, sizeof(cbuf)));
if ((nsdata->nsfeat >> NVME_NS_DATA_NSFEAT_NPVALID_SHIFT) &
NVME_NS_DATA_NSFEAT_NPVALID_MASK) {
printf("Preferred Write Granularity: %u blocks",
nsdata->npwg + 1);
printf("Preferred Write Alignment: %u blocks",
nsdata->npwa + 1);
printf("Preferred Deallocate Granul: %u blocks",
nsdata->npdg + 1);
printf("Preferred Deallocate Align: %u blocks",
nsdata->npda + 1);
printf("Optimal Write Size: %u blocks",
nsdata->nows + 1);
}
printf("Globally Unique Identifier: "); printf("Globally Unique Identifier: ");
for (i = 0; i < sizeof(nsdata->nguid); i++) for (i = 0; i < sizeof(nsdata->nguid); i++)
printf("%02x", nsdata->nguid[i]); printf("%02x", nsdata->nguid[i]);

21
sbin/nvmecontrol/identify_ext.c
View File

@ -121,7 +121,7 @@ nvme_print_controller(struct nvme_controller_data *cdata)
if (cdata->mdts == 0) if (cdata->mdts == 0)
printf("Unlimited\n"); printf("Unlimited\n");
else else
printf("%ld\n", PAGE_SIZE * (1L << cdata->mdts)); printf("%ld bytes\n", PAGE_SIZE * (1L << cdata->mdts));
printf("Controller ID: 0x%04x\n", cdata->ctrlr_id); printf("Controller ID: 0x%04x\n", cdata->ctrlr_id);
printf("Version: %d.%d.%d\n", printf("Version: %d.%d.%d\n",
(cdata->ver >> 16) & 0xffff, (cdata->ver >> 8) & 0xff, (cdata->ver >> 16) & 0xffff, (cdata->ver >> 8) & 0xff,
@ -184,6 +184,14 @@ nvme_print_controller(struct nvme_controller_data *cdata)
ns_smart ? "Yes" : "No"); ns_smart ? "Yes" : "No");
printf("Error Log Page Entries: %d\n", cdata->elpe+1); printf("Error Log Page Entries: %d\n", cdata->elpe+1);
printf("Number of Power States: %d\n", cdata->npss+1); printf("Number of Power States: %d\n", cdata->npss+1);
if (cdata->ver >= 0x010200) {
printf("Total NVM Capacity: %s bytes\n",
uint128_to_str(to128(cdata->untncap.tnvmcap),
cbuf, sizeof(cbuf)));
printf("Unallocated NVM Capacity: %s bytes\n",
uint128_to_str(to128(cdata->untncap.unvmcap),
cbuf, sizeof(cbuf)));
}
printf("\n"); printf("\n");
printf("NVM Command Set Attributes\n"); printf("NVM Command Set Attributes\n");
@ -235,13 +243,6 @@ nvme_print_controller(struct nvme_controller_data *cdata)
(t == NVME_CTRLR_DATA_VWC_ALL_NO) ? ", no flush all" : (t == NVME_CTRLR_DATA_VWC_ALL_NO) ? ", no flush all" :
(t == NVME_CTRLR_DATA_VWC_ALL_YES) ? ", flush all" : ""); (t == NVME_CTRLR_DATA_VWC_ALL_YES) ? ", flush all" : "");
if (nsmgmt) { if (cdata->ver >= 0x010201)
printf("\n"); printf("\nNVM Subsystem Name: %.256s\n", cdata->subnqn);
printf("Namespace Drive Attributes\n");
printf("==========================\n");
printf("NVM total cap: %s\n",
uint128_to_str(to128(cdata->untncap.tnvmcap), cbuf, sizeof(cbuf)));
printf("NVM unallocated cap: %s\n",
uint128_to_str(to128(cdata->untncap.unvmcap), cbuf, sizeof(cbuf)));
}
} }