io_uring: enable io_mem_alloc/free to be used in other parts

axboe · axboe · commit edecf1689768 · 2023-11-27T20:53:52.000-07:00
In preparation for using these helpers, make them non-static and add
them to our internal header.

Signed-off-by: Jens Axboe &lt;axboe@kernel.dk&gt;
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
@@ -2666,7 +2666,7 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events,
 	return READ_ONCE(rings->cq.head) == READ_ONCE(rings->cq.tail) ? ret : 0;
 }
 
-static void io_mem_free(void *ptr)
+void io_mem_free(void *ptr)
 {
 	if (!ptr)
 		return;
@@ -2778,7 +2778,7 @@ static void io_rings_free(struct io_ring_ctx *ctx)
 	}
 }
 
-static void *io_mem_alloc(size_t size)
+void *io_mem_alloc(size_t size)
 {
 	gfp_t gfp = GFP_KERNEL_ACCOUNT | __GFP_ZERO | __GFP_NOWARN | __GFP_COMP;
 	void *ret;
diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h
@@ -86,6 +86,9 @@ bool __io_alloc_req_refill(struct io_ring_ctx *ctx);
 bool io_match_task_safe(struct io_kiocb *head, struct task_struct *task,
 			bool cancel_all);
 
+void *io_mem_alloc(size_t size);
+void io_mem_free(void *ptr);
+
 #if defined(CONFIG_PROVE_LOCKING)
 static inline void io_lockdep_assert_cq_locked(struct io_ring_ctx *ctx)
 {

Original file line number	Diff line number	Diff line change
`@@ -2666,7 +2666,7 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events,`
`2666`	`2666`	`return READ_ONCE(rings->cq.head) == READ_ONCE(rings->cq.tail) ? ret : 0;`
`2667`	`2667`	`}`
`2668`	`2668`
`2669`		`-static void io_mem_free(void *ptr)`
	`2669`	`+void io_mem_free(void *ptr)`
`2670`	`2670`	`{`
`2671`	`2671`	`if (!ptr)`
`2672`	`2672`	`return;`
`@@ -2778,7 +2778,7 @@ static void io_rings_free(struct io_ring_ctx *ctx)`
`2778`	`2778`	`}`
`2779`	`2779`	`}`
`2780`	`2780`
`2781`		`-static void *io_mem_alloc(size_t size)`
	`2781`	`+void *io_mem_alloc(size_t size)`
`2782`	`2782`	`{`
`2783`	`2783`	`gfp_t gfp = GFP_KERNEL_ACCOUNT \| __GFP_ZERO \| __GFP_NOWARN \| __GFP_COMP;`
`2784`	`2784`	`void *ret;`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,9 @@ bool __io_alloc_req_refill(struct io_ring_ctx *ctx);`
`86`	`86`	`bool io_match_task_safe(struct io_kiocb head, struct task_struct task,`
`87`	`87`	`bool cancel_all);`
`88`	`88`
	`89`	`+void *io_mem_alloc(size_t size);`
	`90`	`+void io_mem_free(void *ptr);`
	`91`	`+`
`89`	`92`	`#if defined(CONFIG_PROVE_LOCKING)`
`90`	`93`	`static inline void io_lockdep_assert_cq_locked(struct io_ring_ctx *ctx)`
`91`	`94`	`{`