virtualization.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: kvm@vger.kernel.org, virtualization@lists.linux-foundation.org
Subject: [PATCH v2 12/15] virtio_blk: enable VQs early
Date: Mon, 6 Oct 2014 18:11:22 +0300	[thread overview]
Message-ID: <1412608214-31944-13-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1412608214-31944-1-git-send-email-mst@redhat.com>

virtio spec requires drivers to set DRIVER_OK before using VQs.
This is set automatically after probe returns, virtio block violated this
rule by calling add_disk, which causes the VQ to be used directly within
probe.

To fix, call virtio_enable_vqs_early before using VQs.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 drivers/block/virtio_blk.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 89ba8d6..46b04bf 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -719,6 +719,8 @@ static int virtblk_probe(struct virtio_device *vdev)
 	if (!err && opt_io_size)
 		blk_queue_io_opt(q, blk_size * opt_io_size);
 
+	virtio_enable_vqs_early(vdev);
+
 	add_disk(vblk->disk);
 	err = device_create_file(disk_to_dev(vblk->disk), &dev_attr_serial);
 	if (err)
-- 
MST

  parent reply	other threads:[~2014-10-06 15:11 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-06 15:10 [PATCH v2 00/15] virtio: fix spec compliance issues Michael S. Tsirkin
2014-10-06 15:10 ` [PATCH v2 01/15] virtio_pci: fix virtio spec compliance on restore Michael S. Tsirkin
2014-10-07 12:05   ` Amit Shah
2014-10-07 12:51     ` Michael S. Tsirkin
2014-10-07 12:53   ` Michael S. Tsirkin
2014-10-07 16:54     ` Amit Shah
2014-10-06 15:10 ` [PATCH v2 02/15] virtio: unify config_changed handling Michael S. Tsirkin
2014-10-06 15:16   ` Cornelia Huck
2014-10-06 15:10 ` [PATCH v2 03/15] virtio-pci: move freeze/restore to virtio core Michael S. Tsirkin
2014-10-06 15:20   ` Cornelia Huck
2014-10-06 15:26     ` Michael S. Tsirkin
2014-10-06 15:34       ` Cornelia Huck
2014-10-06 15:10 ` [PATCH v2 04/15] virtio: defer config changed notifications Michael S. Tsirkin
2014-10-06 15:25   ` Cornelia Huck
2014-10-06 15:10 ` [PATCH v2 05/15] virtio_blk: drop config_enable Michael S. Tsirkin
2014-10-06 15:26   ` Cornelia Huck
2014-10-06 15:11 ` [PATCH v2 06/15] virtio-blk: drop config_mutex Michael S. Tsirkin
2014-10-06 15:11 ` [PATCH v2 07/15] virtio_net: drop config_enable Michael S. Tsirkin
2014-10-06 15:11 ` [PATCH v2 08/15] virtio-net: drop config_mutex Michael S. Tsirkin
2014-10-06 15:11 ` [PATCH v2 09/15] virtio_net: minor cleanup Michael S. Tsirkin
2014-10-06 15:11 ` [PATCH v2 10/15] virtio: add API to enable VQs early Michael S. Tsirkin
2014-10-06 15:29   ` Cornelia Huck
2014-10-06 15:11 ` [PATCH v2 11/15] virtio_net: " Michael S. Tsirkin
2014-10-06 15:11 ` Michael S. Tsirkin [this message]
2014-10-06 15:42   ` [PATCH v2 12/15] virtio_blk: " Cornelia Huck
2014-10-06 15:11 ` [PATCH v2 13/15] virtio_console: " Michael S. Tsirkin
2014-10-06 15:11 ` [PATCH v2 14/15] 9p/trans_virtio: " Michael S. Tsirkin
2014-10-06 15:11 ` [PATCH v2 15/15] virtio_net: fix use after free on allocation failure Michael S. Tsirkin
     [not found] ` <1412608214-31944-8-git-send-email-mst@redhat.com>
2014-10-06 15:28   ` [PATCH v2 07/15] virtio_net: drop config_enable Cornelia Huck
     [not found] ` <1412608214-31944-12-git-send-email-mst@redhat.com>
2014-10-06 15:39   ` [PATCH v2 11/15] virtio_net: enable VQs early Cornelia Huck

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=1412608214-31944-13-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --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).