Commit f337a84d authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: opcode independent fixed buf import 



Fixed buffers are generic infrastructure, make io_import_fixed() opcode
agnostic.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/b1e765c8a1c2c913a05a28d2399fc53e1d3cf37a.1655684496.git.asml.silence@gmail.com


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

io_uring/rw.c

+7 −14
Original line number Diff line number Diff line
@@ -273,14 +273,15 @@ static int kiocb_done(struct io_kiocb *req, ssize_t ret, 
	return IOU_ISSUE_SKIP_COMPLETE;

}



static int __io_import_fixed(struct io_kiocb *req, int ddir,

			     struct iov_iter *iter, struct io_mapped_ubuf *imu)

static int io_import_fixed(int ddir, struct iov_iter *iter,

			   struct io_mapped_ubuf *imu,

			   u64 buf_addr, size_t len)

{

	struct io_rw *rw = io_kiocb_to_cmd(req);

	size_t len = rw->len;

	u64 buf_end, buf_addr = rw->addr;

	u64 buf_end;

	size_t offset;



	if (WARN_ON_ONCE(!imu))

		return -EFAULT;

	if (unlikely(check_add_overflow(buf_addr, (u64)len, &buf_end)))

		return -EFAULT;

	/* not inside the mapped region */
@@ -332,14 +333,6 @@ static int __io_import_fixed(struct io_kiocb *req, int ddir, 
	return 0;

}



static int io_import_fixed(struct io_kiocb *req, int rw, struct iov_iter *iter,

			   unsigned int issue_flags)

{

	if (WARN_ON_ONCE(!req->imu))

		return -EFAULT;

	return __io_import_fixed(req, rw, iter, req->imu);

}



#ifdef CONFIG_COMPAT

static ssize_t io_compat_import(struct io_kiocb *req, struct iovec *iov,

				unsigned int issue_flags)
@@ -426,7 +419,7 @@ static struct iovec *__io_import_iovec(int ddir, struct io_kiocb *req, 
	ssize_t ret;



	if (opcode == IORING_OP_READ_FIXED || opcode == IORING_OP_WRITE_FIXED) {

		ret = io_import_fixed(req, ddir, iter, issue_flags);

		ret = io_import_fixed(ddir, iter, req->imu, rw->addr, rw->len);

		if (ret)

			return ERR_PTR(ret);

		return NULL;