[PULL v3 50/81] tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML automatically

Michael S. Tsirkin posted 81 patches 3 years, 3 months ago
Maintainers: "Gonglei (Arei)" <arei.gonglei@huawei.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Ani Sinha <ani@anisinha.ca>, "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Shannon Zhao <shannon.zhaosl@gmail.com>, Raphael Norwitz <raphael.norwitz@nutanix.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Ben Widawsky <ben.widawsky@intel.com>, Jonathan Cameron <jonathan.cameron@huawei.com>, Gerd Hoffmann <kraxel@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Peter Xu <peterx@redhat.com>, Jason Wang <jasowang@redhat.com>, Sergio Lopez <slp@redhat.com>, Dmitry Fleytman <dmitry.fleytman@gmail.com>, Jiri Pirko <jiri@resnulli.us>, Keith Busch <kbusch@kernel.org>, Klaus Jensen <its@irrelevant.dk>, Huai-Cheng Kuo <hchkuo@avery-design.com.tw>, Chris Browy <cbrowy@avery-design.com>, Yuval Shaia <yuval.shaia.ml@gmail.com>, Elena Ufimtseva <elena.ufimtseva@oracle.com>, Jagannathan Raman <jag.raman@oracle.com>, John G Johnson <john.g.johnson@oracle.com>, Alex Williamson <alex.williamson@redhat.com>, Eric Auger <eric.auger@redhat.com>, David Hildenbrand <david@redhat.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Cleber Rosa <crosa@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>
There is a newer version of this series
[PULL v3 50/81] tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML automatically
Posted by Michael S. Tsirkin 3 years, 3 months ago
From: Igor Mammedov <imammedo@redhat.com>

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20221017102146.2254096-3-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/qtest/bios-tables-test-allowed-diff.h | 34 +++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..570b17478e 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,35 @@
 /* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/pc/DSDT",
+"tests/data/acpi/pc/DSDT.acpierst",
+"tests/data/acpi/pc/DSDT.acpihmat",
+"tests/data/acpi/pc/DSDT.bridge",
+"tests/data/acpi/pc/DSDT.cphp",
+"tests/data/acpi/pc/DSDT.dimmpxm",
+"tests/data/acpi/pc/DSDT.hpbridge",
+"tests/data/acpi/pc/DSDT.hpbrroot",
+"tests/data/acpi/pc/DSDT.ipmikcs",
+"tests/data/acpi/pc/DSDT.memhp",
+"tests/data/acpi/pc/DSDT.nohpet",
+"tests/data/acpi/pc/DSDT.numamem",
+"tests/data/acpi/pc/DSDT.roothp",
+"tests/data/acpi/q35/DSDT",
+"tests/data/acpi/q35/DSDT.acpierst",
+"tests/data/acpi/q35/DSDT.acpihmat",
+"tests/data/acpi/q35/DSDT.applesmc",
+"tests/data/acpi/q35/DSDT.bridge",
+"tests/data/acpi/q35/DSDT.cphp",
+"tests/data/acpi/q35/DSDT.cxl",
+"tests/data/acpi/q35/DSDT.dimmpxm",
+"tests/data/acpi/q35/DSDT.ipmibt",
+"tests/data/acpi/q35/DSDT.ipmismbus",
+"tests/data/acpi/q35/DSDT.ivrs",
+"tests/data/acpi/q35/DSDT.memhp",
+"tests/data/acpi/q35/DSDT.mmio64",
+"tests/data/acpi/q35/DSDT.multi-bridge",
+"tests/data/acpi/q35/DSDT.nohpet",
+"tests/data/acpi/q35/DSDT.numamem",
+"tests/data/acpi/q35/DSDT.pvpanic-isa",
+"tests/data/acpi/q35/DSDT.tis.tpm12",
+"tests/data/acpi/q35/DSDT.tis.tpm2",
+"tests/data/acpi/q35/DSDT.viot",
+"tests/data/acpi/q35/DSDT.xapic",
-- 
MST
Re: [PULL v3 50/81] tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML automatically
Posted by Bernhard Beschow 3 years, 3 months ago
On Sat, Nov 5, 2022 at 6:27 PM Michael S. Tsirkin <mst@redhat.com> wrote:

> From: Igor Mammedov <imammedo@redhat.com>
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Message-Id: <20221017102146.2254096-3-imammedo@redhat.com>
> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  tests/qtest/bios-tables-test-allowed-diff.h | 34 +++++++++++++++++++++
>  1 file changed, 34 insertions(+)
>
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h
> b/tests/qtest/bios-tables-test-allowed-diff.h
> index dfb8523c8b..570b17478e 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1 +1,35 @@
>  /* List of comma-separated changed AML files to ignore */
> +"tests/data/acpi/pc/DSDT",
> +"tests/data/acpi/pc/DSDT.acpierst",
> +"tests/data/acpi/pc/DSDT.acpihmat",
> +"tests/data/acpi/pc/DSDT.bridge",
> +"tests/data/acpi/pc/DSDT.cphp",
> +"tests/data/acpi/pc/DSDT.dimmpxm",
> +"tests/data/acpi/pc/DSDT.hpbridge",
> +"tests/data/acpi/pc/DSDT.hpbrroot",
> +"tests/data/acpi/pc/DSDT.ipmikcs",
> +"tests/data/acpi/pc/DSDT.memhp",
> +"tests/data/acpi/pc/DSDT.nohpet",
> +"tests/data/acpi/pc/DSDT.numamem",
> +"tests/data/acpi/pc/DSDT.roothp",
> +"tests/data/acpi/q35/DSDT",
> +"tests/data/acpi/q35/DSDT.acpierst",
> +"tests/data/acpi/q35/DSDT.acpihmat",
> +"tests/data/acpi/q35/DSDT.applesmc",
> +"tests/data/acpi/q35/DSDT.bridge",
>

+"tests/data/acpi/q35/DSDT.core-count2"

... and probably in more patches down the road.

Best regards,
Bernhard

+"tests/data/acpi/q35/DSDT.cphp",
> +"tests/data/acpi/q35/DSDT.cxl",
> +"tests/data/acpi/q35/DSDT.dimmpxm",
> +"tests/data/acpi/q35/DSDT.ipmibt",
> +"tests/data/acpi/q35/DSDT.ipmismbus",
> +"tests/data/acpi/q35/DSDT.ivrs",
> +"tests/data/acpi/q35/DSDT.memhp",
> +"tests/data/acpi/q35/DSDT.mmio64",
> +"tests/data/acpi/q35/DSDT.multi-bridge",
> +"tests/data/acpi/q35/DSDT.nohpet",
> +"tests/data/acpi/q35/DSDT.numamem",
> +"tests/data/acpi/q35/DSDT.pvpanic-isa",
> +"tests/data/acpi/q35/DSDT.tis.tpm12",
> +"tests/data/acpi/q35/DSDT.tis.tpm2",
> +"tests/data/acpi/q35/DSDT.viot",
> +"tests/data/acpi/q35/DSDT.xapic",
> --
> MST
>
>
>
Re: [PULL v3 50/81] tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML automatically
Posted by Ani Sinha 3 years, 3 months ago
On Mon, Nov 7, 2022 at 3:18 AM Bernhard Beschow <shentey@gmail.com> wrote:
>
>
>
> On Sat, Nov 5, 2022 at 6:27 PM Michael S. Tsirkin <mst@redhat.com> wrote:
>>
>> From: Igor Mammedov <imammedo@redhat.com>
>>
>> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>> Message-Id: <20221017102146.2254096-3-imammedo@redhat.com>
>> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>> ---
>>  tests/qtest/bios-tables-test-allowed-diff.h | 34 +++++++++++++++++++++
>>  1 file changed, 34 insertions(+)
>>
>> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
>> index dfb8523c8b..570b17478e 100644
>> --- a/tests/qtest/bios-tables-test-allowed-diff.h
>> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
>> @@ -1 +1,35 @@
>>  /* List of comma-separated changed AML files to ignore */
>> +"tests/data/acpi/pc/DSDT",
>> +"tests/data/acpi/pc/DSDT.acpierst",
>> +"tests/data/acpi/pc/DSDT.acpihmat",
>> +"tests/data/acpi/pc/DSDT.bridge",
>> +"tests/data/acpi/pc/DSDT.cphp",
>> +"tests/data/acpi/pc/DSDT.dimmpxm",
>> +"tests/data/acpi/pc/DSDT.hpbridge",
>> +"tests/data/acpi/pc/DSDT.hpbrroot",
>> +"tests/data/acpi/pc/DSDT.ipmikcs",
>> +"tests/data/acpi/pc/DSDT.memhp",
>> +"tests/data/acpi/pc/DSDT.nohpet",
>> +"tests/data/acpi/pc/DSDT.numamem",
>> +"tests/data/acpi/pc/DSDT.roothp",
>> +"tests/data/acpi/q35/DSDT",
>> +"tests/data/acpi/q35/DSDT.acpierst",
>> +"tests/data/acpi/q35/DSDT.acpihmat",
>> +"tests/data/acpi/q35/DSDT.applesmc",
>> +"tests/data/acpi/q35/DSDT.bridge",
>
>
> +"tests/data/acpi/q35/DSDT.core-count2"
>
> ... and probably in more patches down the road.

Yes I am seeing this failure too:

68/600 qemu:qtest+qtest-x86_64 / qtest-x86_64/bios-tables-test
                   ERROR          39.95s   killed by signal 6 SIGABRT
>>> QTEST_QEMU_IMG=./qemu-img QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon MALLOC_PERTURB_=138 G_TEST_DBUS_DAEMON=/home/anisinha/workspace/qemu-ani/tests/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-x86_64 /home/anisinha/workspace/qemu-ani/build/tests/qtest/bios-tables-test --tap -k
――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
✀  ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
stderr:
acpi-test: Warning! DSDT binary file mismatch. Actual
[aml:/tmp/aml-ARFCV1], Expected
[aml:tests/data/acpi/q35/DSDT.core-count2].
See source file tests/qtest/bios-tables-test.c for instructions on how
to update expected files.
acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-NTFCV1.dsl,
aml:/tmp/aml-ARFCV1], Expected [asl:/tmp/asl-15QEV1.dsl,
aml:tests/data/acpi/q35/DSDT.core-count2].
**
ERROR:../tests/qtest/bios-tables-test.c:533:test_acpi_asl: assertion
failed: (all_tables_match)



>
> Best regards,
> Bernhard
>
>> +"tests/data/acpi/q35/DSDT.cphp",
>> +"tests/data/acpi/q35/DSDT.cxl",
>> +"tests/data/acpi/q35/DSDT.dimmpxm",
>> +"tests/data/acpi/q35/DSDT.ipmibt",
>> +"tests/data/acpi/q35/DSDT.ipmismbus",
>> +"tests/data/acpi/q35/DSDT.ivrs",
>> +"tests/data/acpi/q35/DSDT.memhp",
>> +"tests/data/acpi/q35/DSDT.mmio64",
>> +"tests/data/acpi/q35/DSDT.multi-bridge",
>> +"tests/data/acpi/q35/DSDT.nohpet",
>> +"tests/data/acpi/q35/DSDT.numamem",
>> +"tests/data/acpi/q35/DSDT.pvpanic-isa",
>> +"tests/data/acpi/q35/DSDT.tis.tpm12",
>> +"tests/data/acpi/q35/DSDT.tis.tpm2",
>> +"tests/data/acpi/q35/DSDT.viot",
>> +"tests/data/acpi/q35/DSDT.xapic",
>> --
>> MST
>>
>>
Re: [PULL v3 50/81] tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML automatically
Posted by Michael S. Tsirkin 3 years, 3 months ago
On Mon, Nov 07, 2022 at 02:06:23PM +0530, Ani Sinha wrote:
> On Mon, Nov 7, 2022 at 3:18 AM Bernhard Beschow <shentey@gmail.com> wrote:
> >
> >
> >
> > On Sat, Nov 5, 2022 at 6:27 PM Michael S. Tsirkin <mst@redhat.com> wrote:
> >>
> >> From: Igor Mammedov <imammedo@redhat.com>
> >>
> >> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> >> Message-Id: <20221017102146.2254096-3-imammedo@redhat.com>
> >> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> >> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> >> ---
> >>  tests/qtest/bios-tables-test-allowed-diff.h | 34 +++++++++++++++++++++
> >>  1 file changed, 34 insertions(+)
> >>
> >> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> >> index dfb8523c8b..570b17478e 100644
> >> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> >> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> >> @@ -1 +1,35 @@
> >>  /* List of comma-separated changed AML files to ignore */
> >> +"tests/data/acpi/pc/DSDT",
> >> +"tests/data/acpi/pc/DSDT.acpierst",
> >> +"tests/data/acpi/pc/DSDT.acpihmat",
> >> +"tests/data/acpi/pc/DSDT.bridge",
> >> +"tests/data/acpi/pc/DSDT.cphp",
> >> +"tests/data/acpi/pc/DSDT.dimmpxm",
> >> +"tests/data/acpi/pc/DSDT.hpbridge",
> >> +"tests/data/acpi/pc/DSDT.hpbrroot",
> >> +"tests/data/acpi/pc/DSDT.ipmikcs",
> >> +"tests/data/acpi/pc/DSDT.memhp",
> >> +"tests/data/acpi/pc/DSDT.nohpet",
> >> +"tests/data/acpi/pc/DSDT.numamem",
> >> +"tests/data/acpi/pc/DSDT.roothp",
> >> +"tests/data/acpi/q35/DSDT",
> >> +"tests/data/acpi/q35/DSDT.acpierst",
> >> +"tests/data/acpi/q35/DSDT.acpihmat",
> >> +"tests/data/acpi/q35/DSDT.applesmc",
> >> +"tests/data/acpi/q35/DSDT.bridge",
> >
> >
> > +"tests/data/acpi/q35/DSDT.core-count2"
> >
> > ... and probably in more patches down the road.
> 
> Yes I am seeing this failure too:
> 
> 68/600 qemu:qtest+qtest-x86_64 / qtest-x86_64/bios-tables-test
>                    ERROR          39.95s   killed by signal 6 SIGABRT
> >>> QTEST_QEMU_IMG=./qemu-img QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon MALLOC_PERTURB_=138 G_TEST_DBUS_DAEMON=/home/anisinha/workspace/qemu-ani/tests/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-x86_64 /home/anisinha/workspace/qemu-ani/build/tests/qtest/bios-tables-test --tap -k
> ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
> ✀  ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
> stderr:
> acpi-test: Warning! DSDT binary file mismatch. Actual
> [aml:/tmp/aml-ARFCV1], Expected
> [aml:tests/data/acpi/q35/DSDT.core-count2].
> See source file tests/qtest/bios-tables-test.c for instructions on how
> to update expected files.
> acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-NTFCV1.dsl,
> aml:/tmp/aml-ARFCV1], Expected [asl:/tmp/asl-15QEV1.dsl,
> aml:tests/data/acpi/q35/DSDT.core-count2].
> **
> ERROR:../tests/qtest/bios-tables-test.c:533:test_acpi_asl: assertion
> failed: (all_tables_match)



My bad. BTW we should probably teach checkpatch that if
an expected file is modified then it has to be dropped
from allowed diff list in the same patch.


> 
> 
> >
> > Best regards,
> > Bernhard
> >
> >> +"tests/data/acpi/q35/DSDT.cphp",
> >> +"tests/data/acpi/q35/DSDT.cxl",
> >> +"tests/data/acpi/q35/DSDT.dimmpxm",
> >> +"tests/data/acpi/q35/DSDT.ipmibt",
> >> +"tests/data/acpi/q35/DSDT.ipmismbus",
> >> +"tests/data/acpi/q35/DSDT.ivrs",
> >> +"tests/data/acpi/q35/DSDT.memhp",
> >> +"tests/data/acpi/q35/DSDT.mmio64",
> >> +"tests/data/acpi/q35/DSDT.multi-bridge",
> >> +"tests/data/acpi/q35/DSDT.nohpet",
> >> +"tests/data/acpi/q35/DSDT.numamem",
> >> +"tests/data/acpi/q35/DSDT.pvpanic-isa",
> >> +"tests/data/acpi/q35/DSDT.tis.tpm12",
> >> +"tests/data/acpi/q35/DSDT.tis.tpm2",
> >> +"tests/data/acpi/q35/DSDT.viot",
> >> +"tests/data/acpi/q35/DSDT.xapic",
> >> --
> >> MST
> >>
> >>