pci,pc,virtio: features, tests, fixes, cleanups
[PULL 83/86] intel-iommu: don't warn guest errors when getting rid2pasid entry
In reply to Michael S. TsirkinFrom: Jason Wang <[email protected]>
We use to warn on wrong rid2pasid entry. But this error could be triggered by the guest and could happens during initialization. So let's don't warn in this case.
Message-Id: <[email protected]>
--- hw/i386/intel_iommu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
hw/i386/intel_iommu.c +6 -6
@@ -1554,8 +1554,10 @@ static bool vtd_dev_pt_enabled(IntelIOMMUState *s, VTDContextEntry *ce)if (s->root_scalable) { ret =vtd_ce_get_rid2pasid_entry (s, ce, &pe);if (ret) { -error_report_once ("%s: vtd_ce_get_rid2pasid_entry error: %" PRId32, - __func__, ret); +/* +* This error is guest triggerable. We should assumt PT +* not enabled for safety. +*/ return false; }return (VTD_PE_GET_TYPE (&pe) ==VTD_SM_PASID_ENTRY_PT );
@@ -1569,14 +1571,12 @@ static bool vtd_as_pt_enabled(VTDAddressSpace *as) {IntelIOMMUState *s;VTDContextEntry ce; -int ret;assert (as); s = as->iommu_state; - ret =vtd_dev_to_context_entry (s,pci_bus_num (as->bus), - as->devfn, &ce); -if (ret) { +if (vtd_dev_to_context_entry (s,pci_bus_num (as->bus), as->devfn, + &ce)) {/* * Possibly failed to parse the context entry for some reason * (e.g., during init, or any guest configuration errors on
Signature · 1 line
MST
[PULL 43/86] vhost: expose vhost_virtqueue_start()
In reply to Michael S. TsirkinFrom: Kangjie Xu <[email protected]>
Expose vhost_virtqueue_start(), we need to use it when restarting a virtqueue.
Message-Id: <[email protected]>
--- include/hw/virtio/vhost.h | 3 +++ hw/virtio/vhost.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-)
include/hw/virtio/vhost.h +3 -0
@@ -297,6 +297,9 @@ int vhost_net_set_backend(struct vhost_dev *hdev,int vhost_device_iotlb_miss (struct vhost_dev *dev,uint64_t iova,int write); +int vhost_virtqueue_start (struct vhost_dev *dev,struct VirtIODevice *vdev, +struct vhost_virtqueue *vq,unsigned idx); +void vhost_dev_reset_inflight (struct vhost_inflight *inflight);void vhost_dev_free_inflight (struct vhost_inflight *inflight);void vhost_dev_save_inflight (struct vhost_inflight *inflight,QEMUFile *f);
hw/virtio/vhost.c +4 -4
@@ -1081,10 +1081,10 @@ out:return ret; } -static int vhost_virtqueue_start (struct vhost_dev *dev, -struct VirtIODevice *vdev, -struct vhost_virtqueue *vq, -unsigned idx) +int vhost_virtqueue_start (struct vhost_dev *dev, +struct VirtIODevice *vdev, +struct vhost_virtqueue *vq, +unsigned idx) {BusState *qbus =BUS (qdev_get_parent_bus (DEVICE (vdev)));VirtioBusState *vbus =VIRTIO_BUS (qbus);
Signature · 1 line
MST
[PULL 79/86] hw/arm/virt: Enable HMAT on arm virt machine
In reply to Michael S. TsirkinFrom: Xiang Chen <[email protected]>
Since the patchset ("Build ACPI Heterogeneous Memory Attribute Table (HMAT)"), HMAT is supported, but only x86 is enabled. Enable HMAT on arm virt machine.
Message-Id: <[email protected]>
--- hw/arm/virt-acpi-build.c | 7 +++++++ hw/arm/Kconfig | 1 + 2 files changed, 8 insertions(+)
hw/arm/virt-acpi-build.c +7 -0
@@ -42,6 +42,7 @@#include "hw/acpi/memory_hotplug.h" #include "hw/acpi/generic_event_device.h" #include "hw/acpi/tpm.h" +#include "hw/acpi/hmat.h" #include "hw/pci/pcie_host.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h"
@@ -987,6 +988,12 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)build_slit (tables_blob, tables->linker, ms, vms->oem_id, vms->oem_table_id); } + +if (ms->numa_state->hmat_enabled) { +acpi_add_table (table_offsets, tables_blob); +build_hmat (tables_blob, tables->linker, ms->numa_state, + vms->oem_id, vms->oem_table_id); + } }if (ms->nvdimms_state->is_enabled) {
hw/arm/Kconfig +1 -0
@@ -30,6 +30,7 @@ config ARM_VIRT select ACPI_VIOT select VIRTIO_MEM_SUPPORTED select ACPI_CXL + select ACPI_HMAT config CHEETAH bool
Signature · 1 line
MST
[PULL 46/86] vhost-net: vhost-kernel: introduce vhost_net_virtqueue_restart()
In reply to Michael S. TsirkinFrom: Kangjie Xu <[email protected]>
Introduce vhost_net_virtqueue_restart(), which can restart the specific virtqueue when the vhost net started running before. If it fails to restart the virtqueue, the device will be stopped.
Here we do not reuse vhost_net_start_one() or vhost_dev_start() because they work at queue pair level. The mem table and features do not change, so we can call the vhost_virtqueue_start() to restart a specific queue.
This patch only considers the case of vhost-kernel, when NetClientDriver is NET_CLIENT_DRIVER_TAP.
Message-Id: <[email protected]>
--- include/net/vhost_net.h | 2 ++ hw/net/vhost_net-stub.c | 6 +++++ hw/net/vhost_net.c | 53 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+)
include/net/vhost_net.h +2 -0
@@ -50,4 +50,6 @@ int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu);void vhost_net_virtqueue_reset (VirtIODevice *vdev,NetClientState *nc,int vq_index); +int vhost_net_virtqueue_restart (VirtIODevice *vdev,NetClientState *nc, +int vq_index);#endif
hw/net/vhost_net-stub.c +6 -0
@@ -107,3 +107,9 @@ void vhost_net_virtqueue_reset(VirtIODevice *vdev, NetClientState *nc, { } + +int vhost_net_virtqueue_restart (VirtIODevice *vdev,NetClientState *nc, +int vq_index) +{ +return 0 ; +}
hw/net/vhost_net.c +53 -0
62 lines not on this page · raw message
Signature · 1 line
MST
[PULL 80/86] tests: acpi: aarch64/virt: add a test for hmat nodes with no initiators
In reply to Michael S. TsirkinFrom: Hesham Almatary <[email protected]>
This patch imitates the "tests: acpi: q35: add test for hmat nodes without initiators" commit to test numa nodes with different HMAT attributes, but on AArch64/virt.
Tested with:
qemu-system-aarch64 -accel tcg \
-machine virt,hmat=on,gic-version=3 -cpu cortex-a57 \
-bios qemu-efi-aarch64/QEMU_EFI.fd \
-kernel Image -append "root=/dev/vda2 console=ttyAMA0" \
-drive if=virtio,file=aarch64.qcow2,format=qcow2,id=hd \
-device virtio-rng-pci \
-net user,hostfwd=tcp::10022-:22 -net nic \
-device intel-hda -device hda-duplex -nographic \
-smp 4 \
-m 3G \
-object memory-backend-ram,size=1G,id=ram0 \
-object memory-backend-ram,size=1G,id=ram1 \
-object memory-backend-ram,size=1G,id=ram2 \
-numa node,nodeid=0,memdev=ram0,cpus=0-1 \
-numa node,nodeid=1,memdev=ram1,cpus=2-3 \
-numa node,nodeid=2,memdev=ram2 \
-numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-latency,latency=10 \
-numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-bandwidth,bandwidth=10485760 \
-numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-latency,latency=20 \
-numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-bandwidth,bandwidth=5242880 \
-numa hmat-lb,initiator=0,target=2,hierarchy=memory,data-type=access-latency,latency=30 \
-numa hmat-lb,initiator=0,target=2,hierarchy=memory,data-type=access-bandwidth,bandwidth=1048576 \
-numa hmat-lb,initiator=1,target=0,hierarchy=memory,data-type=access-latency,latency=20 \
-numa hmat-lb,initiator=1,target=0,hierarchy=memory,data-type=access-bandwidth,bandwidth=5242880 \
-numa hmat-lb,initiator=1,target=1,hierarchy=memory,data-type=access-latency,latency=10 \
-numa hmat-lb,initiator=1,target=1,hierarchy=memory,data-type=access-bandwidth,bandwidth=10485760 \
-numa hmat-lb,initiator=1,target=2,hierarchy=memory,data-type=access-latency,latency=30 \
-numa hmat-lb,initiator=1,target=2,hierarchy=memory,data-type=access-bandwidth,bandwidth=1048576
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test.c | 59 ++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+)
tests/qtest/bios-tables-test.c +59 -0
@@ -1543,6 +1543,63 @@ static void test_acpi_piix4_tcg_acpi_hmat(void)test_acpi_tcg_acpi_hmat (MACHINE_PC ); } +static void test_acpi_virt_tcg_acpi_hmat (void ) +{ +test_data data = { + .machine ="virt" , + .tcg_only = true, + .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , + .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" , + .cd ="tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2" , + .ram_start =0x40000000ULL , + .scan_len =128ULL *1024 *1024 , + }; + + data.variant =".acpihmatvirt" ; + +test_acpi_one (" -machine hmat=on" +" -cpu cortex-a57" +" -smp 4,sockets=2" +" -m 256M" +" -object memory-backend-ram,size=64M,id=ram0" +" -object memory-backend-ram,size=64M,id=ram1" +" -object memory-backend-ram,size=128M,id=ram2" +" -numa node,nodeid=0,memdev=ram0" +" -numa node,nodeid=1,memdev=ram1" +" -numa node,nodeid=2,memdev=ram2" +" -numa cpu,node-id=0,socket-id=0" +" -numa cpu,node-id=0,socket-id=0" +" -numa cpu,node-id=1,socket-id=1" +" -numa cpu,node-id=1,socket-id=1" +" -numa hmat-lb,initiator=0,target=0,hierarchy=memory," +"data-type=access-latency,latency=10" +" -numa hmat-lb,initiator=0,target=0,hierarchy=memory," +"data-type=access-bandwidth,bandwidth=10485760" +" -numa hmat-lb,initiator=0,target=1,hierarchy=memory," +"data-type=access-latency,latency=20" +" -numa hmat-lb,initiator=0,target=1,hierarchy=memory," +"data-type=access-bandwidth,bandwidth=5242880" +" -numa hmat-lb,initiator=0,target=2,hierarchy=memory," +"data-type=access-latency,latency=30" +" -numa hmat-lb,initiator=0,target=2,hierarchy=memory," +"data-type=access-bandwidth,bandwidth=1048576" +" -numa hmat-lb,initiator=1,target=0,hierarchy=memory," +"data-type=access-latency,latency=20" +" -numa hmat-lb,initiator=1,target=0,hierarchy=memory," +"data-type=access-bandwidth,bandwidth=5242880" +" -numa hmat-lb,initiator=1,target=1,hierarchy=memory," +"data-type=access-latency,latency=10" +" -numa hmat-lb,initiator=1,target=1,hierarchy=memory," +"data-type=access-bandwidth,bandwidth=10485760" +" -numa hmat-lb,initiator=1,target=2,hierarchy=memory," +"data-type=access-latency,latency=30" +" -numa hmat-lb,initiator=1,target=2,hierarchy=memory," +"data-type=access-bandwidth,bandwidth=1048576" , + &data); + +free_test_data (&data); +} +static void test_acpi_q35_tcg_acpi_hmat_noinitiator (void ) {test_data data;
@@ -1998,6 +2055,8 @@ int main(int argc, char *argv[]) }else if (strcmp (arch,"aarch64" ) ==0 ) {if (has_tcg) {qtest_add_func ("acpi/virt" , test_acpi_virt_tcg); +qtest_add_func ("acpi/virt/acpihmatvirt" , + test_acpi_virt_tcg_acpi_hmat);qtest_add_func ("acpi/virt/numamem" , test_acpi_virt_tcg_numamem);qtest_add_func ("acpi/virt/memhp" , test_acpi_virt_tcg_memhp);qtest_add_func ("acpi/virt/pxb" , test_acpi_virt_tcg_pxb);
Signature · 1 line
MST
[PULL 71/86] hw/i386/acpi-build: Remove unused struct
In reply to Michael S. TsirkinFrom: Bernhard Beschow <[email protected]>
Ammends commit b23046abe78f48498a423b802d6d86ba0172d57f 'pc: acpi-build:
simplify PCI bus tree generation'.
Message-Id: <[email protected]>
Message-Id: <[email protected]>
--- hw/i386/acpi-build.c | 7 ------- 1 file changed, 7 deletions(-)
hw/i386/acpi-build.c +0 -7
@@ -121,13 +121,6 @@ typedef struct AcpiMiscInfo {unsigned dsdt_size; } AcpiMiscInfo; -typedef struct AcpiBuildPciBusHotplugState { -GArray *device_table; -GArray *notify_table; -struct AcpiBuildPciBusHotplugState *parent; -bool pcihp_bridge_en; -}AcpiBuildPciBusHotplugState ; - typedef struct FwCfgTPMConfig { uint32_t tpmppi_address; uint8_t tpm_version;
Signature · 1 line
MST
[PULL 16/86] acpi/tests/avocado/bits/doc: add a doc file to describe the acpi bits test
In reply to Michael S. TsirkinFrom: Ani Sinha <[email protected]>
A doc file is added under docs/devel that describes the purpose of the various test files and gives guidance to developers on where and how to make changes.
Message-Id: <[email protected]>
--- docs/devel/acpi-bits.rst | 145 +++++++++++++++++++++++++++++++++++++ docs/devel/index-build.rst | 1 + 2 files changed, 146 insertions(+) create mode 100644 docs/devel/acpi-bits.rst
docs/devel/acpi-bits.rst new file +145 -0
@@ -0,0 +1,145 @@ +============================================================================= +ACPI/SMBIOS avocado tests using biosbits +============================================================================= + +Biosbits is a software written by Josh Triplett that can be downloaded +from https://biosbits.org/. The github codebase can be found +`here <https://github.com/biosbits/bits/tree/master>`__. It is a software that executes +the bios components such as acpi and smbios tables directly through acpica +bios interpreter (a freely available C based library written by Intel, +downloadable from https://acpica.org/ and is included with biosbits) without an +operating system getting involved in between. +There are several advantages to directly testing the bios in a real physical +machine or VM as opposed to indirectly discovering bios issues through the +operating system. For one thing, the OSes tend to hide bios problems from the +end user. The other is that we have more control of what we wanted to test +and how by directly using acpica interpreter on top of the bios on a running +system. More details on the inspiration for developing biosbits and its real +life uses can be found in [#a]_ and [#b]_. +This directory contains tests written in python using avocado framework that +exercises the QEMU bios components using biosbits and reports test failures. +For QEMU, we maintain a fork of bios bits in gitlab along with all the +dependent submodules: +https://gitlab.com/qemu-project/biosbits-bits +This fork contains numerous fixes, a newer acpica and changes specific to +running this avocado QEMU tests using bits. The author of this document +is the sole maintainer of the QEMU fork of bios bits repo. + +Under the directory ``tests/avocado/``, ``acpi-bits.py`` is a QEMU avocado +test that drives all this. + +A brief description of the various test files follows. + +Under ``tests/avocado/`` as the root we have: + +:: + + ├── acpi-bits + │ ├── bits-config + │ │ └── bits-cfg.txt + │ ├── bits-tests + │ │ ├── smbios.py2 + │ │ ├── testacpi.py2 + │ │ └── testcpuid.py2 + │ └── README + ├── acpi-bits.py + +* ``tests/avocado``: + + ``acpi-bits.py``: + This is the main python avocado test script that generates a + biosbits iso. It then spawns a QEMU VM with it, collects the log and reports + test failures. This is the script one would be interested in if they wanted + to add or change some component of the log parsing, add a new command line + to alter how QEMU is spawned etc. Test writers typically would not need to + modify this script unless they wanted to enhance or change the log parsing + for their tests. In order to enable debugging, you can set **V=1** + environment variable. This enables verbose mode for the test and also dumps + the entire log from bios bits and more information in case failure happens. + + In order to run this test, please perform the following steps from the QEMU + build directory: + :: + + $ make check-venv (needed only the first time to create the venv) + $ ./tests/venv/bin/avocado run -t acpi tests/avocado + + The above will run all acpi avocado tests including this one. + In order to run the individual tests, perform the following: + :: + + $ ./tests/venv/bin/avocado run tests/avocado/acpi-bits.py --tap - + + The above will produce output in tap format. You can omit "--tap -" in the + end and it will produce output like the following: + :: + + $ ./tests/venv/bin/avocado run tests/avocado/acpi-bits.py + Fetching asset from tests/avocado/acpi-bits.py:AcpiBitsTest.test_acpi_smbios_bits + JOB ID : eab225724da7b64c012c65705dc2fa14ab1defef + JOB LOG : /home/anisinha/avocado/job-results/job-2022-10-10T17.58-eab2257/job.log + (1/1) tests/avocado/acpi-bits.py:AcpiBitsTest.test_acpi_smbios_bits: PASS (33.09 s) + RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0 + JOB TIME : 39.22 s + + You can inspect the log file for more information about the run or in order + to diagnoze issues. If you pass V=1 in the environment, more diagnostic logs + would be found in the test log. + +* ``tests/avocado/acpi-bits/bits-config``: + + This location contains biosbits configuration files that determine how the + software runs the tests. + + ``bits-config.txt``: + This is the biosbits config file that determines what tests + or actions are performed by bits. The description of the config options are + provided in the file itself. + +* ``tests/avocado/acpi-bits/bits-tests``: + + This directory contains biosbits python based tests that are run from within + the biosbits environment in the spawned VM. New additions of test cases can + be made in the appropriate test file. For example, new acpi tests can go + into testacpi.py2 and one would call testsuite.add_test() to register the new + test so that it gets executed as a part of the ACPI tests. + It might be occasionally necessary to disable some subtests or add a new + test that belongs to a test suite not already present in this directory. To + do this, please clone the bits source from + https://gitlab.com/qemu-project/biosbits-bits/-/tree/qemu-bits. + Note that this is the "qemu-bits" branch and not the "bits" branch of the + repository. "qemu-bits" is the branch where we have made all the QEMU + specific enhancements and we must use the source from this branch only. + Copy the test suite/script that needs modification (addition of new tests + or disabling them) from python directory into this directory. For + example, in order to change cpuid related tests, copy the following + file into this directory and rename it with .py2 extension: + https://gitlab.com/qemu-project/biosbits-bits/-/blob/qemu-bits/python/testcpuid.py + Then make your additions and changes here. Therefore, the steps are: + + (a) Copy unmodified test script to this directory from bits source. + (b) Add a SPDX license header. + (c) Perform modifications to the test. + + Commits (a), (b) and (c) should go under separate commits so that the original + test script and the changes we have made are separated and clear. + + The test framework will then use your modified test script to run the test. + No further changes would be needed. Please check the logs to make sure that + appropriate changes have taken effect. + + The tests have an extension .py2 in order to indicate that: + + (a) They are python2.7 based scripts and not python 3 scripts. + (b) They are run from within the bios bits VM and is not subjected to QEMU + build/test python script maintainance and dependency resolutions. + (c) They need not be loaded by avocado framework when running tests. + + +Author: Ani Sinha <[email protected]> + +References: +----------- +.. [#a] https://blog.linuxplumbersconf.org/2011/ocw/system/presentations/867/original/bits.pdf +.. [#b] https://www.youtube.com/watch?v=36QIepyUuhg +
docs/devel/index-build.rst +1 -0
@@ -11,6 +11,7 @@ the basics if you are adding new files and targets to the build. build-system kconfig testing + acpi-bits qtest ci qapi-code-gen
Signature · 1 line
MST
[PULL 65/86] hw/acpi/erst.c: Fix memory handling issues
In reply to Michael S. TsirkinFrom: "Christian A. Ehrhardt" <[email protected]>
- Fix memset argument order: The second argument is the value, the length goes last.
- Fix an integer overflow reported by Alexander Bulekov.
Both issues allow the guest to overrun the host buffer allocated for the ERST memory device.
Message-Id: <[email protected]>
--- hw/acpi/erst.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/acpi/erst.c +3 -3
@@ -635,7 +635,7 @@ static unsigned read_erst_record(ERSTDeviceState *s)if (record_length <UEFI_CPER_RECORD_MIN_SIZE ) { rc =STATUS_FAILED ; } -if ((s->record_offset + record_length) > exchange_length) { +if (record_length > exchange_length - s->record_offset) { rc =STATUS_FAILED ; }/* If all is ok, copy the record to the exchange buffer */
@@ -684,7 +684,7 @@ static unsigned write_erst_record(ERSTDeviceState *s)if (record_length <UEFI_CPER_RECORD_MIN_SIZE ) {return STATUS_FAILED ; } -if ((s->record_offset + record_length) > exchange_length) { +if (record_length > exchange_length - s->record_offset) {return STATUS_FAILED ; }
@@ -716,7 +716,7 @@ static unsigned write_erst_record(ERSTDeviceState *s)if (nvram) {/* Write the record into the slot */ memcpy (nvram, exchange, record_length); -memset (nvram + record_length, exchange_length - record_length,0xFF ); +memset (nvram + record_length,0xFF , exchange_length - record_length);/* If a new record, increment the record_count */ if (!record_found) {uint32_t record_count;
Signature · 1 line
MST
[PULL 51/86] virtio-net: enable vq reset feature
In reply to Michael S. TsirkinFrom: Xuan Zhuo <[email protected]>
Add virtqueue reset feature for virtio-net
Message-Id: <[email protected]>
--- hw/net/virtio-net.c | 1 + 1 file changed, 1 insertion(+)
hw/net/virtio-net.c +1 -0
@@ -788,6 +788,7 @@ static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features, }if (!get_vhost_net (nc->peer)) { +virtio_add_feature (&features,VIRTIO_F_RING_RESET );return features; }
Signature · 1 line
MST
[PULL 85/86] intel-iommu: convert VTD_PE_GET_FPD_ERR() to be a function
In reply to Michael S. TsirkinFrom: Jason Wang <[email protected]>
We used to have a macro for VTD_PE_GET_FPD_ERR() but it has an internal goto which prevents it from being reused. This patch convert that macro to a dedicated function and let the caller to decide what to do (e.g using goto or not). This makes sure it can be re-used for other function that requires fault reporting.
Message-Id: <[email protected]>
--- hw/i386/intel_iommu.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-)
hw/i386/intel_iommu.c +28 -14
@@ -49,17 +49,6 @@/* pe operations */ #define VTD_PE_GET_TYPE (pe) ((pe)->val[0] & VTD_SM_PASID_ENTRY_PGTT)#define VTD_PE_GET_LEVEL (pe) (2 + (((pe)->val[0] >> 2) & VTD_SM_PASID_ENTRY_AW)) -#define VTD_PE_GET_FPD_ERR (ret_fr, is_fpd_set, s, source_id, addr, is_write) {\ - if (ret_fr) { \ - ret_fr = -ret_fr; \ - if (is_fpd_set && vtd_is_qualified_fault(ret_fr)) { \ - trace_vtd_fault_disabled(); \ - } else { \ - vtd_report_dmar_fault(s, source_id, addr, ret_fr, is_write); \ - } \ - goto error; \ - } \ -}/* * PCI bus number (or SID) is not reliable since the device is usaully
@@ -1716,6 +1705,19 @@ out:trace_vtd_pt_enable_fast_path (source_id, success); } +static void vtd_report_fault (IntelIOMMUState *s, +int err,bool is_fpd_set, +uint16_t source_id, +hwaddr addr, +bool is_write) +{ +if (is_fpd_set &&vtd_is_qualified_fault (err)) { +trace_vtd_fault_disabled (); + }else { +vtd_report_dmar_fault (s, source_id, addr, err, is_write); + } +} +/* Map dev to context-entry then do a paging-structures walk to do a iommu * translation. *
@@ -1776,7 +1778,11 @@ static bool vtd_do_iommu_translate(VTDAddressSpace *vtd_as, PCIBus *bus, is_fpd_set = ce.lo &VTD_CONTEXT_ENTRY_FPD ;if (!is_fpd_set && s->root_scalable) { ret_fr =vtd_ce_get_pasid_fpd (s, &ce, &is_fpd_set); -VTD_PE_GET_FPD_ERR (ret_fr, is_fpd_set, s, source_id, addr, is_write); +if (ret_fr) { +vtd_report_fault (s, -ret_fr, is_fpd_set, + source_id, addr, is_write); + goto error; + } } }else { ret_fr =vtd_dev_to_context_entry (s, bus_num, devfn, &ce);
@@ -1784,7 +1790,11 @@ static bool vtd_do_iommu_translate(VTDAddressSpace *vtd_as, PCIBus *bus,if (!ret_fr && !is_fpd_set && s->root_scalable) { ret_fr =vtd_ce_get_pasid_fpd (s, &ce, &is_fpd_set); } -VTD_PE_GET_FPD_ERR (ret_fr, is_fpd_set, s, source_id, addr, is_write); +if (ret_fr) { +vtd_report_fault (s, -ret_fr, is_fpd_set, + source_id, addr, is_write); + goto error; + }/* Update context-cache */ trace_vtd_iotlb_cc_update(bus_num, devfn, ce.hi, ce.lo, cc_entry->context_cache_gen,
@@ -1820,7 +1830,11 @@ static bool vtd_do_iommu_translate(VTDAddressSpace *vtd_as, PCIBus *bus, ret_fr =vtd_iova_to_slpte (s, &ce, addr, is_write, &slpte, &level, &reads, &writes, s->aw_bits); -VTD_PE_GET_FPD_ERR (ret_fr, is_fpd_set, s, source_id, addr, is_write); +if (ret_fr) { +vtd_report_fault (s, -ret_fr, is_fpd_set, source_id, + addr, is_write); + goto error; + } page_mask =vtd_slpt_level_page_mask (level); access_flags =IOMMU_ACCESS_FLAG (reads, writes);
Signature · 1 line
MST
[PULL 86/86] intel-iommu: PASID support
In reply to Michael S. TsirkinFrom: Jason Wang <[email protected]>
This patch introduce ECAP_PASID via "x-pasid-mode". Based on the existing support for scalable mode, we need to implement the following missing parts:
1) tag VTDAddressSpace with PASID and support IOMMU/DMA translation with PASID
2) tag IOTLB with PASID
3) PASID cache and its flush
4) PASID based IOTLB invalidation
For simplicity PASID cache is not implemented so we can simply implement the PASID cache flush as a no and leave it to be implemented in the future. For PASID based IOTLB invalidation, since we haven't had L1 stage support, the PASID based IOTLB invalidation is not implemented yet. For PASID based device IOTLB invalidation, it requires the support for vhost so we forbid enabling device IOTLB when PASID is enabled now. Those work could be done in the future.
Note that though PASID based IOMMU translation is ready but no device can issue PASID DMA right now. In this case, PCI_NO_PASID is used as PASID to identify the address without PASID. vtd_find_add_as() has been extended to provision address space with PASID which could be utilized by the future extension of PCI core to allow device model to use PASID based DMA translation.
This feature would be useful for:
1) prototyping PASID support for devices like virtio
2) future vPASID work
3) future PRS and vSVA work
Message-Id: <[email protected]>
--- hw/i386/intel_iommu_internal.h | 16 +- include/hw/i386/intel_iommu.h | 7 +- include/hw/pci/pci_bus.h | 2 + hw/i386/intel_iommu.c | 416 +++++++++++++++++++++++++-------- hw/i386/trace-events | 2 + 5 files changed, 339 insertions(+), 104 deletions(-)
hw/i386/intel_iommu_internal.h +14 -2
@@ -114,8 +114,9 @@ VTD_INTERRUPT_ADDR_FIRST + 1)/* The shift of source_id in the key of IOTLB hash table */ -#define VTD_IOTLB_SID_SHIFT 36 -#define VTD_IOTLB_LVL_SHIFT 52 +#define VTD_IOTLB_SID_SHIFT 20 +#define VTD_IOTLB_LVL_SHIFT 28 +#define VTD_IOTLB_PASID_SHIFT 30#define VTD_IOTLB_MAX_SIZE 1024/* Max size of the hash table */ /* IOTLB_REG */
@@ -191,6 +192,7 @@#define VTD_ECAP_SC (1ULL << 7)#define VTD_ECAP_MHMV (15ULL << 20)#define VTD_ECAP_SRS (1ULL << 31) +#define VTD_ECAP_PASID (1ULL << 40)#define VTD_ECAP_SMTS (1ULL << 43)#define VTD_ECAP_SLTS (1ULL << 46)
@@ -211,6 +213,8 @@#define VTD_CAP_DRAIN_READ (1ULL << 55)#define VTD_CAP_DRAIN (VTD_CAP_DRAIN_READ | VTD_CAP_DRAIN_WRITE)#define VTD_CAP_CM (1ULL << 7) +#define VTD_PASID_ID_SHIFT 20 +#define VTD_PASID_ID_MASK ((1ULL << VTD_PASID_ID_SHIFT) - 1)/* Supported Adjusted Guest Address Widths */ #define VTD_CAP_SAGAW_SHIFT 8
@@ -262,6 +266,8 @@#define VTD_FRCD_SID (val) ((val) & VTD_FRCD_SID_MASK)/* For the low 64-bit of 128-bit */ #define VTD_FRCD_FI (val) ((val) & ~0xfffULL) +#define VTD_FRCD_PV (val) (((val) & 0xffffULL) << 40) +#define VTD_FRCD_PP (val) (((val) & 0x1) << 31)/* DMA Remapping Fault Conditions */ typedef enum VTDFaultReason {
@@ -379,6 +385,11 @@ typedef union VTDInvDesc VTDInvDesc;#define VTD_INV_DESC_IOTLB_AM (val) ((val) & 0x3fULL)#define VTD_INV_DESC_IOTLB_RSVD_LO 0xffffffff0000ff00ULL#define VTD_INV_DESC_IOTLB_RSVD_HI 0xf80ULL +#define VTD_INV_DESC_IOTLB_PASID_PASID (2ULL << 4) +#define VTD_INV_DESC_IOTLB_PASID_PAGE (3ULL << 4) +#define VTD_INV_DESC_IOTLB_PASID (val) (((val) >> 32) & VTD_PASID_ID_MASK) +#define VTD_INV_DESC_IOTLB_PASID_RSVD_LO 0xfff00000000001c0ULL +#define VTD_INV_DESC_IOTLB_PASID_RSVD_HI 0xf80ULL/* Mask for Device IOTLB Invalidate Descriptor */ #define VTD_INV_DESC_DEVICE_IOTLB_ADDR (val) ((val) & 0xfffffffffffff000ULL)
@@ -413,6 +424,7 @@ typedef union VTDInvDesc VTDInvDesc;/* Information about page-selective IOTLB invalidate */ struct VTDIOTLBPageInvInfo {uint16_t domain_id; +uint32_t pasid;uint64_t addr;uint8_t mask; };
include/hw/i386/intel_iommu.h +6 -1
@@ -97,11 +97,13 @@ struct VTDPASIDEntry {struct VTDAddressSpace {PCIBus *bus;uint8_t devfn; +uint32_t pasid;AddressSpace as;IOMMUMemoryRegion iommu;MemoryRegion root;/* The root container of the device */ MemoryRegion nodmar;/* The alias of shared nodmar MR */ MemoryRegion iommu_ir;/* Interrupt region: 0xfeeXXXXX */ +MemoryRegion iommu_ir_fault;/* Interrupt region for catching fault */ IntelIOMMUState *iommu_state;VTDContextCacheEntry context_cache_entry;QLIST_ENTRY (VTDAddressSpace) next;
@@ -113,6 +115,7 @@ struct VTDAddressSpace {struct VTDIOTLBEntry {uint64_t gfn;uint16_t domain_id; +uint32_t pasid;uint64_t slpte;uint64_t mask;uint8_t access_flags;
@@ -261,6 +264,7 @@ struct IntelIOMMUState {uint8_t aw_bits;/* Host/IOVA address width (in bits) */ bool dma_drain;/* Whether DMA r/w draining enabled */ bool dma_translation;/* Whether DMA translation supported */ +bool pasid;/* Whether to support PASID */ /* * Protects IOMMU states in general. Currently it protects the
@@ -272,6 +276,7 @@ struct IntelIOMMUState {/* Find the VTD Address space associated with the given bus pointer, * create a new one if none exists */ -VTDAddressSpace *vtd_find_add_as (IntelIOMMUState *s,PCIBus *bus,int devfn); +VTDAddressSpace *vtd_find_add_as (IntelIOMMUState *s,PCIBus *bus, +int devfn,unsigned int pasid);#endif
include/hw/pci/pci_bus.h +2 -0
@@ -28,6 +28,8 @@ enum PCIBusFlags { PCI_BUS_CXL = 0x0004, }; +#define PCI_NO_PASID UINT32_MAX +struct PCIBus {BusState qbus;enum PCIBusFlags flags;
hw/i386/intel_iommu.c +315 -101
845 lines not on this page · raw message
hw/i386/trace-events +2 -0
@@ -12,6 +12,8 @@ vtd_inv_desc_cc_devices(uint16_t sid, uint16_t fmask) "context invalidate device vtd_inv_desc_iotlb_global(void) "iotlb invalidate global" vtd_inv_desc_iotlb_domain(uint16_t domain) "iotlb invalidate whole domain 0x%"PRIx16 vtd_inv_desc_iotlb_pages(uint16_t domain, uint64_t addr, uint8_t mask) "iotlb invalidate domain 0x%"PRIx16" addr 0x%"PRIx64" mask 0x%"PRIx8 +vtd_inv_desc_iotlb_pasid_pages(uint16_t domain, uint64_t addr, uint8_t mask, uint32_t pasid) "iotlb invalidate domain 0x%"PRIx16" addr 0x%"PRIx64" mask 0x%"PRIx8" pasid 0x%"PRIx32 +vtd_inv_desc_iotlb_pasid(uint16_t domain, uint32_t pasid) "iotlb invalidate domain 0x%"PRIx16" pasid 0x%"PRIx32 vtd_inv_desc_wait_sw(uint64_t addr, uint32_t data) "wait invalidate status write addr 0x%"PRIx64" data 0x%"PRIx32 vtd_inv_desc_wait_irq(const char *msg) "%s" vtd_inv_desc_wait_write_fail(uint64_t hi, uint64_t lo) "write fail for wait desc hi 0x%"PRIx64" lo 0x%"PRIx64
Signature · 1 line
MST
[PULL 58/86] tests: acpi: whitelist DSDT before generating ICH9_SMB AML automatically
In reply to Michael S. TsirkinFrom: Igor Mammedov <[email protected]>
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +21 -0
@@ -1 +1,22 @@/* List of comma-separated changed AML files to ignore */ +"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",
Signature · 1 line
MST
[PULL 13/86] acpi/tests/avocado/bits: disable acpi PSS tests that are failing in biosbits
In reply to Michael S. TsirkinFrom: Ani Sinha <[email protected]>
PSS tests in acpi test suite seems to be failing in biosbits. This is because the test is unable to find PSS support in QEMU bios. Let us disable them for now so that make check does not fail. We can fix the tests and re-enable them later.
Example failure:
---- ACPI _PSS (Pstate) table conformance tests ---- [assert] _PSS must exist FAIL
\_SB_.CPUS.C000
No _PSS exists
Summary: 1 passed, 1 failed
---- ACPI _PSS (Pstate) runtime tests ---- [assert] _PSS must exist FAIL
\_SB_.CPUS.C000
No _PSS exists
Summary: 0 passed, 1 failed
Message-Id: <[email protected]>
--- tests/avocado/acpi-bits/bits-tests/testacpi.py2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tests/avocado/acpi-bits/bits-tests/testacpi.py2 +2 -2
@@ -36,8 +36,8 @@ import time def register_tests(): testsuite.add_test("ACPI _MAT (Multiple APIC Table Entry) under Processor objects", test_mat, submenu="ACPI Tests") - testsuite.add_test("ACPI _PSS (Pstate) table conformance tests", test_pss, submenu="ACPI Tests") - testsuite.add_test("ACPI _PSS (Pstate) runtime tests", test_pstates, submenu="ACPI Tests") +# testsuite.add_test("ACPI _PSS (Pstate) table conformance tests", test_pss, submenu="ACPI Tests") +# testsuite.add_test("ACPI _PSS (Pstate) runtime tests", test_pstates, submenu="ACPI Tests") testsuite.add_test("ACPI DSDT (Differentiated System Description Table)", test_dsdt, submenu="ACPI Tests") testsuite.add_test("ACPI FACP (Fixed ACPI Description Table)", test_facp, submenu="ACPI Tests") testsuite.add_test("ACPI HPET (High Precision Event Timer Table)", test_hpet, submenu="ACPI Tests")
Signature · 1 line
MST
[PULL 76/86] tests: acpi: q35: add test for hmat nodes without initiators
In reply to Michael S. TsirkinFrom: Brice Goglin <[email protected]>
expected HMAT:
[000h 0000 4] Signature : "HMAT" [Heterogeneous Memory Attributes Table] [004h 0004 4] Table Length : 00000120 [008h 0008 1] Revision : 02 [009h 0009 1] Checksum : 4F [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
[024h 0036 4] Reserved : 00000000
[028h 0040 2] Structure Type : 0000 [Memory Proximity Domain Attributes]
[02Ah 0042 2] Reserved : 0000
[02Ch 0044 4] Length : 00000028
[030h 0048 2] Flags (decoded below) : 0001
Processor Proximity Domain Valid : 1
[032h 0050 2] Reserved1 : 0000
[034h 0052 4] Attached Initiator Proximity Domain : 00000000
[038h 0056 4] Memory Proximity Domain : 00000000
[03Ch 0060 4] Reserved2 : 00000000
[040h 0064 8] Reserved3 : 0000000000000000
[048h 0072 8] Reserved4 : 0000000000000000[050h 0080 2] Structure Type : 0000 [Memory Proximity Domain Attributes]
[052h 0082 2] Reserved : 0000
[054h 0084 4] Length : 00000028
[058h 0088 2] Flags (decoded below) : 0001
Processor Proximity Domain Valid : 1
[05Ah 0090 2] Reserved1 : 0000
[05Ch 0092 4] Attached Initiator Proximity Domain : 00000001
[060h 0096 4] Memory Proximity Domain : 00000001
[064h 0100 4] Reserved2 : 00000000
[068h 0104 8] Reserved3 : 0000000000000000
[070h 0112 8] Reserved4 : 0000000000000000[078h 0120 2] Structure Type : 0000 [Memory Proximity Domain Attributes]
[07Ah 0122 2] Reserved : 0000
[07Ch 0124 4] Length : 00000028
[080h 0128 2] Flags (decoded below) : 0000
Processor Proximity Domain Valid : 0
[082h 0130 2] Reserved1 : 0000
[084h 0132 4] Attached Initiator Proximity Domain : 00000080
[088h 0136 4] Memory Proximity Domain : 00000002
[08Ch 0140 4] Reserved2 : 00000000
[090h 0144 8] Reserved3 : 0000000000000000
[098h 0152 8] Reserved4 : 0000000000000000[0A0h 0160 2] Structure Type : 0001 [System Locality Latency and Bandwidth Information]
[0A2h 0162 2] Reserved : 0000
[0A4h 0164 4] Length : 00000040
[0A8h 0168 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0A9h 0169 1] Data Type : 00
[0AAh 0170 2] Reserved1 : 0000
[0ACh 0172 4] Initiator Proximity Domains # : 00000002
[0B0h 0176 4] Target Proximity Domains # : 00000003
[0B4h 0180 4] Reserved2 : 00000000
[0B8h 0184 8] Entry Base Unit : 0000000000002710
[0C0h 0192 4] Initiator Proximity Domain List : 00000000
[0C4h 0196 4] Initiator Proximity Domain List : 00000001
[0C8h 0200 4] Target Proximity Domain List : 00000000
[0CCh 0204 4] Target Proximity Domain List : 00000001
[0D0h 0208 4] Target Proximity Domain List : 00000002
[0D4h 0212 2] Entry : 0001
[0D6h 0214 2] Entry : 0002
[0D8h 0216 2] Entry : 0003
[0DAh 0218 2] Entry : 0002
[0DCh 0220 2] Entry : 0001
[0DEh 0222 2] Entry : 0003[0E0h 0224 2] Structure Type : 0001 [System Locality Latency and Bandwidth Information]
[0E2h 0226 2] Reserved : 0000
[0E4h 0228 4] Length : 00000040
[0E8h 0232 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0E9h 0233 1] Data Type : 03
[0EAh 0234 2] Reserved1 : 0000
[0ECh 0236 4] Initiator Proximity Domains # : 00000002
[0F0h 0240 4] Target Proximity Domains # : 00000003
[0F4h 0244 4] Reserved2 : 00000000
[0F8h 0248 8] Entry Base Unit : 0000000000000001
[100h 0256 4] Initiator Proximity Domain List : 00000000
[104h 0260 4] Initiator Proximity Domain List : 00000001
[108h 0264 4] Target Proximity Domain List : 00000000
[10Ch 0268 4] Target Proximity Domain List : 00000001
[110h 0272 4] Target Proximity Domain List : 00000002
[114h 0276 2] Entry : 000A
[116h 0278 2] Entry : 0005
[118h 0280 2] Entry : 0001
[11Ah 0282 2] Entry : 0005
[11Ch 0284 2] Entry : 000A
[11Eh 0286 2] Entry : 0001Raw Table Data: Length 288 (0x120)
0000: 48 4D 41 54 20 01 00 00 02 4F 42 4F 43 48 53 20 // HMAT ....OBOCHS
0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC
0020: 01 00 00 00 00 00 00 00 00 00 00 00 28 00 00 00 // ............(...
0030: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0050: 00 00 00 00 28 00 00 00 01 00 00 00 01 00 00 00 // ....(...........
0060: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0070: 00 00 00 00 00 00 00 00 00 00 00 00 28 00 00 00 // ............(...
0080: 00 00 00 00 80 00 00 00 02 00 00 00 00 00 00 00 // ................
0090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00A0: 01 00 00 00 40 00 00 00 00 00 00 00 02 00 00 00 // ....@...........
00B0: 03 00 00 00 00 00 00 00 10 27 00 00 00 00 00 00 // .........'......
00C0: 00 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 // ................
00D0: 02 00 00 00 01 00 02 00 03 00 02 00 01 00 03 00 // ................
00E0: 01 00 00 00 40 00 00 00 00 03 00 00 02 00 00 00 // ....@...........
00F0: 03 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 // ................
0100: 00 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 // ................
0110: 02 00 00 00 0A 00 05 00 01 00 05 00 0A 00 01 00 // ................Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test.c | 50 ++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)
tests/qtest/bios-tables-test.c +50 -0
@@ -1543,6 +1543,54 @@ static void test_acpi_piix4_tcg_acpi_hmat(void)test_acpi_tcg_acpi_hmat (MACHINE_PC ); } +static void test_acpi_q35_tcg_acpi_hmat_noinitiator (void ) +{ +test_data data; + +memset (&data,0 ,sizeof (data)); + data.machine =MACHINE_Q35 ; + data.variant =".acpihmat-noinitiator" ; +test_acpi_one (" -machine hmat=on" +" -smp 4,sockets=2" +" -m 128M" +" -object memory-backend-ram,size=32M,id=ram0" +" -object memory-backend-ram,size=32M,id=ram1" +" -object memory-backend-ram,size=64M,id=ram2" +" -numa node,nodeid=0,memdev=ram0" +" -numa node,nodeid=1,memdev=ram1" +" -numa node,nodeid=2,memdev=ram2" +" -numa cpu,node-id=0,socket-id=0" +" -numa cpu,node-id=0,socket-id=0" +" -numa cpu,node-id=1,socket-id=1" +" -numa cpu,node-id=1,socket-id=1" +" -numa hmat-lb,initiator=0,target=0,hierarchy=memory," +"data-type=access-latency,latency=10" +" -numa hmat-lb,initiator=0,target=0,hierarchy=memory," +"data-type=access-bandwidth,bandwidth=10485760" +" -numa hmat-lb,initiator=0,target=1,hierarchy=memory," +"data-type=access-latency,latency=20" +" -numa hmat-lb,initiator=0,target=1,hierarchy=memory," +"data-type=access-bandwidth,bandwidth=5242880" +" -numa hmat-lb,initiator=0,target=2,hierarchy=memory," +"data-type=access-latency,latency=30" +" -numa hmat-lb,initiator=0,target=2,hierarchy=memory," +"data-type=access-bandwidth,bandwidth=1048576" +" -numa hmat-lb,initiator=1,target=0,hierarchy=memory," +"data-type=access-latency,latency=20" +" -numa hmat-lb,initiator=1,target=0,hierarchy=memory," +"data-type=access-bandwidth,bandwidth=5242880" +" -numa hmat-lb,initiator=1,target=1,hierarchy=memory," +"data-type=access-latency,latency=10" +" -numa hmat-lb,initiator=1,target=1,hierarchy=memory," +"data-type=access-bandwidth,bandwidth=10485760" +" -numa hmat-lb,initiator=1,target=2,hierarchy=memory," +"data-type=access-latency,latency=30" +" -numa hmat-lb,initiator=1,target=2,hierarchy=memory," +"data-type=access-bandwidth,bandwidth=1048576" , + &data); +free_test_data (&data); +} +#ifdef CONFIG_POSIX static void test_acpi_erst (const char *machine) {
@@ -1908,6 +1956,8 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/q35/nohpet" , test_acpi_q35_tcg_nohpet);qtest_add_func ("acpi/q35/dimmpxm" , test_acpi_q35_tcg_dimm_pxm);qtest_add_func ("acpi/q35/acpihmat" , test_acpi_q35_tcg_acpi_hmat); +qtest_add_func ("acpi/q35/acpihmat-noinitiator" , + test_acpi_q35_tcg_acpi_hmat_noinitiator);#ifdef CONFIG_POSIX qtest_add_func ("acpi/q35/acpierst" , test_acpi_q35_acpi_erst);#endif
Signature · 1 line
MST
[PULL 53/86] vhost-user: Fix out of order vring host notification handling
In reply to Michael S. TsirkinFrom: Yajun Wu <[email protected]>
vhost backend sends host notification for every VQ. If backend creates VQs in parallel, the VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG may arrive to QEMU in different order than incremental queue index order.
For example VQ 1's message arrive earlier than VQ 0's:
After alloc VhostUserHostNotifier for VQ 1. GPtrArray becomes
[ nil, VQ1 pointer ]
After alloc VhostUserHostNotifier for VQ 0. GPtrArray becomes
[ VQ0 pointer, nil, VQ1 pointer ]
This is wrong. fetch_notifier will return NULL for VQ 1 in vhost_user_get_vring_base, causes host notifier miss removal(leak).
The fix is to remove current element from GPtrArray, make the right position for element to insert.
Message-Id: <[email protected]>
--- hw/virtio/vhost-user.c | 5 +++++ 1 file changed, 5 insertions(+)
hw/virtio/vhost-user.c +5 -0
@@ -1593,6 +1593,11 @@ static VhostUserHostNotifier *fetch_or_create_notifier(VhostUserState *u, n =g_ptr_array_index (u->notifiers, idx);if (!n) { +/* +* In case notification arrive out-of-order, +* make room for current index. +*/ +g_ptr_array_remove_index (u->notifiers, idx); n =g_new0 (VhostUserHostNotifier,1 ); n->idx = idx;g_ptr_array_insert (u->notifiers, idx, n);
Signature · 1 line
MST
Quoted 7 lines · Michael S. Tsirkin
Holiday here tomorrow, so most likely this is it for features for this release.
The following changes since commit
75d30fde55485b965a1168a21d016dd07b50ed32:Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging (2022-10-30 15:07:25 -0400)
Quoted 7 lines
are available in the Git repository at:
https://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
for you to fetch changes up to
3e624c953b9c37f5aafdf92c16c721818ec8c648:intel-iommu: PASID support (2022-10-31 08:46:50 -0400)
Correction it's 07ee04a2016da0bd1eae615678db26b86923d383
I included a bad commit at the very bottom of the stack.
Quoted 337 lines
----------------------------------------------------------------
pci,pc,virtio: features, tests, fixes, cleanupslots of acpi rework
first version of biosbits infrastructure
ASID support in vhost-vdpacore_count2support in smbios
PCIe DOE emulation
virtio vq reset
HMAT support
part of infrastructure for viommu support in vhost-vdpa VTD PASID support
fixes, tests all over the placeSigned-off-by Michael S. Tsirkin <[email protected]>----------------------------------------------------------------
Akihiko Odaki (1):
msix: Assert that specified vector is in rangeAlex Bennée (1):
virtio: re-ordervm_runninganduse_startedchecksAni Sinha (7):
hw/i386/e820: remove legacy reserved entries for e820 acpi/tests/avocado/bits: initial commit of test scripts that are run by biosbits acpi/tests/avocado/bits: disable acpi PSS tests that are failing in biosbits acpi/tests/avocado/bits: add biosbits config file for running bios tests acpi/tests/avocado/bits: add acpi and smbios avocado tests that uses biosbits acpi/tests/avocado/bits/doc: add a doc file to describe the acpi bits test
MAINTAINERS: add myself as the maintainer for acpi biosbits avocado testsBernhard Beschow (3):
hw/i386/acpi-build: Remove unused struct hw/i386/acpi-build: Resolve redundant attribute hw/i386/acpi-build: Resolve north rather than south bridgesBrice Goglin (4):
hmat acpi: Don't require initiator value in -numa
tests: acpi: add and whitelist *.hmat-noinitiator expected blobs
tests: acpi: q35: add test for hmat nodes without initiators
tests: acpi: q35: update expected blobs *.hmat-noinitiators expected HMAT:Christian A. Ehrhardt (1):
hw/acpi/erst.c: Fix memory handling issuesCindy Lu (1):
vfio: move implement ofvfio_get_xlat_addr()tomemory.cDavid Daney (1):
virtio-rng-pci: Allow setting nvectors, so we can use MSI-XEric Auger (1):
hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root busGregory Price (1):
hw/i386/pc.c: CXL Fixed Memory Window should not reserve e820 in biosHesham Almatary (3):
tests: Add HMAT AArch64/virt empty table files
tests: acpi: aarch64/virt: add a test for hmat nodes with no initiators
tests: virt: Update expected *.acpihmatvirt tablesHuai-Cheng Kuo (3):
hw/pci: PCIe Data Object Exchange emulation hw/cxl/cdat: CXL CDAT Data Object Exchange implementation hw/mem/cxl-type3: Add CXL CDAT Data Object ExchangeIgor Mammedov (11):
acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors
tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML automatically
acpi: pc/q35: drop ad-hoc PCI-ISA bridge AML routines and let bus ennumeration generate AML
tests: acpi: update expected DSDT after ISA bridge is moved directly under PCI host bridge
tests: acpi: whitelist DSDT before generatingICH9_SMBAML automatically
acpi: addget_dev_aml_func()helper
acpi: enumerate SMB bridge automatically along with other PCI devices
tests: acpi: update expected blobs
tests: acpi: pc/q35 whitelist DSDT before \_GPE cleanup
acpi: pc/35: sanitize_GPEdeclaration order
tests: acpi: update expected blobsJason Wang (4):
intel-iommu: don't warn guest errors when getting rid2pasid entry
intel-iommu: drop VTDBus
intel-iommu: convertVTD_PE_GET_FPD_ERR()to be a function
intel-iommu: PASID supportJonathan Cameron (2):
hw/mem/cxl-type3: Add MSIX support hw/pci-bridge/cxl-upstream: Add a CDAT table access DOEJulia Suvorova (5):
hw/smbios: addcore_count2to smbios table type 4
bios-tables-test: teach test to use smbios 3.0 tables tests/acpi: allow changes forcore_count2test
bios-tables-test: add test for number of cores > 255 tests/acpi: update tables for new core count testKangjie Xu (10):
virtio: introducevirtio_queue_enable()
virtio: core: vq reset feature negotation support
virtio-pci: support queue enable
vhost: exposevhost_virtqueue_start()
vhost: exposevhost_virtqueue_stop()
vhost-net: vhost-kernel: introducevhost_net_virtqueue_reset()
vhost-net: vhost-kernel: introducevhost_net_virtqueue_restart()
virtio-net: introduceflush_or_purge_queued_packets()
virtio-net: supportqueue_enable
vhost: vhost-kernel: enable vq reset featureLei He (4):
virtio-crypto: Support asynchronous mode
crypto: Support DER encodings
crypto: Support export akcipher to pkcs8
cryptodev: Add a lkcf-backend for cryptodevLev Kujawski (2):
qpci_device_enable: Allow for command bits hardwired to 0 hw/ide/piix: Ignore writes of hardwired PCI command register bitsMarkus Armbruster (1):
MAINTAINERS: Addqapi/virtio.jsonto section "virtio"Michael S. Tsirkin (1):
bios-tables-test: do not ignore allowed diff listMiguel Luis (4):
tests/acpi: virt: allow acpi MADT and FADT changes
acpi: fadt: support revision 6.0 of the ACPI specification
acpi: arm/virt: madt: bump to revision 4 accordingly to ACPI 6.0 Errata A tests/acpi: virt: update ACPI MADT and FADT binariesRobert Hoo (5):
tests/acpi: allow SSDT changes
acpi/ssdt: Fixaml_or()andaml_and()in if clause acpi/nvdimm: define macro for NVDIMM Device_DSMacpi/nvdimm: Implement ACPI NVDIMM Label Methods test/acpi/bios-tables-test: SSDT: update golden master binariesThomas Huth (1):
tests/qtest/cxl-test: Remove temporary directories after testingXiang Chen (1):
hw/arm/virt: Enable HMAT on arm virt machineXuan Zhuo (5):
virtio: introduce__virtio_queue_reset()
virtio: introducevirtio_queue_reset()
virtio-pci: support queue reset
virtio-net: support queue reset
virtio-net: enable vq reset featureYajun Wu (3):
vhost: Change the sequence of device start
vhost-user: Supportvhost_dev_start
vhost-user: Fix out of order vring host notification handlingtests/avocado/acpi-bits/bits-config/bits-cfg.txt | 18 + qapi/qom.json | 2 + crypto/der.h | 211 +- crypto/rsakey.h | 11 +- hw/display/vga_int.h | 2 + hw/i386/e820_memory_layout.h | 8 - hw/i386/fw_cfg.h | 1 - hw/i386/intel_iommu_internal.h | 16 +- hw/smbios/smbios_build.h | 9 +- include/crypto/akcipher.h | 21 + include/exec/memory.h | 4 + include/hw/acpi/acpi_aml_interface.h | 13 +- include/hw/cxl/cxl_cdat.h | 166 ++ include/hw/cxl/cxl_component.h | 7 + include/hw/cxl/cxl_device.h | 3 + include/hw/cxl/cxl_pci.h | 1 + include/hw/firmware/smbios.h | 12 + include/hw/i386/intel_iommu.h | 18 +- include/hw/ide/pci.h | 1 + include/hw/pci/msix.h | 4 +- include/hw/pci/pci_bus.h | 2 + include/hw/pci/pci_ids.h | 3 + include/hw/pci/pcie.h | 1 + include/hw/pci/pcie_doe.h | 123 ++ include/hw/pci/pcie_regs.h | 4 + include/hw/virtio/vhost.h | 5 + include/hw/virtio/virtio-pci.h | 5 + include/hw/virtio/virtio.h | 16 +- include/net/vhost_net.h | 4 + include/sysemu/cryptodev.h | 61 +- tests/qtest/libqos/pci.h | 1 + backends/cryptodev-builtin.c | 69 +- backends/cryptodev-lkcf.c | 645 ++++++ backends/cryptodev-vhost-user.c | 53 +- backends/cryptodev.c | 44 +- crypto/akcipher.c | 18 + crypto/der.c | 313 ++- crypto/rsakey.c | 42 + hw/acpi/aml-build.c | 13 +- hw/acpi/erst.c | 6 +- hw/acpi/nvdimm.c | 106 +- hw/arm/virt-acpi-build.c | 33 +- hw/block/vhost-user-blk.c | 18 +- hw/core/machine.c | 10 +- hw/cxl/cxl-cdat.c | 224 ++ hw/display/acpi-vga-stub.c | 7 + hw/display/acpi-vga.c | 26 + hw/display/vga-pci.c | 4 + hw/i386/acpi-build.c | 203 +- hw/i386/e820_memory_layout.c | 20 +- hw/i386/fw_cfg.c | 3 - hw/i386/intel_iommu.c | 692 +++--- hw/i386/microvm.c | 2 - hw/i386/pc.c | 2 - hw/ide/piix.c | 24 + hw/isa/lpc_ich9.c | 23 + hw/isa/piix3.c | 17 +- hw/mem/cxl_type3.c | 264 +++ hw/net/e1000e.c | 15 +- hw/net/rocker/rocker.c | 23 +- hw/net/vhost_net-stub.c | 12 + hw/net/vhost_net.c | 91 +- hw/net/virtio-net.c | 57 +- hw/net/vmxnet3.c | 27 +- hw/nvme/ctrl.c | 5 +- hw/pci-bridge/cxl_upstream.c | 195 +- hw/pci/msix.c | 24 +- hw/pci/pcie_doe.c | 367 ++++ hw/rdma/vmw/pvrdma_main.c | 7 +- hw/remote/vfio-user-obj.c | 9 +- hw/smbios/smbios.c | 19 +- hw/vfio/common.c | 66 +- hw/virtio/vhost-user.c | 79 +- hw/virtio/vhost.c | 16 +- hw/virtio/virtio-crypto.c | 326 +-- hw/virtio/virtio-iommu-pci.c | 12 +- hw/virtio/virtio-pci.c | 83 +- hw/virtio/virtio-rng-pci.c | 14 + hw/virtio/virtio.c | 62 +- softmmu/memory.c | 72 + tests/qtest/bios-tables-test.c | 269 ++- tests/qtest/cxl-test.c | 3 + tests/qtest/ide-test.c | 1 + tests/qtest/libqos/pci.c | 13 +- tests/unit/test-crypto-der.c | 126 +- MAINTAINERS | 15 + backends/meson.build | 3 + docs/devel/acpi-bits.rst | 145 ++ docs/devel/index-build.rst | 1 + hw/arm/Kconfig | 1 + hw/cxl/meson.build | 1 + hw/display/meson.build | 17 + hw/i386/trace-events | 2 + hw/pci/meson.build | 1 + tests/avocado/acpi-bits.py | 396 ++++ tests/avocado/acpi-bits/bits-tests/smbios.py2 | 2430 ++++++++++++++++++++++ tests/avocado/acpi-bits/bits-tests/testacpi.py2 | 283 +++ tests/avocado/acpi-bits/bits-tests/testcpuid.py2 | 83 + tests/data/acpi/pc/DSDT | Bin 6422 -> 6501 bytes tests/data/acpi/pc/DSDT.acpierst | Bin 6382 -> 6461 bytes tests/data/acpi/pc/DSDT.acpihmat | Bin 7747 -> 7826 bytes tests/data/acpi/pc/DSDT.bridge | Bin 9496 -> 9575 bytes tests/data/acpi/pc/DSDT.cphp | Bin 6886 -> 6965 bytes tests/data/acpi/pc/DSDT.dimmpxm | Bin 8076 -> 8155 bytes tests/data/acpi/pc/DSDT.hpbridge | Bin 6382 -> 6461 bytes tests/data/acpi/pc/DSDT.hpbrroot | Bin 3069 -> 3107 bytes tests/data/acpi/pc/DSDT.ipmikcs | Bin 6494 -> 6573 bytes tests/data/acpi/pc/DSDT.memhp | Bin 7781 -> 7860 bytes tests/data/acpi/pc/DSDT.nohpet | Bin 6280 -> 6359 bytes tests/data/acpi/pc/DSDT.numamem | Bin 6428 -> 6507 bytes tests/data/acpi/pc/DSDT.roothp | Bin 6656 -> 6699 bytes tests/data/acpi/pc/SSDT.dimmpxm | Bin 734 -> 1815 bytes tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 0 -> 144 bytes tests/data/acpi/q35/APIC.core-count2 | Bin 0 -> 2478 bytes tests/data/acpi/q35/DSDT | Bin 8320 -> 8412 bytes tests/data/acpi/q35/DSDT.acpierst | Bin 8337 -> 8429 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9645 -> 9737 bytes tests/data/acpi/q35/DSDT.acpihmat-noinitiator | Bin 0 -> 8553 bytes tests/data/acpi/q35/DSDT.applesmc | Bin 8366 -> 8458 bytes tests/data/acpi/q35/DSDT.bridge | Bin 11449 -> 11541 bytes tests/data/acpi/q35/DSDT.core-count2 | Bin 0 -> 32414 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8784 -> 8876 bytes tests/data/acpi/q35/DSDT.cxl | Bin 9646 -> 9738 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9974 -> 10066 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 8395 -> 8487 bytes tests/data/acpi/q35/DSDT.ipmismbus | Bin 8409 -> 8500 bytes tests/data/acpi/q35/DSDT.ivrs | Bin 8337 -> 8429 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9679 -> 9771 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 9450 -> 9542 bytes tests/data/acpi/q35/DSDT.multi-bridge | Bin 8640 -> 8732 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 8178 -> 8270 bytes tests/data/acpi/q35/DSDT.numamem | Bin 8326 -> 8418 bytes tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 8421 -> 8513 bytes tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8926 -> 9018 bytes tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8952 -> 9044 bytes tests/data/acpi/q35/DSDT.viot | Bin 9429 -> 9521 bytes tests/data/acpi/q35/DSDT.xapic | Bin 35683 -> 35775 bytes tests/data/acpi/q35/FACP.core-count2 | Bin 0 -> 244 bytes tests/data/acpi/q35/HMAT.acpihmat-noinitiator | Bin 0 -> 288 bytes tests/data/acpi/q35/SRAT.acpihmat-noinitiator | Bin 0 -> 312 bytes tests/data/acpi/q35/SSDT.dimmpxm | Bin 734 -> 1815 bytes tests/data/acpi/virt/APIC | Bin 168 -> 172 bytes tests/data/acpi/virt/APIC.acpihmatvirt | Bin 0 -> 396 bytes tests/data/acpi/virt/APIC.memhp | Bin 168 -> 172 bytes tests/data/acpi/virt/APIC.numamem | Bin 168 -> 172 bytes tests/data/acpi/virt/DSDT.acpihmatvirt | Bin 0 -> 5282 bytes tests/data/acpi/virt/FACP | Bin 268 -> 276 bytes tests/data/acpi/virt/FACP.memhp | Bin 268 -> 276 bytes tests/data/acpi/virt/FACP.numamem | Bin 268 -> 276 bytes tests/data/acpi/virt/HMAT.acpihmatvirt | Bin 0 -> 288 bytes tests/data/acpi/virt/PPTT.acpihmatvirt | Bin 0 -> 196 bytes tests/data/acpi/virt/SRAT.acpihmatvirt | Bin 0 -> 240 bytes tests/data/acpi/virt/SSDT.memhp | Bin 736 -> 1817 bytes 153 files changed, 7991 insertions(+), 1014 deletions(-) create mode 100644 tests/avocado/acpi-bits/bits-config/bits-cfg.txt create mode 100644 include/hw/cxl/cxl_cdat.h create mode 100644 include/hw/pci/pcie_doe.h create mode 100644 backends/cryptodev-lkcf.c create mode 100644 hw/cxl/cxl-cdat.c create mode 100644 hw/display/acpi-vga-stub.c create mode 100644 hw/display/acpi-vga.c create mode 100644 hw/pci/pcie_doe.c create mode 100644 docs/devel/acpi-bits.rst create mode 100644 tests/avocado/acpi-bits.py create mode 100644 tests/avocado/acpi-bits/bits-tests/smbios.py2 create mode 100644 tests/avocado/acpi-bits/bits-tests/testacpi.py2 create mode 100644 tests/avocado/acpi-bits/bits-tests/testcpuid.py2 create mode 100644 tests/data/acpi/q35/APIC.acpihmat-noinitiator create mode 100644 tests/data/acpi/q35/APIC.core-count2 create mode 100644 tests/data/acpi/q35/DSDT.acpihmat-noinitiator create mode 100644 tests/data/acpi/q35/DSDT.core-count2 create mode 100644 tests/data/acpi/q35/FACP.core-count2 create mode 100644 tests/data/acpi/q35/HMAT.acpihmat-noinitiator create mode 100644 tests/data/acpi/q35/SRAT.acpihmat-noinitiator create mode 100644 tests/data/acpi/virt/APIC.acpihmatvirt create mode 100644 tests/data/acpi/virt/DSDT.acpihmatvirt create mode 100644 tests/data/acpi/virt/HMAT.acpihmatvirt create mode 100644 tests/data/acpi/virt/PPTT.acpihmatvirt create mode 100644 tests/data/acpi/virt/SRAT.acpihmatvirt
Quoted 2 lines · Michael S. Tsirkin
Lei He (4):
virtio-crypto: Support asynchronous mode
The following clang warning breaks the build. Please resend a fixed pull request, thanks!
clang -m64 -mcx16 -Ilibqemu-x86_64-softmmu.fa.p -I. -I.. -Itarget/i386 -I../target/i386 -Iqapi -Itrace -Iui -Iui/shader -I/usr/include/pixman-1 -I/usr/include/capstone -I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/cacard -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/sysprof-4 -I/usr/include/nss3 -I/usr/include/nspr4 -I/usr/include/PCSC -flto -fcolor-diagnostics -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g -isystem /builds/qemu-project/qemu/linux-headers -isystem linux-headers -iquote . -iquote /builds/qemu-project/qemu -iquote /builds/qemu-project/qemu/include -iquote /builds/qemu-project/qemu/tcg/i386 -pthread -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wno-initializer-overrides -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-string-plus-int -Wno-typedef-redefinition -Wno-tautological-type-limit-compare -Wno-psabi -Wno-gnu-variable-sized-type-not-at-end -fstack-protector-strong -fsanitize=safe-stack -fsanitize=cfi-icall -fsanitize-cfi-icall-generalize-pointers -fno-sanitize-trap=cfi-icall -fPIE -isystem../linux-headers -isystemlinux-headers -DNEED_CPU_H '-DCONFIG_TARGET="x86_64-softmmu-config-target.h"' '-DCONFIG_DEVICES="x86_64-softmmu-config-devices.h"' -MD -MQ libqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o -MF libqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o.d -o libqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o -c ../hw/virtio/virtio-crypto.c ../hw/virtio/virtio-crypto.c:569:30: error: unused variable 'in_iov_copy' [-Werror,-Wunused-variable]g_autofree struct iovec *in_iov_copy = req->in_iov;
^
https://gitlab.com/qemu-project/qemu/-/jobs/3253703167
Stefan
Quoted 7 lines · Stefan Hajnoczi
Quoted 2 lines · Michael S. Tsirkin
Lei He (4):
virtio-crypto: Support asynchronous modeThe following clang warning breaks the build. Please resend a fixed pull request, thanks!
On second thought, I have fixed up the merge commit manually since Michael is offline tomorrow for the soft freeze deadline. If CI passes then I'll apply this pull request (with my fixup) and you won't need to resend.
Quoted 40 lines
clang -m64 -mcx16 -Ilibqemu-x86_64-softmmu.fa.p -I. -I.. -Itarget/i386
(quoted diff) +0
-8-I../target/i386 -Iqapi -Itrace -Iui -Iui/shader -I/usr/include/pixman-1 -I/usr/include/capstone -I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/cacard -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/sysprof-4 -I/usr/include/nss3 -I/usr/include/nspr4 -I/usr/include/PCSC -flto -fcolor-diagnostics -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g -isystem /builds/qemu-project/qemu/linux-headers -isystemlinux-headers -iquote . -iquote /builds/qemu-project/qemu -iquote /builds/qemu-project/qemu/include -iquote /builds/qemu-project/qemu/tcg/i386 -pthread -D_GNU_SOURCE
(quoted diff) +0
-13-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wno-initializer-overrides -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-string-plus-int -Wno-typedef-redefinition -Wno-tautological-type-limit-compare -Wno-psabi -Wno-gnu-variable-sized-type-not-at-end -fstack-protector-strong -fsanitize=safe-stack -fsanitize=cfi-icall -fsanitize-cfi-icall-generalize-pointers -fno-sanitize-trap=cfi-icall -fPIE -isystem../linux-headers -isystemlinux-headers -DNEED_CPU_H'-DCONFIG_TARGET="x86_64-softmmu-config-target.h"' '-DCONFIG_DEVICES="x86_64-softmmu-config-devices.h"' -MD -MQ
libqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o-MF libqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o.d -olibqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o-c../hw/virtio/virtio-crypto.c../hw/virtio/virtio-crypto.c:569:30: error: unused variable 'in_iov_copy' [-Werror,-Wunused-variable]g_autofreestruct iovec*in_iov_copy=req->in_iov; ^https://gitlab.com/qemu-project/qemu/-/jobs/3253703167
Stefan
Quoted 6 lines · Stefan Hajnoczi
Quoted 5 lines · Stefan Hajnoczi
Quoted 2 lines · Michael S. Tsirkin
Lei He (4):
virtio-crypto: Support asynchronous mode
Quoted 7 lines
Quoted 2 lines
The following clang warning breaks the build. Please resend a fixed pull request, thanks!
On second thought, I have fixed up the merge commit manually since Michael is offline tomorrow for the soft freeze deadline. If CI passes then I'll apply this pull request (with my fixup) and you won't need to resend.
Hmm what's the fixup?
I came up with:
hw/virtio/virtio-crypto.c +1 -1
@@ -495,6 +495,7 @@ static void virtio_crypto_free_request(VirtIOCryptoReq *req) } } +g_free (req->in_iov);g_free (req); }
@@ -566,7 +567,6 @@ static void virtio_crypto_req_complete(void *opaque, int ret)VirtIOCrypto *vcrypto = req->vcrypto;VirtIODevice *vdev =VIRTIO_DEVICE (vcrypto);uint8_t status = -ret; - g_autofree struct iovec *in_iov_copy = req->in_iov;if (req->flags ==CRYPTODEV_BACKEND_ALG_SYM ) { virtio_crypto_sym_input_data_helper(vdev, req, status,
Quoted 40 lines
Quoted 40 lines
clang -m64 -mcx16 -Ilibqemu-x86_64-softmmu.fa.p -I. -I.. -Itarget/i386
(quoted diff) +0
-8-I../target/i386 -Iqapi -Itrace -Iui -Iui/shader -I/usr/include/pixman-1 -I/usr/include/capstone -I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/cacard -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/sysprof-4 -I/usr/include/nss3 -I/usr/include/nspr4 -I/usr/include/PCSC -flto -fcolor-diagnostics -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g -isystem /builds/qemu-project/qemu/linux-headers -isystemlinux-headers -iquote . -iquote /builds/qemu-project/qemu -iquote /builds/qemu-project/qemu/include -iquote /builds/qemu-project/qemu/tcg/i386 -pthread -D_GNU_SOURCE
(quoted diff) +0
-13-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wno-initializer-overrides -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-string-plus-int -Wno-typedef-redefinition -Wno-tautological-type-limit-compare -Wno-psabi -Wno-gnu-variable-sized-type-not-at-end -fstack-protector-strong -fsanitize=safe-stack -fsanitize=cfi-icall -fsanitize-cfi-icall-generalize-pointers -fno-sanitize-trap=cfi-icall -fPIE -isystem../linux-headers -isystemlinux-headers -DNEED_CPU_H'-DCONFIG_TARGET="x86_64-softmmu-config-target.h"' '-DCONFIG_DEVICES="x86_64-softmmu-config-devices.h"' -MD -MQ
libqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o-MF libqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o.d -olibqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o-c../hw/virtio/virtio-crypto.c../hw/virtio/virtio-crypto.c:569:30: error: unused variable 'in_iov_copy' [-Werror,-Wunused-variable]g_autofreestruct iovec*in_iov_copy=req->in_iov; ^https://gitlab.com/qemu-project/qemu/-/jobs/3253703167
Stefan
Quoted 32 lines · Michael S. Tsirkin
Quoted 6 lines · Stefan Hajnoczi
Quoted 5 lines · Stefan Hajnoczi
Quoted 2 lines · Michael S. Tsirkin
Lei He (4):
virtio-crypto: Support asynchronous modeQuoted 7 lines
Quoted 2 lines
The following clang warning breaks the build. Please resend a fixed pull request, thanks!
On second thought, I have fixed up the merge commit manually since Michael is offline tomorrow for the soft freeze deadline. If CI passes then I'll apply this pull request (with my fixup) and you won't need to resend.
Hmm what's the fixup?
I came up with:hw/virtio/virtio-crypto.c +1
-0@@ -495,6 +495,7 @@ static void virtio_crypto_free_request(VirtIOCryptoReq *req) } } +g_free (req->in_iov);g_free (req); }
hw/virtio/virtio-crypto.c static void virtio_crypto_req_complete(void *opaque, int ret) · line 572
Quoted 7 lines
hw/virtio/virtio-crypto.c +0
-1@@ -566,7 +567,6 @@ static void virtio_crypto_req_complete(void *opaque, int ret)VirtIOCrypto *vcrypto = req->vcrypto;VirtIODevice *vdev =VIRTIO_DEVICE (vcrypto);uint8_t status = -ret; - g_autofree struct iovec *in_iov_copy = req->in_iov;if (req->flags ==CRYPTODEV_BACKEND_ALG_SYM ) { virtio_crypto_sym_input_data_helper(vdev, req, status,
Not that is not right either.
Quoted 41 lines
Quoted 41 lines
Quoted 41 lines
clang -m64 -mcx16 -Ilibqemu-x86_64-softmmu.fa.p -I. -I.. -Itarget/i386
(quoted diff) +0
-8-I../target/i386 -Iqapi -Itrace -Iui -Iui/shader -I/usr/include/pixman-1 -I/usr/include/capstone -I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/cacard -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/sysprof-4 -I/usr/include/nss3 -I/usr/include/nspr4 -I/usr/include/PCSC -flto -fcolor-diagnostics -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g -isystem /builds/qemu-project/qemu/linux-headers -isystemlinux-headers -iquote . -iquote /builds/qemu-project/qemu -iquote /builds/qemu-project/qemu/include -iquote /builds/qemu-project/qemu/tcg/i386 -pthread -D_GNU_SOURCE
(quoted diff) +0
-13-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wno-initializer-overrides -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-string-plus-int -Wno-typedef-redefinition -Wno-tautological-type-limit-compare -Wno-psabi -Wno-gnu-variable-sized-type-not-at-end -fstack-protector-strong -fsanitize=safe-stack -fsanitize=cfi-icall -fsanitize-cfi-icall-generalize-pointers -fno-sanitize-trap=cfi-icall -fPIE -isystem../linux-headers -isystemlinux-headers -DNEED_CPU_H'-DCONFIG_TARGET="x86_64-softmmu-config-target.h"' '-DCONFIG_DEVICES="x86_64-softmmu-config-devices.h"' -MD -MQ
libqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o-MF libqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o.d -olibqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o-c../hw/virtio/virtio-crypto.c../hw/virtio/virtio-crypto.c:569:30: error: unused variable 'in_iov_copy' [-Werror,-Wunused-variable]g_autofreestruct iovec*in_iov_copy=req->in_iov; ^https://gitlab.com/qemu-project/qemu/-/jobs/3253703167
Stefan
Quoted 37 lines · Michael S. Tsirkin
Quoted 36 lines · Michael S. Tsirkin
Quoted 6 lines · Stefan Hajnoczi
Quoted 5 lines · Stefan Hajnoczi
Quoted 2 lines · Michael S. Tsirkin
Lei He (4):
virtio-crypto: Support asynchronous modeQuoted 7 lines
Quoted 2 lines
The following clang warning breaks the build. Please resend a fixed pull request, thanks!
On second thought, I have fixed up the merge commit manually since Michael is offline tomorrow for the soft freeze deadline. If CI passes then I'll apply this pull request (with my fixup) and you won't need to resend.
Hmm what's the fixup?
I came up with:hw/virtio/virtio-crypto.c +1
-1@@ -495,6 +495,7 @@ static void virtio_crypto_free_request(VirtIOCryptoReq *req) } } +g_free (req->in_iov);g_free (req); }@@ -566,7 +567,6 @@ static void virtio_crypto_req_complete(void *opaque, int ret)VirtIOCrypto *vcrypto = req->vcrypto;VirtIODevice *vdev =VIRTIO_DEVICE (vcrypto);uint8_t status = -ret; - g_autofree struct iovec *in_iov_copy = req->in_iov;
Quoted 6 lines
hw/virtio/virtio-crypto.c static void virtio_crypto_req_complete(void *opaque, int ret) · line 572
Quoted 3 lines
hw/virtio/virtio-crypto.c +0
-0if (req->flags ==CRYPTODEV_BACKEND_ALG_SYM ) { virtio_crypto_sym_input_data_helper(vdev, req, status,Not that is not right either.
Or maybe yes ... still wanted to see what you came up with. Pretty tired here.
Quoted 41 lines
Quoted 41 lines
Quoted 41 lines
Quoted 41 lines
clang -m64 -mcx16 -Ilibqemu-x86_64-softmmu.fa.p -I. -I.. -Itarget/i386
(quoted diff) +0
-8-I../target/i386 -Iqapi -Itrace -Iui -Iui/shader -I/usr/include/pixman-1 -I/usr/include/capstone -I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/cacard -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/sysprof-4 -I/usr/include/nss3 -I/usr/include/nspr4 -I/usr/include/PCSC -flto -fcolor-diagnostics -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g -isystem /builds/qemu-project/qemu/linux-headers -isystemlinux-headers -iquote . -iquote /builds/qemu-project/qemu -iquote /builds/qemu-project/qemu/include -iquote /builds/qemu-project/qemu/tcg/i386 -pthread -D_GNU_SOURCE
(quoted diff) +0
-13-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wno-initializer-overrides -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-string-plus-int -Wno-typedef-redefinition -Wno-tautological-type-limit-compare -Wno-psabi -Wno-gnu-variable-sized-type-not-at-end -fstack-protector-strong -fsanitize=safe-stack -fsanitize=cfi-icall -fsanitize-cfi-icall-generalize-pointers -fno-sanitize-trap=cfi-icall -fPIE -isystem../linux-headers -isystemlinux-headers -DNEED_CPU_H'-DCONFIG_TARGET="x86_64-softmmu-config-target.h"' '-DCONFIG_DEVICES="x86_64-softmmu-config-devices.h"' -MD -MQ
libqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o-MF libqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o.d -olibqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o-c../hw/virtio/virtio-crypto.c../hw/virtio/virtio-crypto.c:569:30: error: unused variable 'in_iov_copy' [-Werror,-Wunused-variable]g_autofreestruct iovec*in_iov_copy=req->in_iov; ^https://gitlab.com/qemu-project/qemu/-/jobs/3253703167
Stefan
Hi Michael,
I removed the local variable in virtio_crypto_req_complete() since it's unused:
- g_autofree struct iovec *in_iov_copy = req->in_iov;
Stefan
Hi Michael,
The fuzzer is not happy with qpci_device_enable():
https://gitlab.com/qemu-project/qemu/-/jobs/3253817499
Stefan
Here is another CI failure:
qemu-system-i386: current -smp configuration requires kernel irqchip and X2APIC API support.
Broken pipe../tests/qtest/libqtest.c:179: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
TAP parsing error: Too few tests run (expected 49, got 22)
(test program exited with status code -6) ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― 6/202 qemu:qtest+qtest-i386 / qtest-i386/test-hmp OK 7.46s 9 subtests passed ▶ 7/202 ERROR:../tests/qtest/bios-tables-test.c:533:test_acpi_asl:
assertion failed: (all_tables_match) ERROR
7/202 qemu:qtest+qtest-aarch64 / qtest-aarch64/bios-tables-test ERROR 108.34s killed by signal 6 SIGABRT
Quoted 1 line
Quoted 1 line
Quoted 1 line
G_TEST_DBUS_DAEMON=/builds/qemu-project/qemu/tests/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-aarch64 MALLOC_PERTURB_=89 /builds/qemu-project/qemu/build/tests/qtest/bios-tables-test --tap -k
――――――――――――――――――――――――――――――――――――― ✀ ――――――――――――――――――――――――――――――――――――― stderr:
acpi-test: Warning! APIC binary file mismatch. Actual [aml:/tmp/aml-UKB6U1], Expected [aml:tests/data/acpi/virt/APIC.acpihmatvirt].
See source file tests/qtest/bios-tables-test.c for instructions on how to update expected files.
to see ASL diff between mismatched files install IASL, rebuild QEMU from scratch and re-run tests with V=1 environment variable set** ERROR:../tests/qtest/bios-tables-test.c:533:test_acpi_asl: assertion
failed: (all_tables_match)
(test program exited with status code -6)
Another CI failure:
https://gitlab.com/qemu-project/qemu/-/jobs/3253817492
Stefan
Quoted 4 lines · Stefan Hajnoczi
Another CI failure:
https://gitlab.com/qemu-project/qemu/-/jobs/3253817492Stefan
Thanks!
Freeze rules only require pull request on list so I think it's ok if I handle the failout and resubmit day after tomorrow, right?
Signature · 1 line
MST
Quoted 10 lines · Michael S. Tsirkin
Quoted 4 lines · Stefan Hajnoczi
Another CI failure:
https://gitlab.com/qemu-project/qemu/-/jobs/3253817492Stefan
Thanks!
Freeze rules only require pull request on list so I think it's ok if I handle the failout and resubmit day after tomorrow, right?
Yes, exactly. That's fine!
https://wiki.qemu.org/Planning/SoftFeatureFreeze
Happy Election Day :)
Stefan
HMAT patches failure (was Re: [PULL 00/86] pci,pc,virtio: features, tests, fixes, cleanups)
In reply to Stefan HajnocziQuoted 29 lines · Stefan Hajnoczi
Here is another CI failure:
qemu-system-i386: current -smp configuration requires kernel irqchip and X2APIC API support.
Broken pipe../tests/qtest/libqtest.c:179:kill_qemu()tried to terminate QEMU process but encountered exit status 1 (expected 0)
TAP parsing error: Too few tests run (expected 49, got 22)
(test program exited with status code -6) ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― 6/202 qemu:qtest+qtest-i386 / qtest-i386/test-hmp OK 7.46s 9 subtests passed ▶ 7/202 ERROR:../tests/qtest/bios-tables-test.c:533:test_acpi_asl:
assertion failed: (all_tables_match) ERROR
7/202 qemu:qtest+qtest-aarch64 / qtest-aarch64/bios-tables-test ERROR 108.34s killed by signal 6 SIGABRTQuoted 1 line
Quoted 1 line
Quoted 1 line
G_TEST_DBUS_DAEMON=/builds/qemu-project/qemu/tests/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-aarch64 MALLOC_PERTURB_=89 /builds/qemu-project/qemu/build/tests/qtest/bios-tables-test --tap -k
――――――――――――――――――――――――――――――――――――― ✀ ――――――――――――――――――――――――――――――――――――― stderr:
acpi-test: Warning! APIC binary file mismatch. Actual [aml:/tmp/aml-UKB6U1], Expected [aml:tests/data/acpi/virt/APIC.acpihmatvirt].
See source filetests/qtest/bios-tables-test.cfor instructions on how to update expected files.
to see ASL diff between mismatched files install IASL, rebuild QEMU from scratch and re-run tests with V=1 environment variable set** ERROR:../tests/qtest/bios-tables-test.c:533:test_acpi_asl: assertion
failed: (all_tables_match)
(test program exited with status code -6)
Hesham Jonathan pls take a look, if you post a fixup today or early tomorrow I can squash it
and then this patchset can still be included in the release.
Thanks!
Signature · 1 line
MST
Re: HMAT patches failure (was Re: [PULL 00/86] pci,pc,virtio: features, tests, fixes, cleanups)
Quoted 9 lines · On Tue, 1 Nov 2022 06:32:05 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
Quoted 8 lines · Stefan Hajnoczi
Here is another CI failure:
qemu-system-i386: current -smp configuration requires kernel irqchip and X2APIC API support.
Broken pipe../tests/qtest/libqtest.c:179:kill_qemu()tried to terminate QEMU process but encountered exit status 1 (expected 0)
TAP parsing error: Too few tests run (expected 49, got 22)
Got a bit thrown by this which is unrelated to the HMAT series. Given I bisected it...
bios-tables-test: add test for number of cores > 255
seems to be issue. I'll take a look into why shortly.
Quoted 8 lines
Quoted 8 lines
(test program exited with status code -6) ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― 6/202 qemu:qtest+qtest-i386 / qtest-i386/test-hmp OK 7.46s 9 subtests passed ▶ 7/202 ERROR:../tests/qtest/bios-tables-test.c:533:test_acpi_asl:
assertion failed: (all_tables_match) ERROR
7/202 qemu:qtest+qtest-aarch64 / qtest-aarch64/bios-tables-test ERROR 108.34s killed by signal 6 SIGABRTQuoted 1 line
Quoted 1 line
Quoted 1 line
G_TEST_DBUS_DAEMON=/builds/qemu-project/qemu/tests/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-aarch64 MALLOC_PERTURB_=89 /builds/qemu-project/qemu/build/tests/qtest/bios-tables-test --tap -k
Quoted 11 lines
Quoted 11 lines
――――――――――――――――――――――――――――――――――――― ✀ ――――――――――――――――――――――――――――――――――――― stderr:
acpi-test: Warning! APIC binary file mismatch. Actual [aml:/tmp/aml-UKB6U1], Expected [aml:tests/data/acpi/virt/APIC.acpihmatvirt].
See source filetests/qtest/bios-tables-test.cfor instructions on how to update expected files.
to see ASL diff between mismatched files install IASL, rebuild QEMU from scratch and re-run tests with V=1 environment variable set** ERROR:../tests/qtest/bios-tables-test.c:533:test_acpi_asl: assertion
failed: (all_tables_match)
Ah. I'd failed to notice you said to drop first patch. Now replicating. Looks like the tables introduced for HMAT need updating to take into account changes made earlier in your pull request (version numbers etc)
Jonathan
Quoted 11 lines
Quoted 3 lines
(test program exited with status code -6)
Hesham Jonathan pls take a look, if you post a fixup today or early tomorrow I can squash it
and then this patchset can still be included in the release.Thanks!
PATCH 1/2 tests: q35: acpi: Fixup for tables in noinitiator test.
Updates to issues with earlier patches in the pull request:
tests: acpi: q35: update expected blobs *.hmat-noinitiators expected HMAT
--- tests/data/acpi/q35/DSDT.acpihmat-noinitiator | Bin 8553 -> 8691 bytes 1 file changed, 0 insertions(+), 0 deletions(-)
tests/data/acpi/q35/DSDT.acpihmat-noinitiator binary +0 -0
Signature · 1 line
2.25.1
PATCH 2/2 tests: acpi: Fixup for tables in Arm HMAT series
Updates to issues with earlier patches in the pull request:
tests: virt: Update expected *.acpihmatvirt tables
--- tests/data/acpi/virt/APIC.acpihmatvirt | Bin 396 -> 412 bytes 1 file changed, 0 insertions(+), 0 deletions(-)
tests/data/acpi/virt/APIC.acpihmatvirt binary +0 -0
Signature · 1 line
2.25.1
PATCH 1/1 fixup! bios-tables-test: add test for number of cores > 255
In reply to Stefan Hajnoczitestcase requires KVM for execution and would fail with
"
qemu-system-i386: current -smp configuration requires kernel irqchip and X2APIC API support
"
move it to kvm guarded section.
This fixes CI failure on hosts that doesn't have KVM enabled for Q35 machine type.
--- tests/qtest/bios-tables-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tests/qtest/bios-tables-test.c +2 -2
@@ -1994,8 +1994,6 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/q35/tpm12-tis" , test_acpi_q35_tcg_tpm12_tis); } -qtest_add_func ("acpi/q35/core-count2" , - test_acpi_q35_tcg_core_count2);qtest_add_func ("acpi/q35/bridge" , test_acpi_q35_tcg_bridge);qtest_add_func ("acpi/q35/multif-bridge" , test_acpi_q35_multif_bridge);
@@ -2026,6 +2024,8 @@ int main(int argc, char *argv[])if (has_kvm) {qtest_add_func ("acpi/q35/kvm/xapic" , test_acpi_q35_kvm_xapic);qtest_add_func ("acpi/q35/kvm/dmar" , test_acpi_q35_kvm_dmar); +qtest_add_func ("acpi/q35/core-count2" , + test_acpi_q35_tcg_core_count2); }qtest_add_func ("acpi/q35/viot" , test_acpi_q35_viot);#ifdef CONFIG_POSIX
Signature · 1 line
2.31.1
Re: [PATCH] fixup! bios-tables-test: add test for number of cores > 255
I will wait for Michael's v2 pull request in the coming days.
Stefan
Quoted 11 lines · On Mon, 31 Oct 2022 08:50:41 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
Holiday here tomorrow, so most likely this is it for features for this release.
The following changes since commit
75d30fde55485b965a1168a21d016dd07b50ed32:Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging (2022-10-30 15:07:25 -0400)
are available in the Git repository at:
https://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
Quoted 8 lines
for you to fetch changes up to
3e624c953b9c37f5aafdf92c16c721818ec8c648:intel-iommu: PASID support (2022-10-31 08:46:50 -0400)
----------------------------------------------------------------
pci,pc,virtio: features, tests, fixes, cleanupslots of acpi rework
expected DSDT tables updates should be updated to include
Quoted 3 lines
first version of biosbits infrastructure
ASID support in vhost-vdpacore_count2support in smbios
tables added by this test which was merged before above refactoring to avoid failure (it was masked by 1/86)
or simpler, swap order they are being merged and then just regenerate tables for this test case only.
Quoted 8 lines
PCIe DOE emulation
virtio vq reset
HMAT support
part of infrastructure for viommu support in vhost-vdpa VTD PASID support
fixes, tests all over the placeSigned-off-by Michael S. Tsirkin <[email protected]>