io_uring/fdinfo: lock SQ thread while retrieving thread cpu/pid
commit 7644b1a1c9
upstream.
We could race with SQ thread exit, and if we do, we'll hit a NULL pointer
dereference when the thread is cleared. Grab the SQPOLL data lock before
attempting to get the task cpu and pid for fdinfo, this ensures we have a
stable view of it.
Cc: stable@vger.kernel.org
Link: https://bugzilla.kernel.org/show_bug.cgi?id=218032
Reviewed-by: Gabriel Krisman Bertazi <krisman@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: He Gao <hegao@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
595b051c83
Коммит
3d7912710e
|
@ -10411,7 +10411,7 @@ static int io_uring_show_cred(struct seq_file *m, unsigned int id,
|
||||||
|
|
||||||
static void __io_uring_show_fdinfo(struct io_ring_ctx *ctx, struct seq_file *m)
|
static void __io_uring_show_fdinfo(struct io_ring_ctx *ctx, struct seq_file *m)
|
||||||
{
|
{
|
||||||
struct io_sq_data *sq = NULL;
|
int sq_pid = -1, sq_cpu = -1;
|
||||||
bool has_lock;
|
bool has_lock;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -10424,13 +10424,19 @@ static void __io_uring_show_fdinfo(struct io_ring_ctx *ctx, struct seq_file *m)
|
||||||
has_lock = mutex_trylock(&ctx->uring_lock);
|
has_lock = mutex_trylock(&ctx->uring_lock);
|
||||||
|
|
||||||
if (has_lock && (ctx->flags & IORING_SETUP_SQPOLL)) {
|
if (has_lock && (ctx->flags & IORING_SETUP_SQPOLL)) {
|
||||||
sq = ctx->sq_data;
|
struct io_sq_data *sq = ctx->sq_data;
|
||||||
if (!sq->thread)
|
|
||||||
sq = NULL;
|
if (mutex_trylock(&sq->lock)) {
|
||||||
|
if (sq->thread) {
|
||||||
|
sq_pid = task_pid_nr(sq->thread);
|
||||||
|
sq_cpu = task_cpu(sq->thread);
|
||||||
|
}
|
||||||
|
mutex_unlock(&sq->lock);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
seq_printf(m, "SqThread:\t%d\n", sq ? task_pid_nr(sq->thread) : -1);
|
seq_printf(m, "SqThread:\t%d\n", sq_pid);
|
||||||
seq_printf(m, "SqThreadCpu:\t%d\n", sq ? task_cpu(sq->thread) : -1);
|
seq_printf(m, "SqThreadCpu:\t%d\n", sq_cpu);
|
||||||
seq_printf(m, "UserFiles:\t%u\n", ctx->nr_user_files);
|
seq_printf(m, "UserFiles:\t%u\n", ctx->nr_user_files);
|
||||||
for (i = 0; has_lock && i < ctx->nr_user_files; i++) {
|
for (i = 0; has_lock && i < ctx->nr_user_files; i++) {
|
||||||
struct file *f = io_file_from_index(ctx, i);
|
struct file *f = io_file_from_index(ctx, i);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче