Commit 99fde895 authored by Xinyu Zhang's avatar Xinyu Zhang Committed by Jens Axboe
Browse files

nvme: map uring_cmd data even if address is 0 



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.

Reviewed-by: default avatarCaleb Sander Mateos <csander@purestorage.com>
Reviewed-by: default avatarJens Axboe <axboe@kernel.dk>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarXinyu Zhang <xizhang@purestorage.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/20250227223916.143006-4-kbusch@meta.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ff92d824

drivers/nvme/host/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,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, ioucmd, vec, issue_flags);