Skip to content

nvme: allow char dev filter for show-pology and list-subsys commands #3120

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 1 commit into from
Mar 2, 2026
Merged

nvme: allow char dev filter for show-pology and list-subsys commands #3120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions nvme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3456,19 +3456,29 @@ static int create_ns(int argc, char **argv, struct command *acmd, struct plugin
return err;
}

static bool nvme_match_devname(char *devname, nvme_ns_t ns)
{
if (!strcmp(devname, nvme_ns_get_name(ns)) ||
!strcmp(devname, nvme_ctrl_get_name(nvme_ns_get_ctrl(ns))) ||
!strcmp(devname, nvme_ns_get_generic_name(ns)))
return true;

return false;
}

static bool nvme_match_device_filter(nvme_subsystem_t s,
nvme_ctrl_t c, nvme_ns_t ns, void *f_args)
{
char *devname = f_args;
nvme_ns_t n;

if (ns && !strcmp(devname, nvme_ns_get_name(ns)))
if (ns && nvme_match_devname(devname, ns))
return true;

if (c) {
s = nvme_ctrl_get_subsystem(c);
nvme_ctrl_for_each_ns(c, n) {
if (!strcmp(devname, nvme_ns_get_name(n)))
if (nvme_match_devname(devname, n))
return true;
}
}
Expand Down Expand Up @@ -3524,7 +3534,8 @@ static int list_subsys(int argc, char **argv, struct command *acmd,
if (devname) {
int subsys_num;

if (sscanf(devname, "nvme%dn%d", &subsys_num, &nsid) != 2) {
if (sscanf(devname, "nvme%dn%d", &subsys_num, &nsid) < 1 &&
sscanf(devname, "ng%dn%d", &subsys_num, &nsid) != 2) {
nvme_show_error("Invalid device name %s", devname);
return -EINVAL;
}
Expand Down Expand Up @@ -10397,7 +10408,8 @@ static int show_topology_cmd(int argc, char **argv, struct command *acmd, struct
if (devname) {
int subsys_id, nsid;

if (sscanf(devname, "nvme%dn%d", &subsys_id, &nsid) != 2) {
if (sscanf(devname, "nvme%dn%d", &subsys_id, &nsid) < 1 &&
sscanf(devname, "ng%dn%d", &subsys_id, &nsid) != 2) {
nvme_show_error("Invalid device name %s\n", devname);
return -EINVAL;
}
Expand Down