[PATCH] nvme: map uring_cmd data even if address is 0
Jens Axboe
axboe at kernel.dk
Thu Feb 20 16:55:01 PST 2025
On 2/20/25 4:51 PM, Xinyu Zhang wrote:
> When using kernel registered bvec fixed buffers, the "address" is
> actually the offset into the bvec rather than userspace address.
> Therefore it can be 0.
> We can skip checking whether the address is NULL before mapping
> uring_cmd data. Bad userspace address will be handled properly later when
> the user buffer is imported.
> With this patch, we will be able to use the kernel registered bvec fixed
> buffers in io_uring NVMe passthru with ublk zero-copy support in
> https://lore.kernel.org/io-uring/20250218224229.837848-1-kbusch@meta.com/T/#u.
>
> Signed-off-by: Xinyu Zhang <xizhang at purestorage.com>
> Reviewed-by: Caleb Sander Mateos <csander at purestorage.com>
> ---
> drivers/nvme/host/ioctl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c
> index 60383da86feda..724ab542b4c33 100644
> --- a/drivers/nvme/host/ioctl.c
> +++ b/drivers/nvme/host/ioctl.c
> @@ -500,7 +500,7 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns,
> return PTR_ERR(req);
> req->timeout = d.timeout_ms ? msecs_to_jiffies(d.timeout_ms) : 0;
>
> - if (d.addr && d.data_len) {
> + if (d.data_len) {
> ret = nvme_map_user_request(req, d.addr,
> d.data_len, nvme_to_user_ptr(d.metadata),
> d.metadata_len, 0, ioucmd, vec);
Looks good to me:
Reviewed-by: Jens Axboe <axboe at kernel.dk>
--
Jens Axboe
More information about the Linux-nvme
mailing list