[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/14] tests: virtio-9p: fix ISR dependence
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PULL 09/14] tests: virtio-9p: fix ISR dependence |
Date: |
Mon, 8 Jan 2018 15:28:26 +0100 |
Like other virtio tests, use the used ring APIs instead of assuming ISR
being set means the request has completed.
Signed-off-by: Greg Kurz <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
tests/virtio-9p-test.c | 30 +++++++++++-------------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c
index ad33d963876f..ebd24b20f657 100644
--- a/tests/virtio-9p-test.c
+++ b/tests/virtio-9p-test.c
@@ -18,6 +18,8 @@
#include "standard-headers/linux/virtio_pci.h"
#include "hw/9pfs/9p.h"
+#define QVIRTIO_9P_TIMEOUT_US (10 * 1000 * 1000)
+
static const char mount_tag[] = "qtest";
typedef struct {
@@ -111,6 +113,7 @@ typedef struct {
/* No r_size, it is hardcoded to P9_MAX_SIZE */
size_t t_off;
size_t r_off;
+ uint32_t free_head;
} P9Req;
static void v9fs_memwrite(P9Req *req, const void *addr, size_t len)
@@ -124,11 +127,6 @@ static void v9fs_memskip(P9Req *req, size_t len)
req->r_off += len;
}
-static void v9fs_memrewind(P9Req *req, size_t len)
-{
- req->r_off -= len;
-}
-
static void v9fs_memread(P9Req *req, void *addr, size_t len)
{
memread(req->r_msg + req->r_off, addr, len);
@@ -227,12 +225,12 @@ static P9Req *v9fs_req_init(QVirtIO9P *v9p, uint32_t
size, uint8_t id,
static void v9fs_req_send(P9Req *req)
{
QVirtIO9P *v9p = req->v9p;
- uint32_t free_head;
req->r_msg = guest_alloc(v9p->qs->alloc, P9_MAX_SIZE);
- free_head = qvirtqueue_add(v9p->vq, req->t_msg, req->t_size, false, true);
+ req->free_head = qvirtqueue_add(v9p->vq, req->t_msg, req->t_size, false,
+ true);
qvirtqueue_add(v9p->vq, req->r_msg, P9_MAX_SIZE, true, false);
- qvirtqueue_kick(v9p->dev, v9p->vq, free_head);
+ qvirtqueue_kick(v9p->dev, v9p->vq, req->free_head);
req->t_off = 0;
}
@@ -250,19 +248,13 @@ static void v9fs_req_recv(P9Req *req, uint8_t id)
{
QVirtIO9P *v9p = req->v9p;
P9Hdr hdr;
- int i;
- for (i = 0; i < 10; i++) {
- qvirtio_wait_queue_isr(v9p->dev, v9p->vq, 1000 * 1000);
+ qvirtio_wait_used_elem(v9p->dev, v9p->vq, req->free_head,
+ QVIRTIO_9P_TIMEOUT_US);
- v9fs_memread(req, &hdr, 7);
- hdr.size = ldl_le_p(&hdr.size);
- hdr.tag = lduw_le_p(&hdr.tag);
- if (hdr.size >= 7) {
- break;
- }
- v9fs_memrewind(req, 7);
- }
+ v9fs_memread(req, &hdr, 7);
+ hdr.size = ldl_le_p(&hdr.size);
+ hdr.tag = lduw_le_p(&hdr.tag);
g_assert_cmpint(hdr.size, >=, 7);
g_assert_cmpint(hdr.size, <=, P9_MAX_SIZE);
--
2.13.6
- [Qemu-devel] [PULL 00/14] 9p patches for 2.12 20180108, Greg Kurz, 2018/01/08
- [Qemu-devel] [PULL 10/14] tests: virtio-9p: set DRIVER_OK before using the device, Greg Kurz, 2018/01/08
- [Qemu-devel] [PULL 05/14] 9pfs: handle: fix type definition, Greg Kurz, 2018/01/08
- [Qemu-devel] [PULL 04/14] 9pfs: fix some type definitions, Greg Kurz, 2018/01/08
- [Qemu-devel] [PULL 07/14] 9pfs: fix error path in pdu_submit(), Greg Kurz, 2018/01/08
- [Qemu-devel] [PULL 08/14] 9pfs: make pdu_marshal() and pdu_unmarshal() static functions, Greg Kurz, 2018/01/08
- [Qemu-devel] [PULL 02/14] 9pfs: fix XattrOperations typedef, Greg Kurz, 2018/01/08
- [Qemu-devel] [PULL 13/14] 9pfs: deprecate handle backend, Greg Kurz, 2018/01/08
- [Qemu-devel] [PULL 03/14] fsdev: fix some type definitions, Greg Kurz, 2018/01/08
- [Qemu-devel] [PULL 12/14] fsdev: improve error handling of backend init, Greg Kurz, 2018/01/08
- [Qemu-devel] [PULL 09/14] tests: virtio-9p: fix ISR dependence,
Greg Kurz <=
- [Qemu-devel] [PULL 06/14] 9pfs: fix type in *_parse_opts declarations, Greg Kurz, 2018/01/08
- [Qemu-devel] [PULL 01/14] virtio-9p: move unrealize/realize after virtio_9p_transport definition, Greg Kurz, 2018/01/08
- [Qemu-devel] [PULL 11/14] fsdev: improve error handling of backend opts parsing, Greg Kurz, 2018/01/08
- [Qemu-devel] [PULL 14/14] MAINTAINERS: Drop Aneesh as 9pfs maintainer, Greg Kurz, 2018/01/08
- Re: [Qemu-devel] [PULL 00/14] 9p patches for 2.12 20180108, Peter Maydell, 2018/01/09