From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH v2 1/6] io_uring: drop file refs after task cancel
Date: Mon, 4 Jan 2021 01:59:14 +0000 [thread overview]
Message-ID: <1857205031b0ad011bd32f27b1438c60315e10c5.1609725418.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
io_uring fds marked O_CLOEXEC and we explicitly cancel all requests
before going through exec, so we don't want to leave task's file
references to not our anymore io_uring instances.
Signed-off-by: Pavel Begunkov <[email protected]>
---
fs/io_uring.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index ca46f314640b..ee1beec7a04d 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -8948,6 +8948,15 @@ static void io_uring_attempt_task_drop(struct file *file)
io_uring_del_task_file(file);
}
+static void io_uring_remove_task_files(struct io_uring_task *tctx)
+{
+ struct file *file;
+ unsigned long index;
+
+ xa_for_each(&tctx->xa, index, file)
+ io_uring_del_task_file(file);
+}
+
void __io_uring_files_cancel(struct files_struct *files)
{
struct io_uring_task *tctx = current->io_uring;
@@ -8956,16 +8965,12 @@ void __io_uring_files_cancel(struct files_struct *files)
/* make sure overflow events are dropped */
atomic_inc(&tctx->in_idle);
-
- xa_for_each(&tctx->xa, index, file) {
- struct io_ring_ctx *ctx = file->private_data;
-
- io_uring_cancel_task_requests(ctx, files);
- if (files)
- io_uring_del_task_file(file);
- }
-
+ xa_for_each(&tctx->xa, index, file)
+ io_uring_cancel_task_requests(file->private_data, files);
atomic_dec(&tctx->in_idle);
+
+ if (files)
+ io_uring_remove_task_files(tctx);
}
static s64 tctx_inflight(struct io_uring_task *tctx)
@@ -9028,6 +9033,8 @@ void __io_uring_task_cancel(void)
} while (1);
atomic_dec(&tctx->in_idle);
+
+ io_uring_remove_task_files(tctx);
}
static int io_uring_flush(struct file *file, void *data)
--
2.24.0
next prev parent reply other threads:[~2021-01-04 2:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-04 1:59 [PATCH v2 0/6] bunch of random fixes Pavel Begunkov
2021-01-04 1:59 ` Pavel Begunkov [this message]
2021-01-04 1:59 ` [PATCH v2 2/6] io_uring: cancel more aggressively in exit_work Pavel Begunkov
2021-01-04 1:59 ` [PATCH v2 3/6] io_uring: trigger eventfd for IOPOLL Pavel Begunkov
2021-01-04 1:59 ` [PATCH v2 4/6] io_uring: dont kill fasync under completion_lock Pavel Begunkov
2021-01-04 1:59 ` [PATCH v2 5/6] io_uring: synchronise IOPOLL on task_submit fail Pavel Begunkov
2021-01-04 1:59 ` [PATCH v2 6/6] io_uring: patch up IOPOLL overflow_flush sync Pavel Begunkov
2021-01-04 16:27 ` [PATCH v2 0/6] bunch of random fixes 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=1857205031b0ad011bd32f27b1438c60315e10c5.1609725418.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