io_uring: restore bgid in io_put_kbuf

Attempt to restore bgid. This is needed when recycling unused buffers as
the next time around it will want the correct bgid.

Signed-off-by: Dylan Yudaken <dylany@fb.com>
Link: https://lore.kernel.org/r/20220630091231.1456789-3-dylany@fb.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/kbuf.h b/io_uring/kbuf.h
index b3e8c6c5fee1432d601a3ea64718e676d57599cf..d6af208d109ffe2956741c42a0a3daeb150745aa 100644 (file)
--- a/io_uring/kbuf.h
+++ b/io_uring/kbuf.h
@@ -103,16 +103,21 @@ static inline void io_kbuf_recycle(struct io_kiocb *req, unsigned issue_flags)
 static inline unsigned int __io_put_kbuf_list(struct io_kiocb *req,
                                              struct list_head *list)
 {
+       unsigned int ret = IORING_CQE_F_BUFFER | (req->buf_index << IORING_CQE_BUFFER_SHIFT);
+
        if (req->flags & REQ_F_BUFFER_RING) {
-               if (req->buf_list)
+               if (req->buf_list) {
+                       req->buf_index = req->buf_list->bgid;
                        req->buf_list->head++;
+               }
                req->flags &= ~REQ_F_BUFFER_RING;
        } else {
+               req->buf_index = req->kbuf->bgid;
                list_add(&req->kbuf->list, list);
                req->flags &= ~REQ_F_BUFFER_SELECTED;
        }
 
-       return IORING_CQE_F_BUFFER | (req->buf_index << IORING_CQE_BUFFER_SHIFT);
+       return ret;
 }
 
 static inline unsigned int io_put_kbuf_comp(struct io_kiocb *req)