From: Amit Shah <amit.shah@redhat.com>
To: Virtualization List <virtualization@lists.linux-foundation.org>
Cc: Amit Shah <amit.shah@redhat.com>,
linux-kernel@vger.kernel.org, levinsasha928@gmail.com,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PATCH v4 09/12] virtio: net: Add freeze, restore handlers to support S4
Date: Wed, 7 Dec 2011 01:18:47 +0530 [thread overview]
Message-ID: <712d8d78cf730161181562ed44d4fe08a370b85e.1323199985.git.amit.shah@redhat.com> (raw)
In-Reply-To: <cover.1323199985.git.amit.shah@redhat.com>
In-Reply-To: <cover.1323199985.git.amit.shah@redhat.com>
Remove all the vqs, disable napi and detach from the netdev on
hibernation.
Re-create vqs after restoring from a hibernated image, re-enable napi
and re-attach the netdev. This keeps networking working across
hibernation.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
drivers/net/virtio_net.c | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 697a0fc..1378f3c 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1151,6 +1151,38 @@ static void __devexit virtnet_remove(struct virtio_device *vdev)
free_netdev(vi->dev);
}
+#ifdef CONFIG_PM
+static int virtnet_freeze(struct virtio_device *vdev)
+{
+ struct virtnet_info *vi = vdev->priv;
+
+ netif_device_detach(vi->dev);
+ if (netif_running(vi->dev))
+ napi_disable(&vi->napi);
+
+ remove_vq_common(vi);
+
+ return 0;
+}
+
+static int virtnet_restore(struct virtio_device *vdev)
+{
+ struct virtnet_info *vi = vdev->priv;
+ int err;
+
+ err = init_vqs(vi);
+ if (err)
+ return err;
+
+ try_fill_recv(vi, GFP_KERNEL);
+ if (netif_running(vi->dev))
+ virtnet_napi_enable(vi);
+
+ netif_device_attach(vi->dev);
+ return 0;
+}
+#endif
+
static struct virtio_device_id id_table[] = {
{ VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID },
{ 0 },
@@ -1175,6 +1207,10 @@ static struct virtio_driver virtio_net_driver = {
.probe = virtnet_probe,
.remove = __devexit_p(virtnet_remove),
.config_changed = virtnet_config_changed,
+#ifdef CONFIG_PM
+ .freeze = virtnet_freeze,
+ .restore = virtnet_restore,
+#endif
};
static int __init init(void)
--
1.7.7.3
next prev parent reply other threads:[~2011-12-06 19:48 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-06 19:48 [PATCH v4 00/12] virtio: s4 support Amit Shah
2011-12-06 19:48 ` [PATCH v4 01/12] virtio: pci: switch to new PM API Amit Shah
2011-12-06 22:12 ` Rafael J. Wysocki
2011-12-07 3:57 ` Amit Shah
2011-12-07 9:48 ` Rafael J. Wysocki
2011-12-07 9:52 ` Amit Shah
2011-12-07 10:16 ` Rafael J. Wysocki
2011-12-06 19:48 ` [PATCH v4 02/12] virtio: pci: add PM notification handlers for restore, freeze, thaw, poweroff Amit Shah
2011-12-06 19:48 ` [PATCH v4 03/12] virtio: console: Move out vq and vq buf removal into separate functions Amit Shah
2011-12-06 19:48 ` [PATCH v4 04/12] virtio: console: Add freeze and restore handlers to support S4 Amit Shah
2011-12-07 10:43 ` Michael S. Tsirkin
2011-12-07 10:59 ` Amit Shah
2011-12-07 15:54 ` Michael S. Tsirkin
2011-12-06 19:48 ` [PATCH v4 05/12] virtio: blk: Move out vq initialization to separate function Amit Shah
2011-12-06 19:48 ` [PATCH v4 06/12] virtio: blk: Add freeze, restore handlers to support S4 Amit Shah
2011-12-07 10:37 ` Michael S. Tsirkin
2011-12-07 10:56 ` Amit Shah
2011-12-07 15:58 ` Michael S. Tsirkin
2011-12-06 19:48 ` [PATCH v4 07/12] virtio: net: Move out vq initialization into separate function Amit Shah
2011-12-06 19:48 ` [PATCH v4 08/12] virtio: net: Move out vq and vq buf removal " Amit Shah
2011-12-06 19:48 ` Amit Shah [this message]
2011-12-07 10:28 ` [PATCH v4 09/12] virtio: net: Add freeze, restore handlers to support S4 Michael S. Tsirkin
2011-12-07 10:35 ` Amit Shah
2011-12-07 11:46 ` Michael S. Tsirkin
2011-12-06 19:48 ` [PATCH v4 10/12] virtio: balloon: ensure thread exists before stopping it Amit Shah
2011-12-06 19:48 ` [PATCH v4 11/12] virtio: balloon: Move out vq initialization into separate function Amit Shah
2011-12-06 19:48 ` [PATCH v4 12/12] virtio: balloon: Add freeze, restore handlers to support S4 Amit Shah
2011-12-07 4:50 ` Amit Shah
2011-12-07 10:34 ` (resend) " Michael S. Tsirkin
2011-12-07 10:39 ` Amit Shah
2011-12-07 7:24 ` [PATCH v4 00/12] virtio: s4 support Rusty Russell
[not found] ` <87wra8j13m.fsf@rustcorp.com.au>
2011-12-07 7:44 ` Amit Shah
2011-12-07 10:52 ` Rusty Russell
2011-12-08 11:56 ` Amit Shah
2011-12-07 10:44 ` Gleb Natapov
2011-12-07 13:43 ` Dor Laor
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=712d8d78cf730161181562ed44d4fe08a370b85e.1323199985.git.amit.shah@redhat.com \
--to=amit.shah@redhat.com \
--cc=levinsasha928@gmail.com \
--cc=linux-kernel@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).