From: Jens Axboe <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>
Subject: [PATCH 3/4] io_uring: cache task cancelation state in the ctx
Date: Fri, 17 Feb 2023 08:55:59 -0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
It can be quite expensive for the fast paths to deference
req->task->io_uring->in_cancel for the (very) unlikely scenario that
we're currently undergoing cancelations.
Add a ctx bit to indicate if we're currently canceling or not, so that
the hot path may check this rather than dip into the remote task
state.
Signed-off-by: Jens Axboe <[email protected]>
---
include/linux/io_uring_types.h | 2 ++
io_uring/io_uring.c | 44 ++++++++++++++++++++++++++++++++--
2 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/include/linux/io_uring_types.h b/include/linux/io_uring_types.h
index 00689c12f6ab..42d704adb9c6 100644
--- a/include/linux/io_uring_types.h
+++ b/include/linux/io_uring_types.h
@@ -211,6 +211,8 @@ struct io_ring_ctx {
enum task_work_notify_mode notify_method;
struct io_rings *rings;
struct task_struct *submitter_task;
+ /* local ctx cache of task cancel state */
+ unsigned long in_cancel;
struct percpu_ref refs;
} ____cacheline_aligned_in_smp;
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 64e07df034d1..0fcb532db1fc 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -3192,6 +3192,46 @@ static s64 tctx_inflight(struct io_uring_task *tctx, bool tracked)
return percpu_counter_sum(&tctx->inflight);
}
+static __cold void io_uring_dec_cancel(struct io_uring_task *tctx,
+ struct io_sq_data *sqd)
+{
+ if (!atomic_dec_return(&tctx->in_cancel))
+ return;
+
+ if (!sqd) {
+ struct io_tctx_node *node;
+ unsigned long index;
+
+ xa_for_each(&tctx->xa, index, node)
+ clear_bit(0, &node->ctx->in_cancel);
+ } else {
+ struct io_ring_ctx *ctx;
+
+ list_for_each_entry(ctx, &sqd->ctx_list, sqd_list)
+ clear_bit(0, &ctx->in_cancel);
+ }
+}
+
+static __cold void io_uring_inc_cancel(struct io_uring_task *tctx,
+ struct io_sq_data *sqd)
+{
+ if (atomic_inc_return(&tctx->in_cancel) != 1)
+ return;
+
+ if (!sqd) {
+ struct io_tctx_node *node;
+ unsigned long index;
+
+ xa_for_each(&tctx->xa, index, node)
+ set_bit(0, &node->ctx->in_cancel);
+ } else {
+ struct io_ring_ctx *ctx;
+
+ list_for_each_entry(ctx, &sqd->ctx_list, sqd_list)
+ set_bit(0, &ctx->in_cancel);
+ }
+}
+
/*
* Find any io_uring ctx that this task has registered or done IO on, and cancel
* requests. @sqd should be not-null IFF it's an SQPOLL thread cancellation.
@@ -3210,7 +3250,7 @@ __cold void io_uring_cancel_generic(bool cancel_all, struct io_sq_data *sqd)
if (tctx->io_wq)
io_wq_exit_start(tctx->io_wq);
- atomic_inc(&tctx->in_cancel);
+ io_uring_inc_cancel(tctx, sqd);
do {
bool loop = false;
@@ -3263,7 +3303,7 @@ __cold void io_uring_cancel_generic(bool cancel_all, struct io_sq_data *sqd)
* We shouldn't run task_works after cancel, so just leave
* ->in_cancel set for normal exit.
*/
- atomic_dec(&tctx->in_cancel);
+ io_uring_dec_cancel(tctx, sqd);
/* for exec all current's requests should be gone, kill tctx */
__io_uring_free(current);
}
--
2.39.1
next prev parent reply other threads:[~2023-02-17 15:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-17 15:55 [PATCH 0/4] Cache tctx cancelation state in the ctx Jens Axboe
2023-02-17 15:55 ` [PATCH 1/4] io_uring: consolidate the put_ref-and-return section of adding work Jens Axboe
2023-02-17 15:55 ` [PATCH 2/4] io_uring: rename 'in_idle' to 'in_cancel' Jens Axboe
2023-02-17 15:55 ` Jens Axboe [this message]
2023-02-20 14:43 ` [PATCH 3/4] io_uring: cache task cancelation state in the ctx Gabriel Krisman Bertazi
2023-02-17 15:56 ` [PATCH 4/4] io_uring: use local ctx cancelation state for io_req_local_work_add() Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox