From: Amit Shah <amit.shah@redhat.com>
To: Virtualization List <virtualization@lists.linux-foundation.org>
Cc: Amit Shah <amit.shah@redhat.com>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PATCH v6 09/11] virtio: net: Add freeze, restore handlers to support S4
Date: Thu, 22 Dec 2011 16:58:33 +0530 [thread overview]
Message-ID: <f84fa9fdc9f5629e711cbb89a2e7efbb289d72fa.1324553223.git.amit.shah@redhat.com> (raw)
In-Reply-To: <cover.1324553223.git.amit.shah@redhat.com>
In-Reply-To: <cover.1324553223.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 | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 7a2a5bf..b31670f 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1159,6 +1159,48 @@ 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;
+
+ virtqueue_disable_cb(vi->rvq);
+ virtqueue_disable_cb(vi->svq);
+ if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ))
+ virtqueue_disable_cb(vi->cvq);
+
+ netif_device_detach(vi->dev);
+ cancel_delayed_work_sync(&vi->refill);
+
+ 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;
+
+ if (netif_running(vi->dev))
+ virtnet_napi_enable(vi);
+
+ netif_device_attach(vi->dev);
+
+ if (!try_fill_recv(vi, GFP_KERNEL))
+ schedule_delayed_work(&vi->refill, 0);
+
+ return 0;
+}
+#endif
+
static struct virtio_device_id id_table[] = {
{ VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID },
{ 0 },
@@ -1183,6 +1225,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.4
next prev parent reply other threads:[~2011-12-22 11:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-22 11:28 [PATCH v6 00/11] virtio: s4 support Amit Shah
2011-12-22 11:28 ` [PATCH v6 01/11] virtio: pci: switch to new PM API Amit Shah
2011-12-22 11:28 ` [PATCH v6 02/11] virtio: pci: add PM notification handlers for restore, freeze, thaw, poweroff Amit Shah
2011-12-22 11:28 ` [PATCH v6 03/11] virtio: console: Move vq and vq buf removal into separate functions Amit Shah
2011-12-22 11:28 ` [PATCH v6 04/11] virtio: console: Add freeze and restore handlers to support S4 Amit Shah
2011-12-22 11:28 ` [PATCH v6 05/11] virtio: blk: Move vq initialization to separate function Amit Shah
2011-12-22 11:28 ` [PATCH v6 06/11] virtio: blk: Add freeze, restore handlers to support S4 Amit Shah
2011-12-22 11:28 ` [PATCH v6 07/11] virtio: net: Move vq initialization into separate function Amit Shah
2011-12-22 11:28 ` [PATCH v6 08/11] virtio: net: Move vq and vq buf removal " Amit Shah
2011-12-22 11:28 ` Amit Shah [this message]
2011-12-29 16:15 ` [PATCH v6 09/11] virtio: net: Add freeze, restore handlers to support S4 Michael S. Tsirkin
2011-12-30 9:38 ` Amit Shah
2012-01-01 11:47 ` Michael S. Tsirkin
2012-01-03 17:07 ` Amit Shah
2012-01-04 2:49 ` Rusty Russell
2011-12-22 11:28 ` [PATCH v6 10/11] virtio: balloon: Move vq initialization into separate function Amit Shah
2011-12-22 11:28 ` [PATCH v6 11/11] virtio: balloon: Add freeze, restore handlers to support S4 Amit Shah
2011-12-29 4:32 ` [PATCH v6 00/11] virtio: s4 support 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=f84fa9fdc9f5629e711cbb89a2e7efbb289d72fa.1324553223.git.amit.shah@redhat.com \
--to=amit.shah@redhat.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).