From: Linux-nvme <redacted> on behalf of Hannes Reinecke <hare@suse.de>
Sent: Friday, August 17, 2018 12:29 AM
To: Keith Busch
Cc: Hannes Reinecke; Hannes Reinecke; Sagi Grimberg; linux-nvme at lists.infradead.org; Christoph Hellwig
Subject: [PATCH 6/6] nvme-list-subsys: Add device name argument and print out ANA state
? 
 
Update the 'nvme list-subsys' command to accept a device name and
print out the ANA state for all paths to that device.

Signed-off-by: Hannes Reinecke <hare at suse.com>
---
?Documentation/nvme-list-subsys.txt |?? 4 +-
?nvme-print.c?????????????????????? |? 10 +++-
?nvme.c???????????????????????????? | 114 +++++++++++++++++++++++++++++++++++--
?nvme.h???????????????????????????? |?? 1 +
?4 files changed, 120 insertions(+), 9 deletions(-)

diff --git a/Documentation/nvme-list-subsys.txt b/Documentation/nvme-list-subsys.txt
index c7de7ef..c40b708 100644
--- a/Documentation/nvme-list-subsys.txt
+++ b/Documentation/nvme-list-subsys.txt

@@ -8,12 +8,14 @@ nvme-list-subsys - List all NVMe subsystems

?SYNOPSIS
?--------
?[verse]
-'nvme list-subsys' [-o <fmt> | --output-format=<fmt>]
+'nvme list-subsys' [-o <fmt> | --output-format=<fmt>] <device>
?
?DESCRIPTION
?-----------
?Scan the sysfs tree for NVM Express subsystems and return the controllers
?for those subsystems as well as some pertinent information about them.
+If a device is given, print out only the values for the controllers
+and subsystems leading to the device.
?
?OPTIONS
?-------

diff --git a/nvme-print.c b/nvme-print.c
index 8a604c5..cc8c716 100644
--- a/nvme-print.c
+++ b/nvme-print.c

@@ -2762,9 +2762,11 @@ static void show_nvme_subsystem(struct subsys_list_item *item)

???????? printf("\\\n");
?
???????? for (i = 0; i < item->nctrls; i++) {
-?????????????? printf(" +- %s %s %s\n", item->ctrls[i].name,
+?????????????? printf(" +- %s %s %s %s\n", item->ctrls[i].name,
???????????????????????????????? item->ctrls[i].transport,
-?????????????????????????????? item->ctrls[i].address);
+?????????????????????????????? item->ctrls[i].address,
+?????????????????????????????? item->ctrls[i].ana_state ?
+?????????????????????????????????????? item->ctrls[i].ana_state : "");
???????? }
?
?}

@@ -2810,6 +2812,10 @@ void json_print_nvme_subsystem_list(struct subsys_list_item *slist, int n)

???????????????????????????????????????? slist[i].ctrls[j].transport);
???????????????????????? json_object_add_value_string(path_attrs, "Address",
???????????????????????????????????????? slist[i].ctrls[j].address);
+?????????????????????? if (slist[i].ctrls[j].ana_state)
+?????????????????????????????? json_object_add_value_string(path_attrs,
+?????????????????????????????????????????????? "State",
+?????????????????????????????????????????????? slist[i].ctrls[j].ana_state);
???????????????????????? json_array_add_value_object(paths, path_attrs);
???????????????? }
???????????????? if (j) {

diff --git a/nvme.c b/nvme.c
index 0438187..b5c9779 100644
--- a/nvme.c
+++ b/nvme.c

@@ -1398,6 +1398,72 @@ err_free_addrpath:

?
???????? return NULL;
?}
+
+static int scan_ctrl_paths_filter(const struct dirent *d)
+{
+?????? int id, cntlid, nsid;
+
+?????? if (d->d_name[0] == '.')
+?????????????? return 0;
+
+?????? if (strstr(d->d_name, "nvme")) {
+?????????????? if (sscanf(d->d_name, "nvme%dc%dn%d", &id, &cntlid, &nsid) != 3)
+?????????????????????? return 0;
+?????????????? return 1;
+?????? }
+
+?????? return 0;
+}
+
+static char *get_nvme_ctrl_path_ana_state(char *path, int nsid)
+{
+?????? struct dirent **paths;
+?????? char *ana_state;
+?????? int i, n;
+
+?????? ana_state = calloc(1, 16);
+?????? if (!ana_state)
+?????????????? return NULL;
+
+?????? n = scandir(path, &paths, scan_ctrl_paths_filter, alphasort);
+?????? if (n <= 0) {
+?????????????? free(ana_state);
+?????????????? return NULL;
+?????? }
+?????? for (i = 0; i < n; i++) {
+?????????????? int id, cntlid, ns, fd;
+?????????????? ssize_t ret;
+?????????????? char ctrl_path[256];
+
+?????????????? if (sscanf(paths[i]->d_name, "nvme%dc%dn%d",
+????????????????????????? &id, &cntlid, &ns) != 3)
+?????????????????????? continue;
+
+?????????????? if (ns != nsid)
+?????????????????????? continue;
+
+?????????????? sprintf(ctrl_path, "%s/%s/ana_state", path, paths[i]->d_name);
+?????????????? fd = open(ctrl_path, O_RDONLY);
+?????????????? if (fd < 0) {
+?????????????????????? fprintf(stderr, "Failed to open ANA state %s\n",
+?????????????????????????????? ctrl_path);
[CK] free (ana_state) here ?
+?????????????????????? return NULL;
+?????????????? }
+?????????????? ret = read(fd, ana_state, 16);
+?????????????? if (ret < 0) {
+?????????????????????? fprintf(stderr, "Failed to read ANA state from %s\n",
+?????????????????????????????? ctrl_path);
+?????????????????????? free(ana_state);
+?????????????????????? ana_state = NULL;
+?????????????? } else if (ana_state[strlen(ana_state) - 1] == '\n')
+?????????????????????? ana_state[strlen(ana_state) - 1] = '\0';
+?????????????? close(fd);
+?????????????? break;
+?????? }
+
[CK] Like your other patch, can we use only one return and error goto pattern ?
+?????? return ana_state;
+}
+
?static int scan_ctrls_filter(const struct dirent *d)
?{
???????? int id, nsid;

@@ -1422,7 +1488,7 @@ static void free_ctrl_list_item(struct ctrl_list_item *ctrls)

?}
?
?int get_nvme_subsystem_info(char *name, char *path,
-?????????????????????????????? struct subsys_list_item *item)
+?????????????????????????? struct subsys_list_item *item, int nsid)
?{
???????? char ctrl_path[512];
???????? struct dirent **ctrls;

@@ -1463,7 +1529,6 @@ int get_nvme_subsystem_info(char *name, char *path,

???????????????????????? free_ctrl_list_item(&item->ctrls[ccnt]);
???????????????????????? continue;
???????????????? }
-
???????????????? if (!strncmp(item->ctrls[ccnt].transport, "pcie", 4))
???????????????????????? item->ctrls[ccnt].address =
???????????????????????????????? get_nvme_pcie_address(ctrl_path);

@@ -1476,6 +1541,9 @@ int get_nvme_subsystem_info(char *name, char *path,

???????????????????????? continue;
???????????????? }
?
+?????????????? if (nsid)
+?????????????????????? item->ctrls[ccnt].ana_state =
+?????????????????????????????? get_nvme_ctrl_path_ana_state(ctrl_path, nsid);
???????????????? ccnt++;
???????? }
?

@@ -1544,9 +1612,10 @@ static int list_subsys(int argc, char **argv, struct command *cmd,

??????????????????????? struct plugin *plugin)
?{
???????? char path[310];
+?????? char *subsysnqn = NULL;
???????? struct dirent **subsys;
???????? struct subsys_list_item *slist;
-?????? int fmt, n, i, ret = 0, subcnt = 0;
+?????? int fmt, n = 1, i, ret = 0, subcnt = 0, nsid = 0, id;
???????? const char *desc = "Retrieve information for subsystems";
???????? struct config {
???????????????? char *output_format;

@@ -1566,13 +1635,42 @@ static int list_subsys(int argc, char **argv, struct command *cmd,

???????? if (ret < 0)
???????????????? return ret;
?
+?????? devicename = NULL;
+?????? if (optind < argc) {
+?????????????? devicename = basename(argv[optind]);
+?????????????? if (sscanf(devicename, "nvme%dn%d", &id, &nsid) != 2) {
+?????????????????????? fprintf(stderr, "%s is not a NVMe namespace device\n",
+?????????????????????????????? argv[optind]);
+?????????????????????? return -EINVAL;
+?????????????? }
+?????????????? sprintf(path, "/sys/block/%s/device", devicename);
+?????????????? subsysnqn = get_nvme_subsnqn(path);
+?????????????? if (!subsysnqn) {
+?????????????????????? fprintf(stderr, "Cannot read subsys NQN from %s\n",
+?????????????????????????????? devicename);
+?????????????????????? return -EINVAL;
+?????????????? }
+?????????????? optind++;
+?????? }
+
+?????? if (ret < 0) {
+?????????????? argconfig_print_help(desc, opts);
[CK] Not sure about if check here.
+?????????????? if (subsysnqn)
+?????????????????????? free(subsysnqn);
+?????????????? return ret;
+?????? }
???????? fmt = validate_output_format(cfg.output_format);
?
-?????? if (fmt != JSON && fmt != NORMAL)
+?????? if (fmt != JSON && fmt != NORMAL) {
+?????????????? if (subsysnqn)
+?????????????????????? free(subsysnqn);
???????????????? return -EINVAL;
+?????? }
???????? n = scandir(subsys_dir, &subsys, scan_subsys_filter, alphasort);
???????? if (n < 0) {
???????????????? fprintf(stderr, "no NVMe subsystem(s) detected.\n");
[CK] Not sure about check here.
+?????????????? if (subsysnqn)
+?????????????????????? free(subsysnqn);
???????????????? return n;
???????? }
?

@@ -1586,12 +1684,15 @@ static int list_subsys(int argc, char **argv, struct command *cmd,

???????????????? snprintf(path, sizeof(path), "%s%s", subsys_dir,
???????????????????????? subsys[i]->d_name);
???????????????? ret = get_nvme_subsystem_info(subsys[i]->d_name, path,
-?????????????????????????????? &slist[subcnt]);
+?????????????????????????????? &slist[subcnt], nsid);
???????????????? if (ret) {
???????????????????????? fprintf(stderr,
???????????????????????????????? "%s: failed to get subsystem info: %s\n",
???????????????????????????????? path, strerror(errno));
???????????????????????? free_subsys_list_item(&slist[subcnt]);
+?????????????? } else if (subsysnqn &&
+????????????????????????? strncmp(slist[subcnt].subsysnqn, subsysnqn, 255)) {
+?????????????????????? free_subsys_list_item(&slist[subcnt]);
???????????????? } else
???????????????????????? subcnt++;
???????? }

@@ -1607,7 +1708,8 @@ free_subsys:

???????? for (i = 0; i < n; i++)
???????????????? free(subsys[i]);
???????? free(subsys);
-
[CK] Not sure about check here.
+?????? if (subsysnqn)
+?????????????? free(subsysnqn);
???????? return ret;
?}
?

diff --git a/nvme.h b/nvme.h
index 5098b0e..26d5b85 100644
--- a/nvme.h
+++ b/nvme.h

@@ -129,6 +129,7 @@ struct ctrl_list_item {

???????? char *name;
???????? char *address;
???????? char *transport;
+?????? char *ana_state;
?};
?
?struct subsys_list_item {
-- 
2.13.7


_______________________________________________
Linux-nvme mailing list
Linux-nvme at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme


Linux-nvme Info Page - lists.infradead.org
lists.infradead.org
To see the collection of prior postings to the list, visit the Linux-nvme Archives.. Using Linux-nvme: To post a message to all the list members, send email to linux-nvme at lists.infradead.org.