From patchwork Thu Sep 15 14:50:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kurz X-Patchwork-Id: 9334013 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 11EBF601C2 for ; Thu, 15 Sep 2016 15:13:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 045F829928 for ; Thu, 15 Sep 2016 15:13:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ECEF72992F; Thu, 15 Sep 2016 15:13:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 705AB29928 for ; Thu, 15 Sep 2016 15:13:20 +0000 (UTC) Received: from localhost ([::1]:35396 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkYLn-00069o-6e for patchwork-qemu-devel@patchwork.kernel.org; Thu, 15 Sep 2016 11:13:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkXzz-0003v8-1Y for qemu-devel@nongnu.org; Thu, 15 Sep 2016 10:50:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkXzt-0002dR-2R for qemu-devel@nongnu.org; Thu, 15 Sep 2016 10:50:46 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:33842) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkXzs-0002dI-OX for qemu-devel@nongnu.org; Thu, 15 Sep 2016 10:50:40 -0400 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u8FEn486051800 for ; Thu, 15 Sep 2016 10:50:40 -0400 Received: from e18.ny.us.ibm.com (e18.ny.us.ibm.com [129.33.205.208]) by mx0a-001b2d01.pphosted.com with ESMTP id 25fr7y2hnc-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 15 Sep 2016 10:50:39 -0400 Received: from localhost by e18.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 15 Sep 2016 10:50:38 -0400 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e18.ny.us.ibm.com (146.89.104.205) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 15 Sep 2016 10:50:36 -0400 X-IBM-Helo: d01dlp02.pok.ibm.com X-IBM-MailFrom: groug@kaod.org Received: from b01cxnp23033.gho.pok.ibm.com (b01cxnp23033.gho.pok.ibm.com [9.57.198.28]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 2B4076E804B; Thu, 15 Sep 2016 10:50:13 -0400 (EDT) Received: from b01ledav002.gho.pok.ibm.com (b01ledav002.gho.pok.ibm.com [9.57.199.107]) by b01cxnp23033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u8FEoZFO16712180; Thu, 15 Sep 2016 14:50:35 GMT Received: from b01ledav002.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DAAB8124052; Thu, 15 Sep 2016 10:50:34 -0400 (EDT) Received: from [192.168.66.108] (unknown [9.164.164.67]) by b01ledav002.gho.pok.ibm.com (Postfix) with ESMTP id 1D01C124037; Thu, 15 Sep 2016 10:50:33 -0400 (EDT) From: Greg Kurz To: qemu-devel@nongnu.org Date: Thu, 15 Sep 2016 16:50:33 +0200 In-Reply-To: <147395101100.3728.9929660720854734579.stgit@bahia> References: <147395101100.3728.9929660720854734579.stgit@bahia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16091514-0044-0000-0000-00000132BAD6 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00005765; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000185; SDB=6.00757981; UDB=6.00359640; IPR=6.00531596; BA=6.00004731; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00012682; XFM=3.00000011; UTC=2016-09-15 14:50:37 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16091514-0045-0000-0000-0000054BBB80 Message-Id: <147395103323.3728.7008442222873377502.stgit@bahia> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-09-15_08:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=4 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609020000 definitions=main-1609150199 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH v2 3/3] tests: virtio-9p: add basic transaction test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cornelia Huck , Greg Kurz , "Aneesh Kumar K.V" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- v2: - added Cornelia's A-b tag --- tests/virtio-9p-test.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c index b8fb6cd869a9..2f579da6cdbd 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,69 @@ 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 = sizeof(hdr); + hdr.id = P9_TERROR; + hdr.tag = 12345; + + req_addr = guest_alloc(v9p->alloc, hdr.size); + memwrite(req_addr, &hdr, 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(&qvirtio_pci, v9p->dev, v9p->vq, free_head); + guest_free(v9p->alloc, req_addr); + qvirtio_wait_queue_isr(&qvirtio_pci, v9p->dev, v9p->vq, + QVIRTIO_9P_TIMEOUT_US); + + memread(resp_addr, &hdr, sizeof(hdr)); + 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); + 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(&argc, &argv, 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(); }