Tools: hv: Represent the ipv6 mask using CIDR notation
[linux-3.10.git] / tools / virtio / virtio_test.c
index 74d3331..e626fa5 100644 (file)
@@ -92,7 +92,8 @@ static void vq_info_add(struct vdev_info *dev, int num)
        assert(r >= 0);
        memset(info->ring, 0, vring_size(num, 4096));
        vring_init(&info->vring, num, info->ring, 4096);
-       info->vq = vring_new_virtqueue(info->vring.num, 4096, &dev->vdev, info->ring,
+       info->vq = vring_new_virtqueue(info->vring.num, 4096, &dev->vdev,
+                                      true, info->ring,
                                       vq_notify, vq_callback, "test");
        assert(info->vq);
        info->vq->priv = info;
@@ -143,7 +144,8 @@ static void wait_for_interrupt(struct vdev_info *dev)
                }
 }
 
-static void run_test(struct vdev_info *dev, struct vq_info *vq, int bufs)
+static void run_test(struct vdev_info *dev, struct vq_info *vq,
+                    bool delayed, int bufs)
 {
        struct scatterlist sl;
        long started = 0, completed = 0;
@@ -160,7 +162,8 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq, int bufs)
                        if (started < bufs) {
                                sg_init_one(&sl, dev->buf, dev->buf_size);
                                r = virtqueue_add_buf(vq->vq, &sl, 1, 0,
-                                                     dev->buf + started);
+                                                     dev->buf + started,
+                                                     GFP_ATOMIC);
                                if (likely(r >= 0)) {
                                        ++started;
                                        virtqueue_kick(vq->vq);
@@ -181,8 +184,12 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq, int bufs)
                assert(started <= bufs);
                if (completed == bufs)
                        break;
-               if (virtqueue_enable_cb(vq->vq)) {
-                       wait_for_interrupt(dev);
+               if (delayed) {
+                       if (virtqueue_enable_cb_delayed(vq->vq))
+                               wait_for_interrupt(dev);
+               } else {
+                       if (virtqueue_enable_cb(vq->vq))
+                               wait_for_interrupt(dev);
                }
        }
        test = 0;
@@ -214,6 +221,14 @@ const struct option longopts[] = {
                .val = 'i',
        },
        {
+               .name = "delayed-interrupt",
+               .val = 'D',
+       },
+       {
+               .name = "no-delayed-interrupt",
+               .val = 'd',
+       },
+       {
        }
 };
 
@@ -222,6 +237,7 @@ static void help()
        fprintf(stderr, "Usage: virtio_test [--help]"
                " [--no-indirect]"
                " [--no-event-idx]"
+               " [--delayed-interrupt]"
                "\n");
 }
 
@@ -231,6 +247,7 @@ int main(int argc, char **argv)
        unsigned long long features = (1ULL << VIRTIO_RING_F_INDIRECT_DESC) |
                (1ULL << VIRTIO_RING_F_EVENT_IDX);
        int o;
+       bool delayed = false;
 
        for (;;) {
                o = getopt_long(argc, argv, optstring, longopts, NULL);
@@ -249,6 +266,9 @@ int main(int argc, char **argv)
                case 'i':
                        features &= ~(1ULL << VIRTIO_RING_F_INDIRECT_DESC);
                        break;
+               case 'D':
+                       delayed = true;
+                       break;
                default:
                        assert(0);
                        break;
@@ -258,6 +278,6 @@ int main(int argc, char **argv)
 done:
        vdev_info_init(&dev, features);
        vq_info_add(&dev, 256);
-       run_test(&dev, &dev.vqs[0], 0x100000);
+       run_test(&dev, &dev.vqs[0], delayed, 0x100000);
        return 0;
 }