Commit ef623a64 authored by Gabriel Krisman Bertazi's avatar Gabriel Krisman Bertazi Committed by Jens Axboe
Browse files

io_uring: Move old async data allocation helper to header 



There are two remaining uses of the old async data allocator that do not
rely on the alloc cache.  I don't want to make them use the new
allocator helper because that would require a if(cache) check, which
will result in dead code for the cached case (for callers passing a
cache, gcc can't prove the cache isn't NULL, and will therefore preserve
the check.  Since this is an inline function and just a few lines long,
keep a second helper to deal with cases where we don't have an async
data cache.

No functional change intended here.  This is just moving the helper
around and making it inline.

Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@suse.de>
Link: https://lore.kernel.org/r/20241216204615.759089-9-krisman@suse.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d7f11616

io_uring/io_uring.c

+0 −13
Original line number Diff line number Diff line
@@ -1643,19 +1643,6 @@ io_req_flags_t io_file_get_flags(struct file *file) 
	return res;

}



bool io_alloc_async_data(struct io_kiocb *req)

{

	const struct io_issue_def *def = &io_issue_defs[req->opcode];



	WARN_ON_ONCE(!def->async_size);

	req->async_data = kmalloc(def->async_size, GFP_KERNEL);

	if (req->async_data) {

		req->flags |= REQ_F_ASYNC_DATA;

		return false;

	}

	return true;

}



static u32 io_get_sequence(struct io_kiocb *req)

{

	u32 seq = req->ctx->cached_sq_head;

io_uring/io_uring.h

+12 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "io-wq.h"

#include "slist.h"

#include "filetable.h"

#include "opdef.h"



#ifndef CREATE_TRACE_POINTS

#include <trace/events/io_uring.h>
@@ -233,6 +234,17 @@ static inline void *io_uring_alloc_async_data(struct io_alloc_cache *cache, 
	return req->async_data;

}



static inline void *io_uring_alloc_async_data_nocache(struct io_kiocb *req)

{

	const struct io_issue_def *def = &io_issue_defs[req->opcode];



	WARN_ON_ONCE(!def->async_size);

	req->async_data = kmalloc(def->async_size, GFP_KERNEL);

	if (req->async_data)

		req->flags |= REQ_F_ASYNC_DATA;

	return req->async_data;

}



static inline bool req_has_async_data(struct io_kiocb *req)

{

	return req->flags & REQ_F_ASYNC_DATA;

io_uring/timeout.c

+2 −3
Original line number Diff line number Diff line
@@ -525,10 +525,9 @@ static int __io_timeout_prep(struct io_kiocb *req, 


	if (WARN_ON_ONCE(req_has_async_data(req)))

		return -EFAULT;

	if (io_alloc_async_data(req))

	data = io_uring_alloc_async_data_nocache(req);

	if (!data)

		return -ENOMEM;



	data = req->async_data;

	data->req = req;

	data->flags = flags;

io_uring/waitid.c

+2 −2
Original line number Diff line number Diff line
@@ -303,10 +303,10 @@ int io_waitid(struct io_kiocb *req, unsigned int issue_flags) 
	struct io_waitid_async *iwa;

	int ret;



	if (io_alloc_async_data(req))

	iwa = io_uring_alloc_async_data_nocache(req);

	if (!iwa)

		return -ENOMEM;



	iwa = req->async_data;

	iwa->req = req;



	ret = kernel_waitid_prepare(&iwa->wo, iw->which, iw->upid, &iw->info,