diff options
| author |   Kanchan Joshi <joshi.k@samsung.com> | 2022-05-20 14:36:29 +0530 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2022-05-20 06:17:33 -0600 |
| commit | 00fc2eeb15acc7f7e8713edc6d4d9855936226cb (patch) | |
| tree | b41cffd1ec9b9e2ba74f7080c386e95586818345 /drivers/nvme/host/ioctl.c | |
| parent | blk-mq: fix passthrough plugging (diff) | |
| download | linux-dev-00fc2eeb15acc7f7e8713edc6d4d9855936226cb.tar.xz linux-dev-00fc2eeb15acc7f7e8713edc6d4d9855936226cb.zip | |
nvme: helper for uring-passthrough checks
Factor out a helper consolidating the error checks, and fix typo in a
comment too. This is in preparation to support admin commands on this
path.
Signed-off-by: Kanchan Joshi <joshi.k@samsung.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220520090630.70394-2-joshi.k@samsung.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to '')
| -rw-r--r-- | drivers/nvme/host/ioctl.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c index 7b0e2c9cdcae..114b490592b0 100644 --- a/drivers/nvme/host/ioctl.c +++ b/drivers/nvme/host/ioctl.c @@ -556,22 +556,30 @@ long nvme_ns_chr_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return __nvme_ioctl(ns, cmd, (void __user *)arg); } -static int nvme_ns_uring_cmd(struct nvme_ns *ns, struct io_uring_cmd *ioucmd, - unsigned int issue_flags) +static int nvme_uring_cmd_checks(unsigned int issue_flags) { - struct nvme_ctrl *ctrl = ns->ctrl; - int ret; - - BUILD_BUG_ON(sizeof(struct nvme_uring_cmd_pdu) > sizeof(ioucmd->pdu)); - /* IOPOLL not supported yet */ if (issue_flags & IO_URING_F_IOPOLL) return -EOPNOTSUPP; - /* NVMe passthrough requires bit SQE/CQE support */ + /* NVMe passthrough requires big SQE/CQE support */ if ((issue_flags & (IO_URING_F_SQE128|IO_URING_F_CQE32)) != (IO_URING_F_SQE128|IO_URING_F_CQE32)) return -EOPNOTSUPP; + return 0; +} + +static int nvme_ns_uring_cmd(struct nvme_ns *ns, struct io_uring_cmd *ioucmd, + unsigned int issue_flags) +{ + struct nvme_ctrl *ctrl = ns->ctrl; + int ret; + + BUILD_BUG_ON(sizeof(struct nvme_uring_cmd_pdu) > sizeof(ioucmd->pdu)); + + ret = nvme_uring_cmd_checks(issue_flags); + if (ret) + return ret; switch (ioucmd->cmd_op) { case NVME_URING_CMD_IO: |