From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 3/8] io_uring: make del_task_file more forgiving
Date: Thu, 4 Mar 2021 13:59:26 +0000 [thread overview]
Message-ID: <b040d5dcd90e551bb0926dac0b3ec092bef1fee2.1614866085.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Rework io_uring_del_task_file(), so it accepts an index to delete, and
it's not necessarily have to be in the ->xa. Infer file from xa_erase()
to maintain a single origin of truth.
Signed-off-by: Pavel Begunkov <[email protected]>
---
fs/io_uring.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index f82f46c604d7..55e1ec4c0099 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -8772,15 +8772,18 @@ static int io_uring_add_task_file(struct io_ring_ctx *ctx, struct file *file)
/*
* Remove this io_uring_file -> task mapping.
*/
-static void io_uring_del_task_file(struct file *file)
+static void io_uring_del_task_file(unsigned long index)
{
struct io_uring_task *tctx = current->io_uring;
+ struct file *file;
+
+ file = xa_erase(&tctx->xa, index);
+ if (!file)
+ return;
if (tctx->last == file)
tctx->last = NULL;
- file = xa_erase(&tctx->xa, (unsigned long)file);
- if (file)
- fput(file);
+ fput(file);
}
static void io_uring_clean_tctx(struct io_uring_task *tctx)
@@ -8789,7 +8792,7 @@ static void io_uring_clean_tctx(struct io_uring_task *tctx)
unsigned long index;
xa_for_each(&tctx->xa, index, file)
- io_uring_del_task_file(file);
+ io_uring_del_task_file(index);
if (tctx->io_wq) {
io_wq_put_and_exit(tctx->io_wq);
tctx->io_wq = NULL;
--
2.24.0
next prev parent reply other threads:[~2021-03-04 14:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-04 13:59 [PATCH 5.12 0/8] remove task file notes Pavel Begunkov
2021-03-04 13:59 ` [PATCH 1/8] io_uring: cancel-match based on flags Pavel Begunkov
2021-03-04 13:59 ` [PATCH 2/8] io_uring: reliably cancel linked timeouts Pavel Begunkov
2021-03-04 13:59 ` Pavel Begunkov [this message]
2021-03-04 13:59 ` [PATCH 4/8] io_uring: introduce ctx to tctx back map Pavel Begunkov
2021-03-04 13:59 ` [PATCH 5/8] io_uring: do ctx initiated file note removal Pavel Begunkov
2021-03-04 13:59 ` [PATCH 6/8] io_uring: don't take task ring-file notes Pavel Begunkov
2021-03-04 13:59 ` [PATCH 7/8] io_uring: index io_uring->xa by ctx not file Pavel Begunkov
2021-03-04 13:59 ` [PATCH 8/8] io_uring: warn when ring exit takes too long Pavel Begunkov
2021-03-05 4:25 ` Jens Axboe
2021-03-05 11:15 ` 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=b040d5dcd90e551bb0926dac0b3ec092bef1fee2.1614866085.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