1 files changed, 26 insertions, 18 deletions

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index bf7c734259ad..cdc7c90a6a9e 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -591,7 +591,8 @@ static bool try_fill_recv(struct receive_queue *rq, gfp_t gfp)
         } while (rq->vq->num_free);
         if (unlikely(rq->num > rq->max))
                 rq->max = rq->num;
-        virtqueue_kick(rq->vq);
+        if (unlikely(!virtqueue_kick(rq->vq)))
+                return false;
         return !oom;
 }
 
@@ -797,7 +798,7 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
         err = xmit_skb(sq, skb);
 
         /* This should not happen! */
-        if (unlikely(err)) {
+        if (unlikely(err) || unlikely(!virtqueue_kick(sq->vq))) {
                 dev->stats.tx_fifo_errors++;
                 if (net_ratelimit())
                         dev_warn(&dev->dev,
@@ -806,7 +807,6 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
                 kfree_skb(skb);
                 return NETDEV_TX_OK;
         }
-        virtqueue_kick(sq->vq);
 
         /* Don't wait up for transmitted skbs to be freed. */
         skb_orphan(skb);
@@ -865,12 +865,14 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
         BUG_ON(virtqueue_add_sgs(vi->cvq, sgs, out_num, in_num, vi, GFP_ATOMIC)
                < 0);
 
-        virtqueue_kick(vi->cvq);
+        if (unlikely(!virtqueue_kick(vi->cvq)))
+                return status == VIRTIO_NET_OK;
 
         /* Spin for a response, the kick causes an ioport write, trapping
          * into the hypervisor, so the request should be handled immediately.
          */
-        while (!virtqueue_get_buf(vi->cvq, &tmp))
+        while (!virtqueue_get_buf(vi->cvq, &tmp) &&
+               !virtqueue_is_broken(vi->cvq))
                 cpu_relax();
 
         return status == VIRTIO_NET_OK;
@@ -898,8 +900,13 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p)
                         return -EINVAL;
                 }
         } else if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) {
-                vdev->config->set(vdev, offsetof(struct virtio_net_config, mac),
-                                  addr->sa_data, dev->addr_len);
+                unsigned int i;
+
+                /* Naturally, this has an atomicity problem. */
+                for (i = 0; i < dev->addr_len; i++)
+                        virtio_cwrite8(vdev,
+                                       offsetof(struct virtio_net_config, mac) +
+                                       i, addr->sa_data[i]);
         }
 
         eth_commit_mac_addr_change(dev, p);
@@ -1281,9 +1288,8 @@ static void virtnet_config_changed_work(struct work_struct *work)
         if (!vi->config_enable)
                 goto done;
 
-        if (virtio_config_val(vi->vdev, VIRTIO_NET_F_STATUS,
-                              offsetof(struct virtio_net_config, status),
-                              &v) < 0)
+        if (virtio_cread_feature(vi->vdev, VIRTIO_NET_F_STATUS,
+                                 struct virtio_net_config, status, &v) < 0)
                 goto done;
 
         if (v & VIRTIO_NET_S_ANNOUNCE) {
@@ -1507,9 +1513,9 @@ static int virtnet_probe(struct virtio_device *vdev)
         u16 max_queue_pairs;
 
         /* Find if host supports multiqueue virtio_net device */
-        err = virtio_config_val(vdev, VIRTIO_NET_F_MQ,
-                                offsetof(struct virtio_net_config,
-                                max_virtqueue_pairs), &max_queue_pairs);
+        err = virtio_cread_feature(vdev, VIRTIO_NET_F_MQ,
+                                   struct virtio_net_config,
+                                   max_virtqueue_pairs, &max_queue_pairs);
 
         /* We need at least 2 queue's */
         if (err || max_queue_pairs < VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN ||
@@ -1561,9 +1567,11 @@ static int virtnet_probe(struct virtio_device *vdev)
         dev->vlan_features = dev->features;
 
         /* Configuration may specify what MAC to use.  Otherwise random. */
-        if (virtio_config_val_len(vdev, VIRTIO_NET_F_MAC,
-                                  offsetof(struct virtio_net_config, mac),
-                                  dev->dev_addr, dev->addr_len) < 0)
+        if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC))
+                virtio_cread_bytes(vdev,
+                                   offsetof(struct virtio_net_config, mac),
+                                   dev->dev_addr, dev->addr_len);
+        else
                 eth_hw_addr_random(dev);
 
         /* Set up our device-specific information */
@@ -1704,7 +1712,7 @@ static void virtnet_remove(struct virtio_device *vdev)
         free_netdev(vi->dev);
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int virtnet_freeze(struct virtio_device *vdev)
 {
         struct virtnet_info *vi = vdev->priv;
@@ -1795,7 +1803,7 @@ static struct virtio_driver virtio_net_driver = {
         .probe =        virtnet_probe,
         .remove =       virtnet_remove,
         .config_changed = virtnet_config_changed,
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
         .freeze =       virtnet_freeze,
         .restore =      virtnet_restore,
 #endif