| Message ID | 20210129110012.8660-22-peter.maydell@linaro.org |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | target-arm queue | expand |
On Fri, 29 Jan 2021 at 11:00, Peter Maydell <peter.maydell@linaro.org> wrote: > > From: Mihai Carabas <mihai.carabas@oracle.com> > > Add a test case for pvpanic-pci device. The scenario is the same as pvpanic > ISA device, but is using the PCI bus. > > Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com> > Acked-by: Thomas Huth <thuth@redhat.com> > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> This turns out to trigger the oss-fuzz build's leak-sanitizer: https://gitlab.com/qemu-project/qemu/-/jobs/995177788 > +static void test_panic_nopause(void) > +{ > + uint8_t val; > + QDict *response, *data; > + QTestState *qts; > + QPCIBus *pcibus; > + QPCIDevice *dev; > + QPCIBar bar; > + > + qts = qtest_init("-device pvpanic-pci,addr=04.0 -action panic=none"); > + pcibus = qpci_new_pc(qts, NULL); > + dev = qpci_device_find(pcibus, QPCI_DEVFN(0x4, 0x0)); > + qpci_device_enable(dev); > + bar = qpci_iomap(dev, 0, NULL); > + > + qpci_memread(dev, bar, 0, &val, sizeof(val)); > + g_assert_cmpuint(val, ==, 3); > + > + val = 1; > + qpci_memwrite(dev, bar, 0, &val, sizeof(val)); > + > + response = qtest_qmp_eventwait_ref(qts, "GUEST_PANICKED"); > + g_assert(qdict_haskey(response, "data")); > + data = qdict_get_qdict(response, "data"); > + g_assert(qdict_haskey(data, "action")); > + g_assert_cmpstr(qdict_get_str(data, "action"), ==, "run"); > + qobject_unref(response); > + I'm going to squash in the trivial fix, which is to add g_free(dev); qpci_free_pc(pcibus); here and similarly in the test_panic() function. > + qtest_quit(qts); > + } thanks -- PMM
La 29.01.2021 17:57, Peter Maydell a scris: > On Fri, 29 Jan 2021 at 11:00, Peter Maydell <peter.maydell@linaro.org> wrote: >> From: Mihai Carabas <mihai.carabas@oracle.com> >> >> Add a test case for pvpanic-pci device. The scenario is the same as pvpanic >> ISA device, but is using the PCI bus. >> >> Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com> >> Acked-by: Thomas Huth <thuth@redhat.com> >> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> >> Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com> >> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > This turns out to trigger the oss-fuzz build's leak-sanitizer: > https://urldefense.com/v3/__https://gitlab.com/qemu-project/qemu/-/jobs/995177788__;!!GqivPVa7Brio!IGLAgdVRl_78c_PuUhuLJVDG1KFnc1gv3Pf1yTTcSiizygGvYHmq3YQ3YxwmMAwSMQ$ > >> +static void test_panic_nopause(void) >> +{ >> + uint8_t val; >> + QDict *response, *data; >> + QTestState *qts; >> + QPCIBus *pcibus; >> + QPCIDevice *dev; >> + QPCIBar bar; >> + >> + qts = qtest_init("-device pvpanic-pci,addr=04.0 -action panic=none"); >> + pcibus = qpci_new_pc(qts, NULL); >> + dev = qpci_device_find(pcibus, QPCI_DEVFN(0x4, 0x0)); >> + qpci_device_enable(dev); >> + bar = qpci_iomap(dev, 0, NULL); >> + >> + qpci_memread(dev, bar, 0, &val, sizeof(val)); >> + g_assert_cmpuint(val, ==, 3); >> + >> + val = 1; >> + qpci_memwrite(dev, bar, 0, &val, sizeof(val)); >> + >> + response = qtest_qmp_eventwait_ref(qts, "GUEST_PANICKED"); >> + g_assert(qdict_haskey(response, "data")); >> + data = qdict_get_qdict(response, "data"); >> + g_assert(qdict_haskey(data, "action")); >> + g_assert_cmpstr(qdict_get_str(data, "action"), ==, "run"); >> + qobject_unref(response); >> + > I'm going to squash in the trivial fix, which is to add > g_free(dev); > qpci_free_pc(pcibus); > > here and similarly in the test_panic() function. Thank you! Sorry for missing that trivial leak:(. Thanks, Mihai > >> + qtest_quit(qts); >> + } > thanks > -- PMM
diff --git a/tests/qtest/pvpanic-pci-test.c b/tests/qtest/pvpanic-pci-test.c new file mode 100644 index 00000000000..24b33c64a0b --- /dev/null +++ b/tests/qtest/pvpanic-pci-test.c @@ -0,0 +1,94 @@ +/* + * QTest testcase for PV Panic PCI device + * + * Copyright (C) 2020 Oracle + * + * Authors: + * Mihai Carabas <mihai.carabas@oracle.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" +#include "qapi/qmp/qdict.h" +#include "libqos/pci.h" +#include "libqos/pci-pc.h" +#include "hw/pci/pci_regs.h" + +static void test_panic_nopause(void) +{ + uint8_t val; + QDict *response, *data; + QTestState *qts; + QPCIBus *pcibus; + QPCIDevice *dev; + QPCIBar bar; + + qts = qtest_init("-device pvpanic-pci,addr=04.0 -action panic=none"); + pcibus = qpci_new_pc(qts, NULL); + dev = qpci_device_find(pcibus, QPCI_DEVFN(0x4, 0x0)); + qpci_device_enable(dev); + bar = qpci_iomap(dev, 0, NULL); + + qpci_memread(dev, bar, 0, &val, sizeof(val)); + g_assert_cmpuint(val, ==, 3); + + val = 1; + qpci_memwrite(dev, bar, 0, &val, sizeof(val)); + + response = qtest_qmp_eventwait_ref(qts, "GUEST_PANICKED"); + g_assert(qdict_haskey(response, "data")); + data = qdict_get_qdict(response, "data"); + g_assert(qdict_haskey(data, "action")); + g_assert_cmpstr(qdict_get_str(data, "action"), ==, "run"); + qobject_unref(response); + + qtest_quit(qts); +} + +static void test_panic(void) +{ + uint8_t val; + QDict *response, *data; + QTestState *qts; + QPCIBus *pcibus; + QPCIDevice *dev; + QPCIBar bar; + + qts = qtest_init("-device pvpanic-pci,addr=04.0 -action panic=pause"); + pcibus = qpci_new_pc(qts, NULL); + dev = qpci_device_find(pcibus, QPCI_DEVFN(0x4, 0x0)); + qpci_device_enable(dev); + bar = qpci_iomap(dev, 0, NULL); + + qpci_memread(dev, bar, 0, &val, sizeof(val)); + g_assert_cmpuint(val, ==, 3); + + val = 1; + qpci_memwrite(dev, bar, 0, &val, sizeof(val)); + + response = qtest_qmp_eventwait_ref(qts, "GUEST_PANICKED"); + g_assert(qdict_haskey(response, "data")); + data = qdict_get_qdict(response, "data"); + g_assert(qdict_haskey(data, "action")); + g_assert_cmpstr(qdict_get_str(data, "action"), ==, "pause"); + qobject_unref(response); + + qtest_quit(qts); +} + +int main(int argc, char **argv) +{ + int ret; + + g_test_init(&argc, &argv, NULL); + qtest_add_func("/pvpanic-pci/panic", test_panic); + qtest_add_func("/pvpanic-pci/panic-nopause", test_panic_nopause); + + ret = g_test_run(); + + return ret; +} diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 0e85343b96b..7ccdf023111 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -34,6 +34,7 @@ qtests_i386 = \ config_all_devices.has_key('CONFIG_ISA_IPMI_BT') ? ['ipmi-bt-test'] : []) + \ (config_all_devices.has_key('CONFIG_WDT_IB700') ? ['wdt_ib700-test'] : []) + \ (config_all_devices.has_key('CONFIG_PVPANIC_ISA') ? ['pvpanic-test'] : []) + \ + (config_all_devices.has_key('CONFIG_PVPANIC_PCI') ? ['pvpanic-pci-test'] : []) + \ (config_all_devices.has_key('CONFIG_HDA') ? ['intel-hda-test'] : []) + \ (config_all_devices.has_key('CONFIG_I82801B11') ? ['i82801b11-test'] : []) + \ (config_all_devices.has_key('CONFIG_IOH3420') ? ['ioh3420-test'] : []) + \