Skip to content

tree: support apple-nvme transport #1071

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
Oct 7, 2025
+56 −3
Merged

tree: support apple-nvme transport #1071

Show file tree
Hide file tree
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
9 changes: 6 additions & 3 deletions src/nvme/tree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,7 +1417,8 @@ struct nvme_ctrl *nvme_create_ctrl(nvme_root_t r,
return NULL;
}
if (strncmp(transport, "loop", 4) &&
strncmp(transport, "pcie", 4) && !traddr) {
strncmp(transport, "pcie", 4) &&
strncmp(transport, "apple-nvme", 10) && !traddr) {
nvme_msg(r, LOG_ERR, "No transport address for '%s'\n",
transport);
errno = EINVAL;
Expand Down Expand Up @@ -2166,7 +2167,8 @@ static nvme_ctrl_t nvme_ctrl_alloc(nvme_root_t r, nvme_subsystem_t s,
goto skip_address;

/* Older kernel don't support pcie transport addresses */
if (strcmp(transport, "pcie")) {
if (strcmp(transport, "pcie") &&
strcmp(transport, "apple-nvme")) {
errno = ENXIO;
return NULL;
}
Expand All @@ -2187,7 +2189,8 @@ static nvme_ctrl_t nvme_ctrl_alloc(nvme_root_t r, nvme_subsystem_t s,
}
if (p)
addr = strdup(p);
} else if (!strcmp(transport, "pcie")) {
} else if (!strcmp(transport, "pcie") ||
!strcmp(transport, "apple-nvme")) {
/* The 'address' string is the transport address */
traddr = addr;
} else {
Expand Down
49 changes: 49 additions & 0 deletions test/sysfs/data/tree-apple-nvme.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"hosts":[
{
"hostnqn":"nqn.2014-08.org.nvmexpress:uuid:ce4fee3e-c02c-11ee-8442-830d068a36c6",
"hostid":"ce4fee3e-c02c-11ee-8442-830d068a36c6",
"subsystems":[
{
"name":"nvme-subsys0",
"nqn":"nqn.2014.08.org.nvmexpress:106b106b0ba01e49841cc620 APPLE SSD AP2048Z",
"namespaces":[
{
"nsid":1,
"name":"nvme0n1",
"controller":[
{
"name":"nvme0",
"transport":"apple-nvme",
"traddr":"27bcc0000.nvme"
}
]
},
{
"nsid":2,
"name":"nvme0n2",
"controller":[
{
"name":"nvme0",
"transport":"apple-nvme",
"traddr":"27bcc0000.nvme"
}
]
},
{
"nsid":3,
"name":"nvme0n3",
"controller":[
{
"name":"nvme0",
"transport":"apple-nvme",
"traddr":"27bcc0000.nvme"
}
]
}
]
}
]
}
]
}
Binary file added test/sysfs/data/tree-apple-nvme.tar.xz
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions test/sysfs/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ if diff.found()

tree_data = [
'tree-pcie',
'tree-apple-nvme',
]

tree_diff = find_program('tree-diff.sh')
Expand Down
Loading