io_uring/kbuf: rename is_mapped

In buffer lists we have ->is_mapped as well as ->is_mmap, it's
pretty hard to stay sane double checking which one means what,
and in the long run there is a high chance of an eventual bug.
Rename ->is_mapped into ->is_buf_ring.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/c4838f4d8ad506ad6373f1c305aee2d2c1a89786.1710343154.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c
index 9be42bff936b95750beee16661893d7686a1fcb9..693c26da4ee1a36b4b0acee0b0cc7a7d0cfde3e6 100644 (file)
--- a/io_uring/kbuf.c
+++ b/io_uring/kbuf.c
@@ -199,7 +199,7 @@ void __user *io_buffer_select(struct io_kiocb *req, size_t *len,
 
        bl = io_buffer_get_list(ctx, req->buf_index);
        if (likely(bl)) {
-               if (bl->is_mapped)
+               if (bl->is_buf_ring)
                        ret = io_ring_buffer_select(req, len, bl, issue_flags);
                else
                        ret = io_provided_buffer_select(req, len, bl);
@@ -253,7 +253,7 @@ static int __io_remove_buffers(struct io_ring_ctx *ctx,
        if (!nbufs)
                return 0;
 
-       if (bl->is_mapped) {
+       if (bl->is_buf_ring) {
                i = bl->buf_ring->tail - bl->head;
                if (bl->is_mmap) {
                        /*
@@ -274,7 +274,7 @@ static int __io_remove_buffers(struct io_ring_ctx *ctx,
                }
                /* make sure it's seen as empty */
                INIT_LIST_HEAD(&bl->buf_list);
-               bl->is_mapped = 0;
+               bl->is_buf_ring = 0;
                return i;
        }
 
@@ -361,7 +361,7 @@ int io_remove_buffers(struct io_kiocb *req, unsigned int issue_flags)
        if (bl) {
                ret = -EINVAL;
                /* can't use provide/remove buffers command on mapped buffers */
-               if (!bl->is_mapped)
+               if (!bl->is_buf_ring)
                        ret = __io_remove_buffers(ctx, bl, p->nbufs);
        }
        io_ring_submit_unlock(ctx, issue_flags);
@@ -519,7 +519,7 @@ int io_provide_buffers(struct io_kiocb *req, unsigned int issue_flags)
                }
        }
        /* can't add buffers via this command for a mapped buffer ring */
-       if (bl->is_mapped) {
+       if (bl->is_buf_ring) {
                ret = -EINVAL;
                goto err;
        }
@@ -575,7 +575,7 @@ static int io_pin_pbuf_ring(struct io_uring_buf_reg *reg,
        bl->buf_pages = pages;
        bl->buf_nr_pages = nr_pages;
        bl->buf_ring = br;
-       bl->is_mapped = 1;
+       bl->is_buf_ring = 1;
        bl->is_mmap = 0;
        return 0;
 error_unpin:
@@ -642,7 +642,7 @@ static int io_alloc_pbuf_ring(struct io_ring_ctx *ctx,
        }
        ibf->inuse = 1;
        bl->buf_ring = ibf->mem;
-       bl->is_mapped = 1;
+       bl->is_buf_ring = 1;
        bl->is_mmap = 1;
        return 0;
 }
@@ -688,7 +688,7 @@ int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg)
        bl = io_buffer_get_list(ctx, reg.bgid);
        if (bl) {
                /* if mapped buffer ring OR classic exists, don't allow */
-               if (bl->is_mapped || !list_empty(&bl->buf_list))
+               if (bl->is_buf_ring || !list_empty(&bl->buf_list))
                        return -EEXIST;
        } else {
                free_bl = bl = kzalloc(sizeof(*bl), GFP_KERNEL);
@@ -730,7 +730,7 @@ int io_unregister_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg)
        bl = io_buffer_get_list(ctx, reg.bgid);
        if (!bl)
                return -ENOENT;
-       if (!bl->is_mapped)
+       if (!bl->is_buf_ring)
                return -EINVAL;
 
        __io_remove_buffers(ctx, bl, -1U);
@@ -757,7 +757,7 @@ int io_register_pbuf_status(struct io_ring_ctx *ctx, void __user *arg)
        bl = io_buffer_get_list(ctx, buf_status.buf_group);
        if (!bl)
                return -ENOENT;
-       if (!bl->is_mapped)
+       if (!bl->is_buf_ring)
                return -EINVAL;
 
        buf_status.head = bl->head;

diff --git a/io_uring/kbuf.h b/io_uring/kbuf.h
index 5218bfd79e871eef88d0a34445ee72731320be22..1c7b654ee7263af16e1491934dcbc21744a4a337 100644 (file)
--- a/io_uring/kbuf.h
+++ b/io_uring/kbuf.h
@@ -26,7 +26,7 @@ struct io_buffer_list {
        __u16 mask;
 
        /* ring mapped provided buffers */
-       __u8 is_mapped;
+       __u8 is_buf_ring;
        /* ring mapped provided buffers, but mmap'ed by application */
        __u8 is_mmap;
        /* bl is visible from an RCU point of view for lookup */