From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWK1o-000761-JG for qemu-devel@nongnu.org; Mon, 31 Aug 2015 04:01:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZWK1l-0005FB-CN for qemu-devel@nongnu.org; Mon, 31 Aug 2015 04:01:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60195) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWK1l-0005Ey-4Q for qemu-devel@nongnu.org; Mon, 31 Aug 2015 04:01:17 -0400 Message-ID: <55E409C7.4080605@redhat.com> Date: Mon, 31 Aug 2015 16:01:11 +0800 From: Jason Wang MIME-Version: 1.0 References: <1440671349-7106-1-git-send-email-mst@redhat.com> <55E3C44A.1030805@redhat.com> <20150831102708-mutt-send-email-mst@redhat.com> In-Reply-To: <20150831102708-mutt-send-email-mst@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] pci-testdev: add nodata test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: Gonglei , qemu-devel@nongnu.org, Markus Armbruster On 08/31/2015 03:28 PM, Michael S. Tsirkin wrote: > On Mon, Aug 31, 2015 at 11:04:42AM +0800, Jason Wang wrote: >> >> On 08/27/2015 06:30 PM, Michael S. Tsirkin wrote: >>> Add nodata test where data length is ignored. >>> Skip it for port IO since kvm does not support it there. >>> >>> Signed-off-by: Michael S. Tsirkin >>> --- >>> hw/misc/pci-testdev.c | 15 ++++++++++++--- >>> 1 file changed, 12 insertions(+), 3 deletions(-) >>> >>> diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c >>> index 26b9b86..b6e11d6 100644 >>> --- a/hw/misc/pci-testdev.c >>> +++ b/hw/misc/pci-testdev.c >>> @@ -45,6 +45,7 @@ typedef struct IOTest { >>> >>> #define IOTEST_DATAMATCH 0xFA >>> #define IOTEST_NOMATCH 0xCE >>> +#define IOTEST_NODATA 0xAB >> This is never used. >> >>> >>> #define IOTEST_IOSIZE 128 >>> #define IOTEST_MEMSIZE 2048 >>> @@ -52,7 +53,8 @@ typedef struct IOTest { >>> static const char *iotest_test[] = { >>> "no-eventfd", >>> "wildcard-eventfd", >>> - "datamatch-eventfd" >>> + "datamatch-eventfd", >>> + "nodata-eventfd" >> For PIO test, "nodata-eventfd" actually means "nodata-noeventfd". > Not really - this test is skipped completely for PIO, as > kvm does not support it. But I get: ... portio-no-eventfd:pci-io 5024 portio-wildcard-eventfd:pci-io 1731 portio-datamatch-eventfd:pci-io 1731 portio-nodata-eventfd:pci-io 4967 ... >>> }; >>> >>> static const char *iotest_type[] = { >>> @@ -261,12 +263,19 @@ static void pci_testdev_realize(PCIDevice *pci_dev, Error **errp) >>> memcpy(test->hdr->name, name, strlen(name) + 1); >>> g_free(name); >>> test->hdr->offset = cpu_to_le32(IOTEST_SIZE(i) + i * IOTEST_ACCESS_WIDTH); >>> - test->size = IOTEST_ACCESS_WIDTH; >>> - test->match_data = strcmp(IOTEST_TEST(i), "wildcard-eventfd"); >>> + test->size = strcmp(IOTEST_TEST(i), "nodata-eventfd") ? IOTEST_ACCESS_WIDTH : 0; >>> + >>> + test->match_data = strcmp(IOTEST_TEST(i), "wildcard-eventfd") && >>> + strcmp(IOTEST_TEST(i), "nodata-eventfd"); >>> test->hdr->test = i; >>> test->hdr->data = test->match_data ? IOTEST_DATAMATCH : IOTEST_NOMATCH; >>> test->hdr->width = IOTEST_ACCESS_WIDTH; >>> test->mr = IOTEST_REGION(d, i); >>> + >>> + if (!test->size && !IOTEST_IS_MEM(i)) { >>> + test->hasnotifier = false; >>> + continue; >>> + } >>> if (!strcmp(IOTEST_TEST(i), "no-eventfd")) { >>> test->hasnotifier = false; >>> continue; >> Since you're at this, how about introduce a test that mixes datamatch >> and wildcard? > How do you mean? wildcard means ignore data ... > I mean for example having both datamatch and wildcard eventfds in a single subtest. E.g in "datamatch-eventfd", registering 1 or more wildcard eventfd before doing the real tests.