From: Jens Axboe <axboe@kernel.dk>
To: linux-fsdevel <linux-fsdevel@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>,
Oleg Nesterov <oleg@redhat.com>, Song Liu <songliubraving@fb.com>
Subject: [PATCH] fs: process fput task_work with TWA_SIGNAL
Date: Tue, 5 Jan 2021 11:29:11 -0700 [thread overview]
Message-ID: <d6ddf6c2-3789-2e10-ba71-668cba03eb35@kernel.dk> (raw)
Song reported a boot regression in a kvm image with 5.11-rc, and bisected
it down to the below patch. Debugging this issue, turns out that the boot
stalled when a task is waiting on a pipe being released. As we no longer
run task_work from get_signal() unless it's queued with TWA_SIGNAL, the
task goes idle without running the task_work. This prevents ->release()
from being called on the pipe, which another boot task is waiting on.
Use TWA_SIGNAL for the file fput work to ensure it's run before the task
goes idle.
Fixes: 98b89b649fce ("signal: kill JOBCTL_TASK_WORK")
Reported-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
The other alternative here is obviously to re-instate the:
if (unlikely(current->task_works))
task_work_run();
in get_signal() that we had before this change. Might be safer in case
there are other cases that need to ensure the work is run in a timely
fashion, though I do think it's cleaner to long term to correctly mark
task_work with the needed notification type. Comments welcome...
diff --git a/fs/file_table.c b/fs/file_table.c
index 45437f8e1003..7c76b611c95b 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -338,7 +338,13 @@ void fput_many(struct file *file, unsigned int refs)
if (likely(!in_interrupt() && !(task->flags & PF_KTHREAD))) {
init_task_work(&file->f_u.fu_rcuhead, ____fput);
- if (!task_work_add(task, &file->f_u.fu_rcuhead, TWA_RESUME))
+ /*
+ * We could be dependent on the fput task_work running,
+ * eg for pipes where someone is waiting on release
+ * being called. Use TWA_SIGNAL to ensure it's run
+ * before the task goes idle.
+ */
+ if (!task_work_add(task, &file->f_u.fu_rcuhead, TWA_SIGNAL))
return;
/*
* After this task has run exit_task_work(),
--
Jens Axboe
next reply other threads:[~2021-01-05 18:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-05 18:29 Jens Axboe [this message]
2021-01-07 22:17 ` [PATCH] fs: process fput task_work with TWA_SIGNAL Doug Anderson
2021-01-08 3:52 ` Jens Axboe
2021-01-08 6:20 ` Sedat Dilek
2021-01-08 5:26 ` Al Viro
2021-01-08 6:21 ` Sedat Dilek
2021-01-08 6:47 ` Al Viro
2021-01-08 6:52 ` Al Viro
2021-01-08 6:46 ` Al Viro
2021-01-08 15:13 ` Jens Axboe
2021-01-08 15:58 ` Al Viro
2021-01-08 16:10 ` Jens Axboe
2021-01-08 16:26 ` Jens Axboe
2021-01-08 18:05 ` Al Viro
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=d6ddf6c2-3789-2e10-ba71-668cba03eb35@kernel.dk \
--to=axboe@kernel.dk \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=songliubraving@fb.com \
--cc=viro@zeniv.linux.org.uk \
/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