Skip to content

Commit

Permalink
io_uring/cmd: add per-op data to struct io_uring_cmd_data
Browse files Browse the repository at this point in the history
In case an op handler for ->uring_cmd() needs stable storage for user
data, it can allocate io_uring_cmd_data->op_data and use it for the
duration of the request. When the request gets cleaned up, uring_cmd
will free it automatically.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
axboe authored and kdave committed Jan 6, 2025
1 parent dadf03c commit 3347fa6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
1 change: 1 addition & 0 deletions include/linux/io_uring/cmd.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ struct io_uring_cmd {

struct io_uring_cmd_data {
struct io_uring_sqe sqes[2];
void *op_data;
};

static inline const void *io_uring_sqe_cmd(const struct io_uring_sqe *sqe)
Expand Down
13 changes: 11 additions & 2 deletions io_uring/uring_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,16 @@ static struct io_uring_cmd_data *io_uring_async_get(struct io_kiocb *req)

cache = io_alloc_cache_get(&ctx->uring_cache);
if (cache) {
cache->op_data = NULL;
req->flags |= REQ_F_ASYNC_DATA;
req->async_data = cache;
return cache;
}
if (!io_alloc_async_data(req))
return req->async_data;
if (!io_alloc_async_data(req)) {
cache = req->async_data;
cache->op_data = NULL;
return cache;
}
return NULL;
}

Expand All @@ -37,6 +41,11 @@ static void io_req_uring_cleanup(struct io_kiocb *req, unsigned int issue_flags)
struct io_uring_cmd *ioucmd = io_kiocb_to_cmd(req, struct io_uring_cmd);
struct io_uring_cmd_data *cache = req->async_data;

if (cache->op_data) {
kfree(cache->op_data);
cache->op_data = NULL;
}

if (issue_flags & IO_URING_F_UNLOCKED)
return;
if (io_alloc_cache_put(&req->ctx->uring_cache, cache)) {
Expand Down

0 comments on commit 3347fa6

Please sign in to comment.