Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

Pull virtio & lguest updates from Rusty Russell:
 "Lots of virtio work which wasn't quite ready for last merge window.

  Plus I dived into lguest again, reworking the pagetable code so we can
  move the switcher page: our fixmaps sometimes take more than 2MB now..."

Ugh.  Annoying conflicts with the tcm_vhost -> vhost_scsi rename.
Hopefully correctly resolved.

* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (57 commits)
  caif_virtio: Remove bouncing email addresses
  lguest: improve code readability in lg_cpu_start.
  virtio-net: fill only rx queues which are being used
  lguest: map Switcher below fixmap.
  lguest: cache last cpu we ran on.
  lguest: map Switcher text whenever we allocate a new pagetable.
  lguest: don't share Switcher PTE pages between guests.
  lguest: expost switcher_pages array (as lg_switcher_pages).
  lguest: extract shadow PTE walking / allocating.
  lguest: make check_gpte et. al return bool.
  lguest: assume Switcher text is a single page.
  lguest: rename switcher_page to switcher_pages.
  lguest: remove RESERVE_MEM constant.
  lguest: check vaddr not pgd for Switcher protection.
  lguest: prepare to make SWITCHER_ADDR a variable.
  virtio: console: replace EMFILE with EBUSY for already-open port
  virtio-scsi: reset virtqueue affinity when doing cpu hotplug
  virtio-scsi: introduce multiqueue support
  virtio-scsi: push vq lock/unlock into virtscsi_vq_done
  virtio-scsi: pass struct virtio_scsi to virtqueue completion function
  ...

1 files changed, 41 insertions, 36 deletions

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 50077753a0e5..3c23fdc27bf0 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -39,7 +39,6 @@ module_param(gso, bool, 0444);
 #define MAX_PACKET_LEN (ETH_HLEN + VLAN_HLEN + ETH_DATA_LEN)
 #define GOOD_COPY_LEN   128
 
-#define VIRTNET_SEND_COMMAND_SG_MAX    2
 #define VIRTNET_DRIVER_VERSION "1.0.0"
 
 struct virtnet_stats {
@@ -444,7 +443,7 @@ static int add_recvbuf_small(struct receive_queue *rq, gfp_t gfp)
 
         skb_to_sgvec(skb, rq->sg + 1, 0, skb->len);
 
-        err = virtqueue_add_buf(rq->vq, rq->sg, 0, 2, skb, gfp);
+        err = virtqueue_add_inbuf(rq->vq, rq->sg, 2, skb, gfp);
         if (err < 0)
                 dev_kfree_skb(skb);
 
@@ -489,8 +488,8 @@ static int add_recvbuf_big(struct receive_queue *rq, gfp_t gfp)
 
         /* chain first in list head */
         first->private = (unsigned long)list;
-        err = virtqueue_add_buf(rq->vq, rq->sg, 0, MAX_SKB_FRAGS + 2,
-                                first, gfp);
+        err = virtqueue_add_inbuf(rq->vq, rq->sg, MAX_SKB_FRAGS + 2,
+                                  first, gfp);
         if (err < 0)
                 give_pages(rq, first);
 
@@ -508,7 +507,7 @@ static int add_recvbuf_mergeable(struct receive_queue *rq, gfp_t gfp)
 
         sg_init_one(rq->sg, page_address(page), PAGE_SIZE);
 
-        err = virtqueue_add_buf(rq->vq, rq->sg, 0, 1, page, gfp);
+        err = virtqueue_add_inbuf(rq->vq, rq->sg, 1, page, gfp);
         if (err < 0)
                 give_pages(rq, page);
 
@@ -582,7 +581,7 @@ static void refill_work(struct work_struct *work)
         bool still_empty;
         int i;
 
-        for (i = 0; i < vi->max_queue_pairs; i++) {
+        for (i = 0; i < vi->curr_queue_pairs; i++) {
                 struct receive_queue *rq = &vi->rq[i];
 
                 napi_disable(&rq->napi);
@@ -637,7 +636,7 @@ static int virtnet_open(struct net_device *dev)
         struct virtnet_info *vi = netdev_priv(dev);
         int i;
 
-        for (i = 0; i < vi->max_queue_pairs; i++) {
+        for (i = 0; i < vi->curr_queue_pairs; i++) {
                 /* Make sure we have some buffers: if oom use wq. */
                 if (!try_fill_recv(&vi->rq[i], GFP_KERNEL))
                         schedule_delayed_work(&vi->refill, 0);
@@ -711,8 +710,7 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb)
                 sg_set_buf(sq->sg, &hdr->hdr, sizeof hdr->hdr);
 
         num_sg = skb_to_sgvec(skb, sq->sg + 1, 0, skb->len) + 1;
-        return virtqueue_add_buf(sq->vq, sq->sg, num_sg,
-                                 0, skb, GFP_ATOMIC);
+        return virtqueue_add_outbuf(sq->vq, sq->sg, num_sg, skb, GFP_ATOMIC);
 }
 
 static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -767,32 +765,35 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
  * never fail unless improperly formated.
  */
 static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
-                                 struct scatterlist *data, int out, int in)
+                                 struct scatterlist *out,
+                                 struct scatterlist *in)
 {
-        struct scatterlist *s, sg[VIRTNET_SEND_COMMAND_SG_MAX + 2];
+        struct scatterlist *sgs[4], hdr, stat;
         struct virtio_net_ctrl_hdr ctrl;
         virtio_net_ctrl_ack status = ~0;
-        unsigned int tmp;
-        int i;
+        unsigned out_num = 0, in_num = 0, tmp;
 
         /* Caller should know better */
-        BUG_ON(!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ) ||
-                (out + in > VIRTNET_SEND_COMMAND_SG_MAX));
-
-        out++; /* Add header */
-        in++; /* Add return status */
+        BUG_ON(!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ));
 
         ctrl.class = class;
         ctrl.cmd = cmd;
+        /* Add header */
+        sg_init_one(&hdr, &ctrl, sizeof(ctrl));
+        sgs[out_num++] = &hdr;
 
-        sg_init_table(sg, out + in);
+        if (out)
+                sgs[out_num++] = out;
+        if (in)
+                sgs[out_num + in_num++] = in;
 
-        sg_set_buf(&sg[0], &ctrl, sizeof(ctrl));
-        for_each_sg(data, s, out + in - 2, i)
-                sg_set_buf(&sg[i + 1], sg_virt(s), s->length);
-        sg_set_buf(&sg[out + in - 1], &status, sizeof(status));
+        /* Add return status. */
+        sg_init_one(&stat, &status, sizeof(status));
+        sgs[out_num + in_num++] = &stat;
 
-        BUG_ON(virtqueue_add_buf(vi->cvq, sg, out, in, vi, GFP_ATOMIC) < 0);
+        BUG_ON(out_num + in_num > ARRAY_SIZE(sgs));
+        BUG_ON(virtqueue_add_sgs(vi->cvq, sgs, out_num, in_num, vi, GFP_ATOMIC)
+               < 0);
 
         virtqueue_kick(vi->cvq);
 
@@ -821,7 +822,7 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p)
                 sg_init_one(&sg, addr->sa_data, dev->addr_len);
                 if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MAC,
                                           VIRTIO_NET_CTRL_MAC_ADDR_SET,
-                                          &sg, 1, 0)) {
+                                          &sg, NULL)) {
                         dev_warn(&vdev->dev,
                                  "Failed to set mac address by vq command.\n");
                         return -EINVAL;
@@ -889,8 +890,7 @@ static void virtnet_ack_link_announce(struct virtnet_info *vi)
 {
         rtnl_lock();
         if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_ANNOUNCE,
-                                  VIRTIO_NET_CTRL_ANNOUNCE_ACK, NULL,
-                                  0, 0))
+                                  VIRTIO_NET_CTRL_ANNOUNCE_ACK, NULL, NULL))
                 dev_warn(&vi->dev->dev, "Failed to ack link announce.\n");
         rtnl_unlock();
 }
@@ -900,6 +900,7 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs)
         struct scatterlist sg;
         struct virtio_net_ctrl_mq s;
         struct net_device *dev = vi->dev;
+        int i;
 
         if (!vi->has_cvq || !virtio_has_feature(vi->vdev, VIRTIO_NET_F_MQ))
                 return 0;
@@ -908,12 +909,16 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs)
         sg_init_one(&sg, &s, sizeof(s));
 
         if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MQ,
-                                  VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET, &sg, 1, 0)){
+                                  VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET, &sg, NULL)) {
                 dev_warn(&dev->dev, "Fail to set num of queue pairs to %d\n",
                          queue_pairs);
                 return -EINVAL;
-        } else
+        } else {
+                for (i = vi->curr_queue_pairs; i < queue_pairs; i++)
+                        if (!try_fill_recv(&vi->rq[i], GFP_KERNEL))
+                                schedule_delayed_work(&vi->refill, 0);
                 vi->curr_queue_pairs = queue_pairs;
+        }
 
         return 0;
 }
@@ -955,7 +960,7 @@ static void virtnet_set_rx_mode(struct net_device *dev)
 
         if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,
                                   VIRTIO_NET_CTRL_RX_PROMISC,
-                                  sg, 1, 0))
+                                  sg, NULL))
                 dev_warn(&dev->dev, "Failed to %sable promisc mode.\n",
                          promisc ? "en" : "dis");
 
@@ -963,7 +968,7 @@ static void virtnet_set_rx_mode(struct net_device *dev)
 
         if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,
                                   VIRTIO_NET_CTRL_RX_ALLMULTI,
-                                  sg, 1, 0))
+                                  sg, NULL))
                 dev_warn(&dev->dev, "Failed to %sable allmulti mode.\n",
                          allmulti ? "en" : "dis");
 
@@ -1000,7 +1005,7 @@ static void virtnet_set_rx_mode(struct net_device *dev)
 
         if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MAC,
                                   VIRTIO_NET_CTRL_MAC_TABLE_SET,
-                                  sg, 2, 0))
+                                  sg, NULL))
                 dev_warn(&dev->dev, "Failed to set MAC fitler table.\n");
 
         kfree(buf);
@@ -1015,7 +1020,7 @@ static int virtnet_vlan_rx_add_vid(struct net_device *dev,
         sg_init_one(&sg, &vid, sizeof(vid));
 
         if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
-                                  VIRTIO_NET_CTRL_VLAN_ADD, &sg, 1, 0))
+                                  VIRTIO_NET_CTRL_VLAN_ADD, &sg, NULL))
                 dev_warn(&dev->dev, "Failed to add VLAN ID %d.\n", vid);
         return 0;
 }
@@ -1029,7 +1034,7 @@ static int virtnet_vlan_rx_kill_vid(struct net_device *dev,
         sg_init_one(&sg, &vid, sizeof(vid));
 
         if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
-                                  VIRTIO_NET_CTRL_VLAN_DEL, &sg, 1, 0))
+                                  VIRTIO_NET_CTRL_VLAN_DEL, &sg, NULL))
                 dev_warn(&dev->dev, "Failed to kill VLAN ID %d.\n", vid);
         return 0;
 }
@@ -1570,7 +1575,7 @@ static int virtnet_probe(struct virtio_device *vdev)
         }
 
         /* Last of all, set up some receive buffers. */
-        for (i = 0; i < vi->max_queue_pairs; i++) {
+        for (i = 0; i < vi->curr_queue_pairs; i++) {
                 try_fill_recv(&vi->rq[i], GFP_KERNEL);
 
                 /* If we didn't even get one input buffer, we're useless. */
@@ -1694,7 +1699,7 @@ static int virtnet_restore(struct virtio_device *vdev)
 
         netif_device_attach(vi->dev);
 
-        for (i = 0; i < vi->max_queue_pairs; i++)
+        for (i = 0; i < vi->curr_queue_pairs; i++)
                 if (!try_fill_recv(&vi->rq[i], GFP_KERNEL))
                         schedule_delayed_work(&vi->refill, 0);