Skip to content

libnvme: use 64-bit version struct nvme_passtru_cmd everywhere #2963

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 3 commits into from
Dec 1, 2025
Merged

libnvme: use 64-bit version struct nvme_passtru_cmd everywhere #2963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5427479
libnvme: use 64-bit version struct nvme_passtru_cmd everywhere
igaw Nov 7, 2025
9320951
ioctl: add hooks into submission path
igaw Nov 26, 2025
89f5ce8
src: drop result argument from submit API
igaw Nov 26, 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
2 changes: 1 addition & 1 deletion libnvme/examples/mi-mctp-csi-test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)

nvme_init_get_log(&cmd, NVME_NSID_NONE, lid, NVME_CSI_NVM,
buf, sizeof(buf));
rc = nvme_get_log(hdl, &cmd, false, NVME_LOG_PAGE_PDU_SIZE, NULL);
rc = nvme_get_log(hdl, &cmd, false, NVME_LOG_PAGE_PDU_SIZE);
if (rc) {
warn("can't perform Get Log page command");
return -1;
Expand Down
6 changes: 3 additions & 3 deletions libnvme/examples/mi-mctp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ int do_identify(nvme_mi_ep_t ep, int argc, char **argv)
if (partial)
cmd.data_len = offsetof(struct nvme_id_ctrl, rab);

rc = nvme_submit_admin_passthru(hdl, &cmd, NULL);
rc = nvme_submit_admin_passthru(hdl, &cmd);
if (rc) {
warn("can't perform Admin Identify command");
return -1;
Expand Down Expand Up @@ -399,7 +399,7 @@ int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)

nvme_init_get_log(&cmd, NVME_NSID_NONE, lid, NVME_CSI_NVM,
buf, sizeof(buf));
rc = nvme_get_log(hdl, &cmd, true, NVME_LOG_PAGE_PDU_SIZE, NULL);
rc = nvme_get_log(hdl, &cmd, true, NVME_LOG_PAGE_PDU_SIZE);
if (rc) {
warn("can't perform Get Log page command");
return -1;
Expand Down Expand Up @@ -566,7 +566,7 @@ int do_security_info(nvme_mi_ep_t ep, int argc, char **argv)
}

nvme_init_security_receive(&cmd, 0, 0, 0, 0, 0, data, data_len);
rc = nvme_submit_admin_passthru(hdl, &cmd, NULL);
rc = nvme_submit_admin_passthru(hdl, &cmd);
if (rc) {
warnx("can't perform Security Receive command: rc %d", rc);
return -1;
Expand Down
2 changes: 1 addition & 1 deletion libnvme/libnvme/nvme.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ struct nvme_ns {

Py_BEGIN_ALLOW_THREADS /* Release Python GIL */
nvme_init_get_log_supported_log_pages(&cmd, NVME_CSI_NVM, &log);
ret = nvme_get_log(nvme_ctrl_get_transport_handle($self), &cmd, rae, NVME_LOG_PAGE_PDU_SIZE, NULL);
ret = nvme_get_log(nvme_ctrl_get_transport_handle($self), &cmd, rae, NVME_LOG_PAGE_PDU_SIZE);
Py_END_ALLOW_THREADS /* Reacquire Python GIL */

if (ret) {
Expand Down
12 changes: 4 additions & 8 deletions libnvme/src/libnvme.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ LIBNVME_1_16 {

LIBNVME_2_0 {
global:
nvme_admin_passthru64;
nvme_admin_passthru;
nvme_close;
nvme_create_ctrl;
nvme_create_global_ctx;
Expand Down Expand Up @@ -132,8 +130,6 @@ LIBNVME_2_0 {
nvme_init_logging;
nvme_insert_tls_key;
nvme_insert_tls_key_versioned;
nvme_io_passthru64;
nvme_io_passthru;
nvme_ipaddrs_eq;
nvme_lookup_ctrl;
nvme_lookup_host;
Expand Down Expand Up @@ -244,18 +240,15 @@ LIBNVME_2_0 {
nvme_scan_topology;
nvme_set_application;
nvme_set_debug;
nvme_set_dry_run;
nvme_set_keyring;
nvme_set_property;
nvme_set_root;
nvme_skip_namespaces;
nvme_status_to_errno;
nvme_status_to_string;
nvme_submit_admin_passthru64;
nvme_submit_admin_passthru;
nvme_submit_io_passthru64;
nvme_submit_io_passthru;
nvme_submit_passthru64;
nvme_submit_passthru;
nvme_subsys_filter;
nvme_subsystem_first_ctrl;
nvme_subsystem_first_ns;
Expand All @@ -281,6 +274,9 @@ LIBNVME_2_0 {
nvme_transport_handle_is_chardev;
nvme_transport_handle_is_direct;
nvme_transport_handle_is_mi;
nvme_transport_handle_set_decide_retry;
nvme_transport_handle_set_submit_entry;
nvme_transport_handle_set_submit_exit;
nvme_unlink_ctrl;
nvme_update_config;
nvme_update_key;
Expand Down
9 changes: 4 additions & 5 deletions libnvme/src/nvme/fabrics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,7 +1134,7 @@ static int nvme_discovery_log(const struct nvme_get_discovery_args *args,
nvme_msg(ctx, LOG_DEBUG, "%s: get header (try %d/%d)\n",
name, retries, args->max_retries);
nvme_init_get_log_discovery(&cmd, 0, log, DISCOVERY_HEADER_LEN);
err = nvme_get_log(hdl, &cmd, false, DISCOVERY_HEADER_LEN, NULL);
err = nvme_get_log(hdl, &cmd, false, DISCOVERY_HEADER_LEN);
if (err) {
nvme_msg(ctx, LOG_INFO,
"%s: discover try %d/%d failed, errno %d status 0x%x\n",
Expand Down Expand Up @@ -1168,8 +1168,7 @@ static int nvme_discovery_log(const struct nvme_get_discovery_args *args,
cmd.cdw10 |= NVME_FIELD_ENCODE(args->lsp,
NVME_LOG_CDW10_LSP_SHIFT,
NVME_LOG_CDW10_LSP_MASK);
err = nvme_get_log(hdl, &cmd, false,
NVME_LOG_PAGE_PDU_SIZE, NULL);
err = nvme_get_log(hdl, &cmd, false, NVME_LOG_PAGE_PDU_SIZE);
if (err) {
nvme_msg(ctx, LOG_INFO,
"%s: discover try %d/%d failed, errno %d status 0x%x\n",
Expand All @@ -1184,7 +1183,7 @@ static int nvme_discovery_log(const struct nvme_get_discovery_args *args,
nvme_msg(ctx, LOG_DEBUG, "%s: get header again\n", name);

nvme_init_get_log_discovery(&cmd, 0, log, DISCOVERY_HEADER_LEN);
err = nvme_get_log(hdl, &cmd, false, DISCOVERY_HEADER_LEN, NULL);
err = nvme_get_log(hdl, &cmd, false, DISCOVERY_HEADER_LEN);
if (err) {
nvme_msg(ctx, LOG_INFO,
"%s: discover try %d/%d failed, errno %d status 0x%x\n",
Expand Down Expand Up @@ -1669,7 +1668,7 @@ static int nvmf_dim(nvme_ctrl_t c, enum nvmf_dim_tas tas, __u8 trtype,
nvmf_fill_die(die, c->s->h, tel, trtype, adrfam, reg_addr, tsas);

nvme_init_dim_send(&cmd, tas, dim, tdl);
return nvme_submit_admin_passthru(hdl, &cmd, NULL);
return nvme_submit_admin_passthru(hdl, &cmd);
}

/**
Expand Down
Loading
Loading