From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Ohad Ben-Cohen <ohad@wizery.com>,
Rusty Russell <rusty@rustcorp.com.au>,
qemu-devel@nongnu.org, kvm@vger.kernel.org,
virtualization@lists.linux-foundation.org
Subject: Re: [Qemu-devel] [PATCH] virtio_rpmsg: set DRIVER_OK before using device
Date: Mon, 9 Mar 2015 09:41:01 +0100 [thread overview]
Message-ID: <20150309084101.GC22567@redhat.com> (raw)
In-Reply-To: <1425754898-32707-1-git-send-email-mst@redhat.com>
On Sat, Mar 07, 2015 at 08:06:56PM +0100, Michael S. Tsirkin wrote:
> virtio spec requires that all drivers set DRIVER_OK
> before using devices. While rpmsg isn't yet
> included in the virtio 1 spec, previous spec versions
> also required this.
>
> virtio rpmsg violates this rule: is calls kick
> before setting DRIVER_OK.
>
> The fix isn't trivial since simply calling virtio_device_ready earlier
> would mean we might get an interrupt in parallel with adding buffers.
>
> Instead, split kick out to prepare+notify calls. prepare before
> virtio_device_ready - when we know we won't get interrupts. notify right
> afterwards.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
Ohad, can you review and ack pls?
> Note: compile-tested only.
>
> drivers/rpmsg/virtio_rpmsg_bus.c | 17 ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c
> index 92f6af6..73354ee 100644
> --- a/drivers/rpmsg/virtio_rpmsg_bus.c
> +++ b/drivers/rpmsg/virtio_rpmsg_bus.c
> @@ -951,6 +951,7 @@ static int rpmsg_probe(struct virtio_device *vdev)
> void *bufs_va;
> int err = 0, i;
> size_t total_buf_space;
> + bool notify;
>
> vrp = kzalloc(sizeof(*vrp), GFP_KERNEL);
> if (!vrp)
> @@ -1030,8 +1031,22 @@ static int rpmsg_probe(struct virtio_device *vdev)
> }
> }
>
> + /*
> + * Prepare to kick but don't notify yet - we can't do this before
> + * device is ready.
> + */
> + notify = virtqueue_kick_prepare(vrp->rvq);
> +
> + /* From this point on, we can notify and get callbacks. */
> + virtio_device_ready(vdev);
> +
> /* tell the remote processor it can start sending messages */
> - virtqueue_kick(vrp->rvq);
> + /*
> + * this might be concurrent with callbacks, but we are only
> + * doing notify, not a full kick here, so that's ok.
> + */
> + if (notify)
> + virtqueue_notify(vrp->rvq);
>
> dev_info(&vdev->dev, "rpmsg host is online\n");
>
> --
> MST
next prev parent reply other threads:[~2015-03-09 8:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-07 19:06 [Qemu-devel] [PATCH] virtio_rpmsg: set DRIVER_OK before using device Michael S. Tsirkin
2015-03-09 7:09 ` Rusty Russell
2015-03-09 8:27 ` Michael S. Tsirkin
2015-03-09 8:41 ` Michael S. Tsirkin [this message]
2015-03-11 12:45 ` Ohad Ben-Cohen
2015-03-12 1:05 ` Rusty Russell
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=20150309084101.GC22567@redhat.com \
--to=mst@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ohad@wizery.com \
--cc=qemu-devel@nongnu.org \
--cc=rusty@rustcorp.com.au \
--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).