From: "Eugenio Pérez" <eperezma@redhat•com>
To: "Michael S. Tsirkin" <mst@redhat•com>
Cc: "virtualization@lists•linux-foundation.org"
<virtualization@lists•linux-foundation.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
"Halil Pasic" <pasic@linux•ibm.com>,
"Cornelia Huck" <cohuck@redhat•com>,
"Eugenio Pérez" <eperezma@redhat•com>,
"Christian Borntraeger" <borntraeger@de•ibm.com>,
"kvm list" <kvm@vger•kernel.org>,
"Stephen Rothwell" <sfr@canb•auug.org.au>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>
Subject: [PATCH v3 7/8] tools/virtio: Reset index in virtio_test --reset.
Date: Sat, 18 Apr 2020 12:22:16 +0200 [thread overview]
Message-ID: <20200418102217.32327-8-eperezma@redhat.com> (raw)
In-Reply-To: <20200418102217.32327-1-eperezma@redhat.com>
This way behavior for vhost is more like a VM.
Signed-off-by: Eugenio Pérez <eperezma@redhat•com>
---
tools/virtio/virtio_test.c | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c
index bc16c818bda3..82902fc3ba2a 100644
--- a/tools/virtio/virtio_test.c
+++ b/tools/virtio/virtio_test.c
@@ -48,6 +48,7 @@ struct vdev_info {
static const struct vhost_vring_file no_backend = { .fd = -1 },
backend = { .fd = 1 };
+static const struct vhost_vring_state null_state = {};
bool vq_notify(struct virtqueue *vq)
{
@@ -173,14 +174,19 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq,
unsigned len;
long long spurious = 0;
const bool random_batch = batch == RANDOM_BATCH;
+
r = ioctl(dev->control, VHOST_TEST_RUN, &test);
assert(r >= 0);
+ if (!reset_n) {
+ next_reset = INT_MAX;
+ }
+
for (;;) {
virtqueue_disable_cb(vq->vq);
completed_before = completed;
started_before = started;
do {
- const bool reset = reset_n && completed > next_reset;
+ const bool reset = completed > next_reset;
if (random_batch)
batch = (random() % vq->vring.num) + 1;
@@ -223,10 +229,24 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq,
}
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,
&backend);
assert(!r);
+ started = completed;
while (completed > next_reset)
next_reset += completed;
}
@@ -248,7 +268,9 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq,
test = 0;
r = ioctl(dev->control, VHOST_TEST_RUN, &test);
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";
--
2.18.1
next prev parent reply other threads:[~2020-04-18 10:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-18 10:22 [PATCH v3 0/8] tools/vhost: Reset virtqueue on tests Eugenio Pérez
2020-04-18 10:22 ` [PATCH v3 1/8] vhost: Not cleaning batched descs in VHOST_SET_VRING_BASE ioctl Eugenio Pérez
2020-04-18 10:22 ` [PATCH v3 2/8] tools/virtio: Add --batch option Eugenio Pérez
2020-04-18 10:22 ` [PATCH v3 3/8] tools/virtio: Add --batch=random option Eugenio Pérez
2020-04-18 10:22 ` [PATCH v3 4/8] tools/virtio: Add --reset Eugenio Pérez
2020-04-18 10:22 ` [PATCH v3 5/8] tools/virtio: Use __vring_new_virtqueue in virtio_test.c Eugenio Pérez
2020-04-18 10:22 ` [PATCH v3 6/8] tools/virtio: Extract virtqueue initialization in vq_reset Eugenio Pérez
2020-04-18 10:22 ` Eugenio Pérez [this message]
2020-04-18 10:22 ` [PATCH v3 8/8] tools/virtio: Use tools/include/list.h instead of stubs Eugenio Pérez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200418102217.32327-8-eperezma@redhat.com \
--to=eperezma@redhat$(echo .)com \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=cohuck@redhat$(echo .)com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mst@redhat$(echo .)com \
--cc=pasic@linux$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=virtualization@lists$(echo .)linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox