Skip to content

nvme: fix to call nvme_submit_io_passthru for I/O commands #94

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 2 commits into from
Nov 25, 2025
Merged

nvme: fix to call nvme_submit_io_passthru for I/O commands #94

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96b5f6a
nvme: fix to call nvme_submit_io_passthru for I/O commands
ikegami-t Nov 1, 2025
dc07082
nvme: fix copy_cmd to get pif and sts values
ikegami-t Nov 1, 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
61 changes: 52 additions & 9 deletions nvme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7237,7 +7237,7 @@ static int write_zeroes(int argc, char **argv, struct command *acmd, struct plug
cfg.ref_tag, cfg.storage_tag);
nvme_init_app_tag((struct nvme_passthru_cmd64 *)&cmd, cfg.app_tag,
cfg.app_tag_mask);
err = nvme_submit_admin_passthru(hdl, &cmd, &result);
err = nvme_submit_io_passthru(hdl, &cmd, &result);
if (err < 0)
nvme_show_error("write-zeroes: %s", nvme_strerror(-err));
else if (err != 0)
Expand Down Expand Up @@ -7348,7 +7348,7 @@ static int dsm(int argc, char **argv, struct command *acmd, struct plugin *plugi
nvme_init_dsm_range(dsm, ctx_attrs, nlbs, slbas, nr);
nvme_init_dsm(&cmd, cfg.namespace_id, nr, cfg.idr, cfg.idw, cfg.ad, dsm,
sizeof(*dsm) * 256);
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
if (err < 0)
nvme_show_error("data-set management: %s", nvme_strerror(-err));
else if (err > 0)
Expand All @@ -7359,6 +7359,40 @@ static int dsm(int argc, char **argv, struct command *acmd, struct plugin *plugi
return err;
}

static int
identify_pif_sts(struct nvme_transport_handle *hdl,
__u32 nsid, __u8 *pif, __u8 *sts)
{
_cleanup_free_ struct nvme_nvm_id_ns *nvm_ns = NULL;

_cleanup_free_ struct nvme_id_ns *ns = NULL;

int err;

ns = nvme_alloc(sizeof(*ns));
if (!ns)
return -ENOMEM;

err = nvme_identify_ns(hdl, nsid, ns);
if (err > 0) {
nvme_show_status(err);
return err;
} else if (err < 0) {
nvme_show_error("identify namespace: %s", nvme_strerror(-err));
return err;
}

nvm_ns = nvme_alloc(sizeof(*nvm_ns));
if (!nvm_ns)
return -ENOMEM;

err = nvme_identify_csi_ns(hdl, nsid, NVME_CSI_NVM, 0, nvm_ns);
if (!err)
get_pif_sts(ns, nvm_ns, pif, sts);

return 0;
}

static int copy_cmd(int argc, char **argv, struct command *acmd, struct plugin *plugin)
{
const char *desc = "The Copy command is used by the host to copy data\n"
Expand Down Expand Up @@ -7391,6 +7425,8 @@ static int copy_cmd(int argc, char **argv, struct command *acmd, struct plugin *
__u64 slbas[256] = { 0 };
__u32 snsids[256] = { 0 };
__u16 sopts[256] = { 0 };
__u8 pif = 0;
__u8 sts = 0;
int err;

union {
Expand Down Expand Up @@ -7554,14 +7590,21 @@ static int copy_cmd(int argc, char **argv, struct command *acmd, struct plugin *
break;
}

err = identify_pif_sts(hdl, cfg.namespace_id, &pif, &sts);
if (err)
return err;

if (invalid_tags(0, cfg.ilbrt, sts, pif))
return -EINVAL;

nvme_init_copy(&cmd, cfg.namespace_id, cfg.sdlba, nr, cfg.format,
cfg.prinfor, cfg.prinfow, 0, cfg.dtype, false, false,
cfg.fua, cfg.lr, 0, cfg.dspec, copy->f0);
nvme_init_var_size_tags((struct nvme_passthru_cmd64 *)&cmd,
NVME_NVM_PIF_32B_GUARD, 0, cfg.ilbrt, 0);
nvme_init_var_size_tags((struct nvme_passthru_cmd64 *)&cmd, pif, sts,
cfg.ilbrt, 0);
nvme_init_app_tag((struct nvme_passthru_cmd64 *)&cmd, cfg.lbat,
cfg.lbatm);
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
if (err < 0)
nvme_show_error("NVMe Copy: %s", nvme_strerror(-err));
else if (err != 0)
Expand Down Expand Up @@ -7685,7 +7728,7 @@ static int resv_acquire(int argc, char **argv, struct command *acmd, struct plug

nvme_init_resv_acquire(&cmd, cfg.namespace_id, cfg.racqa, cfg.iekey,
false, cfg.rtype, cfg.crkey, cfg.prkey, payload);
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
if (err < 0)
nvme_show_error("reservation acquire: %s", nvme_strerror(-err));
else if (err > 0)
Expand Down Expand Up @@ -7767,7 +7810,7 @@ static int resv_register(int argc, char **argv, struct command *acmd, struct plu
nvme_init_resv_register(&cmd, cfg.namespace_id, cfg.rrega, cfg.iekey,
false, cfg.cptpl, cfg.crkey, cfg.nrkey,
payload);
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
if (err < 0)
nvme_show_error("reservation register: %s", nvme_strerror(-err));
else if (err > 0)
Expand Down Expand Up @@ -8301,7 +8344,7 @@ static int submit_io(int opcode, char *command, const char *desc, int argc, char
cfg.ref_tag, cfg.storage_tag);
nvme_init_app_tag((struct nvme_passthru_cmd64 *)&cmd, cfg.app_tag,
cfg.app_tag_mask);
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
gettimeofday(&end_time, NULL);
if (cfg.latency)
printf(" latency: %s: %llu us\n",
Expand Down Expand Up @@ -8470,7 +8513,7 @@ static int verify_cmd(int argc, char **argv, struct command *acmd, struct plugin
cfg.ref_tag, cfg.storage_tag);
nvme_init_app_tag((struct nvme_passthru_cmd64 *)&cmd, cfg.app_tag,
cfg.app_tag_mask);
err = nvme_submit_admin_passthru(hdl, &cmd, NULL);
err = nvme_submit_io_passthru(hdl, &cmd, NULL);
if (err < 0)
nvme_show_error("verify: %s", nvme_strerror(-err));
else if (err != 0)
Expand Down