From: Thomas Huth <thuth@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
qemu-devel@nongnu.org, "Alexander Bulekov" <alxndr@bu.edu>
Cc: Fam Zheng <fam@euphon.net>, Laurent Vivier <lvivier@redhat.com>,
Hannes Reinecke <hare@suse.com>,
qemu-block@nongnu.org, "Michael S . Tsirkin" <mst@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH v2 2/2] tests/qtest: Only run fuzz-virtio-scsi when virtio-scsi is available
Date: Tue, 26 Jan 2021 18:52:45 +0100 [thread overview]
Message-ID: <dff6001a-8628-aa18-e874-8678211a12b5@redhat.com> (raw)
In-Reply-To: <20210126111638.3141780-3-philmd@redhat.com>
On 26/01/2021 12.16, Philippe Mathieu-Daudé wrote:
> This test fails when QEMU is built without the virtio-scsi device,
> restrict it to its availability.
>
> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> tests/qtest/fuzz-test.c | 51 --------------------
> tests/qtest/fuzz-virtio-scsi-test.c | 75 +++++++++++++++++++++++++++++
> MAINTAINERS | 1 +
> tests/qtest/meson.build | 1 +
> 4 files changed, 77 insertions(+), 51 deletions(-)
> create mode 100644 tests/qtest/fuzz-virtio-scsi-test.c
>
> diff --git a/tests/qtest/fuzz-test.c b/tests/qtest/fuzz-test.c
> index 6188fbb8e96..d112798afe3 100644
> --- a/tests/qtest/fuzz-test.c
> +++ b/tests/qtest/fuzz-test.c
> @@ -25,55 +25,6 @@ static void test_lp1878642_pci_bus_get_irq_level_assert(void)
> qtest_quit(s);
> }
>
> -/*
> - * Here a MemoryRegionCache pointed to an MMIO region but had a
> - * larger size than the underlying region.
> - */
> -static void test_mmio_oob_from_memory_region_cache(void)
> -{
> - QTestState *s;
> -
> - s = qtest_init("-M pc-q35-5.2 -display none -m 512M "
> - "-device virtio-scsi,num_queues=8,addr=03.0 ");
> -
> - qtest_outl(s, 0xcf8, 0x80001811);
> - qtest_outb(s, 0xcfc, 0x6e);
> - qtest_outl(s, 0xcf8, 0x80001824);
> - qtest_outl(s, 0xcf8, 0x80001813);
> - qtest_outl(s, 0xcfc, 0xa080000);
> - qtest_outl(s, 0xcf8, 0x80001802);
> - qtest_outl(s, 0xcfc, 0x5a175a63);
> - qtest_outb(s, 0x6e08, 0x9e);
> - qtest_writeb(s, 0x9f003, 0xff);
> - qtest_writeb(s, 0x9f004, 0x01);
> - qtest_writeb(s, 0x9e012, 0x0e);
> - qtest_writeb(s, 0x9e01b, 0x0e);
> - qtest_writeb(s, 0x9f006, 0x01);
> - qtest_writeb(s, 0x9f008, 0x01);
> - qtest_writeb(s, 0x9f00a, 0x01);
> - qtest_writeb(s, 0x9f00c, 0x01);
> - qtest_writeb(s, 0x9f00e, 0x01);
> - qtest_writeb(s, 0x9f010, 0x01);
> - qtest_writeb(s, 0x9f012, 0x01);
> - qtest_writeb(s, 0x9f014, 0x01);
> - qtest_writeb(s, 0x9f016, 0x01);
> - qtest_writeb(s, 0x9f018, 0x01);
> - qtest_writeb(s, 0x9f01a, 0x01);
> - qtest_writeb(s, 0x9f01c, 0x01);
> - qtest_writeb(s, 0x9f01e, 0x01);
> - qtest_writeb(s, 0x9f020, 0x01);
> - qtest_writeb(s, 0x9f022, 0x01);
> - qtest_writeb(s, 0x9f024, 0x01);
> - qtest_writeb(s, 0x9f026, 0x01);
> - qtest_writeb(s, 0x9f028, 0x01);
> - qtest_writeb(s, 0x9f02a, 0x01);
> - qtest_writeb(s, 0x9f02c, 0x01);
> - qtest_writeb(s, 0x9f02e, 0x01);
> - qtest_writeb(s, 0x9f030, 0x01);
> - qtest_outb(s, 0x6e10, 0x00);
> - qtest_quit(s);
> -}
> -
> int main(int argc, char **argv)
> {
> const char *arch = qtest_get_arch();
> @@ -83,8 +34,6 @@ int main(int argc, char **argv)
> if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
> qtest_add_func("fuzz/test_lp1878642_pci_bus_get_irq_level_assert",
> test_lp1878642_pci_bus_get_irq_level_assert);
> - qtest_add_func("fuzz/test_mmio_oob_from_memory_region_cache",
> - test_mmio_oob_from_memory_region_cache);
> }
>
> return g_test_run();
> diff --git a/tests/qtest/fuzz-virtio-scsi-test.c b/tests/qtest/fuzz-virtio-scsi-test.c
> new file mode 100644
> index 00000000000..aaf6d10e189
> --- /dev/null
> +++ b/tests/qtest/fuzz-virtio-scsi-test.c
> @@ -0,0 +1,75 @@
> +/*
> + * QTest fuzzer-generated testcase for virtio-scsi device
> + *
> + * Copyright (c) 2020 Li Qiang <liq3ea@gmail.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +
> +#include "qemu/osdep.h"
> +
> +#include "libqos/libqtest.h"
> +
> +/*
> + * Here a MemoryRegionCache pointed to an MMIO region but had a
> + * larger size than the underlying region.
> + */
> +static void test_mmio_oob_from_memory_region_cache(void)
> +{
> + QTestState *s;
> +
> + s = qtest_init("-M pc-q35-5.2 -display none -m 512M "
> + "-device virtio-scsi,num_queues=8,addr=03.0 ");
> +
> + qtest_outl(s, 0xcf8, 0x80001811);
> + qtest_outb(s, 0xcfc, 0x6e);
> + qtest_outl(s, 0xcf8, 0x80001824);
> + qtest_outl(s, 0xcf8, 0x80001813);
> + qtest_outl(s, 0xcfc, 0xa080000);
> + qtest_outl(s, 0xcf8, 0x80001802);
> + qtest_outl(s, 0xcfc, 0x5a175a63);
> + qtest_outb(s, 0x6e08, 0x9e);
> + qtest_writeb(s, 0x9f003, 0xff);
> + qtest_writeb(s, 0x9f004, 0x01);
> + qtest_writeb(s, 0x9e012, 0x0e);
> + qtest_writeb(s, 0x9e01b, 0x0e);
> + qtest_writeb(s, 0x9f006, 0x01);
> + qtest_writeb(s, 0x9f008, 0x01);
> + qtest_writeb(s, 0x9f00a, 0x01);
> + qtest_writeb(s, 0x9f00c, 0x01);
> + qtest_writeb(s, 0x9f00e, 0x01);
> + qtest_writeb(s, 0x9f010, 0x01);
> + qtest_writeb(s, 0x9f012, 0x01);
> + qtest_writeb(s, 0x9f014, 0x01);
> + qtest_writeb(s, 0x9f016, 0x01);
> + qtest_writeb(s, 0x9f018, 0x01);
> + qtest_writeb(s, 0x9f01a, 0x01);
> + qtest_writeb(s, 0x9f01c, 0x01);
> + qtest_writeb(s, 0x9f01e, 0x01);
> + qtest_writeb(s, 0x9f020, 0x01);
> + qtest_writeb(s, 0x9f022, 0x01);
> + qtest_writeb(s, 0x9f024, 0x01);
> + qtest_writeb(s, 0x9f026, 0x01);
> + qtest_writeb(s, 0x9f028, 0x01);
> + qtest_writeb(s, 0x9f02a, 0x01);
> + qtest_writeb(s, 0x9f02c, 0x01);
> + qtest_writeb(s, 0x9f02e, 0x01);
> + qtest_writeb(s, 0x9f030, 0x01);
> + qtest_outb(s, 0x6e10, 0x00);
> + qtest_quit(s);
> +}
> +
> +int main(int argc, char **argv)
> +{
> + const char *arch = qtest_get_arch();
> +
> + g_test_init(&argc, &argv, NULL);
> +
> + if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
> + qtest_add_func("fuzz/test_mmio_oob_from_memory_region_cache",
> + test_mmio_oob_from_memory_region_cache);
> + }
> +
> + return g_test_run();
> +}
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 44cd74b03cd..48c0ec41e93 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1717,6 +1717,7 @@ S: Supported
> F: include/hw/scsi/*
> F: hw/scsi/*
> F: tests/qtest/virtio-scsi-test.c
> +F: tests/qtest/fuzz-virtio-scsi-test.c
> T: git https://github.com/bonzini/qemu.git scsi-next
>
> SSI
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index 85682d0dfce..f2090296597 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -6,6 +6,7 @@
>
> qtests_generic = \
> (config_all_devices.has_key('CONFIG_MEGASAS_SCSI_PCI') ? ['fuzz-megasas-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_VIRTIO_SCSI') ? ['fuzz-virtio-scsi-test'] : []) + \
> [
> 'cdrom-test',
> 'device-introspect-test',
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
next prev parent reply other threads:[~2021-01-26 17:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 11:16 [PATCH v2 0/2] tests/qtest: Only run fuzz-tests when tested devices are available Philippe Mathieu-Daudé
2021-01-26 11:16 ` [PATCH v2 1/2] tests/qtest: Only run fuzz-megasas-test if megasas device is available Philippe Mathieu-Daudé
2021-01-26 17:51 ` Thomas Huth
2021-01-26 18:01 ` Alexander Bulekov
2021-01-26 18:12 ` Thomas Huth
2021-01-26 11:16 ` [PATCH v2 2/2] tests/qtest: Only run fuzz-virtio-scsi when virtio-scsi " Philippe Mathieu-Daudé
2021-01-26 17:52 ` Thomas Huth [this message]
2021-01-26 11:20 ` [PATCH v2 0/2] tests/qtest: Only run fuzz-tests when tested devices are available Philippe Mathieu-Daudé
2021-01-26 11:28 ` [PATCH v2 3/2] MAINTAINERS: Cover fuzzer reproducer tests within 'Device Fuzzing' Philippe Mathieu-Daudé
2021-01-26 17:56 ` Thomas Huth
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=dff6001a-8628-aa18-e874-8678211a12b5@redhat.com \
--to=thuth@redhat.com \
--cc=alxndr@bu.edu \
--cc=fam@euphon.net \
--cc=hare@suse.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).