Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-01 10:42:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

io_uring: pass in counter to handle_tw_list() rather than return it

Browse Source 
No functional changes in this patch, just in preparation for returning
something other than count from this helper.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2024-02-02 14:25:27 -07:00
parent 42c0905f0c
commit 2708af1adc
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
io_uring/io_uring.c
View File

@ -1173,11 +1173,10 @@ static void ctx_flush_and_put(struct io_ring_ctx *ctx, struct io_tw_state *ts)
percpu_ref_put(&ctx->refs); percpu_ref_put(&ctx->refs);
} }
static unsigned int handle_tw_list(struct llist_node *node) static void handle_tw_list(struct llist_node *node, unsigned int *count)
{ {
struct io_ring_ctx *ctx = NULL; struct io_ring_ctx *ctx = NULL;
struct io_tw_state ts = { }; struct io_tw_state ts = { };
unsigned int count = 0;
do { do {
struct llist_node *next = node->next; struct llist_node *next = node->next;
@ -1195,7 +1194,7 @@ static unsigned int handle_tw_list(struct llist_node *node)
io_poll_task_func, io_req_rw_complete, io_poll_task_func, io_req_rw_complete,
req, &ts); req, &ts);
node = next; node = next;
count++; (*count)++;
if (unlikely(need_resched())) { if (unlikely(need_resched())) {
ctx_flush_and_put(ctx, &ts); ctx_flush_and_put(ctx, &ts);
ctx = NULL; ctx = NULL;
@ -1204,7 +1203,6 @@ static unsigned int handle_tw_list(struct llist_node *node)
} while (node); } while (node);
ctx_flush_and_put(ctx, &ts); ctx_flush_and_put(ctx, &ts);
return count;
} }
/** /**
@ -1263,7 +1261,7 @@ void tctx_task_work(struct callback_head *cb)
node = llist_del_all(&tctx->task_list); node = llist_del_all(&tctx->task_list);
if (node) if (node)
count = handle_tw_list(llist_reverse_order(node)); handle_tw_list(llist_reverse_order(node), &count);
/* relaxed read is enough as only the task itself sets ->in_cancel */ /* relaxed read is enough as only the task itself sets ->in_cancel */
if (unlikely(atomic_read(&tctx->in_cancel))) if (unlikely(atomic_read(&tctx->in_cancel)))