svn commit: r335091 - head/sbin/nvmecontrol
Warner Losh
imp at FreeBSD.org
Wed Jun 13 22:00:04 UTC 2018
Author: imp
Date: Wed Jun 13 22:00:02 2018
New Revision: 335091
URL: https://svnweb.freebsd.org/changeset/base/335091
Log:
Make it possible to use print_controller from another program
Rename print_controller to nvme_print_controller. Put it in its
own file for easy inclusion. Move util.c to be nc_util.c to not
conflict with camcontrol. add nvecontrol_ext.h to define shared
interfaces.
Sponsored by: Netflix
Differential Revision: https://reviews.freebsd.org/D15371
Added:
head/sbin/nvmecontrol/identify_ext.c
- copied, changed from r335089, head/sbin/nvmecontrol/identify.c
head/sbin/nvmecontrol/nc_util.c
- copied, changed from r335089, head/sbin/nvmecontrol/util.c
head/sbin/nvmecontrol/nvmecontrol_ext.h (contents, props changed)
- copied, changed from r335089, head/sbin/nvmecontrol/util.c
Deleted:
head/sbin/nvmecontrol/util.c
Modified:
head/sbin/nvmecontrol/Makefile
head/sbin/nvmecontrol/identify.c
Modified: head/sbin/nvmecontrol/Makefile
==============================================================================
--- head/sbin/nvmecontrol/Makefile Wed Jun 13 21:10:33 2018 (r335090)
+++ head/sbin/nvmecontrol/Makefile Wed Jun 13 22:00:02 2018 (r335091)
@@ -2,8 +2,8 @@
PACKAGE=runtime
PROG= nvmecontrol
-SRCS= nvmecontrol.c devlist.c firmware.c format.c identify.c logpage.c \
- perftest.c reset.c ns.c nvme_util.c power.c util.c wdc.c
+SRCS= nvmecontrol.c devlist.c firmware.c format.c identify.c identify_ext.c logpage.c \
+ perftest.c reset.c ns.c nvme_util.c power.c nc_util.c wdc.c
MAN= nvmecontrol.8
.PATH: ${SRCTOP}/sys/dev/nvme
Modified: head/sbin/nvmecontrol/identify.c
==============================================================================
--- head/sbin/nvmecontrol/identify.c Wed Jun 13 21:10:33 2018 (r335090)
+++ head/sbin/nvmecontrol/identify.c Wed Jun 13 22:00:02 2018 (r335091)
@@ -41,187 +41,9 @@ __FBSDID("$FreeBSD$");
#include <unistd.h>
#include "nvmecontrol.h"
+#include "nvmecontrol_ext.h"
static void
-print_controller(struct nvme_controller_data *cdata)
-{
- uint8_t str[128];
- char cbuf[UINT128_DIG + 1];
- uint16_t oncs, oacs;
- uint8_t compare, write_unc, dsm, vwc_present;
- uint8_t security, fmt, fw, nsmgmt;
- uint8_t fw_slot1_ro, fw_num_slots;
- uint8_t ns_smart;
- uint8_t sqes_max, sqes_min;
- uint8_t cqes_max, cqes_min;
-
- oncs = cdata->oncs;
- compare = (oncs >> NVME_CTRLR_DATA_ONCS_COMPARE_SHIFT) &
- NVME_CTRLR_DATA_ONCS_COMPARE_MASK;
- write_unc = (oncs >> NVME_CTRLR_DATA_ONCS_WRITE_UNC_SHIFT) &
- NVME_CTRLR_DATA_ONCS_WRITE_UNC_MASK;
- dsm = (oncs >> NVME_CTRLR_DATA_ONCS_DSM_SHIFT) &
- NVME_CTRLR_DATA_ONCS_DSM_MASK;
- vwc_present = (cdata->vwc >> NVME_CTRLR_DATA_VWC_PRESENT_SHIFT) &
- NVME_CTRLR_DATA_VWC_PRESENT_MASK;
-
- oacs = cdata->oacs;
- security = (oacs >> NVME_CTRLR_DATA_OACS_SECURITY_SHIFT) &
- NVME_CTRLR_DATA_OACS_SECURITY_MASK;
- fmt = (oacs >> NVME_CTRLR_DATA_OACS_FORMAT_SHIFT) &
- NVME_CTRLR_DATA_OACS_FORMAT_MASK;
- fw = (oacs >> NVME_CTRLR_DATA_OACS_FIRMWARE_SHIFT) &
- NVME_CTRLR_DATA_OACS_FIRMWARE_MASK;
- nsmgmt = (oacs >> NVME_CTRLR_DATA_OACS_NSMGMT_SHIFT) &
- NVME_CTRLR_DATA_OACS_NSMGMT_MASK;
-
- fw_num_slots = (cdata->frmw >> NVME_CTRLR_DATA_FRMW_NUM_SLOTS_SHIFT) &
- NVME_CTRLR_DATA_FRMW_NUM_SLOTS_MASK;
- fw_slot1_ro = (cdata->frmw >> NVME_CTRLR_DATA_FRMW_SLOT1_RO_SHIFT) &
- NVME_CTRLR_DATA_FRMW_SLOT1_RO_MASK;
-
- ns_smart = (cdata->lpa >> NVME_CTRLR_DATA_LPA_NS_SMART_SHIFT) &
- NVME_CTRLR_DATA_LPA_NS_SMART_MASK;
-
- sqes_min = (cdata->sqes >> NVME_CTRLR_DATA_SQES_MIN_SHIFT) &
- NVME_CTRLR_DATA_SQES_MIN_MASK;
- sqes_max = (cdata->sqes >> NVME_CTRLR_DATA_SQES_MAX_SHIFT) &
- NVME_CTRLR_DATA_SQES_MAX_MASK;
-
- cqes_min = (cdata->cqes >> NVME_CTRLR_DATA_CQES_MIN_SHIFT) &
- NVME_CTRLR_DATA_CQES_MIN_MASK;
- cqes_max = (cdata->cqes >> NVME_CTRLR_DATA_CQES_MAX_SHIFT) &
- NVME_CTRLR_DATA_CQES_MAX_MASK;
-
- printf("Controller Capabilities/Features\n");
- printf("================================\n");
- printf("Vendor ID: %04x\n", cdata->vid);
- printf("Subsystem Vendor ID: %04x\n", cdata->ssvid);
- nvme_strvis(str, cdata->sn, sizeof(str), NVME_SERIAL_NUMBER_LENGTH);
- printf("Serial Number: %s\n", str);
- nvme_strvis(str, cdata->mn, sizeof(str), NVME_MODEL_NUMBER_LENGTH);
- printf("Model Number: %s\n", str);
- nvme_strvis(str, cdata->fr, sizeof(str), NVME_FIRMWARE_REVISION_LENGTH);
- printf("Firmware Version: %s\n", str);
- printf("Recommended Arb Burst: %d\n", cdata->rab);
- printf("IEEE OUI Identifier: %02x %02x %02x\n",
- cdata->ieee[0], cdata->ieee[1], cdata->ieee[2]);
- printf("Multi-Path I/O Capabilities: %s%s%s%s\n",
- (cdata->mic == 0) ? "Not Supported" : "",
- ((cdata->mic >> NVME_CTRLR_DATA_MIC_SRIOVVF_SHIFT) &
- NVME_CTRLR_DATA_MIC_SRIOVVF_MASK) ? "SR-IOV VF, " : "",
- ((cdata->mic >> NVME_CTRLR_DATA_MIC_MCTRLRS_SHIFT) &
- NVME_CTRLR_DATA_MIC_MCTRLRS_MASK) ? "Multiple controllers, " : "",
- ((cdata->mic >> NVME_CTRLR_DATA_MIC_MPORTS_SHIFT) &
- NVME_CTRLR_DATA_MIC_MPORTS_MASK) ? "Multiple ports" : "");
- /* TODO: Use CAP.MPSMIN to determine true memory page size. */
- printf("Max Data Transfer Size: ");
- if (cdata->mdts == 0)
- printf("Unlimited\n");
- else
- printf("%ld\n", PAGE_SIZE * (1L << cdata->mdts));
- printf("Controller ID: 0x%02x\n", cdata->ctrlr_id);
- printf("Version: %d.%d.%d\n",
- (cdata->ver >> 16) & 0xffff, (cdata->ver >> 8) & 0xff,
- cdata->ver & 0xff);
- printf("\n");
-
- printf("Admin Command Set Attributes\n");
- printf("============================\n");
- printf("Security Send/Receive: %s\n",
- security ? "Supported" : "Not Supported");
- printf("Format NVM: %s\n",
- fmt ? "Supported" : "Not Supported");
- printf("Firmware Activate/Download: %s\n",
- fw ? "Supported" : "Not Supported");
- printf("Namespace Managment: %s\n",
- nsmgmt ? "Supported" : "Not Supported");
- printf("Device Self-test: %sSupported\n",
- ((oacs >> NVME_CTRLR_DATA_OACS_SELFTEST_SHIFT) &
- NVME_CTRLR_DATA_OACS_SELFTEST_MASK) ? "" : "Not ");
- printf("Directives: %sSupported\n",
- ((oacs >> NVME_CTRLR_DATA_OACS_DIRECTIVES_SHIFT) &
- NVME_CTRLR_DATA_OACS_DIRECTIVES_MASK) ? "" : "Not ");
- printf("NVMe-MI Send/Receive: %sSupported\n",
- ((oacs >> NVME_CTRLR_DATA_OACS_NVMEMI_SHIFT) &
- NVME_CTRLR_DATA_OACS_NVMEMI_MASK) ? "" : "Not ");
- printf("Virtualization Management: %sSupported\n",
- ((oacs >> NVME_CTRLR_DATA_OACS_VM_SHIFT) &
- NVME_CTRLR_DATA_OACS_VM_MASK) ? "" : "Not ");
- printf("Doorbell Buffer Config %sSupported\n",
- ((oacs >> NVME_CTRLR_DATA_OACS_DBBUFFER_SHIFT) &
- NVME_CTRLR_DATA_OACS_DBBUFFER_MASK) ? "" : "Not ");
- printf("Abort Command Limit: %d\n", cdata->acl+1);
- printf("Async Event Request Limit: %d\n", cdata->aerl+1);
- printf("Number of Firmware Slots: ");
- if (fw != 0)
- printf("%d\n", fw_num_slots);
- else
- printf("N/A\n");
- printf("Firmware Slot 1 Read-Only: ");
- if (fw != 0)
- printf("%s\n", fw_slot1_ro ? "Yes" : "No");
- else
- printf("N/A\n");
- printf("Per-Namespace SMART Log: %s\n",
- ns_smart ? "Yes" : "No");
- printf("Error Log Page Entries: %d\n", cdata->elpe+1);
- printf("Number of Power States: %d\n", cdata->npss+1);
-
- printf("\n");
- printf("NVM Command Set Attributes\n");
- printf("==========================\n");
- printf("Submission Queue Entry Size\n");
- printf(" Max: %d\n", 1 << sqes_max);
- printf(" Min: %d\n", 1 << sqes_min);
- printf("Completion Queue Entry Size\n");
- printf(" Max: %d\n", 1 << cqes_max);
- printf(" Min: %d\n", 1 << cqes_min);
- printf("Number of Namespaces: %d\n", cdata->nn);
- printf("Compare Command: %s\n",
- compare ? "Supported" : "Not Supported");
- printf("Write Uncorrectable Command: %s\n",
- write_unc ? "Supported" : "Not Supported");
- printf("Dataset Management Command: %s\n",
- dsm ? "Supported" : "Not Supported");
- printf("Write Zeroes Command: %sSupported\n",
- ((oncs >> NVME_CTRLR_DATA_ONCS_WRZERO_SHIFT) &
- NVME_CTRLR_DATA_ONCS_WRZERO_MASK) ? "" : "Not ");
- printf("Save Features: %sSupported\n",
- ((oncs >> NVME_CTRLR_DATA_ONCS_SAVEFEAT_SHIFT) &
- NVME_CTRLR_DATA_ONCS_SAVEFEAT_MASK) ? "" : "Not ");
- printf("Reservations: %sSupported\n",
- ((oncs >> NVME_CTRLR_DATA_ONCS_RESERV_SHIFT) &
- NVME_CTRLR_DATA_ONCS_RESERV_MASK) ? "" : "Not ");
- printf("Timestamp feature: %sSupported\n",
- ((oncs >> NVME_CTRLR_DATA_ONCS_TIMESTAMP_SHIFT) &
- NVME_CTRLR_DATA_ONCS_TIMESTAMP_MASK) ? "" : "Not ");
- printf("Fused Operation Support: %s%s\n",
- (cdata->fuses == 0) ? "Not Supported" : "",
- ((cdata->fuses >> NVME_CTRLR_DATA_FUSES_CNW_SHIFT) &
- NVME_CTRLR_DATA_FUSES_CNW_MASK) ? "Compare and Write" : "");
- printf("Format NVM Attributes: %s%s Erase, %s Format\n",
- ((cdata->fna >> NVME_CTRLR_DATA_FNA_CRYPTO_ERASE_SHIFT) &
- NVME_CTRLR_DATA_FNA_CRYPTO_ERASE_MASK) ? "Crypto Erase, " : "",
- ((cdata->fna >> NVME_CTRLR_DATA_FNA_ERASE_ALL_SHIFT) &
- NVME_CTRLR_DATA_FNA_ERASE_ALL_MASK) ? "All-NVM" : "Per-NS",
- ((cdata->fna >> NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT) &
- NVME_CTRLR_DATA_FNA_FORMAT_ALL_MASK) ? "All-NVM" : "Per-NS");
- printf("Volatile Write Cache: %s\n",
- vwc_present ? "Present" : "Not Present");
-
- if (nsmgmt) {
- printf("\n");
- 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)));
- }
-}
-
-static void
print_namespace(struct nvme_namespace_data *nsdata)
{
uint32_t i;
@@ -375,7 +197,7 @@ identify_ctrlr(int argc, char *argv[])
identify_usage();
}
- print_controller(&cdata);
+ nvme_print_controller(&cdata);
exit(0);
}
Copied and modified: head/sbin/nvmecontrol/identify_ext.c (from r335089, head/sbin/nvmecontrol/identify.c)
==============================================================================
--- head/sbin/nvmecontrol/identify.c Wed Jun 13 21:10:23 2018 (r335089, copy source)
+++ head/sbin/nvmecontrol/identify_ext.c Wed Jun 13 22:00:02 2018 (r335091)
@@ -41,9 +41,10 @@ __FBSDID("$FreeBSD$");
#include <unistd.h>
#include "nvmecontrol.h"
+#include "nvmecontrol_ext.h"
-static void
-print_controller(struct nvme_controller_data *cdata)
+void
+nvme_print_controller(struct nvme_controller_data *cdata)
{
uint8_t str[128];
char cbuf[UINT128_DIG + 1];
@@ -219,255 +220,4 @@ print_controller(struct nvme_controller_data *cdata)
printf("NVM unallocated cap: %s\n",
uint128_to_str(to128(cdata->untncap.unvmcap), cbuf, sizeof(cbuf)));
}
-}
-
-static void
-print_namespace(struct nvme_namespace_data *nsdata)
-{
- uint32_t i;
- uint32_t lbaf, lbads, ms, rp;
- uint8_t thin_prov, ptype;
- uint8_t flbas_fmt;
-
- thin_prov = (nsdata->nsfeat >> NVME_NS_DATA_NSFEAT_THIN_PROV_SHIFT) &
- NVME_NS_DATA_NSFEAT_THIN_PROV_MASK;
-
- flbas_fmt = (nsdata->flbas >> NVME_NS_DATA_FLBAS_FORMAT_SHIFT) &
- NVME_NS_DATA_FLBAS_FORMAT_MASK;
-
- printf("Size (in LBAs): %lld (%lldM)\n",
- (long long)nsdata->nsze,
- (long long)nsdata->nsze / 1024 / 1024);
- printf("Capacity (in LBAs): %lld (%lldM)\n",
- (long long)nsdata->ncap,
- (long long)nsdata->ncap / 1024 / 1024);
- printf("Utilization (in LBAs): %lld (%lldM)\n",
- (long long)nsdata->nuse,
- (long long)nsdata->nuse / 1024 / 1024);
- printf("Thin Provisioning: %s\n",
- thin_prov ? "Supported" : "Not Supported");
- printf("Number of LBA Formats: %d\n", nsdata->nlbaf+1);
- printf("Current LBA Format: LBA Format #%02d\n", flbas_fmt);
- printf("Data Protection Caps: %s%s%s%s%s%s\n",
- (nsdata->dpc == 0) ? "Not Supported" : "",
- ((nsdata->dpc >> NVME_NS_DATA_DPC_MD_END_SHIFT) &
- NVME_NS_DATA_DPC_MD_END_MASK) ? "Last Bytes, " : "",
- ((nsdata->dpc >> NVME_NS_DATA_DPC_MD_START_SHIFT) &
- NVME_NS_DATA_DPC_MD_START_MASK) ? "First Bytes, " : "",
- ((nsdata->dpc >> NVME_NS_DATA_DPC_PIT3_SHIFT) &
- NVME_NS_DATA_DPC_PIT3_MASK) ? "Type 3, " : "",
- ((nsdata->dpc >> NVME_NS_DATA_DPC_PIT2_SHIFT) &
- NVME_NS_DATA_DPC_PIT2_MASK) ? "Type 2, " : "",
- ((nsdata->dpc >> NVME_NS_DATA_DPC_PIT2_MASK) &
- NVME_NS_DATA_DPC_PIT1_MASK) ? "Type 1" : "");
- printf("Data Protection Settings: ");
- ptype = (nsdata->dps >> NVME_NS_DATA_DPS_PIT_SHIFT) &
- NVME_NS_DATA_DPS_PIT_MASK;
- if (ptype) {
- printf("Type %d, %s Bytes\n", ptype,
- ((nsdata->dps >> NVME_NS_DATA_DPS_MD_START_SHIFT) &
- NVME_NS_DATA_DPS_MD_START_MASK) ? "First" : "Last");
- } else {
- printf("Not Enabled\n");
- }
- printf("Multi-Path I/O Capabilities: %s%s\n",
- (nsdata->nmic == 0) ? "Not Supported" : "",
- ((nsdata->nmic >> NVME_NS_DATA_NMIC_MAY_BE_SHARED_SHIFT) &
- NVME_NS_DATA_NMIC_MAY_BE_SHARED_MASK) ? "May be shared" : "");
- printf("Reservation Capabilities: %s%s%s%s%s%s%s%s%s\n",
- (nsdata->rescap == 0) ? "Not Supported" : "",
- ((nsdata->rescap >> NVME_NS_DATA_RESCAP_IEKEY13_SHIFT) &
- NVME_NS_DATA_RESCAP_IEKEY13_MASK) ? "IEKEY13, " : "",
- ((nsdata->rescap >> NVME_NS_DATA_RESCAP_EX_AC_AR_SHIFT) &
- NVME_NS_DATA_RESCAP_EX_AC_AR_MASK) ? "EX_AC_AR, " : "",
- ((nsdata->rescap >> NVME_NS_DATA_RESCAP_WR_EX_AR_SHIFT) &
- NVME_NS_DATA_RESCAP_WR_EX_AR_MASK) ? "WR_EX_AR, " : "",
- ((nsdata->rescap >> NVME_NS_DATA_RESCAP_EX_AC_RO_SHIFT) &
- NVME_NS_DATA_RESCAP_EX_AC_RO_MASK) ? "EX_AC_RO, " : "",
- ((nsdata->rescap >> NVME_NS_DATA_RESCAP_WR_EX_RO_SHIFT) &
- NVME_NS_DATA_RESCAP_WR_EX_RO_MASK) ? "WR_EX_RO, " : "",
- ((nsdata->rescap >> NVME_NS_DATA_RESCAP_EX_AC_SHIFT) &
- NVME_NS_DATA_RESCAP_EX_AC_MASK) ? "EX_AC, " : "",
- ((nsdata->rescap >> NVME_NS_DATA_RESCAP_WR_EX_SHIFT) &
- NVME_NS_DATA_RESCAP_WR_EX_MASK) ? "WR_EX, " : "",
- ((nsdata->rescap >> NVME_NS_DATA_RESCAP_PTPL_SHIFT) &
- NVME_NS_DATA_RESCAP_PTPL_MASK) ? "PTPL" : "");
- printf("Format Progress Indicator: ");
- if ((nsdata->fpi >> NVME_NS_DATA_FPI_SUPP_SHIFT) &
- NVME_NS_DATA_FPI_SUPP_MASK) {
- printf("%u%% remains\n",
- (nsdata->fpi >> NVME_NS_DATA_FPI_PERC_SHIFT) &
- NVME_NS_DATA_FPI_PERC_MASK);
- } else
- printf("Not Supported\n");
- printf("Optimal I/O Boundary (LBAs): %u\n", nsdata->noiob);
- printf("Globally Unique Identifier: ");
- for (i = 0; i < sizeof(nsdata->nguid); i++)
- printf("%02x", nsdata->nguid[i]);
- printf("\n");
- printf("IEEE EUI64: ");
- for (i = 0; i < sizeof(nsdata->eui64); i++)
- printf("%02x", nsdata->eui64[i]);
- printf("\n");
- for (i = 0; i <= nsdata->nlbaf; i++) {
- lbaf = nsdata->lbaf[i];
- lbads = (lbaf >> NVME_NS_DATA_LBAF_LBADS_SHIFT) &
- NVME_NS_DATA_LBAF_LBADS_MASK;
- ms = (lbaf >> NVME_NS_DATA_LBAF_MS_SHIFT) &
- NVME_NS_DATA_LBAF_MS_MASK;
- rp = (lbaf >> NVME_NS_DATA_LBAF_RP_SHIFT) &
- NVME_NS_DATA_LBAF_RP_MASK;
- printf("LBA Format #%02d: Data Size: %5d Metadata Size: %5d"
- " Performance: %s\n",
- i, 1 << lbads, ms, (rp == 0) ? "Best" :
- (rp == 1) ? "Better" : (rp == 2) ? "Good" : "Degraded");
- }
-}
-
-static void
-identify_usage(void)
-{
- fprintf(stderr, "usage:\n");
- fprintf(stderr, IDENTIFY_USAGE);
- exit(1);
-}
-
-static void
-identify_ctrlr(int argc, char *argv[])
-{
- struct nvme_controller_data cdata;
- int ch, fd, hexflag = 0, hexlength;
- int verboseflag = 0;
-
- while ((ch = getopt(argc, argv, "vx")) != -1) {
- switch ((char)ch) {
- case 'v':
- verboseflag = 1;
- break;
- case 'x':
- hexflag = 1;
- break;
- default:
- identify_usage();
- }
- }
-
- /* Check that a controller was specified. */
- if (optind >= argc)
- identify_usage();
-
- open_dev(argv[optind], &fd, 1, 1);
- read_controller_data(fd, &cdata);
- close(fd);
-
- if (hexflag == 1) {
- if (verboseflag == 1)
- hexlength = sizeof(struct nvme_controller_data);
- else
- hexlength = offsetof(struct nvme_controller_data,
- reserved8);
- print_hex(&cdata, hexlength);
- exit(0);
- }
-
- if (verboseflag == 1) {
- fprintf(stderr, "-v not currently supported without -x\n");
- identify_usage();
- }
-
- print_controller(&cdata);
- exit(0);
-}
-
-static void
-identify_ns(int argc, char *argv[])
-{
- struct nvme_namespace_data nsdata;
- char path[64];
- int ch, fd, hexflag = 0, hexlength;
- int verboseflag = 0;
- uint32_t nsid;
-
- while ((ch = getopt(argc, argv, "vx")) != -1) {
- switch ((char)ch) {
- case 'v':
- verboseflag = 1;
- break;
- case 'x':
- hexflag = 1;
- break;
- default:
- identify_usage();
- }
- }
-
- /* Check that a namespace was specified. */
- if (optind >= argc)
- identify_usage();
-
- /*
- * Check if the specified device node exists before continuing.
- * This is a cleaner check for cases where the correct controller
- * is specified, but an invalid namespace on that controller.
- */
- open_dev(argv[optind], &fd, 1, 1);
- close(fd);
-
- /*
- * We send IDENTIFY commands to the controller, not the namespace,
- * since it is an admin cmd. The namespace ID will be specified in
- * the IDENTIFY command itself. So parse the namespace's device node
- * string to get the controller substring and namespace ID.
- */
- parse_ns_str(argv[optind], path, &nsid);
- open_dev(path, &fd, 1, 1);
- read_namespace_data(fd, nsid, &nsdata);
- close(fd);
-
- if (hexflag == 1) {
- if (verboseflag == 1)
- hexlength = sizeof(struct nvme_namespace_data);
- else
- hexlength = offsetof(struct nvme_namespace_data,
- reserved6);
- print_hex(&nsdata, hexlength);
- exit(0);
- }
-
- if (verboseflag == 1) {
- fprintf(stderr, "-v not currently supported without -x\n");
- identify_usage();
- }
-
- print_namespace(&nsdata);
- exit(0);
-}
-
-void
-identify(int argc, char *argv[])
-{
- char *target;
-
- if (argc < 2)
- identify_usage();
-
- while (getopt(argc, argv, "vx") != -1) ;
-
- /* Check that a controller or namespace was specified. */
- if (optind >= argc)
- identify_usage();
-
- target = argv[optind];
-
- optreset = 1;
- optind = 1;
-
- /*
- * If device node contains "ns", we consider it a namespace,
- * otherwise, consider it a controller.
- */
- if (strstr(target, NVME_NS_PREFIX) == NULL)
- identify_ctrlr(argc, argv);
- else
- identify_ns(argc, argv);
}
Copied and modified: head/sbin/nvmecontrol/nc_util.c (from r335089, head/sbin/nvmecontrol/util.c)
==============================================================================
Copied and modified: head/sbin/nvmecontrol/nvmecontrol_ext.h (from r335089, head/sbin/nvmecontrol/util.c)
==============================================================================
--- head/sbin/nvmecontrol/util.c Wed Jun 13 21:10:23 2018 (r335089, copy source)
+++ head/sbin/nvmecontrol/nvmecontrol_ext.h Wed Jun 13 22:00:02 2018 (r335091)
@@ -1,7 +1,8 @@
/*-
- * Copyright (c) 2017 Netflix, Inc
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
+ * Copyright (C) 2018 Netflix
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -22,38 +23,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/endian.h>
-#include "nvmecontrol.h"
-
-char *
-uint128_to_str(uint128_t u, char *buf, size_t buflen)
-{
- char *end = buf + buflen - 1;
-
- *end-- = '\0';
- if (u == 0)
- *end-- = '0';
- while (u && end >= buf) {
- *end-- = u % 10 + '0';
- u /= 10;
- }
- end++;
- if (u != 0)
- return NULL;
-
- return end;
-}
-
-/* "Missing" from endian.h */
-uint64_t
-le48dec(const void *pp)
-{
- uint8_t const *p = (uint8_t const *)pp;
-
- return (((uint64_t)le16dec(p + 4) << 32) | le32dec(p));
-}
+void nvme_print_controller(struct nvme_controller_data *cdata);
More information about the svn-src-all
mailing list