From: Pavel Begunkov <asml.silence@gmail.com>
To: Hao Xu <haoxu@linux.alibaba.com>, Jens Axboe <axboe@kernel.dk>
Cc: io-uring@vger.kernel.org, Joseph Qi <joseph.qi@linux.alibaba.com>
Subject: Re: [PATCH 2/2] io_uring: don't hold uring_lock when calling io_run_task_work*
Date: Thu, 4 Feb 2021 11:33:19 +0000 [thread overview]
Message-ID: <4f03b07c-1be8-1e05-1e5e-8be490fce2b3@gmail.com> (raw)
In-Reply-To: <1612364276-26847-3-git-send-email-haoxu@linux.alibaba.com>
On 03/02/2021 14:57, Hao Xu wrote:
> This is caused by calling io_run_task_work_sig() to do work under
> uring_lock while the caller io_sqe_files_unregister() already held
> uring_lock.
> we need to check if uring_lock is held by us when doing unlock around
> io_run_task_work_sig() since there are code paths down to that place
> without uring_lock held.
btw, better to prepare it for-5.12, seems it won't apply
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index efb6d02fea6f..b093977713ee 100644
[...]
> - if (ret < 0) {
> - percpu_ref_resurrect(&data->refs);
> - reinit_completion(&data->done);
> - io_sqe_files_set_node(data, backup_node);
> - return ret;
> - }
> + if (ret < 0)
> + break;
> } while (1);
while (ret >= 0) ?
--
Pavel Begunkov
prev parent reply other threads:[~2021-02-04 11:38 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-03 14:57 [PATCH 0/2] fix deadlock in __io_req_task_submit() Hao Xu
2021-02-03 14:57 ` [PATCH 1/2] io_uring: add uring_lock as an argument to io_sqe_files_unregister() Hao Xu
2021-02-03 16:33 ` Pavel Begunkov
2021-02-04 3:34 ` Hao Xu
2021-02-04 11:11 ` Pavel Begunkov
2021-02-04 14:49 ` Jens Axboe
2021-02-03 14:57 ` [PATCH 2/2] io_uring: don't hold uring_lock when calling io_run_task_work* Hao Xu
2021-02-03 16:35 ` Pavel Begunkov
2021-02-03 16:45 ` Pavel Begunkov
2021-02-04 3:25 ` Hao Xu
2021-02-04 11:17 ` Pavel Begunkov
2021-02-04 15:26 ` Pavel Begunkov
2021-02-05 9:57 ` Hao Xu
2021-02-05 10:18 ` Pavel Begunkov
2021-02-06 11:34 ` Hao Xu
2021-02-07 17:16 ` Pavel Begunkov
2021-02-06 16:21 ` Hao Xu
2021-02-11 13:30 ` Hao Xu
2021-02-05 10:03 ` Hao Xu
2021-02-04 11:33 ` Pavel Begunkov [this message]
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=4f03b07c-1be8-1e05-1e5e-8be490fce2b3@gmail.com \
--to=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=haoxu@linux.alibaba.com \
--cc=io-uring@vger.kernel.org \
--cc=joseph.qi@linux.alibaba.com \
/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