Skip to content

ioctl: nvme_dsm use nvme_passthru_cmd directly #2

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

Closed
ikegami-t wants to merge 14 commits into from
Closed

ioctl: nvme_dsm use nvme_passthru_cmd directly #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ea5835a
ioctl: nvme_identify use nvme_passthru_cmd directly
igaw Jul 31, 2025
52926b4
ioctl: reorder nvme_get_log and nvme_get_log_page
igaw Jul 30, 2025
08703bb
ioctl: nvme_get_log use nvme_passthru_cmd directly
igaw Jul 29, 2025
0f642e1
ioctl: nvme_format_nvm use nvme_passthru_cmd directly
igaw Aug 1, 2025
58dedbd
ioctl: nvme_ns_mgmt use nvme_passthru_cmd directly
igaw Aug 1, 2025
e9e3621
ioctl: nvme_ns_attach use nvme_passthru_cmd directly
igaw Aug 1, 2025
763dc6a
ioctl: nvme_ns_download use nvme_passthru_cmd directly
igaw Aug 1, 2025
52bf56f
ioctl: nvme_fw_commit use nvme_passthru_cmd directly
igaw Aug 1, 2025
499a108
ioctl: nvme_security_send use nvme_passthru_cmd directly
igaw Aug 1, 2025
3876ec6
ioctl: nvme_dsm use nvme_passthru_cmd directly
ikegami-t Aug 2, 2025
812ebf2
ioctl: nvme_io use nvme_passthru_cmd directly
ikegami-t Aug 2, 2025
825164b
ioctl: add dsm and io commands dword fields
ikegami-t Aug 3, 2025
aa9c43f
ioctl: nvme_copy use nvme_passthru_cmd directly
ikegami-t Aug 4, 2025
04bc422
ioctl: reorder nsid argument
ikegami-t Aug 5, 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
19 changes: 9 additions & 10 deletions examples/mi-mctp-csi-test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void hexdump(const unsigned char *buf, int len)

int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)
{
struct nvme_get_log_args args = { 0 };
enum nvme_cmd_get_log_lid lid;
struct nvme_link *link;
uint8_t buf[4096];
uint16_t ctrl_id;
Expand All @@ -75,15 +75,11 @@ int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)

ctrl_id = tmp & 0xffff;

args.args_size = sizeof(args);
args.log = buf;
args.len = sizeof(buf);

if (argc > 2) {
tmp = atoi(argv[2]);
args.lid = tmp & 0xff;
lid = tmp & 0xff;
} else {
args.lid = 0x1;
lid = 0x1;
}

link = nvme_mi_init_link(ep, ctrl_id);
Expand All @@ -92,14 +88,17 @@ int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)
return -1;
}

rc = nvme_get_log(link, &args);
rc = nvme_get_log(link, false, NVME_LOG_LSP_NONE,
lid, NVME_LOG_LSI_NONE, NVME_CSI_NVM, false,
NVME_UUID_NONE, NVME_NSID_NONE,
sizeof(buf), sizeof(buf), 0, buf, NULL);
if (rc) {
warn("can't perform Get Log page command");
return -1;
}

printf("Get log page (log id = 0x%02x) data:\n", args.lid);
hexdump(buf, args.len);
printf("Get log page (log id = 0x%02x) data:\n", lid);
hexdump(buf, sizeof(buf));

return 0;
}
Expand Down
37 changes: 16 additions & 21 deletions examples/mi-mctp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ static const char *__copy_id_str(const void *field, size_t size,

int do_identify(nvme_mi_ep_t ep, int argc, char **argv)
{
struct nvme_identify_args id_args = { 0 };
struct nvme_link *link;
struct nvme_id_ctrl id;
uint16_t ctrl_id;
Expand Down Expand Up @@ -207,23 +206,20 @@ int do_identify(nvme_mi_ep_t ep, int argc, char **argv)
return -1;
}

id_args.data = &id;
id_args.args_size = sizeof(id_args);
id_args.cns = NVME_IDENTIFY_CNS_CTRL;
id_args.nsid = NVME_NSID_NONE;
id_args.cntid = 0;
id_args.csi = NVME_CSI_NVM;

/* for this example code, we can either do a full or partial identify;
* since we're only printing the fields before the 'rab' member,
* these will be equivalent, aside from the size of the MI
* response.
*/
if (partial) {
rc = nvme_identify_partial(link, offsetof(struct nvme_id_ctrl, rab),
&id_args);
rc = nvme_identify_partial(link, 0, NVME_IDENTIFY_CNS_CTRL,
NVME_CSI_NVM, 0, 0, NVME_NSID_NONE,
offsetof(struct nvme_id_ctrl, rab),
&id, NULL);
} else {
rc = nvme_identify(link, &id_args);
rc = nvme_identify(link, 0, NVME_IDENTIFY_CNS_CTRL,
NVME_CSI_NVM, 0, 0, NVME_NSID_NONE,
&id, NULL);
}

if (rc) {
Expand Down Expand Up @@ -373,7 +369,7 @@ void hexdump(const unsigned char *buf, int len)

int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)
{
struct nvme_get_log_args args = { 0 };
enum nvme_cmd_get_log_lid lid;
struct nvme_link *link;
uint8_t buf[512];
uint16_t ctrl_id;
Expand All @@ -392,15 +388,11 @@ int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)

ctrl_id = tmp & 0xffff;

args.args_size = sizeof(args);
args.log = buf;
args.len = sizeof(buf);

if (argc > 2) {
tmp = atoi(argv[2]);
args.lid = tmp & 0xff;
lid = tmp & 0xff;
} else {
args.lid = 0x1;
lid = 0x1;
}

link = nvme_mi_init_link(ep, ctrl_id);
Expand All @@ -409,14 +401,17 @@ int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)
return -1;
}

rc = nvme_get_log(link, &args);
rc = nvme_get_log(link, false, NVME_LOG_LSP_NONE,
lid, NVME_LOG_LSI_NONE, NVME_CSI_NVM, false,
NVME_UUID_NONE, NVME_NSID_NONE,
sizeof(buf), sizeof(buf), 0, buf, NULL);
if (rc) {
warn("can't perform Get Log page command");
return -1;
}

printf("Get log page (log id = 0x%02x) data:\n", args.lid);
hexdump(buf, args.len);
printf("Get log page (log id = 0x%02x) data:\n", lid);
hexdump(buf, sizeof(buf));

return 0;
}
Expand Down
10 changes: 0 additions & 10 deletions src/libnvme.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ LIBNVME_2_0 {
nvme_admin_passthru;
nvme_capacity_mgmt;
nvme_close;
nvme_copy;
nvme_create_ctrl;
nvme_create_root;
nvme_ctrl_config_match;
Expand Down Expand Up @@ -67,23 +66,19 @@ LIBNVME_2_0 {
nvme_directive_send;
nvme_directive_send_id_endir;
nvme_disconnect_ctrl;
nvme_dsm;
nvme_dump_config;
nvme_dump_tree;
nvme_errno_to_string;
nvme_export_tls_key;
nvme_export_tls_key_versioned;
nvme_first_host;
nvme_first_subsystem;
nvme_format_nvm;
nvme_free_ctrl;
nvme_free_host;
nvme_free_ns;
nvme_free_root;
nvme_free_subsystem;
nvme_free_uri;
nvme_fw_commit;
nvme_fw_download;
nvme_fw_download_seq;
nvme_gen_dhchap_key;
nvme_generate_tls_key_identity;
Expand Down Expand Up @@ -129,7 +124,6 @@ LIBNVME_2_0 {
nvme_get_features_write_protect;
nvme_get_host_telemetry;
nvme_get_lba_status;
nvme_get_log;
nvme_get_log_page;
nvme_get_logging_level;
nvme_get_logical_block_size;
Expand All @@ -153,8 +147,6 @@ LIBNVME_2_0 {
nvme_host_set_dhchap_key;
nvme_host_set_hostsymname;
nvme_host_set_pdc_enabled;
nvme_identify;
nvme_identify_partial;
nvme_import_tls_key;
nvme_import_tls_key_versioned;
nvme_init_copy_range;
Expand All @@ -168,7 +160,6 @@ LIBNVME_2_0 {
nvme_init_logging;
nvme_insert_tls_key;
nvme_insert_tls_key_versioned;
nvme_io;
nvme_io_mgmt_recv;
nvme_io_mgmt_send;
nvme_io_passthru64;
Expand Down Expand Up @@ -261,7 +252,6 @@ LIBNVME_2_0 {
nvme_ns_get_sysfs_dir;
nvme_ns_get_uuid;
nvme_ns_identify;
nvme_ns_mgmt;
nvme_ns_read;
nvme_ns_release_link;
nvme_ns_rescan;
Expand Down
Loading