iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/virtio: Reset index in virtio_test --reset.

Browse Source 
This way behavior for vhost is more like a VM.

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Link: https://lore.kernel.org/r/20200418102217.32327-8-eperezma@redhat.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Eugenio Pérez
2020-04-18 12:22:16 +02:00
committed by Michael S. Tsirkin
parent 6741239260
commit 1d8bf5c3a3
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/virtio/virtio_test.c
View File

@@ -48,6 +48,7 @@ struct vdev_info {
static const struct vhost_vring_file no_backend = { .fd = -1 }, static const struct vhost_vring_file no_backend = { .fd = -1 },
backend = { .fd = 1 }; backend = { .fd = 1 };
static const struct vhost_vring_state null_state = {};
bool vq_notify(struct virtqueue *vq) bool vq_notify(struct virtqueue *vq)
{ {
@@ -173,14 +174,19 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq,
unsigned len; unsigned len;
long long spurious = 0; long long spurious = 0;
const bool random_batch = batch == RANDOM_BATCH; const bool random_batch = batch == RANDOM_BATCH;
r = ioctl(dev->control, VHOST_TEST_RUN, &test); r = ioctl(dev->control, VHOST_TEST_RUN, &test);
assert(r >= 0); assert(r >= 0);
if (!reset_n) {
next_reset = INT_MAX;
}
for (;;) { for (;;) {
virtqueue_disable_cb(vq->vq); virtqueue_disable_cb(vq->vq);
completed_before = completed; completed_before = completed;
started_before = started; started_before = started;
do { do {
const bool reset = reset_n && completed > next_reset; const bool reset = completed > next_reset;
if (random_batch) if (random_batch)
batch = (random() % vq->vring.num) + 1; batch = (random() % vq->vring.num) + 1;
@@ -223,10 +229,24 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq,
} }
if (reset) { if (reset) {
struct vhost_vring_state s = { .index = 0 };
vq_reset(vq, vq->vring.num, &dev->vdev);
r = ioctl(dev->control, VHOST_GET_VRING_BASE,
&s);
assert(!r);
s.num = 0;
r = ioctl(dev->control, VHOST_SET_VRING_BASE,
&null_state);
assert(!r);
r = ioctl(dev->control, VHOST_TEST_SET_BACKEND, r = ioctl(dev->control, VHOST_TEST_SET_BACKEND,
&backend); &backend);
assert(!r); assert(!r);
started = completed;
while (completed > next_reset) while (completed > next_reset)
next_reset += completed; next_reset += completed;
} }
@@ -248,7 +268,9 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq,
test = 0; test = 0;
r = ioctl(dev->control, VHOST_TEST_RUN, &test); r = ioctl(dev->control, VHOST_TEST_RUN, &test);
assert(r >= 0); assert(r >= 0);
fprintf(stderr, "spurious wakeups: 0x%llx\n", spurious); fprintf(stderr,
"spurious wakeups: 0x%llx started=0x%lx completed=0x%lx\n",
spurious, started, completed);
} }
const char optstring[] = "h"; const char optstring[] = "h";