| Message ID | 20240522062313.453317-18-zhenzhong.duan@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | intel_iommu: Enable stage-1 translation for emulated device | expand |
On 22/05/2024 08.23, Zhenzhong Duan wrote: > Add the framework to test the intel-iommu device. > > Currently only tested cap/ecap bits correctness in scalable > modern mode. Also tested cap/ecap bits consistency before > and after system reset. > > Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com> > --- > MAINTAINERS | 1 + > tests/qtest/intel-iommu-test.c | 63 ++++++++++++++++++++++++++++++++++ > tests/qtest/meson.build | 1 + > 3 files changed, 65 insertions(+) > create mode 100644 tests/qtest/intel-iommu-test.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index 5dab60bd04..f1ef6128c8 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -3656,6 +3656,7 @@ S: Supported > F: hw/i386/intel_iommu.c > F: hw/i386/intel_iommu_internal.h > F: include/hw/i386/intel_iommu.h > +F: tests/qtest/intel-iommu-test.c > > AMD-Vi Emulation > S: Orphan > diff --git a/tests/qtest/intel-iommu-test.c b/tests/qtest/intel-iommu-test.c > new file mode 100644 > index 0000000000..e1273bce14 > --- /dev/null > +++ b/tests/qtest/intel-iommu-test.c > @@ -0,0 +1,63 @@ > +/* > + * QTest testcase for intel-iommu > + * > + * Copyright (c) 2024 Intel, Inc. > + * > + * Author: Zhenzhong Duan <zhenzhong.duan@intel.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 "libqtest-single.h" It's a little bit nicer to write new tests without libqtest-single.h (e.g. in case you ever add migration tests later, you must not use anything that uses a global state), so I'd recommend to use "qts = qtest_init(...)" instead of qtest_start(...) and then to use the functions with the "qtest_" prefix instead of the other functions from libqtest-single.h ... but it's only a recommendation, up to you whether you want to respin your patch with it or not. Anyway: Acked-by: Thomas Huth <thuth@redhat.com> Do you want me to pick this up through the qtest tree, or shall this go through some x86-related tree instead? Thomas
>-----Original Message----- >From: Thomas Huth <thuth@redhat.com> >Subject: Re: [PATCH rfcv2 17/17] tests/qtest: Add intel-iommu test > >On 22/05/2024 08.23, Zhenzhong Duan wrote: >> Add the framework to test the intel-iommu device. >> >> Currently only tested cap/ecap bits correctness in scalable >> modern mode. Also tested cap/ecap bits consistency before >> and after system reset. >> >> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com> >> --- >> MAINTAINERS | 1 + >> tests/qtest/intel-iommu-test.c | 63 >++++++++++++++++++++++++++++++++++ >> tests/qtest/meson.build | 1 + >> 3 files changed, 65 insertions(+) >> create mode 100644 tests/qtest/intel-iommu-test.c >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 5dab60bd04..f1ef6128c8 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -3656,6 +3656,7 @@ S: Supported >> F: hw/i386/intel_iommu.c >> F: hw/i386/intel_iommu_internal.h >> F: include/hw/i386/intel_iommu.h >> +F: tests/qtest/intel-iommu-test.c >> >> AMD-Vi Emulation >> S: Orphan >> diff --git a/tests/qtest/intel-iommu-test.c b/tests/qtest/intel-iommu-test.c >> new file mode 100644 >> index 0000000000..e1273bce14 >> --- /dev/null >> +++ b/tests/qtest/intel-iommu-test.c >> @@ -0,0 +1,63 @@ >> +/* >> + * QTest testcase for intel-iommu >> + * >> + * Copyright (c) 2024 Intel, Inc. >> + * >> + * Author: Zhenzhong Duan <zhenzhong.duan@intel.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 "libqtest-single.h" > >It's a little bit nicer to write new tests without libqtest-single.h (e.g. >in case you ever add migration tests later, you must not use anything that >uses a global state), so I'd recommend to use "qts = qtest_init(...)" >instead of qtest_start(...) and then to use the functions with the "qtest_" >prefix instead of the other functions from libqtest-single.h ... but it's >only a recommendation, up to you whether you want to respin your patch >with >it or not. Got it, I'll fix it in next version. > >Anyway: >Acked-by: Thomas Huth <thuth@redhat.com> > >Do you want me to pick this up through the qtest tree, or shall this go >through some x86-related tree instead? This patch depends on other functional patches in this series, So maybe going through x86-related tree with others is better. Thanks Zhenzhong
diff --git a/MAINTAINERS b/MAINTAINERS index 5dab60bd04..f1ef6128c8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3656,6 +3656,7 @@ S: Supported F: hw/i386/intel_iommu.c F: hw/i386/intel_iommu_internal.h F: include/hw/i386/intel_iommu.h +F: tests/qtest/intel-iommu-test.c AMD-Vi Emulation S: Orphan diff --git a/tests/qtest/intel-iommu-test.c b/tests/qtest/intel-iommu-test.c new file mode 100644 index 0000000000..e1273bce14 --- /dev/null +++ b/tests/qtest/intel-iommu-test.c @@ -0,0 +1,63 @@ +/* + * QTest testcase for intel-iommu + * + * Copyright (c) 2024 Intel, Inc. + * + * Author: Zhenzhong Duan <zhenzhong.duan@intel.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 "libqtest-single.h" +#include "hw/i386/intel_iommu_internal.h" + +#define vtd_reg_readl(offset) (readq(Q35_HOST_BRIDGE_IOMMU_ADDR + offset)) +#define CAP_MODERN_FIXED1 (VTD_CAP_FRO | VTD_CAP_NFR | VTD_CAP_ND | \ + VTD_CAP_MAMV | VTD_CAP_PSI | VTD_CAP_SLLPS) +#define ECAP_MODERN_FIXED1 (VTD_ECAP_QI | VTD_ECAP_IRO | VTD_ECAP_MHMV | \ + VTD_ECAP_SMTS | VTD_ECAP_FLTS) + +static void test_intel_iommu_modern(void) +{ + uint8_t init_csr[DMAR_REG_SIZE]; /* register values */ + uint8_t post_reset_csr[DMAR_REG_SIZE]; /* register values */ + uint64_t cap, ecap, tmp; + + qtest_start("-M q35 -device intel-iommu,x-scalable-mode=modern"); + + g_assert(vtd_reg_readl(DMAR_VER_REG) == 0x30); + + cap = vtd_reg_readl(DMAR_CAP_REG); + g_assert((cap & CAP_MODERN_FIXED1) == CAP_MODERN_FIXED1); + + tmp = cap & VTD_CAP_SAGAW_MASK; + g_assert(tmp == (VTD_CAP_SAGAW_39bit | VTD_CAP_SAGAW_48bit)); + + tmp = VTD_MGAW_FROM_CAP(cap); + g_assert(tmp == VTD_HOST_AW_48BIT - 1); + + ecap = vtd_reg_readl(DMAR_ECAP_REG); + g_assert((ecap & ECAP_MODERN_FIXED1) == ECAP_MODERN_FIXED1); + g_assert(ecap & VTD_ECAP_IR); + + memread(Q35_HOST_BRIDGE_IOMMU_ADDR, init_csr, DMAR_REG_SIZE); + + qobject_unref(qmp("{ 'execute': 'system_reset' }")); + qmp_eventwait("RESET"); + + memread(Q35_HOST_BRIDGE_IOMMU_ADDR, post_reset_csr, DMAR_REG_SIZE); + /* Ensure registers are consistent after hard reset */ + g_assert(!memcmp(init_csr, post_reset_csr, DMAR_REG_SIZE)); + + qtest_end(); +} + +int main(int argc, char **argv) +{ + g_test_init(&argc, &argv, NULL); + qtest_add_func("/q35/intel-iommu/modern", test_intel_iommu_modern); + + return g_test_run(); +} diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 6f2f594ace..09106739d2 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -79,6 +79,7 @@ qtests_i386 = \ (config_all_devices.has_key('CONFIG_SB16') ? ['fuzz-sb16-test'] : []) + \ (config_all_devices.has_key('CONFIG_SDHCI_PCI') ? ['fuzz-sdcard-test'] : []) + \ (config_all_devices.has_key('CONFIG_ESP_PCI') ? ['am53c974-test'] : []) + \ + (config_all_devices.has_key('CONFIG_VTD') ? ['intel-iommu-test'] : []) + \ (host_os != 'windows' and \ config_all_devices.has_key('CONFIG_ACPI_ERST') ? ['erst-test'] : []) + \ (config_all_devices.has_key('CONFIG_PCIE_PORT') and \
Add the framework to test the intel-iommu device. Currently only tested cap/ecap bits correctness in scalable modern mode. Also tested cap/ecap bits consistency before and after system reset. Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com> --- MAINTAINERS | 1 + tests/qtest/intel-iommu-test.c | 63 ++++++++++++++++++++++++++++++++++ tests/qtest/meson.build | 1 + 3 files changed, 65 insertions(+) create mode 100644 tests/qtest/intel-iommu-test.c