From: Amit Shah <amit.shah@redhat.com>
To: Virtualization List <virtualization@lists.linux-foundation.org>
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
"Michael S. Tsirkin" <mst@redhat.com>,
levinsasha928@gmail.com, Amit Shah <amit.shah@redhat.com>
Subject: [PATCH v5 06/11] virtio: blk: Add freeze, restore handlers to support S4
Date: Thu, 15 Dec 2011 18:15:52 +0530 [thread overview]
Message-ID: <a43d429430f89966048908183d424aa22094a95b.1323952934.git.amit.shah@redhat.com> (raw)
In-Reply-To: <cover.1323952933.git.amit.shah@redhat.com>
In-Reply-To: <cover.1323952933.git.amit.shah@redhat.com>
Delete the vq and flush any pending requests from the block queue on the
freeze callback to prepare for hibernation.
Re-create the vq in the restore callback to resume normal function.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
drivers/block/virtio_blk.c | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 467f218..a9147a6 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -568,6 +568,40 @@ static void __devexit virtblk_remove(struct virtio_device *vdev)
ida_simple_remove(&vd_index_ida, index);
}
+#ifdef CONFIG_PM
+static int virtblk_freeze(struct virtio_device *vdev)
+{
+ struct virtio_blk *vblk = vdev->priv;
+
+ /* Ensure we don't receive any more interrupts */
+ vdev->config->reset(vdev);
+
+ flush_work(&vblk->config_work);
+
+ spin_lock_irq(vblk->disk->queue->queue_lock);
+ blk_stop_queue(vblk->disk->queue);
+ spin_unlock_irq(vblk->disk->queue->queue_lock);
+ blk_sync_queue(vblk->disk->queue);
+
+ vdev->config->del_vqs(vdev);
+ return 0;
+}
+
+static int virtblk_restore(struct virtio_device *vdev)
+{
+ struct virtio_blk *vblk = vdev->priv;
+ int ret;
+
+ ret = init_vq(vdev->priv);
+ if (!ret) {
+ spin_lock_irq(vblk->disk->queue->queue_lock);
+ blk_start_queue(vblk->disk->queue);
+ spin_unlock_irq(vblk->disk->queue->queue_lock);
+ }
+ return ret;
+}
+#endif
+
static const struct virtio_device_id id_table[] = {
{ VIRTIO_ID_BLOCK, VIRTIO_DEV_ANY_ID },
{ 0 },
@@ -593,6 +627,10 @@ static struct virtio_driver __refdata virtio_blk = {
.probe = virtblk_probe,
.remove = __devexit_p(virtblk_remove),
.config_changed = virtblk_config_changed,
+#ifdef CONFIG_PM
+ .freeze = virtblk_freeze,
+ .restore = virtblk_restore,
+#endif
};
static int __init init(void)
--
1.7.7.3
next prev parent reply other threads:[~2011-12-15 12:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-15 12:45 [PATCH v5 00/11] virtio: s4 support Amit Shah
2011-12-15 12:45 ` [PATCH v5 01/11] virtio: pci: switch to new PM API Amit Shah
2011-12-15 12:45 ` [PATCH v5 02/11] virtio: pci: add PM notification handlers for restore, freeze, thaw, poweroff Amit Shah
2011-12-15 12:45 ` [PATCH v5 03/11] virtio: console: Move vq and vq buf removal into separate functions Amit Shah
2011-12-15 12:45 ` [PATCH v5 04/11] virtio: console: Add freeze and restore handlers to support S4 Amit Shah
2011-12-15 12:45 ` [PATCH v5 05/11] virtio: blk: Move vq initialization to separate function Amit Shah
2011-12-15 12:45 ` Amit Shah [this message]
2011-12-15 12:45 ` [PATCH v5 07/11] virtio: net: Move vq initialization into " Amit Shah
2011-12-15 12:45 ` [PATCH v5 08/11] virtio: net: Move vq and vq buf removal " Amit Shah
2011-12-15 12:45 ` [PATCH v5 09/11] virtio: net: Add freeze, restore handlers to support S4 Amit Shah
2011-12-15 12:45 ` [PATCH v5 10/11] virtio: balloon: Move vq initialization into separate function Amit Shah
2011-12-15 12:45 ` [PATCH v5 11/11] virtio: balloon: Add freeze, restore handlers to support S4 Amit Shah
2011-12-15 13:13 ` [PATCH v5 00/11] virtio: s4 support Michael S. Tsirkin
2011-12-15 14:55 ` Amit Shah
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=a43d429430f89966048908183d424aa22094a95b.1323952934.git.amit.shah@redhat.com \
--to=amit.shah@redhat.com \
--cc=levinsasha928@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mst@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).