[PATCH 2/3] io_uring: add IORING_OP_PROVIDE_BUFFER

Jens Axboe
2020-02-25T16:04:58Z

IORING_OP_PROVIDE_BUFFER uses the buffer registration infrastructure to
support passing in an addr/len that is associated with a buffer ID and
buffer group ID. The group ID is used to index and lookup the buffers,
while the buffer ID can be used to notify the application which buffer
in the group was used.

At least for now, no validation is done of the buffer ID. If the
application provides buffers within the same group with identical buffer
IDs, then it'll have a hard time telling which buffer ID was used. The
only restriction is that the buffer ID can be a max of 16-bits in size,
so USHRT_MAX is the maximum ID that can be used.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
fs/io_uring.c | 86 ++++++++++++++++++++++++++++++++++-
include/uapi/linux/io_uring.h | 1 +
2 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index d985da9252a2..d28602f32936 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -452,6 +452,14 @@ struct io_splice {
unsigned int flags;
};

+struct io_provide_buf {
+ struct file *file;
+ __u64 addr;
+ __s32 len;
+ __u32 gid;
+ __u16 bid;
+};
+
struct io_async_connect {
struct sockaddr_storage address;
};
@@ -577,6 +585,7 @@ struct io_kiocb {
struct io_madvise madvise;
struct io_epoll epoll;
struct io_splice splice;
+ struct io_provide_buf pbuf;
};

struct io_async_ctx *io;
@@ -804,7 +813,8 @@ static const struct io_op_def io_op_defs[] = {
.needs_file = 1,
.hash_reg_file = 1,
.unbound_nonreg_file = 1,
- }
+ },
+ [IORING_OP_PROVIDE_BUFFER] = {},
};

static void io_wq_submit_work(struct io_wq_work **workptr);
@@ -2807,6 +2817,69 @@ static int io_openat(struct io_kiocb *req, struct io_kiocb **nxt,
return io_openat2(req, nxt, force_nonblock);
}

+static int io_provide_buffer_prep(struct io_kiocb *req,
+ const struct io_uring_sqe *sqe)
+{
+ struct io_provide_buf *p = &req->pbuf;
+ u64 off;
+
+ p->addr = READ_ONCE(sqe->addr);
+ p->len = READ_ONCE(sqe->len);
+ p->gid = READ_ONCE(sqe->fd);
+ off = READ_ONCE(sqe->off);
+ if (off > USHRT_MAX)
+ return -EINVAL;
+ p->bid = off;
+ return 0;
+}
+
+static int io_provide_buffer(struct io_kiocb *req, struct io_kiocb **nxt)
+{
+ struct io_provide_buf *p = &req->pbuf;
+ struct io_ring_ctx *ctx = req->ctx;
+ struct list_head *list;
+ struct io_buffer *buf;
+ int ret = 0;
+
+ list = idr_find(&ctx->io_buffer_idr, p->gid);
+ if (!list) {
+ list = kmalloc(sizeof(*list), GFP_KERNEL);
+ if (!list) {
+ ret = -ENOMEM;
+ goto out;
+ }
+ INIT_LIST_HEAD(list);
+ ret = idr_alloc(&ctx->io_buffer_idr, list, p->gid, p->gid + 1,
+ GFP_KERNEL);
+ if (ret < 0) {
+ kfree(list);
+ goto out;
+ }
+ }
+
+ buf = kmalloc(sizeof(*buf), GFP_KERNEL);
+ if (!buf) {
+ if (list_empty(list)) {
+ idr_remove(&ctx->io_buffer_idr, p->gid);
+ kfree(list);
+ }
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ buf->addr = p->addr;
+ buf->len = p->len;
+ buf->bid = p->bid;
+ list_add(&buf->list, list);
+ ret = buf->bid;
+out:
+ if (ret < 0)
+ req_set_fail_links(req);
+ io_cqring_add_event(req, ret);
+ io_put_req_find_next(req, nxt);
+ return 0;
+}
+
static int io_epoll_ctl_prep(struct io_kiocb *req,
const struct io_uring_sqe *sqe)
{
@@ -4422,6 +4495,9 @@ static int io_req_defer_prep(struct io_kiocb *req,
case IORING_OP_SPLICE:
ret = io_splice_prep(req, sqe);
break;
+ case IORING_OP_PROVIDE_BUFFER:
+ ret = io_provide_buffer_prep(req, sqe);
+ break;
default:
printk_once(KERN_WARNING "io_uring: unhandled opcode %d\n",
req->opcode);
@@ -4699,6 +4775,14 @@ static int io_issue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
}
ret = io_splice(req, nxt, force_nonblock);
break;
+ case IORING_OP_PROVIDE_BUFFER:
+ if (sqe) {
+ ret = io_provide_buffer_prep(req, sqe);
+ if (ret)
+ break;
+ }
+ ret = io_provide_buffer(req, nxt);
+ break;
default:
ret = -EINVAL;
break;
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index 53b36311cdac..7e2af5753bcc 100644
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -119,6 +119,7 @@ enum {
IORING_OP_OPENAT2,
IORING_OP_EPOLL_CTL,
IORING_OP_SPLICE,
+ IORING_OP_PROVIDE_BUFFER,

/* this goes last, obviously */
IORING_OP_LAST,
--
2.25.1