From: Miklos Szeredi <miklos@szeredi.hu>
To: Christoph Hellwig <hch@lst.de>
Cc: Bart Van Assche <bvanassche@acm.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
linux-fsdevel@vger.kernel.org, linux-aio <linux-aio@kvack.org>,
syzbot <syzkaller@googlegroups.com>,
Avi Kivity <avi@scylladb.com>, Eric Dumazet <edumazet@google.com>,
stable <stable@vger.kernel.org>
Subject: Re: [PATCH] aio: Fix locking in aio_poll()
Date: Wed, 6 Feb 2019 15:31:49 +0100 [thread overview]
Message-ID: <20190206143149.GB19821@veci.piliscsaba.redhat.com> (raw)
In-Reply-To: <20190206134758.GB29185@lst.de>
On Wed, Feb 06, 2019 at 02:47:58PM +0100, Christoph Hellwig wrote:
> Just use the waitqueue API properly in fuse and we are done:
No, the waitqueue implementation is not assuming disabled irqs, only AIO is.
How about this?
Thanks,
Miklos
---
diff --git a/fs/aio.c b/fs/aio.c
index b906ff70c90f..18b1d3947592 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1679,6 +1679,7 @@ static int aio_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync,
struct poll_iocb *req = container_of(wait, struct poll_iocb, wait);
struct aio_kiocb *iocb = container_of(req, struct aio_kiocb, poll);
__poll_t mask = key_to_poll(key);
+ unsigned long flags;
req->woken = true;
@@ -1688,9 +1689,9 @@ static int aio_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync,
return 0;
/* try to complete the iocb inline if we can: */
- if (spin_trylock(&iocb->ki_ctx->ctx_lock)) {
+ if (spin_trylock_irqsave(&iocb->ki_ctx->ctx_lock, flags)) {
list_del(&iocb->ki_list);
- spin_unlock(&iocb->ki_ctx->ctx_lock);
+ spin_unlock_irqrestore(&iocb->ki_ctx->ctx_lock, flags);
list_del_init(&req->wait.entry);
aio_poll_complete(iocb, mask);
next prev parent reply other threads:[~2019-02-06 14:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-04 17:45 [PATCH] aio: Fix locking in aio_poll() Bart Van Assche
2019-02-04 17:49 ` Christoph Hellwig
2019-02-05 8:12 ` Miklos Szeredi
2019-02-06 0:53 ` Bart Van Assche
2019-02-06 8:36 ` Miklos Szeredi
2019-02-06 13:47 ` Christoph Hellwig
2019-02-06 14:31 ` Miklos Szeredi [this message]
2019-02-06 13:39 ` Christoph Hellwig
2019-02-09 0:59 Bart Van Assche
2019-02-12 7:56 ` Christoph Hellwig
2019-02-21 22:28 ` Bart Van Assche
2019-02-22 3:17 ` 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=20190206143149.GB19821@veci.piliscsaba.redhat.com \
--to=miklos@szeredi.hu \
--cc=avi@scylladb.com \
--cc=bvanassche@acm.org \
--cc=edumazet@google.com \
--cc=hch@lst.de \
--cc=linux-aio@kvack.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=syzkaller@googlegroups.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;
as well as URLs for NNTP newsgroup(s).