From: Vivek Goyal <vgoyal@redhat.com>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: chirantan@chromium.org,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
virtualization@lists.linux-foundation.org, virtio-fs@redhat.com,
Stefan Hajnoczi <stefanha@redhat.com>,
linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH 5/5] virtiofs: Retry request submission from worker context
Date: Mon, 21 Oct 2019 09:01:43 -0400 [thread overview]
Message-ID: <20191021130143.GB13573@redhat.com> (raw)
In-Reply-To: <CAJfpegvg1ePA7=Fm3499bKsZBv_98j817KCDxOU18j=BdVfHyA@mail.gmail.com>
On Mon, Oct 21, 2019 at 10:15:18AM +0200, Miklos Szeredi wrote:
[..]
> > @@ -268,13 +272,43 @@ static void virtio_fs_request_dispatch_work(struct work_struct *work)
> > list);
> > if (!req) {
> > spin_unlock(&fsvq->lock);
> > - return;
> > + break;
> > }
> >
> > list_del_init(&req->list);
> > spin_unlock(&fsvq->lock);
> > fuse_request_end(fc, req);
> > }
> > +
> > + /* Dispatch pending requests */
> > + while (1) {
> > + spin_lock(&fsvq->lock);
> > + req = list_first_entry_or_null(&fsvq->queued_reqs,
> > + struct fuse_req, list);
> > + if (!req) {
> > + spin_unlock(&fsvq->lock);
> > + return;
> > + }
> > + list_del_init(&req->list);
> > + spin_unlock(&fsvq->lock);
> > +
> > + ret = virtio_fs_enqueue_req(fsvq, req, true);
> > + if (ret < 0) {
> > + if (ret == -ENOMEM || ret == -ENOSPC) {
> > + spin_lock(&fsvq->lock);
> > + list_add_tail(&req->list, &fsvq->queued_reqs);
> > + schedule_delayed_work(&fsvq->dispatch_work,
> > + msecs_to_jiffies(1));
> > + spin_unlock(&fsvq->lock);
> > + return;
> > + }
> > + req->out.h.error = ret;
> > + dec_in_flight_req(fsvq);
>
> Missing locking. Fixed.
Good catch. Thanks.
Vivek
prev parent reply other threads:[~2019-10-21 13:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-15 17:46 [PATCH 0/5] virtiofs: Fix couple of deadlocks Vivek Goyal
2019-10-15 17:46 ` [PATCH 1/5] virtiofs: Do not end request in submission context Vivek Goyal
[not found] ` <CAJfpegtrFvuBUuQ7B+ynCLVmgZ8zRjbUYZYg+BzG6HDmt5RyXw@mail.gmail.com>
2019-10-21 11:52 ` Vivek Goyal
2019-10-15 17:46 ` [PATCH 2/5] virtiofs: No need to check fpq->connected state Vivek Goyal
2019-10-15 17:46 ` [PATCH 3/5] virtiofs: Set FR_SENT flag only after request has been sent Vivek Goyal
2019-10-15 17:46 ` [PATCH 4/5] virtiofs: Count pending forgets as in_flight forgets Vivek Goyal
2019-10-15 17:46 ` [PATCH 5/5] virtiofs: Retry request submission from worker context Vivek Goyal
[not found] ` <CAJfpegvg1ePA7=Fm3499bKsZBv_98j817KCDxOU18j=BdVfHyA@mail.gmail.com>
2019-10-21 13:01 ` Vivek Goyal [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=20191021130143.GB13573@redhat.com \
--to=vgoyal@redhat.com \
--cc=chirantan@chromium.org \
--cc=dgilbert@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=stefanha@redhat.com \
--cc=virtio-fs@redhat.com \
--cc=virtualization@lists.linux-foundation.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).