Skip to content

nvme-cli: enhance the visibility of multipath using show-topology command #2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igaw merged 4 commits into from
Sep 22, 2025
Merged

nvme-cli: enhance the visibility of multipath using show-topology command #2911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d55162
nvme: support <device> option in show-topology command
shroffni Sep 4, 2025
15f7bcc
nvme: extend show-topology command to add support for multipath
shroffni Sep 4, 2025
d752268
nvme: add common APIs for printing tabular format output
shroffni Sep 4, 2025
7cde355
nvme: add support for printing show-topology in tabular form
shroffni Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions nvme-print-binary.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,7 @@ static struct print_ops binary_print_ops = {
.print_nvme_subsystem_list = NULL,
.topology_ctrl = NULL,
.topology_namespace = NULL,
.topology_multipath = NULL,

/* status and error messages */
.connect_msg = NULL,
Expand Down
36 changes: 30 additions & 6 deletions nvme-print-json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4743,26 +4743,48 @@ static unsigned int json_subsystem_topology_multipath(nvme_subsystem_t s,
nvme_ns_t n;
nvme_path_t p;
unsigned int i = 0;
const char *iopolicy = nvme_subsystem_get_iopolicy(s);

nvme_subsystem_for_each_ns(s, n) {
struct json_object *ns_attrs;
struct json_object *paths;

ns_attrs = json_create_object();
obj_add_int(ns_attrs, "NSID", nvme_ns_get_nsid(n));
obj_add_str(ns_attrs, "Name", nvme_ns_get_name(n));

paths = json_create_array();
nvme_namespace_for_each_path(n, p) {
struct json_object *path_attrs;

nvme_ctrl_t c = nvme_path_get_ctrl(p);
struct json_object *ctrls, *ctrl_attrs;
nvme_ctrl_t c;

path_attrs = json_create_object();
obj_add_str(path_attrs, "Name", nvme_ctrl_get_name(c));
obj_add_str(path_attrs, "Transport", nvme_ctrl_get_transport(c));
obj_add_str(path_attrs, "Address", nvme_ctrl_get_address(c));
obj_add_str(path_attrs, "State", nvme_ctrl_get_state(c));
obj_add_str(path_attrs, "Path", nvme_path_get_name(p));
obj_add_str(path_attrs, "ANAState", nvme_path_get_ana_state(p));

/*
* For iopolicy numa exclude "Qdepth", for iopolicy
* queue-depth exclude "NUMANodes" and for iopolicy
* round-robin exclude both "Qdepth" and "NUMANodes".
*/
if (!strcmp(iopolicy, "numa"))
obj_add_str(path_attrs, "NUMANodes",
nvme_path_get_numa_nodes(p));
else if (!strcmp(iopolicy, "queue-depth"))
obj_add_int(path_attrs, "Qdepth",
nvme_path_get_queue_depth(p));

c = nvme_path_get_ctrl(p);
ctrls = json_create_array();
ctrl_attrs = json_create_object();
obj_add_str(ctrl_attrs, "Name", nvme_ctrl_get_name(c));
obj_add_str(ctrl_attrs, "Transport", nvme_ctrl_get_transport(c));
obj_add_str(ctrl_attrs, "Address", nvme_ctrl_get_address(c));
obj_add_str(ctrl_attrs, "State", nvme_ctrl_get_state(c));
array_add_obj(ctrls, ctrl_attrs);
obj_add_array(path_attrs, "Controller", ctrls);

array_add_obj(paths, path_attrs);
}
obj_add_array(ns_attrs, "Paths", paths);
Expand All @@ -4787,6 +4809,7 @@ static void json_print_nvme_subsystem_topology(nvme_subsystem_t s,

ns_attrs = json_create_object();
obj_add_int(ns_attrs, "NSID", nvme_ns_get_nsid(n));
obj_add_str(ns_attrs, "Name", nvme_ns_get_name(n));

ctrl = json_create_array();
ctrl_attrs = json_create_object();
Expand Down Expand Up @@ -5546,6 +5569,7 @@ static struct print_ops json_print_ops = {
.print_nvme_subsystem_list = json_print_nvme_subsystem_list,
.topology_ctrl = json_simple_topology,
.topology_namespace = json_simple_topology,
.topology_multipath = json_simple_topology,

/* status and error messages */
.connect_msg = json_connect_msg,
Expand Down
Loading
Loading