Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 02:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

io_uring: don't expose io_fill_cqe_aux()

Browse Source 
Deduplicate some code and add a helper for filling an aux CQE, locking
and notification.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/b7c6557c8f9dc5c4cfb01292116c682a0ff61081.1655455613.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2022-06-17 09:48:00 +01:00 committed by Jens Axboe
parent f09c8643f0
commit d245bca637
6 changed files with 35 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
io_uring/io_uring.c
View File

@ -676,8 +676,8 @@ bool io_cqring_event_overflow(struct io_ring_ctx *ctx, u64 user_data, s32 res,
return true; return true;
} }
bool io_fill_cqe_aux(struct io_ring_ctx *ctx, u64 user_data, s32 res, static bool io_fill_cqe_aux(struct io_ring_ctx *ctx,
u32 cflags) u64 user_data, s32 res, u32 cflags)
{ {
struct io_uring_cqe *cqe; struct io_uring_cqe *cqe;
@ -704,6 +704,20 @@ bool io_fill_cqe_aux(struct io_ring_ctx *ctx, u64 user_data, s32 res,
return io_cqring_event_overflow(ctx, user_data, res, cflags, 0, 0); return io_cqring_event_overflow(ctx, user_data, res, cflags, 0, 0);
} }
bool io_post_aux_cqe(struct io_ring_ctx *ctx,
u64 user_data, s32 res, u32 cflags)
{
bool filled;
spin_lock(&ctx->completion_lock);
filled = io_fill_cqe_aux(ctx, user_data, res, cflags);
io_commit_cqring(ctx);
spin_unlock(&ctx->completion_lock);
if (filled)
io_cqring_ev_posted(ctx);
return filled;
}
static void __io_req_complete_put(struct io_kiocb *req) static void __io_req_complete_put(struct io_kiocb *req)
{ {
/* /*

3
io_uring/io_uring.h
View File

@ -239,8 +239,7 @@ void io_req_complete_failed(struct io_kiocb *req, s32 res);
void __io_req_complete(struct io_kiocb *req, unsigned issue_flags); void __io_req_complete(struct io_kiocb *req, unsigned issue_flags);
void io_req_complete_post(struct io_kiocb *req); void io_req_complete_post(struct io_kiocb *req);
void __io_req_complete_post(struct io_kiocb *req); void __io_req_complete_post(struct io_kiocb *req);
bool io_fill_cqe_aux(struct io_ring_ctx *ctx, u64 user_data, s32 res, bool io_post_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags);
u32 cflags);
void io_cqring_ev_posted(struct io_ring_ctx *ctx); void io_cqring_ev_posted(struct io_ring_ctx *ctx);
void __io_commit_cqring_flush(struct io_ring_ctx *ctx); void __io_commit_cqring_flush(struct io_ring_ctx *ctx);

11
io_uring/msg_ring.c
View File

@ -34,7 +34,6 @@ int io_msg_ring(struct io_kiocb *req, unsigned int issue_flags)
{ {
struct io_msg *msg = io_kiocb_to_cmd(req); struct io_msg *msg = io_kiocb_to_cmd(req);
struct io_ring_ctx *target_ctx; struct io_ring_ctx *target_ctx;
bool filled;
int ret; int ret;
ret = -EBADFD; ret = -EBADFD;
@ -43,16 +42,8 @@ int io_msg_ring(struct io_kiocb *req, unsigned int issue_flags)
ret = -EOVERFLOW; ret = -EOVERFLOW;
target_ctx = req->file->private_data; target_ctx = req->file->private_data;
if (io_post_aux_cqe(target_ctx, msg->user_data, msg->len, 0))
spin_lock(&target_ctx->completion_lock);
filled = io_fill_cqe_aux(target_ctx, msg->user_data, msg->len, 0);
io_commit_cqring(target_ctx);
spin_unlock(&target_ctx->completion_lock);
if (filled) {
io_cqring_ev_posted(target_ctx);
ret = 0; ret = 0;
}
done: done:
if (ret < 0) if (ret < 0)

20
io_uring/net.c
View File

@ -644,22 +644,12 @@ retry:
io_req_set_res(req, ret, 0); io_req_set_res(req, ret, 0);
return IOU_OK; return IOU_OK;
} }
if (ret >= 0) {
bool filled;
spin_lock(&ctx->completion_lock); if (ret < 0)
filled = io_fill_cqe_aux(ctx, req->cqe.user_data, ret, return ret;
IORING_CQE_F_MORE); if (io_post_aux_cqe(ctx, req->cqe.user_data, ret, IORING_CQE_F_MORE))
io_commit_cqring(ctx); goto retry;
spin_unlock(&ctx->completion_lock); return -ECANCELED;
if (filled) {
io_cqring_ev_posted(ctx);
goto retry;
}
ret = -ECANCELED;
}
return ret;
} }
int io_socket_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) int io_socket_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

22
io_uring/poll.c
View File

@ -214,24 +214,16 @@ static int io_poll_check_events(struct io_kiocb *req, bool *locked)
if (!(req->flags & REQ_F_APOLL_MULTISHOT)) { if (!(req->flags & REQ_F_APOLL_MULTISHOT)) {
__poll_t mask = mangle_poll(req->cqe.res & __poll_t mask = mangle_poll(req->cqe.res &
req->apoll_events); req->apoll_events);
bool filled;
spin_lock(&ctx->completion_lock); if (!io_post_aux_cqe(ctx, req->cqe.user_data,
filled = io_fill_cqe_aux(ctx, req->cqe.user_data, mask, IORING_CQE_F_MORE))
mask, IORING_CQE_F_MORE); return -ECANCELED;
io_commit_cqring(ctx); } else {
spin_unlock(&ctx->completion_lock); ret = io_poll_issue(req, locked);
if (filled) { if (ret)
io_cqring_ev_posted(ctx); return ret;
continue;
}
return -ECANCELED;
} }
ret = io_poll_issue(req, locked);
if (ret)
return ret;
/* /*
* Release all references, retry if someone tried to restart * Release all references, retry if someone tried to restart
* task_work while we were executing it. * task_work while we were executing it.

14
io_uring/rsrc.c
View File

@ -174,17 +174,13 @@ static void __io_rsrc_put_work(struct io_rsrc_node *ref_node)
list_del(&prsrc->list); list_del(&prsrc->list);
if (prsrc->tag) { if (prsrc->tag) {
if (ctx->flags & IORING_SETUP_IOPOLL) if (ctx->flags & IORING_SETUP_IOPOLL) {
mutex_lock(&ctx->uring_lock); mutex_lock(&ctx->uring_lock);
io_post_aux_cqe(ctx, prsrc->tag, 0, 0);
spin_lock(&ctx->completion_lock);
io_fill_cqe_aux(ctx, prsrc->tag, 0, 0);
io_commit_cqring(ctx);
spin_unlock(&ctx->completion_lock);
io_cqring_ev_posted(ctx);
if (ctx->flags & IORING_SETUP_IOPOLL)
mutex_unlock(&ctx->uring_lock); mutex_unlock(&ctx->uring_lock);
} else {
io_post_aux_cqe(ctx, prsrc->tag, 0, 0);
}
} }
rsrc_data->do_put(ctx, prsrc); rsrc_data->do_put(ctx, prsrc);