From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-s390@vger.kernel.org, kvm@vger.kernel.org,
linux-scsi@vger.kernel.org,
Christian Borntraeger <borntraeger@de.ibm.com>,
netdev@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
virtualization@lists.linux-foundation.org,
Arnd Bergmann <arnd@arndb.de>,
Paolo Bonzini <pbonzini@redhat.com>,
Amit Shah <amit.shah@redhat.com>,
v9fs-developer@lists.sourceforge.net,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH v3 19/25] virtio_console: enable VQs early on restore
Date: Sun, 12 Oct 2014 14:48:06 +0300 [thread overview]
Message-ID: <1413114332-626-20-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1413114332-626-1-git-send-email-mst@redhat.com>
virtio spec requires drivers to set DRIVER_OK before using VQs.
This is set automatically after resume returns, virtio console violated this
rule by adding inbufs, which causes the VQ to be used directly within
restore.
To fix, call virtio_enable_vqs_early before using VQs.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/char/virtio_console.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 6ebe8f6..2ae843f 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -2184,6 +2184,8 @@ static int virtcons_restore(struct virtio_device *vdev)
if (ret)
return ret;
+ virtio_enable_vqs_early(portdev->vdev);
+
if (use_multiport(portdev))
fill_queue(portdev->c_ivq, &portdev->c_ivq_lock);
--
MST
next prev parent reply other threads:[~2014-10-12 11:48 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-12 11:46 [PATCH v3 00/25] virtio: fix spec compliance issues Michael S. Tsirkin
2014-10-12 11:46 ` [PATCH v3 01/25] virtio_pci: fix virtio spec compliance on restore Michael S. Tsirkin
2014-10-12 11:46 ` [PATCH v3 02/25] virtio: unify config_changed handling Michael S. Tsirkin
2014-10-12 11:46 ` [PATCH v3 03/25] virtio-pci: move freeze/restore to virtio core Michael S. Tsirkin
2014-10-12 11:46 ` [PATCH v3 04/25] virtio: defer config changed notifications Michael S. Tsirkin
2014-10-12 11:46 ` [PATCH v3 05/25] virtio_blk: drop config_enable Michael S. Tsirkin
2014-10-12 11:46 ` [PATCH v3 06/25] virtio-blk: drop config_mutex Michael S. Tsirkin
2014-10-12 11:47 ` [PATCH v3 07/25] virtio_net: drop config_enable Michael S. Tsirkin
2014-10-12 11:47 ` [PATCH v3 08/25] virtio-net: drop config_mutex Michael S. Tsirkin
2014-10-12 11:47 ` [PATCH v3 09/25] virtio_net: minor cleanup Michael S. Tsirkin
2014-10-12 11:47 ` [PATCH v3 10/25] virtio: add API to enable VQs early Michael S. Tsirkin
2014-10-13 6:52 ` Rusty Russell
2014-10-13 7:35 ` Michael S. Tsirkin
2014-10-12 11:47 ` [PATCH v3 11/25] virtio_net: " Michael S. Tsirkin
2014-10-12 11:47 ` [PATCH v3 12/25] virtio_blk: " Michael S. Tsirkin
2014-10-12 11:47 ` [PATCH v3 13/25] virtio_console: " Michael S. Tsirkin
2014-10-12 11:47 ` [PATCH v3 14/25] 9p/trans_virtio: " Michael S. Tsirkin
2014-10-12 11:47 ` [PATCH v3 15/25] virtio_net: fix use after free on allocation failure Michael S. Tsirkin
2014-10-12 11:47 ` [PATCH v3 16/25] virtio_scsi: move kick event out from virtscsi_init Michael S. Tsirkin
2014-10-12 11:47 ` [PATCH v3 17/25] virtio_blk: enable VQs early on restore Michael S. Tsirkin
2014-10-12 11:48 ` [PATCH v3 18/25] virtio_scsi: " Michael S. Tsirkin
2014-10-12 11:48 ` Michael S. Tsirkin [this message]
2014-10-12 11:48 ` [PATCH v3 20/25] virtio_net: " Michael S. Tsirkin
2014-10-12 11:48 ` [PATCH v3 21/25] virito_scsi: use freezable WQ for events Michael S. Tsirkin
2014-10-12 11:48 ` [PATCH v3 22/25] virtio_scsi: fix race on device removal Michael S. Tsirkin
2014-10-12 11:48 ` [PATCH v3 23/25] virtio_balloon: enable VQs early on restore Michael S. Tsirkin
2014-10-12 11:48 ` [PATCH v3 24/25] virtio_scsi: drop scan callback Michael S. Tsirkin
2014-10-12 11:48 ` [PATCH v3 25/25] virtio-rng: refactor probe error handling Michael S. Tsirkin
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=1413114332-626-20-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=amit.shah@redhat.com \
--cc=arnd@arndb.de \
--cc=borntraeger@de.ibm.com \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=v9fs-developer@lists.sourceforge.net \
--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).