summaryrefslogtreecommitdiff
path: root/io_uring/kbuf.h
diff options
context:
space:
mode:
authorDylan Yudaken <dylany@fb.com>2022-06-30 12:12:21 +0300
committerJens Axboe <axboe@kernel.dk>2022-07-25 03:39:16 +0300
commit32f3c434b14238a2eee0c726a1918de58c07faf6 (patch)
tree0a636f8067fcc325416a3a6cbc686a33ba521749 /io_uring/kbuf.h
parentb8c015598c8ef9195b8a2a5089e275c4f64ca999 (diff)
downloadlinux-32f3c434b14238a2eee0c726a1918de58c07faf6.tar.xz
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>
Diffstat (limited to 'io_uring/kbuf.h')
-rw-r--r--io_uring/kbuf.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/io_uring/kbuf.h b/io_uring/kbuf.h
index b3e8c6c5fee1..d6af208d109f 100644
--- 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)