nvme/ioctl: allow 64-bit results in io-passthru command
PATCH v2 1/1 nvme/ioctl: allow 64-bit results in io-passthru command
Deprecated NVME_IOCTL_IO_CMD ioctl on the char device. But nvme-cli still uses it and NVME_IOCTL_IO64_CMD for now. So add NVME_IOCTL_IO64_CMD also to allow it.
Signed-off-by Tokunori Ikegami <[email protected]>
--- drivers/nvme/host/ioctl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/nvme/host/ioctl.c +8 -3
@@ -809,7 +809,7 @@ int nvme_dev_uring_cmd(struct io_uring_cmd *ioucmd, unsigned int issue_flags) }static int nvme_dev_user_cmd (struct nvme_ctrl *ctrl,void __user *argp, -bool open_for_write) +bool open_for_write,bool is64bit) {struct nvme_ns *ns;int ret, srcu_idx;
@@ -836,7 +836,10 @@ static int nvme_dev_user_cmd(struct nvme_ctrl *ctrl, void __user *argp, }srcu_read_unlock (&ctrl->srcu, srcu_idx); - ret =nvme_user_cmd (ctrl, ns, argp,0 , open_for_write); +if (is64bit) + ret =nvme_user_cmd64 (ctrl, ns, argp,0 , open_for_write); +else + ret =nvme_user_cmd (ctrl, ns, argp,0 , open_for_write);nvme_put_ns (ns);return ret;
@@ -858,7 +861,9 @@ long nvme_dev_ioctl(struct file *file, unsigned int cmd,case NVME_IOCTL_ADMIN64_CMD :return nvme_user_cmd64 (ctrl,NULL , argp,0 , open_for_write);case NVME_IOCTL_IO_CMD : -return nvme_dev_user_cmd (ctrl, argp, open_for_write); +return nvme_dev_user_cmd (ctrl, argp, open_for_write, false); +case NVME_IOCTL_IO64_CMD : +return nvme_dev_user_cmd (ctrl, argp, open_for_write, true);case NVME_IOCTL_RESET :if (!capable (CAP_SYS_ADMIN ))return -EACCES ;
Signature · 1 line
2.51.0