Patchwork virito-net: remove layout assumption for multiqueue ctrl

login
register
mail settings
Submitter Jason Wang
Date March 6, 2013, 5:50 a.m.
Message ID <1362549027-49386-1-git-send-email-jasowang@redhat.com>
Download mbox | patch
Permalink /patch/225342/
State New
Headers show

Comments

Jason Wang - March 6, 2013, 5:50 a.m.
Follow commit 921ac5d0f3a0df869db5ce4edf752f51d8b1596a (virtio-net: remove
layout assumptions for ctrl vq), this patch makes multiqueue ctrl handling not
reply on the layout of descriptors.

Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/virtio-net.c |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)
Michael S. Tsirkin - March 6, 2013, 6:35 a.m.
On Wed, Mar 06, 2013 at 01:50:27PM +0800, Jason Wang wrote:
> Follow commit 921ac5d0f3a0df869db5ce4edf752f51d8b1596a (virtio-net: remove
> layout assumptions for ctrl vq), this patch makes multiqueue ctrl handling not
> reply on the layout of descriptors.
> 
> Signed-off-by: Jason Wang <jasowang@redhat.com>

Applied, thanks.

> ---
>  hw/virtio-net.c |   23 ++++++++++++-----------
>  1 files changed, 12 insertions(+), 11 deletions(-)
> 
> diff --git a/hw/virtio-net.c b/hw/virtio-net.c
> index bb2c26c..009f09e 100644
> --- a/hw/virtio-net.c
> +++ b/hw/virtio-net.c
> @@ -578,13 +578,14 @@ static int virtio_net_handle_vlan_table(VirtIONet *n, uint8_t cmd,
>  }
>  
>  static int virtio_net_handle_mq(VirtIONet *n, uint8_t cmd,
> -                                VirtQueueElement *elem)
> +                                struct iovec *iov, unsigned int iov_cnt)
>  {
> -    struct virtio_net_ctrl_mq s;
> +    struct virtio_net_ctrl_mq mq;
> +    size_t s;
> +    uint16_t queues;
>  
> -    if (elem->out_num != 2 ||
> -        elem->out_sg[1].iov_len != sizeof(struct virtio_net_ctrl_mq)) {
> -        error_report("virtio-net ctrl invalid steering command");
> +    s = iov_to_buf(iov, iov_cnt, 0, &mq, sizeof(mq));
> +    if (s != sizeof(mq)) {
>          return VIRTIO_NET_ERR;
>      }
>  
> @@ -592,16 +593,16 @@ static int virtio_net_handle_mq(VirtIONet *n, uint8_t cmd,
>          return VIRTIO_NET_ERR;
>      }
>  
> -    memcpy(&s, elem->out_sg[1].iov_base, sizeof(struct virtio_net_ctrl_mq));
> +    queues = lduw_p(&mq.virtqueue_pairs);
>  
> -    if (s.virtqueue_pairs < VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN ||
> -        s.virtqueue_pairs > VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX ||
> -        s.virtqueue_pairs > n->max_queues ||
> +    if (queues < VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN ||
> +        queues > VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX ||
> +        queues > n->max_queues ||
>          !n->multiqueue) {
>          return VIRTIO_NET_ERR;
>      }
>  
> -    n->curr_queues = s.virtqueue_pairs;
> +    n->curr_queues = queues;
>      /* stop the backend before changing the number of queues to avoid handling a
>       * disabled queue */
>      virtio_net_set_status(&n->vdev, n->vdev.status);
> @@ -639,7 +640,7 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
>          } else if (ctrl.class == VIRTIO_NET_CTRL_VLAN) {
>              status = virtio_net_handle_vlan_table(n, ctrl.cmd, iov, iov_cnt);
>          } else if (ctrl.class == VIRTIO_NET_CTRL_MQ) {
> -            status = virtio_net_handle_mq(n, ctrl.cmd, &elem);
> +            status = virtio_net_handle_mq(n, ctrl.cmd, iov, iov_cnt);
>          }
>  
>          s = iov_from_buf(elem.in_sg, elem.in_num, 0, &status, sizeof(status));
> -- 
> 1.7.1

Patch

diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index bb2c26c..009f09e 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -578,13 +578,14 @@  static int virtio_net_handle_vlan_table(VirtIONet *n, uint8_t cmd,
 }
 
 static int virtio_net_handle_mq(VirtIONet *n, uint8_t cmd,
-                                VirtQueueElement *elem)
+                                struct iovec *iov, unsigned int iov_cnt)
 {
-    struct virtio_net_ctrl_mq s;
+    struct virtio_net_ctrl_mq mq;
+    size_t s;
+    uint16_t queues;
 
-    if (elem->out_num != 2 ||
-        elem->out_sg[1].iov_len != sizeof(struct virtio_net_ctrl_mq)) {
-        error_report("virtio-net ctrl invalid steering command");
+    s = iov_to_buf(iov, iov_cnt, 0, &mq, sizeof(mq));
+    if (s != sizeof(mq)) {
         return VIRTIO_NET_ERR;
     }
 
@@ -592,16 +593,16 @@  static int virtio_net_handle_mq(VirtIONet *n, uint8_t cmd,
         return VIRTIO_NET_ERR;
     }
 
-    memcpy(&s, elem->out_sg[1].iov_base, sizeof(struct virtio_net_ctrl_mq));
+    queues = lduw_p(&mq.virtqueue_pairs);
 
-    if (s.virtqueue_pairs < VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN ||
-        s.virtqueue_pairs > VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX ||
-        s.virtqueue_pairs > n->max_queues ||
+    if (queues < VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN ||
+        queues > VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX ||
+        queues > n->max_queues ||
         !n->multiqueue) {
         return VIRTIO_NET_ERR;
     }
 
-    n->curr_queues = s.virtqueue_pairs;
+    n->curr_queues = queues;
     /* stop the backend before changing the number of queues to avoid handling a
      * disabled queue */
     virtio_net_set_status(&n->vdev, n->vdev.status);
@@ -639,7 +640,7 @@  static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
         } else if (ctrl.class == VIRTIO_NET_CTRL_VLAN) {
             status = virtio_net_handle_vlan_table(n, ctrl.cmd, iov, iov_cnt);
         } else if (ctrl.class == VIRTIO_NET_CTRL_MQ) {
-            status = virtio_net_handle_mq(n, ctrl.cmd, &elem);
+            status = virtio_net_handle_mq(n, ctrl.cmd, iov, iov_cnt);
         }
 
         s = iov_from_buf(elem.in_sg, elem.in_num, 0, &status, sizeof(status));