| Message ID | 20220904002317.60158-1-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
The tsan (clang) build is broken: https://gitlab.com/qemu-project/qemu/-/jobs/2982480773 clang-10 -m64 -mcx16 -Ilibqemu-x86_64-linux-user.fa.p -I. -I.. -Itarget/i386 -I../target/i386 -I../common-user/host/x86_64 -I../linux-user/include/host/x86_64 -I../linux-user/include -Ilinux-user -I../linux-user -Ilinux-user/x86_64 -I../linux-user/x86_64 -Iqapi -Itrace -Iui -Iui/shader -I/usr/include/capstone -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -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 -fsanitize=thread -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 -fstack-protector-strong -fPIE -isystem../linux-headers -isystemlinux-headers -DNEED_CPU_H '-DCONFIG_TARGET="x86_64-linux-user-config-target.h"' '-DCONFIG_DEVICES="x86_64-linux-user-config-devices.h"' -MD -MQ libqemu-x86_64-linux-user.fa.p/linux-user_elfload.c.o -MF libqemu-x86_64-linux-user.fa.p/linux-user_elfload.c.o.d -o libqemu-x86_64-linux-user.fa.p/linux-user_elfload.c.o -c ../linux-user/elfload.c ../linux-user/elfload.c:198:18: error: integer overflow in preprocessor expression [-Werror] #if ULONG_MAX >= TARGET_VSYSCALL_PAGE ^~~~~~~~~~~~~~~~~~~~ ../target/i386/cpu.h:2386:47: note: expanded from macro 'TARGET_VSYSCALL_PAGE' # define TARGET_VSYSCALL_PAGE (UINT64_C(-10) << 20) ~~~~~~~~~~~~~ ^ ~~
On 9/5/22 22:58, Stefan Hajnoczi wrote: > The tsan (clang) build is broken: > https://gitlab.com/qemu-project/qemu/-/jobs/2982480773 > > clang-10 -m64 -mcx16 -Ilibqemu-x86_64-linux-user.fa.p -I. -I.. > -Itarget/i386 -I../target/i386 -I../common-user/host/x86_64 > -I../linux-user/include/host/x86_64 -I../linux-user/include > -Ilinux-user -I../linux-user -Ilinux-user/x86_64 > -I../linux-user/x86_64 -Iqapi -Itrace -Iui -Iui/shader > -I/usr/include/capstone -I/usr/include/glib-2.0 > -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -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 -fsanitize=thread > -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 -fstack-protector-strong -fPIE > -isystem../linux-headers -isystemlinux-headers -DNEED_CPU_H > '-DCONFIG_TARGET="x86_64-linux-user-config-target.h"' > '-DCONFIG_DEVICES="x86_64-linux-user-config-devices.h"' -MD -MQ > libqemu-x86_64-linux-user.fa.p/linux-user_elfload.c.o -MF > libqemu-x86_64-linux-user.fa.p/linux-user_elfload.c.o.d -o > libqemu-x86_64-linux-user.fa.p/linux-user_elfload.c.o -c > ../linux-user/elfload.c > ../linux-user/elfload.c:198:18: error: integer overflow in > preprocessor expression [-Werror] > #if ULONG_MAX >= TARGET_VSYSCALL_PAGE > ^~~~~~~~~~~~~~~~~~~~ > ../target/i386/cpu.h:2386:47: note: expanded from macro 'TARGET_VSYSCALL_PAGE' > # define TARGET_VSYSCALL_PAGE (UINT64_C(-10) << 20) > ~~~~~~~~~~~~~ ^ ~~ Arg! This is a compiler bug. r~
v2: Fix incorretly resolved rebase conflict in patch 16. r~ The following changes since commit 61fd710b8da8aedcea9b4f197283dc38638e4b60: Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2022-09-02 13:24:28 -0400) are available in the Git repository at: https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20220904 for you to fetch changes up to cc64de1fdeb81bc1ab8bb6c7c24bfd4fc9b28ef2: target/riscv: Make translator stop before the end of a page (2022-09-03 09:27:05 +0100) ---------------------------------------------------------------- Respect PROT_EXEC in user-only mode. Fix s390x, i386 and riscv for translations crossing a page. ---------------------------------------------------------------- Ilya Leoshkevich (4): linux-user: Clear translations on mprotect() accel/tcg: Introduce is_same_page() target/s390x: Make translator stop before the end of a page target/i386: Make translator stop before the end of a page Richard Henderson (16): linux-user/arm: Mark the commpage executable linux-user/hppa: Allocate page zero as a commpage linux-user/x86_64: Allocate vsyscall page as a commpage linux-user: Honor PT_GNU_STACK tests/tcg/i386: Move smc_code2 to an executable section accel/tcg: Properly implement get_page_addr_code for user-only accel/tcg: Unlock mmap_lock after longjmp accel/tcg: Make tb_htable_lookup static accel/tcg: Move qemu_ram_addr_from_host_nofail to physmem.c accel/tcg: Use probe_access_internal for softmmu get_page_addr_code_hostp accel/tcg: Document the faulting lookup in tb_lookup_cmp accel/tcg: Remove translator_ldsw accel/tcg: Add pc and host_pc params to gen_intermediate_code accel/tcg: Add fast path for translator_ld* target/riscv: Add MAX_INSN_LEN and insn_len target/riscv: Make translator stop before the end of a page include/elf.h | 1 + include/exec/cpu-common.h | 1 + include/exec/exec-all.h | 89 ++++++++---------------- include/exec/translator.h | 96 ++++++++++++++++--------- linux-user/arm/target_cpu.h | 4 +- linux-user/qemu.h | 1 + accel/tcg/cpu-exec.c | 143 ++++++++++++++++++++------------------ accel/tcg/cputlb.c | 93 +++++++------------------ accel/tcg/translate-all.c | 29 ++++---- accel/tcg/translator.c | 135 ++++++++++++++++++++++++++--------- accel/tcg/user-exec.c | 17 ++++- linux-user/elfload.c | 82 ++++++++++++++++++++-- linux-user/mmap.c | 6 +- softmmu/physmem.c | 12 ++++ target/alpha/translate.c | 5 +- target/arm/translate.c | 5 +- target/avr/translate.c | 5 +- target/cris/translate.c | 5 +- target/hexagon/translate.c | 6 +- target/hppa/translate.c | 5 +- target/i386/tcg/translate.c | 71 +++++++++++-------- target/loongarch/translate.c | 6 +- target/m68k/translate.c | 5 +- target/microblaze/translate.c | 5 +- target/mips/tcg/translate.c | 5 +- target/nios2/translate.c | 5 +- target/openrisc/translate.c | 6 +- target/ppc/translate.c | 5 +- target/riscv/translate.c | 32 +++++++-- target/rx/translate.c | 5 +- target/s390x/tcg/translate.c | 20 ++++-- target/sh4/translate.c | 5 +- target/sparc/translate.c | 5 +- target/tricore/translate.c | 6 +- target/xtensa/translate.c | 6 +- tests/tcg/i386/test-i386.c | 2 +- tests/tcg/riscv64/noexec.c | 79 +++++++++++++++++++++ tests/tcg/s390x/noexec.c | 106 ++++++++++++++++++++++++++++ tests/tcg/x86_64/noexec.c | 75 ++++++++++++++++++++ tests/tcg/multiarch/noexec.c.inc | 139 ++++++++++++++++++++++++++++++++++++ tests/tcg/riscv64/Makefile.target | 1 + tests/tcg/s390x/Makefile.target | 1 + tests/tcg/x86_64/Makefile.target | 3 +- 43 files changed, 966 insertions(+), 367 deletions(-) create mode 100644 tests/tcg/riscv64/noexec.c create mode 100644 tests/tcg/s390x/noexec.c create mode 100644 tests/tcg/x86_64/noexec.c create mode 100644 tests/tcg/multiarch/noexec.c.inc