From: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
To: axboe@kernel.dk
Cc: linux-block@vger.kernel.org
Subject: [RFC 2/2] io_uring: acquire ctx->uring_lock before calling io_issue_sqe()
Date: Wed, 15 Jan 2020 18:37:46 -0800 [thread overview]
Message-ID: <1579142266-64789-3-git-send-email-bijan.mottahedeh@oracle.com> (raw)
In-Reply-To: <1579142266-64789-1-git-send-email-bijan.mottahedeh@oracle.com>
io_issue_sqe() calls io_iopoll_req_issued() which manipulates poll_list,
so acquire ctx->uring_lock beforehand similar to other instances of
calling io_issue_sqe().
Signed-off-by: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
---
fs/io_uring.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index d015ce8..7b399e2 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -4359,7 +4359,9 @@ static void io_wq_submit_work(struct io_wq_work **workptr)
req->has_user = (work->flags & IO_WQ_WORK_HAS_MM) != 0;
req->in_async = true;
do {
+ mutex_lock(&req->ctx->uring_lock);
ret = io_issue_sqe(req, NULL, &nxt, false);
+ mutex_unlock(&req->ctx->uring_lock);
/*
* We can get EAGAIN for polled IO even though we're
* forcing a sync submission from here, since we can't
--
1.8.3.1
next prev parent reply other threads:[~2020-01-16 2:37 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-16 2:37 [RFC 0/2] Fixes for fio io_uring polled mode test failures Bijan Mottahedeh
2020-01-16 2:37 ` [RFC 1/2] io_uring: clear req->result always before issuing a read/write request Bijan Mottahedeh
2020-01-16 4:34 ` Jens Axboe
2020-01-16 2:37 ` Bijan Mottahedeh [this message]
2020-01-16 4:34 ` [RFC 2/2] io_uring: acquire ctx->uring_lock before calling io_issue_sqe() Jens Axboe
2020-01-16 4:42 ` Jens Axboe
2020-01-16 16:22 ` Jens Axboe
2020-01-16 19:08 ` Bijan Mottahedeh
2020-01-16 20:02 ` Jens Axboe
2020-01-16 21:04 ` Bijan Mottahedeh
2020-01-16 21:26 ` Jens Axboe
2020-01-28 20:34 ` Bijan Mottahedeh
2020-01-28 23:37 ` Jens Axboe
2020-01-28 23:49 ` Bijan Mottahedeh
2020-01-28 23:52 ` Jens Axboe
2020-01-31 3:36 ` Bijan Mottahedeh
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=1579142266-64789-3-git-send-email-bijan.mottahedeh@oracle.com \
--to=bijan.mottahedeh@oracle.com \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).