Re: [Qemu-devel] [PATCH v3 3/3] tests: virtio-9p: add basic transaction test

[Greg Kurz]

On Fri, 16 Sep 2016 19:43:57 +0200
Greg Kurz  wrote:

> This adds a simple test to validate the device is functional: it transmits
> a request with type Terror, which is not used by the 9P protocol [1], and
> expects QEMU to return a reply with type Rerror and the "Operation not
> supported" error string.
> 
> [1] http://lxr.free-electrons.com/source/include/net/9p/9p.h#L121
> 
> Signed-off-by: Greg Kurz 
> Acked-by: Cornelia Huck 
> ---
> v3: - the 9P protocol uses little-endian ordering
> ---
> ---
>  tests/virtio-9p-test.c |   65 
> 
>  1 file changed, 65 insertions(+)
> 
> diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c
> index b8fb6cd869a9..95cba3fd3e8e 100644
> --- a/tests/virtio-9p-test.c
> +++ b/tests/virtio-9p-test.c
> @@ -8,6 +8,7 @@
>   */
>  
>  #include "qemu/osdep.h"
> +#include 
>  #include "libqtest.h"
>  #include "qemu-common.h"
>  #include "libqos/pci-pc.h"
> @@ -17,6 +18,9 @@
>  #include "libqos/malloc-pc.h"
>  #include "standard-headers/linux/virtio_ids.h"
>  #include "standard-headers/linux/virtio_pci.h"
> +#include "hw/9pfs/9p.h"
> +
> +#define QVIRTIO_9P_TIMEOUT_US (1 * 1000 * 1000)
>  
>  static const char mount_tag[] = "qtest";
>  static char *test_share;
> @@ -118,11 +122,72 @@ static void pci_basic_config(void)
>  qvirtio_9p_stop();
>  }
>  
> +typedef struct VirtIO9PHdr {
> +uint32_t size;
> +uint8_t id;
> +uint16_t tag;
> +} QEMU_PACKED VirtIO9PHdr;
> +
> +typedef struct VirtIO9PMsgRError {
> +uint16_t error_len;
> +char error[0];
> +} QEMU_PACKED VirtIO9PMsgRError;
> +
> +#define P9_MAX_SIZE 8192
> +
> +static void pci_basic_transaction(void)
> +{
> +QVirtIO9P *v9p;
> +VirtIO9PHdr hdr;
> +VirtIO9PMsgRError *resp;
> +uint64_t req_addr, resp_addr;
> +uint32_t free_head;
> +char *expected_error = strerror(ENOTSUP);
> +
> +qvirtio_9p_start();
> +v9p = qvirtio_9p_pci_init();
> +
> +hdr.size = cpu_to_le32(sizeof(hdr));
> +hdr.id = P9_TERROR;
> +hdr.tag = cpu_to_le16(12345);
> +
> +req_addr = guest_alloc(v9p->alloc, hdr.size);

Ugh... this is wrong since hdr.size isn't cpu endian. :-\

The code must be globally rearranged to handle endianness correctly.

Cheers.

--
Greg

> +memwrite(req_addr, , sizeof(hdr));
> +free_head = qvirtqueue_add(v9p->vq, req_addr, hdr.size, false, true);
> +
> +resp_addr = guest_alloc(v9p->alloc, P9_MAX_SIZE);
> +qvirtqueue_add(v9p->vq, resp_addr, P9_MAX_SIZE, true, false);
> +
> +qvirtqueue_kick(_pci, v9p->dev, v9p->vq, free_head);
> +guest_free(v9p->alloc, req_addr);
> +qvirtio_wait_queue_isr(_pci, v9p->dev, v9p->vq,
> +   QVIRTIO_9P_TIMEOUT_US);
> +
> +memread(resp_addr, , sizeof(hdr));
> +le32_to_cpus();
> +le16_to_cpus();
> +g_assert_cmpint(hdr.size, <, (uint32_t) P9_MAX_SIZE);
> +g_assert_cmpint(hdr.id, ==, (uint8_t) P9_RERROR);
> +g_assert_cmpint(hdr.tag, ==, (uint16_t) 12345);
> +
> +resp = g_malloc(hdr.size);
> +memread(resp_addr + sizeof(hdr), resp, hdr.size - sizeof(hdr));
> +guest_free(v9p->alloc, resp_addr);
> +le16_to_cpus(>error_len);
> +g_assert_cmpmem(resp->error, resp->error_len, expected_error,
> +strlen(expected_error));
> +g_free(resp);
> +
> +qvirtio_9p_pci_free(v9p);
> +qvirtio_9p_stop();
> +}
> +
>  int main(int argc, char **argv)
>  {
>  g_test_init(, , NULL);
>  qtest_add_func("/virtio/9p/pci/nop", pci_nop);
>  qtest_add_func("/virtio/9p/pci/basic/configuration", pci_basic_config);
> +qtest_add_func("/virtio/9p/pci/basic/transaction", 
> pci_basic_transaction);
>  
>  return g_test_run();
>  }
> 

[Qemu-devel] [PATCH v3 3/3] tests: virtio-9p: add basic transaction test

[Greg Kurz]

This adds a simple test to validate the device is functional: it transmits
a request with type Terror, which is not used by the 9P protocol [1], and
expects QEMU to return a reply with type Rerror and the "Operation not
supported" error string.

[1] http://lxr.free-electrons.com/source/include/net/9p/9p.h#L121

Signed-off-by: Greg Kurz 
Acked-by: Cornelia Huck 
---
v3: - the 9P protocol uses little-endian ordering
---
---
 tests/virtio-9p-test.c |   65 
 1 file changed, 65 insertions(+)

diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c
index b8fb6cd869a9..95cba3fd3e8e 100644
--- a/tests/virtio-9p-test.c
+++ b/tests/virtio-9p-test.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include 
 #include "libqtest.h"
 #include "qemu-common.h"
 #include "libqos/pci-pc.h"
@@ -17,6 +18,9 @@
 #include "libqos/malloc-pc.h"
 #include "standard-headers/linux/virtio_ids.h"
 #include "standard-headers/linux/virtio_pci.h"
+#include "hw/9pfs/9p.h"
+
+#define QVIRTIO_9P_TIMEOUT_US (1 * 1000 * 1000)
 
 static const char mount_tag[] = "qtest";
 static char *test_share;
@@ -118,11 +122,72 @@ static void pci_basic_config(void)
 qvirtio_9p_stop();
 }
 
+typedef struct VirtIO9PHdr {
+uint32_t size;
+uint8_t id;
+uint16_t tag;
+} QEMU_PACKED VirtIO9PHdr;
+
+typedef struct VirtIO9PMsgRError {
+uint16_t error_len;
+char error[0];
+} QEMU_PACKED VirtIO9PMsgRError;
+
+#define P9_MAX_SIZE 8192
+
+static void pci_basic_transaction(void)
+{
+QVirtIO9P *v9p;
+VirtIO9PHdr hdr;
+VirtIO9PMsgRError *resp;
+uint64_t req_addr, resp_addr;
+uint32_t free_head;
+char *expected_error = strerror(ENOTSUP);
+
+qvirtio_9p_start();
+v9p = qvirtio_9p_pci_init();
+
+hdr.size = cpu_to_le32(sizeof(hdr));
+hdr.id = P9_TERROR;
+hdr.tag = cpu_to_le16(12345);
+
+req_addr = guest_alloc(v9p->alloc, hdr.size);
+memwrite(req_addr, , sizeof(hdr));
+free_head = qvirtqueue_add(v9p->vq, req_addr, hdr.size, false, true);
+
+resp_addr = guest_alloc(v9p->alloc, P9_MAX_SIZE);
+qvirtqueue_add(v9p->vq, resp_addr, P9_MAX_SIZE, true, false);
+
+qvirtqueue_kick(_pci, v9p->dev, v9p->vq, free_head);
+guest_free(v9p->alloc, req_addr);
+qvirtio_wait_queue_isr(_pci, v9p->dev, v9p->vq,
+   QVIRTIO_9P_TIMEOUT_US);
+
+memread(resp_addr, , sizeof(hdr));
+le32_to_cpus();
+le16_to_cpus();
+g_assert_cmpint(hdr.size, <, (uint32_t) P9_MAX_SIZE);
+g_assert_cmpint(hdr.id, ==, (uint8_t) P9_RERROR);
+g_assert_cmpint(hdr.tag, ==, (uint16_t) 12345);
+
+resp = g_malloc(hdr.size);
+memread(resp_addr + sizeof(hdr), resp, hdr.size - sizeof(hdr));
+guest_free(v9p->alloc, resp_addr);
+le16_to_cpus(>error_len);
+g_assert_cmpmem(resp->error, resp->error_len, expected_error,
+strlen(expected_error));
+g_free(resp);
+
+qvirtio_9p_pci_free(v9p);
+qvirtio_9p_stop();
+}
+
 int main(int argc, char **argv)
 {
 g_test_init(, , NULL);
 qtest_add_func("/virtio/9p/pci/nop", pci_nop);
 qtest_add_func("/virtio/9p/pci/basic/configuration", pci_basic_config);
+qtest_add_func("/virtio/9p/pci/basic/transaction", pci_basic_transaction);
 
 return g_test_run();
 }