1 files changed, 92 insertions, 33 deletions

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 76fe14efb2b5..4880aa8b4c28 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -370,7 +370,7 @@ static int add_recvbuf_small(struct virtnet_info *vi, gfp_t gfp)
 
         skb_to_sgvec(skb, vi->rx_sg + 1, 0, skb->len);
 
-        err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, 2, skb, gfp);
+        err = virtqueue_add_buf(vi->rvq, vi->rx_sg, 0, 2, skb, gfp);
         if (err < 0)
                 dev_kfree_skb(skb);
 
@@ -415,8 +415,8 @@ static int add_recvbuf_big(struct virtnet_info *vi, gfp_t gfp)
 
         /* chain first in list head */
         first->private = (unsigned long)list;
-        err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, MAX_SKB_FRAGS + 2,
-                                    first, gfp);
+        err = virtqueue_add_buf(vi->rvq, vi->rx_sg, 0, MAX_SKB_FRAGS + 2,
+                                first, gfp);
         if (err < 0)
                 give_pages(vi, first);
 
@@ -434,7 +434,7 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi, gfp_t gfp)
 
         sg_init_one(vi->rx_sg, page_address(page), PAGE_SIZE);
 
-        err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, 1, page, gfp);
+        err = virtqueue_add_buf(vi->rvq, vi->rx_sg, 0, 1, page, gfp);
         if (err < 0)
                 give_pages(vi, page);
 
@@ -609,7 +609,7 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb)
 
         hdr->num_sg = skb_to_sgvec(skb, vi->tx_sg + 1, 0, skb->len) + 1;
         return virtqueue_add_buf(vi->svq, vi->tx_sg, hdr->num_sg,
-                                        0, skb);
+                                 0, skb, GFP_ATOMIC);
 }
 
 static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -767,7 +767,7 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
                 sg_set_buf(&sg[i + 1], sg_virt(s), s->length);
         sg_set_buf(&sg[out + in - 1], &status, sizeof(status));
 
-        BUG_ON(virtqueue_add_buf(vi->cvq, sg, out, in, vi) < 0);
+        BUG_ON(virtqueue_add_buf(vi->cvq, sg, out, in, vi, GFP_ATOMIC) < 0);
 
         virtqueue_kick(vi->cvq);
 
@@ -985,15 +985,38 @@ static void virtnet_config_changed(struct virtio_device *vdev)
         virtnet_update_status(vi);
 }
 
+static int init_vqs(struct virtnet_info *vi)
+{
+        struct virtqueue *vqs[3];
+        vq_callback_t *callbacks[] = { skb_recv_done, skb_xmit_done, NULL};
+        const char *names[] = { "input", "output", "control" };
+        int nvqs, err;
+
+        /* We expect two virtqueues, receive then send,
+         * and optionally control. */
+        nvqs = virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ) ? 3 : 2;
+
+        err = vi->vdev->config->find_vqs(vi->vdev, nvqs, vqs, callbacks, names);
+        if (err)
+                return err;
+
+        vi->rvq = vqs[0];
+        vi->svq = vqs[1];
+
+        if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) {
+                vi->cvq = vqs[2];
+
+                if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VLAN))
+                        vi->dev->features |= NETIF_F_HW_VLAN_FILTER;
+        }
+        return 0;
+}
+
 static int virtnet_probe(struct virtio_device *vdev)
 {
         int err;
         struct net_device *dev;
         struct virtnet_info *vi;
-        struct virtqueue *vqs[3];
-        vq_callback_t *callbacks[] = { skb_recv_done, skb_xmit_done, NULL};
-        const char *names[] = { "input", "output", "control" };
-        int nvqs;
 
         /* Allocate ourselves a network device with room for our info */
         dev = alloc_etherdev(sizeof(struct virtnet_info));
@@ -1065,24 +1088,10 @@ static int virtnet_probe(struct virtio_device *vdev)
         if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF))
                 vi->mergeable_rx_bufs = true;
 
-        /* We expect two virtqueues, receive then send,
-         * and optionally control. */
-        nvqs = virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ) ? 3 : 2;
-
-        err = vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names);
+        err = init_vqs(vi);
         if (err)
                 goto free_stats;
 
-        vi->rvq = vqs[0];
-        vi->svq = vqs[1];
-
-        if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) {
-                vi->cvq = vqs[2];
-
-                if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VLAN))
-                        dev->features |= NETIF_F_HW_VLAN_FILTER;
-        }
-
         err = register_netdev(dev);
         if (err) {
                 pr_debug("virtio_net: registering device failed\n");
@@ -1144,27 +1153,73 @@ static void free_unused_bufs(struct virtnet_info *vi)
         BUG_ON(vi->num != 0);
 }
 
-static void __devexit virtnet_remove(struct virtio_device *vdev)
+static void remove_vq_common(struct virtnet_info *vi)
 {
-        struct virtnet_info *vi = vdev->priv;
-
-        /* Stop all the virtqueues. */
-        vdev->config->reset(vdev);
-
-        unregister_netdev(vi->dev);
+        vi->vdev->config->reset(vi->vdev);
 
         /* Free unused buffers in both send and recv, if any. */
         free_unused_bufs(vi);
 
-        vdev->config->del_vqs(vi->vdev);
+        vi->vdev->config->del_vqs(vi->vdev);
 
         while (vi->pages)
                 __free_pages(get_a_page(vi, GFP_KERNEL), 0);
+}
+
+static void __devexit virtnet_remove(struct virtio_device *vdev)
+{
+        struct virtnet_info *vi = vdev->priv;
+
+        unregister_netdev(vi->dev);
+
+        remove_vq_common(vi);
 
         free_percpu(vi->stats);
         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))
+                queue_delayed_work(system_nrt_wq, &vi->refill, 0);
+
+        return 0;
+}
+#endif
+
 static struct virtio_device_id id_table[] = {
         { VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID },
         { 0 },
@@ -1189,6 +1244,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)