| Message ID | 20210928125116.183620-1-pbonzini@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 28 Sept 2021 at 14:04, Paolo Bonzini <pbonzini@redhat.com> wrote: > > The following changes since commit 14f02d8a9ec1746823c106933a4c8f062f9e0f95: > > Merge remote-tracking branch 'remotes/philmd/tags/integration-testing-20210927' into staging (2021-09-27 19:52:43 +0100) > > are available in the Git repository at: > > https://gitlab.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 824ba1e99c8bc12048636ea43dec923385ff042f: > > meson_options.txt: Switch the default value for the vnc option to 'auto' (2021-09-28 14:50:14 +0200) > > ---------------------------------------------------------------- > * SGX implementation for x86 > * Miscellaneous bugfixes > * Fix dependencies from ROMs to qtests > > ---------------------------------------------------------------- This causes "make check" to hang on my local x86-64 machine (consistently). Last output printed is: Not run: 220 287 Passed all 121 iotests make: Leaving directory '/mnt/nvmedisk/linaro/qemu-for-merges/build/all' make: Entering directory '/mnt/nvmedisk/linaro/qemu-for-merges/build/all' MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} QTEST_QEMU_IMG=./qemu-img G_TEST_DBUS_DAEMON=/mnt/nvmedisk/linaro/qemu-for-merges/tests/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-i386 QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon tests/qtest/pxe-test --tap -k Broken pipe ERROR qtest-i386/pxe-test - too few tests run (expected 4, got 0) Makefile.mtest:664: recipe for target 'run-test-81' failed make: *** [run-test-81] Error 1 make: Leaving directory '/mnt/nvmedisk/linaro/qemu-for-merges/build/all' make: *** Waiting for unfinished jobs.... make: Entering directory '/mnt/nvmedisk/linaro/qemu-for-merges/build/all' MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} QTEST_QEMU_IMG=./qemu-img G_TEST_DBUS_DAEMON=/mnt/nvmedisk/linaro/qemu-for-merges/tests/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-i386 QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon tests/qtest/bios-tables-test --tap -k Broken pipe ERROR qtest-i386/bios-tables-test - too few tests run (expected 37, got 0) Makefile.mtest:368: recipe for target 'run-test-44' failed make: *** [run-test-44] Error 1 make: Leaving directory '/mnt/nvmedisk/linaro/qemu-for-merges/build/all' and tests/qtest/migration-test, tests/qtest/vmgenid-test and tests/qtest/cdrom-test are all still running, but hung, for a qemu-system-i386 guest. Backtraces for cdrom-test; both processes are at 95%+ CPU usage, so they're livelocked I guess. The vmgenid-test hang looks similar to this one, with the test process in qtest_qmp_receive and the QEMU process in pci_host_config_write_common(). cdrom-test(29050)---qemu-system-i38(29059) =========================================================== PROCESS: 29050 petmay01 29050 29048 94 18:23 pts/3 02:42:16 tests/qtest/cdrom-test --tap -k -m quick [New LWP 29052] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". 0x00007f56c73ee557 in g_list_last () from /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 Thread 2 (Thread 0x7f56c6785700 (LWP 29052)): #0 syscall () at ../sysdeps/unix/sysv/linux/x86_64/syscall.S:38 #1 0x00005586532a767b in qemu_futex_wait (val=<optimised out>, f=<optimised out>) at /mnt/nvmedisk/linaro/qemu-for-merges/include/qemu/futex.h:29 #2 qemu_event_wait (ev=ev@entry=0x5586534d4c68 <rcu_call_ready_event>) at ../../util/qemu-thread-posix.c:480 #3 0x00005586532a5428 in call_rcu_thread (opaque=opaque@entry=0x0) at ../../util/rcu.c:258 #4 0x00005586532a6796 in qemu_thread_start (args=<optimised out>) at ../../util/qemu-thread-posix.c:557 #5 0x00007f56c6df06db in start_thread (arg=0x7f56c6785700) at pthread_create.c:463 #6 0x00007f56c6b1971f in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95 Thread 1 (Thread 0x7f56c78af180 (LWP 29050)): #0 0x00007f56c73ee557 in g_list_last () from /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 #1 0x00007f56c73ee5b8 in g_list_append () from /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 #2 0x000055865328744f in qtest_qmp_receive (s=0x558654965c00) at ../../tests/qtest/libqtest.c:642 #3 0x0000558653287c62 in qtest_vqmp (s=<optimised out>, fmt=<optimised out>, ap=ap@entry=0x7ffe72cb7160) at ../../tests/qtest/libqtest.c:749 #4 0x0000558653287f34 in qtest_qmp (s=s@entry=0x558654965c00, fmt=fmt@entry=0x5586532b523d "{ 'execute': 'query-status' }") at ../../tests/qtest/libqtest.c:790 #5 0x00005586532862db in boot_sector_test (qts=0x558654965c00) at ../../tests/qtest/boot-sector.c:161 #6 0x0000558653285fa4 in test_cdboot (data=<optimised out>) at ../../tests/qtest/cdrom-test.c:125 #7 0x00007f56c741905a in ?? () from /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 #8 0x00007f56c7418f8b in ?? () from /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 #9 0x00007f56c7418f8b in ?? () from /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 #10 0x00007f56c7418f8b in ?? () from /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 #11 0x00007f56c7419232 in g_test_run_suite () from /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 #12 0x00007f56c7419251 in g_test_run () from /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 #13 0x0000558653285473 in main (argc=<optimised out>, argv=<optimised out>) at ../../tests/qtest/cdrom-test.c:235 =========================================================== PROCESS: 29059 petmay01 29059 29050 98 18:23 pts/3 02:49:53 ./qemu-system-i386 -qtest unix:/tmp/qtest-29050.sock -qtest-log /dev/null -chardev socket,path=/tmp/qtest-29050.qmp,id=char0 -mon chardev=char0,mode=control -display none -accel kvm -accel tcg -no-shutdown -cdrom cdrom-boot-iso-AphMQp -accel qtest [New LWP 29074] [New LWP 29078] [New LWP 29080] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". 0x00007fe4151ccdb6 in __GI_ppoll (fds=0x562d23a3a8c0, nfds=5, timeout=<optimised out>, timeout@entry=0x7ffe201ef100, sigmask=sigmask@entry=0x0) at ../sysdeps/unix/sysv/linux/ppoll.c:39 39 ../sysdeps/unix/sysv/linux/ppoll.c: No such file or directory. Thread 4 (Thread 0x7fe3fabf6700 (LWP 29080)): #0 0x0000562d2099581f in flatview_ref (view=view@entry=0x562d2349bea0) at ../../softmmu/memory.c:303 #1 0x0000562d20996e1b in address_space_get_flatview (as=as@entry=0x562d23735418) at ../../softmmu/memory.c:813 #2 0x0000562d20996eef in address_space_update_ioeventfds (as=as@entry=0x562d23735418) at ../../softmmu/memory.c:835 #3 0x0000562d2099a6a8 in memory_region_transaction_commit () at ../../softmmu/memory.c:1104 #4 0x0000562d20759432 in pci_update_mappings (d=d@entry=0x562d23b564b0) at ../../hw/pci/pci.c:1402 #5 0x0000562d20759b49 in pci_default_write_config (d=0x562d23b564b0, addr=4, val_in=259, l=2) at ../../hw/pci/pci.c:1462 #6 0x0000562d2087beab in pci_host_config_write_common (pci_dev=0x562d23b564b0, addr=4, limit=<optimised out>, val=259, len=2) at ../../hw/pci/pci_host.c:83 #7 0x0000562d20998f61 in memory_region_write_accessor (mr=0x562d236fc5a0, addr=0, value=<optimised out>, size=2, shift=<optimised out>, mask=<optimised out>, attrs=...) at ../../softmmu/memory.c:492 #8 0x0000562d20995326 in access_with_adjusted_size (addr=addr@entry=0, value=value@entry=0x7fe3fabf2f18, size=size@entry=2, access_size_min=<optimised out>, access_size_max=<optimised out>, access_fn=0x562d20998ed0 <memory_region_write_accessor>, mr=0x562d236fc5a0, attrs=...) at ../../softmmu/memory.c:554 #9 0x0000562d209984d2 in memory_region_dispatch_write (mr=mr@entry=0x562d236fc5a0, addr=0, data=<optimised out>, op=<optimised out>, attrs=attrs@entry=...) at ../../softmmu/memory.c:1511 #10 0x0000562d209c9bbd in flatview_write_continue (fv=fv@entry=0x7fe3dc38f9f0, addr=addr@entry=3324, attrs=..., ptr=ptr@entry=0x7fe41d8b3000, len=len@entry=2, addr1=<optimised out>, l=<optimised out>, mr=0x562d236fc5a0) at ../../softmmu/physmem.c:2782 #11 0x0000562d209c9d56 in flatview_write (fv=0x7fe3dc38f9f0, addr=addr@entry=3324, attrs=attrs@entry=..., buf=buf@entry=0x7fe41d8b3000, len=len@entry=2) at ../../softmmu/physmem.c:2822 #12 0x0000562d209cc990 in address_space_write (as=0x562d217ddf80 <address_space_io>, addr=3324, attrs=..., buf=0x7fe41d8b3000, len=2) at ../../softmmu/physmem.c:2914 #13 0x0000562d209cca35 in address_space_rw (as=<optimised out>, addr=addr@entry=3324, attrs=..., attrs@entry=..., buf=<optimised out>, len=len@entry=2, is_write=is_write@entry=true) at ../../softmmu/physmem.c:2924 #14 0x0000562d20a35783 in kvm_handle_io (count=1, size=2, direction=<optimised out>, data=<optimised out>, attrs=..., port=3324) at ../../accel/kvm/kvm-all.c:2635 #15 0x0000562d20a35783 in kvm_cpu_exec (cpu=cpu@entry=0x562d23587740) at ../../accel/kvm/kvm-all.c:2886 #16 0x0000562d20a3b5c5 in kvm_vcpu_thread_fn (arg=arg@entry=0x562d23587740) at ../../accel/kvm/kvm-accel-ops.c:49 #17 0x0000562d20c95346 in qemu_thread_start (args=<optimised out>) at ../../util/qemu-thread-posix.c:557 #18 0x00007fe4154b06db in start_thread (arg=0x7fe3fabf6700) at pthread_create.c:463 #19 0x00007fe4151d971f in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95 Thread 3 (Thread 0x7fe3fb5d9700 (LWP 29078)): #0 0x00007fe4151cccb9 in __GI___poll (fds=0x7fe3f0003240, nfds=3, timeout=-1) at ../sysdeps/unix/sysv/linux/poll.c:29 #1 0x00007fe41b6676e9 in () at /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 #2 0x00007fe41b667a82 in g_main_loop_run () at /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 #3 0x0000562d20aa7c71 in iothread_run (opaque=opaque@entry=0x562d231d9ef0) at ../../iothread.c:73 #4 0x0000562d20c95346 in qemu_thread_start (args=<optimised out>) at ../../util/qemu-thread-posix.c:557 #5 0x00007fe4154b06db in start_thread (arg=0x7fe3fb5d9700) at pthread_create.c:463 #6 0x00007fe4151d971f in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95 Thread 2 (Thread 0x7fe3fc7dd700 (LWP 29074)): #0 0x00007fe4154bad50 in __GI___nanosleep (requested_time=0x7fe3fc7da0e0, remaining=0x7fe3fc7da0f0) at ../sysdeps/unix/sysv/linux/nanosleep.c:28 #1 0x00007fe41b69097f in g_usleep () at /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 #2 0x0000562d20c83e69 in call_rcu_thread (opaque=opaque@entry=0x0) at ../../util/rcu.c:250 #3 0x0000562d20c95346 in qemu_thread_start (args=<optimised out>) at ../../util/qemu-thread-posix.c:557 #4 0x00007fe4154b06db in start_thread (arg=0x7fe3fc7dd700) at pthread_create.c:463 #5 0x00007fe4151d971f in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95 Thread 1 (Thread 0x7fe41d83c440 (LWP 29059)): #0 0x00007fe4151ccdb6 in __GI_ppoll (fds=0x562d23a3a8c0, nfds=5, timeout=<optimised out>, timeout@entry=0x7ffe201ef100, sigmask=sigmask@entry=0x0) at ../sysdeps/unix/sysv/linux/ppoll.c:39 #1 0x0000562d20c98949 in ppoll (__ss=0x0, __timeout=0x7ffe201ef100, __nfds=<optimised out>, __fds=<optimised out>) at /usr/include/x86_64-linux-gnu/bits/poll2.h:77 #2 0x0000562d20c98949 in qemu_poll_ns (fds=<optimised out>, nfds=<optimised out>, timeout=timeout@entry=28296000) at ../../util/qemu-timer.c:348 #3 0x0000562d20c9b605 in os_host_main_loop_wait (timeout=28296000) at ../../util/main-loop.c:250 #4 0x0000562d20c9b605 in main_loop_wait (nonblocking=nonblocking@entry=0) at ../../util/main-loop.c:531 #5 0x0000562d20994e06 in qemu_main_loop () at ../../softmmu/runstate.c:726 #6 0x0000562d206c46de in main (argc=<optimised out>, argv=<optimised out>, envp=<optimised out>) at ../../softmmu/main.c:50 -- PMM
The following changes since commit 14f02d8a9ec1746823c106933a4c8f062f9e0f95: Merge remote-tracking branch 'remotes/philmd/tags/integration-testing-20210927' into staging (2021-09-27 19:52:43 +0100) are available in the Git repository at: https://gitlab.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 824ba1e99c8bc12048636ea43dec923385ff042f: meson_options.txt: Switch the default value for the vnc option to 'auto' (2021-09-28 14:50:14 +0200) ---------------------------------------------------------------- * SGX implementation for x86 * Miscellaneous bugfixes * Fix dependencies from ROMs to qtests ---------------------------------------------------------------- Marc-André Lureau (1): build-sys: add HAVE_IPPROTO_MPTCP Paolo Bonzini (2): meson: unpack edk2 firmware even if --disable-blobs tests: qtest: bios-tables-test depends on the unpacked edk2 ROMs Peter Maydell (1): target/i386: Fix memory leak in sev_read_file_base64() Peter Xu (2): memory: Name all the memory listeners memory: Add tracepoint for dirty sync Sean Christopherson (21): memory: Add RAM_PROTECTED flag to skip IOMMU mappings hostmem: Add hostmem-epc as a backend for SGX EPC i386: Add 'sgx-epc' device to expose EPC sections to guest vl: Add sgx compound properties to expose SGX EPC sections to guest i386: Add primary SGX CPUID and MSR defines i386: Add SGX CPUID leaf FEAT_SGX_12_0_EAX i386: Add SGX CPUID leaf FEAT_SGX_12_0_EBX i386: Add SGX CPUID leaf FEAT_SGX_12_1_EAX i386: Add get/set/migrate support for SGX_LEPUBKEYHASH MSRs i386: Add feature control MSR dependency when SGX is enabled i386: Update SGX CPUID info according to hardware/KVM/user input i386: kvm: Add support for exposing PROVISIONKEY to guest i386: Propagate SGX CPUID sub-leafs to KVM Adjust min CPUID level to 0x12 when SGX is enabled hw/i386/fw_cfg: Set SGX bits in feature control fw_cfg accordingly hw/i386/pc: Account for SGX EPC sections when calculating device memory i386/pc: Add e820 entry for SGX EPC section(s) i386: acpi: Add SGX EPC entry to ACPI tables q35: Add support for SGX EPC i440fx: Add support for SGX EPC docs/system: Add SGX documentation to the system manual Thomas Huth (1): meson_options.txt: Switch the default value for the vnc option to 'auto' Yang Zhong (5): Kconfig: Add CONFIG_SGX support qom: Add memory-backend-epc ObjectOptions support sgx-epc: Add the fill_device_info() callback support target/i386: Add HMP and QMP interfaces for SGX target/i386: Add the query-sgx-capabilities QMP command accel/hvf/hvf-accel-ops.c | 1 + accel/kvm/kvm-all.c | 7 +- backends/hostmem-epc.c | 82 ++++++++++++++ backends/meson.build | 1 + configs/devices/i386-softmmu/default.mak | 1 + docs/system/i386/sgx.rst | 165 +++++++++++++++++++++++++++ docs/system/target-i386.rst | 1 + hmp-commands-info.hx | 15 +++ hw/i386/Kconfig | 5 + hw/i386/acpi-build.c | 22 ++++ hw/i386/fw_cfg.c | 10 +- hw/i386/meson.build | 2 + hw/i386/pc.c | 15 ++- hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + hw/i386/sgx-epc.c | 184 +++++++++++++++++++++++++++++++ hw/i386/sgx-stub.c | 26 +++++ hw/i386/sgx.c | 170 ++++++++++++++++++++++++++++ hw/i386/x86.c | 29 +++++ hw/i386/xen/xen-hvm.c | 2 + hw/intc/openpic_kvm.c | 1 + hw/remote/proxy-memory-listener.c | 1 + hw/vfio/common.c | 2 + hw/vfio/spapr.c | 1 + hw/virtio/vhost-vdpa.c | 1 + hw/virtio/vhost.c | 2 + hw/virtio/virtio.c | 1 + hw/xen/xen_pt.c | 2 + include/exec/memory.h | 23 +++- include/hw/i386/hostmem-epc.h | 28 +++++ include/hw/i386/pc.h | 6 + include/hw/i386/sgx-epc.h | 67 +++++++++++ include/hw/i386/sgx.h | 12 ++ include/hw/i386/x86.h | 1 + include/monitor/hmp-target.h | 1 + include/sysemu/kvm_int.h | 2 +- io/dns-resolver.c | 2 +- meson.build | 18 +-- meson_options.txt | 2 +- monitor/hmp-cmds.c | 10 ++ pc-bios/descriptors/meson.build | 4 +- pc-bios/meson.build | 5 +- qapi/machine.json | 63 ++++++++++- qapi/misc-target.json | 61 ++++++++++ qapi/qom.json | 19 ++++ qapi/sockets.json | 2 +- qemu-options.hx | 10 +- softmmu/memory.c | 7 ++ softmmu/physmem.c | 4 +- softmmu/trace-events | 1 + target/arm/kvm.c | 1 + target/i386/cpu.c | 167 +++++++++++++++++++++++++++- target/i386/cpu.h | 16 +++ target/i386/hax/hax-mem.c | 1 + target/i386/kvm/kvm.c | 77 ++++++++++++- target/i386/kvm/kvm_i386.h | 2 + target/i386/machine.c | 20 ++++ target/i386/monitor.c | 32 ++++++ target/i386/nvmm/nvmm-all.c | 1 + target/i386/sev.c | 2 +- target/i386/whpx/whpx-all.c | 1 + tests/qtest/meson.build | 6 +- tests/qtest/qmp-cmd-test.c | 2 + util/qemu-sockets.c | 6 +- 64 files changed, 1395 insertions(+), 38 deletions(-) create mode 100644 backends/hostmem-epc.c create mode 100644 docs/system/i386/sgx.rst create mode 100644 hw/i386/sgx-epc.c create mode 100644 hw/i386/sgx-stub.c create mode 100644 hw/i386/sgx.c create mode 100644 include/hw/i386/hostmem-epc.h create mode 100644 include/hw/i386/sgx-epc.h create mode 100644 include/hw/i386/sgx.h