archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-08 01:24:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

io_uring/rsrc: replace reg buffer bit field with flags

Browse source 
I'll need a flag in the registered buffer struct for dmabuf work, and
it'll be more convenient to have a flags field rather than bit fields,
especially for io_mapped_ubuf initialisation.

We might want to add more flags in the future as well. For example, it
might be useful for debugging and potentially optimisations to split out
a flag indicating the shape of the buffer to gate iov_iter_advance()
walks vs bit/mask arithmetics. It can also be combined with the
direction mask field.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2026-02-09 14:31:22 +00:00 • committed by Jens Axboe
parent 417d029dc4
commit 0efc331d78
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
io_uring/rsrc.c
View file

@ -828,7 +828,7 @@ static struct io_rsrc_node *io_sqe_buffer_register(struct io_ring_ctx *ctx,
imu->folio_shift = PAGE_SHIFT; imu->folio_shift = PAGE_SHIFT;
imu->release = io_release_ubuf; imu->release = io_release_ubuf;
imu->priv = imu; imu->priv = imu;
imu->is_kbuf = false; imu->flags = 0;
imu->dir = IO_IMU_DEST | IO_IMU_SOURCE; imu->dir = IO_IMU_DEST | IO_IMU_SOURCE;
if (coalesced) if (coalesced)
imu->folio_shift = data.folio_shift; imu->folio_shift = data.folio_shift;
@ -985,7 +985,7 @@ int io_buffer_register_bvec(struct io_uring_cmd *cmd, struct request *rq,
refcount_set(&imu->refs, 1); refcount_set(&imu->refs, 1);
imu->release = release; imu->release = release;
imu->priv = rq; imu->priv = rq;
imu->is_kbuf = true; imu->flags = IO_REGBUF_F_KBUF;
imu->dir = 1 << rq_data_dir(rq); imu->dir = 1 << rq_data_dir(rq);
rq_for_each_bvec(bv, rq, rq_iter) rq_for_each_bvec(bv, rq, rq_iter)
@ -1020,7 +1020,7 @@ int io_buffer_unregister_bvec(struct io_uring_cmd *cmd, unsigned int index,
ret = -EINVAL; ret = -EINVAL;
goto unlock; goto unlock;
} }
if (!node->buf->is_kbuf) { if (!(node->buf->flags & IO_REGBUF_F_KBUF)) {
ret = -EBUSY; ret = -EBUSY;
goto unlock; goto unlock;
} }
@ -1076,7 +1076,7 @@ static int io_import_fixed(int ddir, struct iov_iter *iter,
offset = buf_addr - imu->ubuf; offset = buf_addr - imu->ubuf;
if (imu->is_kbuf) if (imu->flags & IO_REGBUF_F_KBUF)
return io_import_kbuf(ddir, iter, imu, len, offset); return io_import_kbuf(ddir, iter, imu, len, offset);
/* /*
@ -1496,7 +1496,7 @@ int io_import_reg_vec(int ddir, struct iov_iter *iter,
iovec_off = vec->nr - nr_iovs; iovec_off = vec->nr - nr_iovs;
iov = vec->iovec + iovec_off; iov = vec->iovec + iovec_off;
if (imu->is_kbuf) { if (imu->flags & IO_REGBUF_F_KBUF) {
int ret = io_kern_bvec_size(iov, nr_iovs, imu, &nr_segs); int ret = io_kern_bvec_size(iov, nr_iovs, imu, &nr_segs);
if (unlikely(ret)) if (unlikely(ret))
@ -1534,7 +1534,7 @@ int io_import_reg_vec(int ddir, struct iov_iter *iter,
req->flags |= REQ_F_NEED_CLEANUP; req->flags |= REQ_F_NEED_CLEANUP;
} }
if (imu->is_kbuf) if (imu->flags & IO_REGBUF_F_KBUF)
return io_vec_fill_kern_bvec(ddir, iter, imu, iov, nr_iovs, vec); return io_vec_fill_kern_bvec(ddir, iter, imu, iov, nr_iovs, vec);
return io_vec_fill_bvec(ddir, iter, imu, iov, nr_iovs, vec); return io_vec_fill_bvec(ddir, iter, imu, iov, nr_iovs, vec);

6
io_uring/rsrc.h
View file

@ -28,6 +28,10 @@ enum {
IO_IMU_SOURCE = 1 << ITER_SOURCE, IO_IMU_SOURCE = 1 << ITER_SOURCE,
}; };
enum {
IO_REGBUF_F_KBUF = 1,
};
struct io_mapped_ubuf { struct io_mapped_ubuf {
u64 ubuf; u64 ubuf;
unsigned int len; unsigned int len;
@ -37,7 +41,7 @@ struct io_mapped_ubuf {
unsigned long acct_pages; unsigned long acct_pages;
void (*release)(void *); void (*release)(void *);
void *priv; void *priv;
bool is_kbuf; u8 flags;
u8 dir; u8 dir;
struct bio_vec bvec[] __counted_by(nr_bvecs); struct bio_vec bvec[] __counted_by(nr_bvecs);
}; };

3
io_uring/rw.c
View file

@ -702,7 +702,8 @@ static ssize_t loop_rw_iter(int ddir, struct io_rw *rw, struct iov_iter *iter)
if ((kiocb->ki_flags & IOCB_NOWAIT) && if ((kiocb->ki_flags & IOCB_NOWAIT) &&
!(kiocb->ki_filp->f_flags & O_NONBLOCK)) !(kiocb->ki_filp->f_flags & O_NONBLOCK))
return -EAGAIN; return -EAGAIN;
if ((req->flags & REQ_F_BUF_NODE) && req->buf_node->buf->is_kbuf) if ((req->flags & REQ_F_BUF_NODE) &&
(req->buf_node->buf->flags & IO_REGBUF_F_KBUF))
return -EFAULT; return -EFAULT;
ppos = io_kiocb_ppos(kiocb); ppos = io_kiocb_ppos(kiocb);