io_uring/kbuf: move io_ring_head_to_buf() to kbuf.h

axboe · axboe · commit 2c8fa70bf3e9 · 2024-08-29T08:44:42.000-06:00
In preparation for using this helper in kbuf.h as well, move it there and
turn it into a macro.

Signed-off-by: Jens Axboe &lt;axboe@kernel.dk&gt;
diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c
@@ -132,12 +132,6 @@ static int io_provided_buffers_select(struct io_kiocb *req, size_t *len,
 	return 0;
 }
 
-static struct io_uring_buf *io_ring_head_to_buf(struct io_uring_buf_ring *br,
-						__u16 head, __u16 mask)
-{
-	return &br->bufs[head & mask];
-}
-
 static void __user *io_ring_buffer_select(struct io_kiocb *req, size_t *len,
 					  struct io_buffer_list *bl,
 					  unsigned int issue_flags)
diff --git a/io_uring/kbuf.h b/io_uring/kbuf.h
@@ -121,6 +121,9 @@ static inline bool io_kbuf_recycle(struct io_kiocb *req, unsigned issue_flags)
 	return false;
 }
 
+/* Mapped buffer ring, return io_uring_buf from head */
+#define io_ring_head_to_buf(br, head, mask)	&(br)->bufs[(head) & (mask)]
+
 static inline void io_kbuf_commit(struct io_kiocb *req,
 				  struct io_buffer_list *bl, int nr)
 {

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,9 @@ static inline bool io_kbuf_recycle(struct io_kiocb *req, unsigned issue_flags)`
`121`	`121`	`return false;`
`122`	`122`	`}`
`123`	`123`
	`124`	`+/* Mapped buffer ring, return io_uring_buf from head */`
	`125`	`+#define io_ring_head_to_buf(br, head, mask) &(br)->bufs[(head) & (mask)]`
	`126`	`+`
`124`	`127`	`static inline void io_kbuf_commit(struct io_kiocb *req,`
`125`	`128`	`struct io_buffer_list *bl, int nr)`
`126`	`129`	`{`