From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 2/7] io_uring: simplify io_rsrc_node_ref_zero
Date: Tue, 23 Mar 2021 14:13:12 +0000 [thread overview]
Message-ID: <b589ce62c73cd9a65858ac8ce4e2e5846b43ec0e.1616508751.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Replace queue_delayed_work() with mod_delayed_work() in
io_rsrc_node_ref_zero() as the later one can schedule a new work, and
cleanup it further for better readability.
Signed-off-by: Pavel Begunkov <[email protected]>
---
fs/io_uring.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 2ecb21ba0ca4..8c5fd7a8f31d 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -7448,7 +7448,7 @@ static void io_rsrc_node_ref_zero(struct percpu_ref *ref)
struct io_rsrc_data *data = node->rsrc_data;
struct io_ring_ctx *ctx = data->ctx;
bool first_add = false;
- int delay = HZ;
+ int delay;
io_rsrc_ref_lock(ctx);
node->done = true;
@@ -7464,13 +7464,9 @@ static void io_rsrc_node_ref_zero(struct percpu_ref *ref)
}
io_rsrc_ref_unlock(ctx);
- if (percpu_ref_is_dying(&data->refs))
- delay = 0;
-
- if (!delay)
- mod_delayed_work(system_wq, &ctx->rsrc_put_work, 0);
- else if (first_add)
- queue_delayed_work(system_wq, &ctx->rsrc_put_work, delay);
+ delay = percpu_ref_is_dying(&data->refs) ? 0 : HZ;
+ if (first_add || !delay)
+ mod_delayed_work(system_wq, &ctx->rsrc_put_work, delay);
}
static struct io_rsrc_node *io_rsrc_node_alloc(struct io_ring_ctx *ctx)
--
2.24.0
next prev parent reply other threads:[~2021-03-23 14:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-23 14:13 [PATCH 5.13 0/7] ctx wide rsrc nodes Pavel Begunkov
2021-03-23 14:13 ` [PATCH 1/7] io_uring: name rsrc bits consistently Pavel Begunkov
2021-03-23 14:13 ` Pavel Begunkov [this message]
2021-03-23 14:13 ` [PATCH 3/7] io_uring: use rsrc prealloc infra for files reg Pavel Begunkov
2021-03-23 14:13 ` [PATCH 4/7] io_uring: encapsulate rsrc node manipulations Pavel Begunkov
2021-03-23 14:13 ` [PATCH 5/7] io_uring: move rsrc_put callback into io_rsrc_data Pavel Begunkov
2021-03-23 14:13 ` [PATCH 6/7] io_uring: refactor io_queue_rsrc_removal() Pavel Begunkov
2021-03-23 14:13 ` [PATCH 7/7] io_uring: ctx-wide rsrc nodes Pavel Begunkov
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 \
--in-reply-to=b589ce62c73cd9a65858ac8ce4e2e5846b43ec0e.1616508751.git.asml.silence@gmail.com \
[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