Exec / accelerators patches
Subsystems (3)
The following changes since commit a118c4aff4087eafb68f7132b233ad548cf16376:
Merge tag 'hw-misc-20240425' of https://github.com/philmd/qemu into staging (2024-04-25 09:43:29 -0700)
are available in the Git repository at:
https://github.com/philmd/qemu.git tags/accel-20240426
for you to fetch changes up to 671558d290ffb93752d3245e7c5604b04b6dcdf2:
plugins: Include missing 'qemu/bitmap.h' header (2024-04-26 21:36:19 +0200)
Selfish PR, painfully tested commit by commit.
----------------------------------------------------------------
Accelerators patches
A lot of trivial cleanups and simplifications (moving methods around, adding/removing #include statements). Most notable changes:
- Rename NEED_CPU_H -> COMPILING_PER_TARGET
- Rename few template headers using the '.h.inc' suffix
- Extract some definitions / declarations into their own header:
- accel/tcg/user-retaddr.h (helper_retaddr)
- include/exec/abi_ptr.h (abi_ptr)
- include/exec/breakpoint.h (CPUBreakpoint, CPUWatchpoint)
- include/exec/mmu-access-type.h (MMUAccessType)
- include/user/tswap-target.h (tswapl, bswaptls)
----------------------------------------------------------------
Philippe Mathieu-Daudé (38):
exec: Rename NEED_CPU_H -> COMPILING_PER_TARGET
exec: Reduce tlb_set_dirty() declaration scope
exec: Include 'cpu.h' before validating CPUArchState placement
exec: Expose 'target_page.h' API to user emulation
accel: Include missing 'exec/cpu_ldst.h' header
gdbstub: Include missing 'hw/core/cpu.h' header
gdbstub: Simplify #ifdef'ry in helpers.h
gdbstub: Avoid including 'cpu.h' in 'gdbstub/helpers.h' semihosting/uaccess: Avoid including 'cpu.h' semihosting/guestfd: Remove unused 'semihosting/uaccess.h' header
target: Define TCG_GUEST_DEFAULT_MO in 'cpu-param.h' target/ppc/excp_helper: Avoid 'abi_ptr' in system emulation target/sparc: Replace abi_ulong by uint32_t for TARGET_ABI32 target/i386: Include missing 'exec/exec-all.h' header accel/tcg: Un-inline retaddr helpers to 'user-retaddr.h' accel/tcg: Include missing 'hw/core/cpu.h' header accel/tcg: Include missing headers in 'tb-jmp-cache.h' accel/tcg: Rename load-extract/store-insert headers using .h.inc
suffix
accel/tcg: Rename helper-head.h -> helper-head.h.inc accel/whpx: Use accel-specific per-vcpu @dirty field accel/nvmm: Use accel-specific per-vcpu @dirty field accel/hvf: Use accel-specific per-vcpu @dirty field exec/cpu-all: Reduce 'qemu/rcu.h' header inclusion exec/cpu-all: Remove unused 'qemu/thread.h' header exec/cpu-all: Remove unused tswapls() definitions
exec: Declare target_words_bigendian() in 'exec/tswap.h'
exec: Move [b]tswapl() declarations to 'exec/user/tswap-target.h' exec/user: Do not include 'cpu.h' in 'abitypes.h'
exec: Declare abi_ptr type in its own 'abi_ptr.h' header
exec: Declare MMUAccessType type in 'mmu-access-type.h' header
exec: Declare CPUBreakpoint/CPUWatchpoint type in 'breakpoint.h'
header
exec: Restrict TCG specific declarations of 'cputlb.h'
exec: Restrict 'cpu_ldst.h' to TCG accelerator
exec: Rename 'exec/user/guest-base.h' as 'user/guest-base.h'
exec: Restrict inclusion of 'user/guest-base.h'
exec: Move CPUTLBEntry helpers to cputlb.c
hw/core: Avoid including the full 'hw/core/cpu.h' in 'tcg-cpu-ops.h'
plugins: Include missing 'qemu/bitmap.h' header
MAINTAINERS | 1 +
meson.build | 6 +-
accel/tcg/tb-jmp-cache.h | 3 +
accel/tcg/user-retaddr.h | 28 +++++
bsd-user/freebsd/target_os_elf.h | 1 +
bsd-user/freebsd/target_os_stack.h | 1 +
bsd-user/netbsd/target_os_elf.h | 1 +
bsd-user/openbsd/target_os_elf.h | 1 +
include/exec/abi_ptr.h | 33 ++++++
include/exec/breakpoint.h | 30 +++++
include/exec/cpu-all.h | 16 +--
include/exec/cpu-defs.h | 2 +-
include/exec/cpu_ldst.h | 105 ++----------------
include/exec/cputlb.h | 5 +
include/exec/exec-all.h | 3 +-
include/exec/memop.h | 4 +-
include/exec/memory.h | 4 +-
include/exec/mmu-access-type.h | 18 +++
include/exec/ram_addr.h | 1 +
include/exec/translator.h | 5 +-
include/exec/tswap.h | 16 ++-
include/exec/user/abitypes.h | 8 +-
include/exec/user/guest-base.h | 12 --
include/gdbstub/helpers.h | 12 +-
include/hw/core/cpu.h | 42 +------
include/hw/core/tcg-cpu-ops.h | 6 +-
include/qemu/osdep.h | 2 +-
include/qemu/plugin.h | 1 +
include/semihosting/uaccess.h | 4 +-
include/sysemu/hvf.h | 8 +-
include/sysemu/hvf_int.h | 1 +
include/sysemu/kvm.h | 6 +-
include/sysemu/nvmm.h | 4 +-
include/sysemu/whpx.h | 4 +-
include/sysemu/xen.h | 4 +-
include/user/guest-base.h | 18 +++
include/user/tswap-target.h | 22 ++++
target/alpha/cpu-param.h | 3 +
target/alpha/cpu.h | 3 -
target/arm/cpu-param.h | 8 +-
target/arm/cpu.h | 3 -
target/arm/internals.h | 1 +
target/arm/kvm-consts.h | 4 +-
target/avr/cpu-param.h | 2 +
target/avr/cpu.h | 2 -
target/hppa/cpu-param.h | 8 ++
target/hppa/cpu.h | 6 -
target/i386/cpu-param.h | 3 +
target/i386/cpu.h | 3 -
target/loongarch/cpu-param.h | 2 +
target/loongarch/cpu.h | 2 -
target/microblaze/cpu-param.h | 3 +
target/microblaze/cpu.h | 3 -
target/mips/cpu-param.h | 2 +
target/mips/cpu.h | 2 -
target/openrisc/cpu-param.h | 2 +
target/openrisc/cpu.h | 2 -
target/ppc/cpu-param.h | 2 +
target/ppc/cpu.h | 2 -
target/ppc/internal.h | 1 +
target/riscv/cpu-param.h | 2 +
target/riscv/cpu.h | 2 -
target/riscv/debug.h | 2 +
target/s390x/cpu-param.h | 6 +
target/s390x/cpu.h | 3 -
target/sparc/cpu-param.h | 23 ++++
target/sparc/cpu.h | 23 ----
target/xtensa/cpu-param.h | 3 +
target/xtensa/cpu.h | 3 -
...al16-al8.h => load-extract-al16-al8.h.inc} | 0
...-insert-al16.h => store-insert-al16.h.inc} | 0
...al16-al8.h => load-extract-al16-al8.h.inc} | 0
...-insert-al16.h => store-insert-al16.h.inc} | 0
...al16-al8.h => load-extract-al16-al8.h.inc} | 0
...-insert-al16.h => store-insert-al16.h.inc} | 0
...al16-al8.h => load-extract-al16-al8.h.inc} | 0
include/exec/helper-gen.h.inc | 2 +-
.../exec/{helper-head.h => helper-head.h.inc} | 4 +-
include/exec/helper-proto.h.inc | 2 +-
accel/hvf/hvf-accel-ops.c | 10 +-
accel/stubs/tcg-stub.c | 4 -
accel/tcg/cpu-exec.c | 3 +
accel/tcg/cputlb.c | 53 ++++++++-
accel/tcg/tcg-accel-ops.c | 2 +
accel/tcg/translator.c | 1 +
accel/tcg/user-exec.c | 1 +
bsd-user/main.c | 1 +
bsd-user/signal.c | 1 +
bsd-user/strace.c | 1 +
cpu-target.c | 1 +
disas/disas.c | 1 +
gdbstub/gdbstub.c | 1 +
hw/audio/virtio-snd.c | 2 +-
hw/core/cpu-sysemu.c | 2 +-
hw/core/generic-loader.c | 2 +-
hw/display/vga.c | 2 +-
hw/virtio/virtio.c | 1 +
linux-user/elfload.c | 2 +
linux-user/i386/signal.c | 1 +
linux-user/main.c | 1 +
linux-user/ppc/signal.c | 1 +
page-target.c | 44 ++++++++
semihosting/guestfd.c | 5 +-
system/physmem.c | 30 -----
target/arm/hvf/hvf.c | 4 +-
target/avr/gdbstub.c | 1 +
target/hexagon/translate.c | 1 +
target/i386/hvf/hvf.c | 4 +-
target/i386/hvf/x86hvf.c | 2 +-
target/i386/nvmm/nvmm-all.c | 21 ++--
target/i386/tcg/fpu_helper.c | 1 +
target/i386/whpx/whpx-all.c | 23 ++--
target/microblaze/cpu.c | 1 +
target/microblaze/translate.c | 1 +
target/ppc/excp_helper.c | 2 +-
target/sparc/gdbstub.c | 2 +-
target/target-common.c | 10 --
target/tricore/gdbstub.c | 1 +
tcg/tcg.c | 2 +-
accel/tcg/ldst_atomicity.c.inc | 4 +-
include/exec/helper-info.c.inc | 2 +-
scripts/analyze-inclusions | 6 +-
target/meson.build | 2 -
123 files changed, 488 insertions(+), 357 deletions(-)
create mode 100644 accel/tcg/user-retaddr.h
create mode 100644 include/exec/abi_ptr.h
create mode 100644 include/exec/breakpoint.h
create mode 100644 include/exec/mmu-access-type.h
delete mode 100644 include/exec/user/guest-base.h
create mode 100644 include/user/guest-base.h
create mode 100644 include/user/tswap-target.h
rename host/include/aarch64/host/{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} (100%)
rename host/include/aarch64/host/{store-insert-al16.h => store-insert-al16.h.inc} (100%)
rename host/include/generic/host/{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} (100%)
rename host/include/generic/host/{store-insert-al16.h => store-insert-al16.h.inc} (100%)
rename host/include/loongarch64/host/{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} (100%)
rename host/include/loongarch64/host/{store-insert-al16.h => store-insert-al16.h.inc} (100%)
rename host/include/x86_64/host/{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} (100%)
rename include/exec/{helper-head.h => helper-head.h.inc} (98%)
create mode 100644 page-target.c
delete mode 100644 target/target-common.cSignature · 1 line
2.41.0
[PULL 01/38] exec: Rename NEED_CPU_H -> COMPILING_PER_TARGET
'NEED_CPU_H' guard target-specific code; it is defined by meson altogether with the 'CONFIG_TARGET' definition. Rename NEED_CPU_H as COMPILING_PER_TARGET to clarify its meaning.
Mechanical change running:
$ sed -i s/NEED_CPU_H/COMPILING_PER_TARGET/g $(git grep -l NEED_CPU_H)
then manually add a /* COMPILING_PER_TARGET */ comment after the '#endif' when the block is large.
Message-Id: <[email protected]>
--- meson.build | 4 ++-- include/exec/cpu-defs.h | 2 +- include/exec/helper-head.h | 4 ++-- include/exec/memop.h | 4 ++-- include/exec/memory.h | 4 ++-- include/exec/tswap.h | 4 ++-- include/gdbstub/helpers.h | 2 +- include/hw/core/cpu.h | 4 ++-- include/qemu/osdep.h | 2 +- include/sysemu/hvf.h | 8 ++++---- include/sysemu/kvm.h | 6 +++--- include/sysemu/nvmm.h | 4 ++-- include/sysemu/whpx.h | 4 ++-- include/sysemu/xen.h | 4 ++-- target/arm/kvm-consts.h | 4 ++-- scripts/analyze-inclusions | 6 +++--- 16 files changed, 33 insertions(+), 33 deletions(-)
meson.build +2 -2
@@ -3610,7 +3610,7 @@ foreach d, list : target_modules if target.endswith('-softmmu') config_target = config_target_mak[target] target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])] - c_args = ['-DNEED_CPU_H', + c_args = ['-DCOMPILING_PER_TARGET', '-DCONFIG_TARGET="@[email protected]"'.format(target), '-DCONFIG_DEVICES="@[email protected]"'.format(target)] target_module_ss = module_ss.apply(config_target, strict: false)
@@ -3793,7 +3793,7 @@ foreach target : target_dirs target_base_arch = config_target['TARGET_BASE_ARCH'] arch_srcs = [config_target_h[target]] arch_deps = [] - c_args = ['-DNEED_CPU_H', + c_args = ['-DCOMPILING_PER_TARGET', '-DCONFIG_TARGET="@[email protected]"'.format(target), '-DCONFIG_DEVICES="@[email protected]"'.format(target)] link_args = emulator_link_args
include/exec/cpu-defs.h +1 -1
@@ -19,7 +19,7 @@#ifndef CPU_DEFS_H #define CPU_DEFS_H -#ifndef NEED_CPU_H +#ifndef COMPILING_PER_TARGET #error cpu.h included from common code#endif
include/exec/helper-head.h +2 -2
@@ -43,7 +43,7 @@#define dh_ctype_noreturn G_NORETURN void#define dh_ctype (t) dh_ctype_##t -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET # ifdef TARGET_LONG_BITS # if TARGET_LONG_BITS ==32 # define dh_alias_tl i32
@@ -54,7 +54,7 @@# endif # endif # define dh_ctype_tl target_ulong -#endif +#endif /* COMPILING_PER_TARGET */ /* We can't use glue() here because it falls foul of C preprocessor recursive expansion rules. */
include/exec/memop.h +2 -2
@@ -35,7 +35,7 @@ typedef enum MemOp { MO_LE = 0, MO_BE = MO_BSWAP,#endif -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET #if TARGET_BIG_ENDIAN MO_TE = MO_BE,#else
@@ -135,7 +135,7 @@ typedef enum MemOp { MO_BESL = MO_BE | MO_SL, MO_BESQ = MO_BE | MO_SQ, -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET MO_TEUW =MO_TE |MO_UW ,MO_TEUL =MO_TE |MO_UL , MO_TEUQ = MO_TE | MO_UQ,
include/exec/memory.h +2 -2
@@ -3107,7 +3107,7 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr,MemTxResult address_space_set (AddressSpace *as,hwaddr addr,uint8_t c,hwaddr len,MemTxAttrs attrs); -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET /* enum device_endian to MemOp. */ static inline MemOp devend_memop (enum device_endian end) {
@@ -3125,7 +3125,7 @@ static inline MemOp devend_memop(enum device_endian end)return (end == non_host_endianness) ?MO_BSWAP :0 ; #endif } -#endif +#endif /* COMPILING_PER_TARGET */ /* * Inhibit technologies that require discarding of pages in RAM blocks, e.g.,
include/exec/tswap.h +2 -2
@@ -15,11 +15,11 @@* If we're in target-specific code, we can hard-code the swapping * condition, otherwise we have to do (slower) run-time checks. */ -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET #define target_needs_bswap () (HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN)#else #define target_needs_bswap () (target_words_bigendian() != HOST_BIG_ENDIAN) -#endif +#endif /* COMPILING_PER_TARGET */ static inline uint16_t tswap16 (uint16_t s) {
include/gdbstub/helpers.h +1 -1
@@ -12,7 +12,7 @@#ifndef _GDBSTUB_HELPERS_H_#define _GDBSTUB_HELPERS_H_ -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET #include "cpu.h" /*
include/hw/core/cpu.h +2 -2
@@ -1182,7 +1182,7 @@ bool target_words_bigendian(void);const char *target_name (void ); -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET #ifndef CONFIG_USER_ONLY
@@ -1197,7 +1197,7 @@ extern const VMStateDescription vmstate_cpu_common; }#endif /* !CONFIG_USER_ONLY */ -#endif /* NEED_CPU_H */ +#endif /* COMPILING_PER_TARGET */ #define UNASSIGNED_CPU_INDEX -1#define UNASSIGNED_CLUSTER_INDEX -1
include/qemu/osdep.h +1 -1
@@ -32,7 +32,7 @@#endif #include "config-host.h" -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET #include CONFIG_TARGET #else #include "exec/poison.h"
include/sysemu/hvf.h +4 -4
@@ -16,7 +16,7 @@#include "qemu/accel.h" #include "qom/object.h" -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET #include "cpu.h" #ifdef CONFIG_HVF
@@ -26,7 +26,7 @@ extern bool hvf_allowed;#define hvf_enabled () 0#endif /* !CONFIG_HVF */ -#endif /* NEED_CPU_H */ +#endif /* COMPILING_PER_TARGET */ #define TYPE_HVF_ACCEL ACCEL_CLASS_NAME("hvf")
@@ -34,7 +34,7 @@ typedef struct HVFState HVFState;DECLARE_INSTANCE_CHECKER (HVFState,HVF_STATE , TYPE_HVF_ACCEL) -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET struct hvf_sw_breakpoint { vaddr pc; vaddr saved_insn;
@@ -66,6 +66,6 @@ void hvf_arch_update_guest_debug(CPUState *cpu);* Return whether the guest supports debugging. */ bool hvf_arch_supports_guest_debug (void ); -#endif /* NEED_CPU_H */ +#endif /* COMPILING_PER_TARGET */ #endif
include/sysemu/kvm.h +3 -3
@@ -20,7 +20,7 @@#include "qemu/accel.h" #include "qom/object.h" -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET # ifdef CONFIG_KVM # include <linux/kvm.h> # define CONFIG_KVM_IS_POSSIBLE
@@ -210,7 +210,7 @@ bool kvm_arm_supports_user_irq(void);int kvm_on_sigbus_vcpu (CPUState *cpu,int code,void *addr);int kvm_on_sigbus (int code,void *addr); -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET #include "cpu.h" void kvm_flush_coalesced_mmio_buffer (void );
@@ -435,7 +435,7 @@ void kvm_set_sigmask_len(KVMState *s, unsigned int sigmask_len);int kvm_physical_memory_addr_from_host (KVMState *s,void *ram_addr,hwaddr *phys_addr); -#endif /* NEED_CPU_H */ +#endif /* COMPILING_PER_TARGET */ void kvm_cpu_synchronize_state (CPUState *cpu);
include/sysemu/nvmm.h +2 -2
@@ -12,7 +12,7 @@#ifndef QEMU_NVMM_H #define QEMU_NVMM_H -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET #ifdef CONFIG_NVMM
@@ -24,6 +24,6 @@ int nvmm_enabled(void);#endif /* CONFIG_NVMM */ -#endif /* NEED_CPU_H */ +#endif /* COMPILING_PER_TARGET */ #endif /* QEMU_NVMM_H */
include/sysemu/whpx.h +2 -2
@@ -15,7 +15,7 @@#ifndef QEMU_WHPX_H #define QEMU_WHPX_H -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET #ifdef CONFIG_WHPX
@@ -29,6 +29,6 @@ bool whpx_apic_in_platform(void);#endif /* CONFIG_WHPX */ -#endif /* NEED_CPU_H */ +#endif /* COMPILING_PER_TARGET */ #endif /* QEMU_WHPX_H */
include/sysemu/xen.h +2 -2
@@ -16,13 +16,13 @@#include "exec/cpu-common.h" -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET # ifdef CONFIG_XEN # define CONFIG_XEN_IS_POSSIBLE # endif #else # define CONFIG_XEN_IS_POSSIBLE -#endif +#endif /* COMPILING_PER_TARGET */ #ifdef CONFIG_XEN_IS_POSSIBLE
target/arm/kvm-consts.h +2 -2
@@ -14,13 +14,13 @@#ifndef ARM_KVM_CONSTS_H #define ARM_KVM_CONSTS_H -#ifdef NEED_CPU_H +#ifdef COMPILING_PER_TARGET #ifdef CONFIG_KVM #include <linux/kvm.h> #include <linux/psci.h> #define MISMATCH_CHECK (X ,Y ) QEMU_BUILD_BUG_ON(X != Y)#endif -#endif +#endif /* COMPILING_PER_TARGET */ #ifndef MISMATCH_CHECK #define MISMATCH_CHECK (X ,Y ) QEMU_BUILD_BUG_ON(0)
scripts/analyze-inclusions +3 -3
@@ -92,7 +92,7 @@ echo trace/generated-tracers.h: analyze -include ../include/qemu/osdep.h trace/generated-tracers.h echo target/i386/cpu.h: -analyze -DNEED_CPU_H -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../target/i386/cpu.h +analyze -DCOMPILING_PER_TARGET -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../target/i386/cpu.h -echo hw/hw.h + NEED_CPU_H: -analyze -DNEED_CPU_H -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../include/hw/hw.h +echo hw/hw.h + COMPILING_PER_TARGET: +analyze -DCOMPILING_PER_TARGET -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../include/hw/hw.h
Signature · 1 line
2.41.0
[PULL 06/38] gdbstub: Include missing 'hw/core/cpu.h' header
In reply to Philippe Mathieu-DaudéFunctions such gdb_get_cpu_pid() dereference CPUState so require the structure declaration from "hw/core/cpu.h":
static uint32_t gdb_get_cpu_pid(CPUState *cpu)
{
...
return cpu->cluster_index + 1;
}Message-Id: <[email protected]>
--- gdbstub/gdbstub.c | 1 + 1 file changed, 1 insertion(+)
gdbstub/gdbstub.c +1 -0
@@ -37,6 +37,7 @@#include "hw/cpu/cluster.h" #include "hw/boards.h" #endif +#include "hw/core/cpu.h" #include "sysemu/hw_accel.h" #include "sysemu/runstate.h"
Signature · 1 line
2.41.0
[PULL 07/38] gdbstub: Simplify #ifdef'ry in helpers.h
In reply to Philippe Mathieu-DaudéSlightly simplify by checking NEED_CPU_H definition in header.
Message-Id: <[email protected]>
--- include/gdbstub/helpers.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
include/gdbstub/helpers.h +4 -5
@@ -12,7 +12,10 @@#ifndef _GDBSTUB_HELPERS_H_#define _GDBSTUB_HELPERS_H_ -#ifdef COMPILING_PER_TARGET +#ifndef COMPILING_PER_TARGET +#error "gdbstub helpers should only be included by target specific code" +#endif +#include "cpu.h" /*
@@ -96,8 +99,4 @@ static inline uint8_t *gdb_get_reg_ptr(GByteArray *buf, int len)#define ldtul_p (addr) ldl_p(addr)#endif -#else -#error "gdbstub helpers should only be included by target specific code" -#endif -#endif /* _GDBSTUB_HELPERS_H_ */
Signature · 1 line
2.41.0
[PULL 08/38] gdbstub: Avoid including 'cpu.h' in 'gdbstub/helpers.h'
In reply to Philippe Mathieu-DaudéWe only need the "exec/tswap.h" and "cpu-param.h" headers. Only include "cpu.h" in the target gdbstub.c source files.
Message-Id: <[email protected]>
--- include/gdbstub/helpers.h | 3 ++- target/avr/gdbstub.c | 1 + target/tricore/gdbstub.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
include/gdbstub/helpers.h +2 -1
@@ -16,7 +16,8 @@#error "gdbstub helpers should only be included by target specific code"#endif -#include "cpu.h" +#include "exec/tswap.h" +#include "cpu-param.h" /* * The GDB remote protocol transfers values in target byte order. As
target/avr/gdbstub.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "gdbstub/helpers.h" +#include "cpu.h" int avr_cpu_gdb_read_register (CPUState *cs,GByteArray *mem_buf,int n) {
target/tricore/gdbstub.c +1 -0
@@ -19,6 +19,7 @@#include "qemu/osdep.h" #include "gdbstub/helpers.h" +#include "cpu.h" #define LCX_REGNUM 32
Signature · 1 line
2.41.0
[PULL 04/38] exec: Expose 'target_page.h' API to user emulation
In reply to Philippe Mathieu-DaudéUser-only objects might benefit from the "exec/target_page.h" API, which allows to build some objects once for all targets.
Message-Id: <[email protected]>
--- meson.build | 2 +- page-target.c | 44 ++++++++++++++++++++++++++++++++++++++++++ system/physmem.c | 30 ---------------------------- target/target-common.c | 10 ---------- target/meson.build | 2 -- 5 files changed, 45 insertions(+), 43 deletions(-) create mode 100644 page-target.c delete mode 100644 target/target-common.c
meson.build +1 -1
@@ -3523,7 +3523,7 @@ if get_option('b_lto') pagevary = declare_dependency(link_with: pagevary) endif common_ss.add(pagevary) -specific_ss.add(files('page-vary-target.c')) +specific_ss.add(files('page-target.c', 'page-vary-target.c')) subdir('backends') subdir('disas')
page-target.c new file +44 -0
44 lines not on this page · raw message
system/physmem.c +0 -30
@@ -3540,36 +3540,6 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,return 0 ; } -/* -* Allows code that needs to deal with migration bitmaps etc to still be built -* target independent. -*/ -size_t qemu_target_page_size (void ) -{ -return TARGET_PAGE_SIZE ; -} - -int qemu_target_page_bits (void ) -{ -return TARGET_PAGE_BITS ; -} - -int qemu_target_page_bits_min (void ) -{ -return TARGET_PAGE_BITS_MIN ; -} - -/* Convert target pages to MiB (2**20). */ -size_t qemu_target_pages_to_MiB (size_t pages) -{ -int page_bits =TARGET_PAGE_BITS ; - -/* So far, the largest (non-huge) page size is 64k, i.e. 16 bits. */ -g_assert (page_bits <20 ); - -return pages >> (20 - page_bits); -} -bool cpu_physical_memory_is_io (hwaddr phys_addr) {MemoryRegion *mr;
target/target-common.c deleted +0 -10
@@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -#include "qemu/osdep.h" - -#include "cpu.h" -#include "exec/target_page.h" - -int qemu_target_page_mask (void ) -{ -return TARGET_PAGE_MASK ; -}
target/meson.build +0 -2
@@ -18,5 +18,3 @@ subdir('sh4') subdir('sparc') subdir('tricore') subdir('xtensa') - -specific_ss.add(files('target-common.c'))
Signature · 1 line
2.41.0
[PULL 09/38] semihosting/uaccess: Avoid including 'cpu.h'
In reply to Philippe Mathieu-Daudé"semihosting/uaccess.h" only requires the following headers:
- "exec/cpu-defs.h" for target_ulong,
- "exec/cpu-common.h" for cpu_memory_rw_debug()
- "exec/tswap.h" for tswap32() and tswap64().
Include them instead of the huge "cpu.h".
Message-Id: <[email protected]>
--- include/semihosting/uaccess.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
include/semihosting/uaccess.h +3 -1
@@ -14,7 +14,9 @@#error Cannot include semihosting/uaccess.h from user emulation#endif -#include "cpu.h" +#include "exec/cpu-common.h" +#include "exec/cpu-defs.h" +#include "exec/tswap.h" #define get_user_u64 (val, addr) \ ({ uint64_t val_ = 0; \
Signature · 1 line
2.41.0
[PULL 02/38] exec: Reduce tlb_set_dirty() declaration scope
In reply to Philippe Mathieu-Daudétlb_set_dirty() is only used in accel/tcg/cputlb.c, where it is defined. Declare it statically, removing the stub.
Message-Id: <[email protected]>
--- include/exec/exec-all.h | 1 - accel/stubs/tcg-stub.c | 4 ---- accel/tcg/cputlb.c | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-)
include/exec/exec-all.h +0 -1
@@ -654,7 +654,6 @@ static inline void mmap_unlock(void) {}#define WITH_MMAP_LOCK_GUARD ()void tlb_reset_dirty (CPUState *cpu,ram_addr_t start1,ram_addr_t length); -void tlb_set_dirty (CPUState *cpu,vaddr addr);void tlb_reset_dirty_range_all (ram_addr_t start,ram_addr_t length); MemoryRegionSection *
accel/stubs/tcg-stub.c +0 -4
@@ -18,10 +18,6 @@ void tb_flush(CPUState *cpu) { } -void tlb_set_dirty (CPUState *cpu,vaddr vaddr) -{ -} -int probe_access_flags (CPUArchState *env,vaddr addr,int size,MMUAccessType access_type,int mmu_idx,bool nonfault,void **phost,uintptr_t retaddr)
accel/tcg/cputlb.c +1 -1
@@ -1039,7 +1039,7 @@ static inline void tlb_set_dirty1_locked(CPUTLBEntry *tlb_entry,/* update the TLB corresponding to virtual page vaddr so that it is no longer dirty */ -void tlb_set_dirty (CPUState *cpu,vaddr addr) +static void tlb_set_dirty (CPUState *cpu,vaddr addr) {int mmu_idx;
Signature · 1 line
2.41.0
[PULL 10/38] semihosting/guestfd: Remove unused 'semihosting/uaccess.h' header
In reply to Philippe Mathieu-DaudéNothing in guestfd.c requires "semihosting/uaccess.h" nor "qemu.h".
Message-Id: <[email protected]>
--- semihosting/guestfd.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
semihosting/guestfd.c +1 -4
@@ -12,10 +12,7 @@#include "gdbstub/syscalls.h" #include "semihosting/semihost.h" #include "semihosting/guestfd.h" -#ifdef CONFIG_USER_ONLY -#include "qemu.h" -#else -#include "semihosting/uaccess.h" +#ifndef CONFIG_USER_ONLY #include CONFIG_DEVICES #endif
Signature · 1 line
2.41.0
[PULL 13/38] target/sparc: Replace abi_ulong by uint32_t for TARGET_ABI32
In reply to Philippe Mathieu-DaudéWe have abi_ulong == uint32_t for the 32-bit ABI.
Use the generic type to avoid to depend on the
"exec/user/abitypes.h" header.
Message-Id: <[email protected]>
--- target/sparc/gdbstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/sparc/gdbstub.c +1 -1
@@ -108,7 +108,7 @@ int sparc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)SPARCCPU *cpu =SPARC_CPU (cs);CPUSPARCState *env = &cpu->env;#if defined(TARGET_ABI32 ) -abi_ulong tmp; +uint32_t tmp; tmp =ldl_p (mem_buf);#else
Signature · 1 line
2.41.0
[PULL 12/38] target/ppc/excp_helper: Avoid 'abi_ptr' in system emulation
In reply to Philippe Mathieu-Daudé'abi_ptr' is a user specific type. The system emulation equivalent is 'target_ulong'. Use it in ppc_ldl_code() to emphasis this is not an user emulation function.
Message-Id: <[email protected]>
--- target/ppc/excp_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/ppc/excp_helper.c +1 -1
@@ -142,7 +142,7 @@ static inline bool insn_need_byteswap(CPUArchState *env)return !!(env->msr & ((target_ulong )1 <<MSR_LE )); } -static uint32_t ppc_ldl_code (CPUArchState *env,abi_ptr addr) +static uint32_t ppc_ldl_code (CPUArchState *env,target_ulong addr) {uint32_t insn =cpu_ldl_code (env, addr);
Signature · 1 line
2.41.0
[PULL 11/38] target: Define TCG_GUEST_DEFAULT_MO in 'cpu-param.h'
In reply to Philippe Mathieu-Daudéaccel/tcg/ files requires the following definitions:
- TARGET_LONG_BITS
- TARGET_PAGE_BITS
- TARGET_PHYS_ADDR_SPACE_BITS
- TCG_GUEST_DEFAULT_MO
The first 3 are defined in "cpu-param.h". The last one in "cpu.h", with a bunch of definitions irrelevant for TCG. By moving the TCG_GUEST_DEFAULT_MO definition to "cpu-param.h", we can simplify various accel/tcg includes.
Message-Id: <[email protected]>
--- target/alpha/cpu-param.h | 3 +++ target/alpha/cpu.h | 3 --- target/arm/cpu-param.h | 8 +++++--- target/arm/cpu.h | 3 --- target/avr/cpu-param.h | 2 ++ target/avr/cpu.h | 2 -- target/hppa/cpu-param.h | 8 ++++++++ target/hppa/cpu.h | 6 ------ target/i386/cpu-param.h | 3 +++ target/i386/cpu.h | 3 --- target/loongarch/cpu-param.h | 2 ++ target/loongarch/cpu.h | 2 -- target/microblaze/cpu-param.h | 3 +++ target/microblaze/cpu.h | 3 --- target/mips/cpu-param.h | 2 ++ target/mips/cpu.h | 2 -- target/openrisc/cpu-param.h | 2 ++ target/openrisc/cpu.h | 2 -- target/ppc/cpu-param.h | 2 ++ target/ppc/cpu.h | 2 -- target/riscv/cpu-param.h | 2 ++ target/riscv/cpu.h | 2 -- target/s390x/cpu-param.h | 6 ++++++ target/s390x/cpu.h | 3 --- target/sparc/cpu-param.h | 23 +++++++++++++++++++++++ target/sparc/cpu.h | 23 ----------------------- target/xtensa/cpu-param.h | 3 +++ target/xtensa/cpu.h | 3 --- 28 files changed, 66 insertions(+), 62 deletions(-)
target/alpha/cpu-param.h +3 -0
@@ -27,4 +27,7 @@# define TARGET_VIRT_ADDR_SPACE_BITS (30 + TARGET_PAGE_BITS)#endif +/* Alpha processors have a weak memory model */ +#define TCG_GUEST_DEFAULT_MO (0) +#endif
target/alpha/cpu.h +0 -3
@@ -24,9 +24,6 @@#include "exec/cpu-defs.h" #include "qemu/cpu-float.h" -/* Alpha processors have a weak memory model */ -#define TCG_GUEST_DEFAULT_MO (0) -#define ICACHE_LINE_SIZE 32#define DCACHE_LINE_SIZE 32
target/arm/cpu-param.h +5 -3
@@ -27,14 +27,16 @@# else # define TARGET_PAGE_BITS 12# endif -#else +#else /* !CONFIG_USER_ONLY */ /* * ARMv7 and later CPUs have 4K pages minimum, but ARMv5 and v6 * have to support 1K tiny pages. */ # define TARGET_PAGE_BITS_VARY # define TARGET_PAGE_BITS_MIN 10 - -#endif +#endif /* !CONFIG_USER_ONLY */ + +/* ARM processors have a weak memory model */ +#define TCG_GUEST_DEFAULT_MO (0)#endif
target/arm/cpu.h +0 -3
@@ -30,9 +30,6 @@#include "target/arm/multiprocessing.h" #include "target/arm/gtimer.h" -/* ARM processors have a weak memory model */ -#define TCG_GUEST_DEFAULT_MO (0) -#ifdef TARGET_AARCH64 #define KVM_HAVE_MCE_INJECTION 1#endif
target/avr/cpu-param.h +2 -0
@@ -32,4 +32,6 @@#define TARGET_PHYS_ADDR_SPACE_BITS 24#define TARGET_VIRT_ADDR_SPACE_BITS 24 +#define TCG_GUEST_DEFAULT_MO 0 +#endif
target/avr/cpu.h +0 -2
@@ -30,8 +30,6 @@#define CPU_RESOLVING_TYPE TYPE_AVR_CPU -#define TCG_GUEST_DEFAULT_MO 0 -/* * AVR has two memory spaces, data & code. * e.g. both have 0 address
target/hppa/cpu-param.h +8 -0
@@ -21,4 +21,12 @@#define TARGET_PAGE_BITS 12 +/* PA-RISC 1.x processors have a strong memory model. */ +/* +* ??? While we do not yet implement PA-RISC 2.0, those processors have +* a weak memory model, but with TLB bits that force ordering on a per-page +* basis. It's probably easier to fall back to a strong memory model. +*/ +#define TCG_GUEST_DEFAULT_MO TCG_MO_ALL +#endif
target/hppa/cpu.h +0 -6
@@ -25,12 +25,6 @@#include "qemu/cpu-float.h" #include "qemu/interval-tree.h" -/* PA-RISC 1.x processors have a strong memory model. */ -/* ??? While we do not yet implement PA-RISC 2.0, those processors have -a weak memory model, but with TLB bits that force ordering on a per-page -basis. It's probably easier to fall back to a strong memory model. */ -#define TCG_GUEST_DEFAULT_MO TCG_MO_ALL -#define MMU_ABS_W_IDX 6#define MMU_ABS_IDX 7#define MMU_KERNEL_IDX 8
target/i386/cpu-param.h +3 -0
@@ -24,4 +24,7 @@#endif #define TARGET_PAGE_BITS 12 +/* The x86 has a strong memory model with some store-after-load re-ordering */ +#define TCG_GUEST_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD) +#endif
target/i386/cpu.h +0 -3
@@ -30,9 +30,6 @@#define XEN_NR_VIRQS 24 -/* The x86 has a strong memory model with some store-after-load re-ordering */ -#define TCG_GUEST_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD) -#define KVM_HAVE_MCE_INJECTION 1/* support for self modifying code even if the modified instruction is
target/loongarch/cpu-param.h +2 -0
@@ -14,4 +14,6 @@#define TARGET_PAGE_BITS 12 +#define TCG_GUEST_DEFAULT_MO (0) +#endif
target/loongarch/cpu.h +0 -2
@@ -39,8 +39,6 @@#define IOCSR_MEM_SIZE 0x428 -#define TCG_GUEST_DEFAULT_MO (0) -#define FCSR0_M1 0x1f/* FCSR1 mask, Enables */ #define FCSR0_M2 0x1f1f0000/* FCSR2 mask, Cause and Flags */ #define FCSR0_M3 0x300/* FCSR3 mask, Round Mode */
target/microblaze/cpu-param.h +3 -0
@@ -29,4 +29,7 @@/* FIXME: MB uses variable pages down to 1K but linux only uses 4k. */ #define TARGET_PAGE_BITS 12 +/* MicroBlaze is always in-order. */ +#define TCG_GUEST_DEFAULT_MO TCG_MO_ALL +#endif
target/microblaze/cpu.h +0 -3
@@ -24,9 +24,6 @@#include "exec/cpu-defs.h" #include "qemu/cpu-float.h" -/* MicroBlaze is always in-order. */ -#define TCG_GUEST_DEFAULT_MO TCG_MO_ALL -typedef struct CPUArchState CPUMBState ;#if !defined(CONFIG_USER_ONLY )#include "mmu.h"
target/mips/cpu-param.h +2 -0
@@ -30,4 +30,6 @@#define TARGET_PAGE_BITS_MIN 12#endif +#define TCG_GUEST_DEFAULT_MO (0) +#endif
target/mips/cpu.h +0 -2
@@ -10,8 +10,6 @@#include "hw/clock.h" #include "mips-defs.h" -#define TCG_GUEST_DEFAULT_MO (0) -typedef struct CPUMIPSTLBContext CPUMIPSTLBContext ;/* MSA Context */
target/openrisc/cpu-param.h +2 -0
@@ -13,4 +13,6 @@#define TARGET_PHYS_ADDR_SPACE_BITS 32#define TARGET_VIRT_ADDR_SPACE_BITS 32 +#define TCG_GUEST_DEFAULT_MO (0) +#endif
target/openrisc/cpu.h +0 -2
@@ -24,8 +24,6 @@#include "exec/cpu-defs.h" #include "fpu/softfloat-types.h" -#define TCG_GUEST_DEFAULT_MO (0) -/** * OpenRISCCPUClass: * @parent_realize: The parent class' realize handler.
target/ppc/cpu-param.h +2 -0
@@ -40,4 +40,6 @@# define TARGET_PAGE_BITS 12#endif +#define TCG_GUEST_DEFAULT_MO 0 +#endif
target/ppc/cpu.h +0 -2
@@ -29,8 +29,6 @@#define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU -#define TCG_GUEST_DEFAULT_MO 0 -#define TARGET_PAGE_BITS_64K 16#define TARGET_PAGE_BITS_16M 24
target/riscv/cpu-param.h +2 -0
@@ -28,4 +28,6 @@* - M mode HLV/HLVX/HSV 0b111 */ +#define TCG_GUEST_DEFAULT_MO 0 +#endif
target/riscv/cpu.h +0 -2
@@ -43,8 +43,6 @@ typedef struct CPUArchState CPURISCVState;# define TYPE_RISCV_CPU_BASE TYPE_RISCV_CPU_BASE64#endif -#define TCG_GUEST_DEFAULT_MO 0 -/* * RISC-V-specific extra insn start words: * 1: Original instruction opcode
target/s390x/cpu-param.h +6 -0
@@ -13,4 +13,10 @@#define TARGET_PHYS_ADDR_SPACE_BITS 64#define TARGET_VIRT_ADDR_SPACE_BITS 64 +/* +* The z/Architecture has a strong memory model with some +* store-after-load re-ordering. +*/ +#define TCG_GUEST_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD) +#endif
target/s390x/cpu.h +0 -3
@@ -33,9 +33,6 @@#define ELF_MACHINE_UNAME "S390X" -/* The z/Architecture has a strong memory model with some store-after-load re-ordering */ -#define TCG_GUEST_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD) -#define TARGET_HAS_PRECISE_SMC #define TARGET_INSN_START_EXTRA_WORDS 2
target/sparc/cpu-param.h +23 -0
@@ -23,4 +23,27 @@# define TARGET_VIRT_ADDR_SPACE_BITS 32#endif +/* +* From Oracle SPARC Architecture 2015: +* +* Compatibility notes: The PSO memory model described in SPARC V8 and +* SPARC V9 compatibility architecture specifications was never implemented +* in a SPARC V9 implementation and is not included in the Oracle SPARC +* Architecture specification. +* +* The RMO memory model described in the SPARC V9 specification was +* implemented in some non-Sun SPARC V9 implementations, but is not +* directly supported in Oracle SPARC Architecture 2015 implementations. +* +* Therefore always use TSO in QEMU. +* +* D.5 Specification of Partial Store Order (PSO) +* ... [loads] are followed by an implied MEMBAR #LoadLoad | #LoadStore. +* +* D.6 Specification of Total Store Order (TSO) +* ... PSO with the additional requirement that all [stores] are followed +* by an implied MEMBAR #StoreStore. +*/ +#define TCG_GUEST_DEFAULT_MO (TCG_MO_LD_LD | TCG_MO_LD_ST | TCG_MO_ST_ST) +#endif
target/sparc/cpu.h +0 -23
@@ -6,29 +6,6 @@#include "exec/cpu-defs.h" #include "qemu/cpu-float.h" -/* -* From Oracle SPARC Architecture 2015: -* -* Compatibility notes: The PSO memory model described in SPARC V8 and -* SPARC V9 compatibility architecture specifications was never implemented -* in a SPARC V9 implementation and is not included in the Oracle SPARC -* Architecture specification. -* -* The RMO memory model described in the SPARC V9 specification was -* implemented in some non-Sun SPARC V9 implementations, but is not -* directly supported in Oracle SPARC Architecture 2015 implementations. -* -* Therefore always use TSO in QEMU. -* -* D.5 Specification of Partial Store Order (PSO) -* ... [loads] are followed by an implied MEMBAR #LoadLoad | #LoadStore. -* -* D.6 Specification of Total Store Order (TSO) -* ... PSO with the additional requirement that all [stores] are followed -* by an implied MEMBAR #StoreStore. -*/ -#define TCG_GUEST_DEFAULT_MO (TCG_MO_LD_LD | TCG_MO_LD_ST | TCG_MO_ST_ST) -#if !defined(TARGET_SPARC64 )#define TARGET_DPREGS 16#define TARGET_FCCREGS 1
target/xtensa/cpu-param.h +3 -0
@@ -17,4 +17,7 @@#define TARGET_VIRT_ADDR_SPACE_BITS 32#endif +/* Xtensa processors have a weak memory model */ +#define TCG_GUEST_DEFAULT_MO (0) +#endif
target/xtensa/cpu.h +0 -3
@@ -34,9 +34,6 @@#include "hw/clock.h" #include "xtensa-isa.h" -/* Xtensa processors have a weak memory model */ -#define TCG_GUEST_DEFAULT_MO (0) -enum {/* Additional instructions */ XTENSA_OPTION_CODE_DENSITY ,
Signature · 1 line
2.41.0
[PULL 15/38] accel/tcg: Un-inline retaddr helpers to 'user-retaddr.h'
In reply to Philippe Mathieu-Daudéset_helper_retaddr() is only used in accel/tcg/user-exec.c.
clear_helper_retaddr() is only used in accel/tcg/cpu-exec.c and accel/tcg/user-exec.c.
No need to expose their definitions to all user-emulation files including "exec/cpu_ldst.h", move them to a new "user-retaddr.h" header (restricted to accel/tcg/).
Message-Id: <[email protected]>
--- accel/tcg/user-retaddr.h | 28 ++++++++++++++++++++++++++++ include/exec/cpu_ldst.h | 28 ++-------------------------- accel/tcg/cpu-exec.c | 3 +++ accel/tcg/user-exec.c | 1 + 4 files changed, 34 insertions(+), 26 deletions(-) create mode 100644 accel/tcg/user-retaddr.h
accel/tcg/user-retaddr.h new file +28 -0
@@ -0,0 +1,28 @@ +#ifndef ACCEL_TCG_USER_RETADDR_H +#define ACCEL_TCG_USER_RETADDR_H + +#include "qemu/atomic.h" + +extern __threaduintptr_t helper_retaddr; + +static inline void set_helper_retaddr (uintptr_t ra) +{ + helper_retaddr = ra; +/* +* Ensure that this write is visible to the SIGSEGV handler that +* may be invoked due to a subsequent invalid memory operation. +*/ +signal_barrier (); +} + +static inline void clear_helper_retaddr (void ) +{ +/* +* Ensure that previous memory operations have succeeded before +* removing the data visible to the signal handler. +*/ +signal_barrier (); + helper_retaddr =0 ; +} + +#endif
include/exec/cpu_ldst.h +2 -26
@@ -300,31 +300,7 @@ Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, abi_ptr addr, Int128 cmpv, Int128 newv, MemOpIdx oi, uintptr_t retaddr); -#if defined(CONFIG_USER_ONLY ) - -extern __threaduintptr_t helper_retaddr; - -static inline void set_helper_retaddr (uintptr_t ra) -{ - helper_retaddr = ra; -/* -* Ensure that this write is visible to the SIGSEGV handler that -* may be invoked due to a subsequent invalid memory operation. -*/ -signal_barrier (); -} - -static inline void clear_helper_retaddr (void ) -{ -/* -* Ensure that previous memory operations have succeeded before -* removing the data visible to the signal handler. -*/ -signal_barrier (); - helper_retaddr =0 ; -} - -#else +#if !defined(CONFIG_USER_ONLY )#include "tcg/oversized-guest.h"
@@ -376,7 +352,7 @@ static inline CPUTLBEntry *tlb_entry(CPUState *cpu, uintptr_t mmu_idx, return &cpu->neg.tlb.f[mmu_idx].table[tlb_index(cpu, mmu_idx, addr)]; } -#endif /* defined(CONFIG_USER_ONLY) */ +#endif /* !defined(CONFIG_USER_ONLY) */ #if TARGET_BIG_ENDIAN # define cpu_lduw_data cpu_lduw_be_data
accel/tcg/cpu-exec.c +3 -0
@@ -41,6 +41,9 @@#include "tb-context.h" #include "internal-common.h" #include "internal-target.h" +#if defined(CONFIG_USER_ONLY ) +#include "user-retaddr.h" +#endif /* -icount align implementation. */
accel/tcg/user-exec.c +1 -0
@@ -31,6 +31,7 @@#include "tcg/tcg-ldst.h" #include "internal-common.h" #include "internal-target.h" +#include "user-retaddr.h" __threaduintptr_t helper_retaddr;
Signature · 1 line
2.41.0
[PULL 03/38] exec: Include 'cpu.h' before validating CPUArchState placement
In reply to Philippe Mathieu-DaudéCPUArchState 'env' field is defined within the ArchCPU structure, so we need to include each target "cpu.h" header which defines it.
Message-Id: <[email protected]>
--- include/exec/cpu-all.h | 1 + 1 file changed, 1 insertion(+)
include/exec/cpu-all.h +1 -0
@@ -391,6 +391,7 @@ static inline bool tlb_hit(uint64_t tlb_addr, vaddr addr)#endif /* !CONFIG_USER_ONLY */ /* Validate correct placement of CPUArchState. */ +#include "cpu.h" QEMU_BUILD_BUG_ON (offsetof(ArchCPU , parent_obj) !=0 );QEMU_BUILD_BUG_ON (offsetof(ArchCPU , env) !=sizeof (CPUState));
Signature · 1 line
2.41.0
[PULL 19/38] accel/tcg: Rename helper-head.h -> helper-head.h.inc
In reply to Philippe Mathieu-DaudéSince commit 139c1837db ("meson: rename included C source files to .c.inc"), QEMU standard procedure for included C files is to use *.c.inc.
Besides, since commit 6a0057aa22 ("docs/devel: make a statement about includes") this is documented in the Coding Style:
If you do use template header files they should be named with the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are being included for expansion.
Therefore rename "exec/helper-head.h" as "exec/helper-head.h.inc".
Message-Id: <[email protected]>
---
include/exec/helper-gen.h.inc | 2 +-
include/exec/{helper-head.h => helper-head.h.inc} | 0
include/exec/helper-proto.h.inc | 2 +-
include/exec/helper-info.c.inc | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
rename include/exec/{helper-head.h => helper-head.h.inc} (100%)include/exec/helper-gen.h.inc +1 -1
@@ -8,7 +8,7 @@ #include "tcg/tcg.h" #include "tcg/helper-info.h" -#include "exec/helper-head.h" +#include "exec/helper-head.h.inc" #define DEF_HELPER_FLAGS_0(name, flags, ret) \ extern TCGHelperInfo glue(helper_info_, name); \
include/exec/helper-head.h.inc renamed from include/exec/helper-head.h +0 -0
include/exec/helper-proto.h.inc +1 -1
@@ -5,7 +5,7 @@ * Define HELPER_H for the header file to be expanded. */ -#include "exec/helper-head.h" +#include "exec/helper-head.h.inc" /* * Work around an issue with --enable-lto, in which GCC's ipa-split pass
include/exec/helper-info.c.inc +1 -1
@@ -7,7 +7,7 @@ #include "tcg/tcg.h" #include "tcg/helper-info.h" -#include "exec/helper-head.h" +#include "exec/helper-head.h.inc" /* * Need one more level of indirection before stringification
Signature · 1 line
2.41.0
[PULL 18/38] accel/tcg: Rename load-extract/store-insert headers using .h.inc suffix
In reply to Philippe Mathieu-DaudéSince commit 139c1837db ("meson: rename included C source files to .c.inc"), QEMU standard procedure for included C files is to use *.c.inc.
Besides, since commit 6a0057aa22 ("docs/devel: make a statement about includes") this is documented in the Coding Style:
If you do use template header files they should be named with the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are being included for expansion.
Therefore rename 'store-insert-al16.h' as 'store-insert-al16.h.inc' and 'load-extract-al16-al8.h' as 'load-extract-al16-al8.h.inc'.
Message-Id: <[email protected]>
---
.../{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} | 0
.../host/{store-insert-al16.h => store-insert-al16.h.inc} | 0
.../{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} | 0
.../host/{store-insert-al16.h => store-insert-al16.h.inc} | 0
.../{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} | 0
.../host/{store-insert-al16.h => store-insert-al16.h.inc} | 0
.../{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} | 0
accel/tcg/ldst_atomicity.c.inc | 4 ++--
8 files changed, 2 insertions(+), 2 deletions(-)
rename host/include/aarch64/host/{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} (100%)
rename host/include/aarch64/host/{store-insert-al16.h => store-insert-al16.h.inc} (100%)
rename host/include/generic/host/{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} (100%)
rename host/include/generic/host/{store-insert-al16.h => store-insert-al16.h.inc} (100%)
rename host/include/loongarch64/host/{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} (100%)
rename host/include/loongarch64/host/{store-insert-al16.h => store-insert-al16.h.inc} (100%)
rename host/include/x86_64/host/{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} (100%)host/include/aarch64/host/load-extract-al16-al8.h.inc renamed from host/include/aarch64/host/load-extract-al16-al8.h +0 -0
host/include/aarch64/host/store-insert-al16.h.inc renamed from host/include/aarch64/host/store-insert-al16.h +0 -0
host/include/generic/host/load-extract-al16-al8.h.inc renamed from host/include/generic/host/load-extract-al16-al8.h +0 -0
host/include/generic/host/store-insert-al16.h.inc renamed from host/include/generic/host/store-insert-al16.h +0 -0
host/include/loongarch64/host/load-extract-al16-al8.h.inc renamed from host/include/loongarch64/host/load-extract-al16-al8.h +0 -0
host/include/loongarch64/host/store-insert-al16.h.inc renamed from host/include/loongarch64/host/store-insert-al16.h +0 -0
host/include/x86_64/host/load-extract-al16-al8.h.inc renamed from host/include/x86_64/host/load-extract-al16-al8.h +0 -0
accel/tcg/ldst_atomicity.c.inc +2 -2
@@ -9,8 +9,8 @@ * See the COPYING file in the top-level directory. */ -#include "host/load-extract-al16-al8.h" -#include "host/store-insert-al16.h" +#include "host/load-extract-al16-al8.h.inc" +#include "host/store-insert-al16.h.inc" #ifdef CONFIG_ATOMIC64 # define HAVE_al8 true
Signature · 1 line
2.41.0
[PULL 14/38] target/i386: Include missing 'exec/exec-all.h' header
In reply to Philippe Mathieu-DaudéThe XRSTOR instruction ends calling tlb_flush(), declared in "exec/exec-all.h".
Message-Id: <[email protected]>
--- target/i386/tcg/fpu_helper.c | 1 + 1 file changed, 1 insertion(+)
target/i386/tcg/fpu_helper.c +1 -0
@@ -21,6 +21,7 @@#include <math.h> #include "cpu.h" #include "tcg-cpu.h" +#include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h"
Signature · 1 line
2.41.0
[PULL 26/38] exec: Declare target_words_bigendian() in 'exec/tswap.h'
In reply to Philippe Mathieu-DaudéWe usually check target endianess before swapping values, so target_words_bigendian() declaration makes sense in "exec/tswap.h" with the target swapping helpers.
Remove "hw/core/cpu.h" when it was only included to get the target_words_bigendian() declaration.
Message-Id: <[email protected]>
--- include/exec/tswap.h | 12 +++++++++++- include/hw/core/cpu.h | 11 ----------- cpu-target.c | 1 + disas/disas.c | 1 + hw/audio/virtio-snd.c | 2 +- hw/core/cpu-sysemu.c | 2 +- hw/core/generic-loader.c | 2 +- hw/display/vga.c | 2 +- hw/virtio/virtio.c | 1 + 9 files changed, 18 insertions(+), 16 deletions(-)
include/exec/tswap.h +11 -1
@@ -8,9 +8,19 @@#ifndef TSWAP_H #define TSWAP_H -#include "hw/core/cpu.h" #include "qemu/bswap.h" +/** +* target_words_bigendian: +* Returns true if the (default) endianness of the target is big endian, +* false otherwise. Note that in target-specific code, you can use +* TARGET_BIG_ENDIAN directly instead. On the other hand, common +* code should normally never need to know about the endianness of the +* target, so please do *not* use this function unless you know very well +* what you are doing! +*/ +bool target_words_bigendian (void ); +/* * If we're in target-specific code, we can hard-code the swapping * condition, otherwise we have to do (slower) run-time checks.
include/hw/core/cpu.h +0 -11
@@ -1168,17 +1168,6 @@ bool cpu_exec_realizefn(CPUState *cpu, Error **errp);void cpu_exec_unrealizefn (CPUState *cpu);void cpu_exec_reset_hold (CPUState *cpu); -/** -* target_words_bigendian: -* Returns true if the (default) endianness of the target is big endian, -* false otherwise. Note that in target-specific code, you can use -* TARGET_BIG_ENDIAN directly instead. On the other hand, common -* code should normally never need to know about the endianness of the -* target, so please do *not* use this function unless you know very well -* what you are doing! -*/ -bool target_words_bigendian (void ); -const char *target_name (void );#ifdef COMPILING_PER_TARGET
cpu-target.c +1 -0
@@ -35,6 +35,7 @@#endif #include "sysemu/cpus.h" #include "sysemu/tcg.h" +#include "exec/tswap.h" #include "exec/replay-core.h" #include "exec/cpu-common.h" #include "exec/exec-all.h"
disas/disas.c +1 -0
@@ -6,6 +6,7 @@#include "disas/disas.h" #include "disas/capstone.h" #include "hw/core/cpu.h" +#include "exec/tswap.h" #include "exec/memory.h" /* Filled in by elfload.c. Simplistic, but will do for now. */
hw/audio/virtio-snd.c +1 -1
@@ -20,11 +20,11 @@#include "qemu/log.h" #include "qemu/error-report.h" #include "include/qemu/lockable.h" +#include "exec/tswap.h" #include "sysemu/runstate.h" #include "trace.h" #include "qapi/error.h" #include "hw/audio/virtio-snd.h" -#include "hw/core/cpu.h" #define VIRTIO_SOUND_VM_VERSION 1#define VIRTIO_SOUND_JACK_DEFAULT 0
hw/core/cpu-sysemu.c +1 -1
@@ -20,7 +20,7 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/core/cpu.h" +#include "exec/tswap.h" #include "hw/core/sysemu-cpu-ops.h" bool cpu_paging_enabled (const CPUState *cpu)
hw/core/generic-loader.c +1 -1
@@ -31,7 +31,7 @@*/ #include "qemu/osdep.h" -#include "hw/core/cpu.h" +#include "exec/tswap.h" #include "sysemu/dma.h" #include "sysemu/reset.h" #include "hw/boards.h"
hw/display/vga.c +1 -1
@@ -26,7 +26,7 @@#include "qemu/units.h" #include "sysemu/reset.h" #include "qapi/error.h" -#include "hw/core/cpu.h" +#include "exec/tswap.h" #include "hw/display/vga.h" #include "hw/i386/x86.h" #include "hw/pci/pci.h"
hw/virtio/virtio.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/log.h" #include "qemu/main-loop.h" #include "qemu/module.h" +#include "exec/tswap.h" #include "qom/object_interfaces.h" #include "hw/core/cpu.h" #include "hw/virtio/virtio.h"
Signature · 1 line
2.41.0
[PULL 27/38] exec: Move [b]tswapl() declarations to 'exec/user/tswap-target.h'
In reply to Philippe Mathieu-Daudétswapl() and bswaptls() are target-dependent and only used by user emulation. Move their definitions to a new header:
"exec/user/tswap-target.h".
Message-Id: <[email protected]>
--- MAINTAINERS | 1 + bsd-user/freebsd/target_os_elf.h | 1 + bsd-user/freebsd/target_os_stack.h | 1 + bsd-user/netbsd/target_os_elf.h | 1 + bsd-user/openbsd/target_os_elf.h | 1 + include/exec/cpu-all.h | 8 -------- include/exec/user/abitypes.h | 1 + include/user/tswap-target.h | 22 ++++++++++++++++++++++ bsd-user/signal.c | 1 + bsd-user/strace.c | 1 + linux-user/elfload.c | 1 + linux-user/i386/signal.c | 1 + linux-user/ppc/signal.c | 1 + 13 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 include/user/tswap-target.h
MAINTAINERS +1 -0
@@ -3692,6 +3692,7 @@ Overall usermode emulation M: Riku Voipio <[email protected]> S: Maintained F: accel/tcg/user-exec*.c +F: include/exec/user/ F: include/user/ F: common-user/
bsd-user/freebsd/target_os_elf.h +1 -0
@@ -22,6 +22,7 @@#include "target_arch_elf.h" #include "elf.h" +#include "user/tswap-target.h" #define bsd_get_ncpu () 1/* until we pull in bsd-proc.[hc] */
bsd-user/freebsd/target_os_stack.h +1 -0
@@ -23,6 +23,7 @@#include <sys/param.h> #include "target_arch_sigtramp.h" #include "qemu/guest-random.h" +#include "user/tswap-target.h" /* * The initial FreeBSD stack is as follows:
bsd-user/netbsd/target_os_elf.h +1 -0
@@ -22,6 +22,7 @@#include "target_arch_elf.h" #include "elf.h" +#include "user/tswap-target.h" /* this flag is uneffective under linux too, should be deleted */ #ifndef MAP_DENYWRITE
bsd-user/openbsd/target_os_elf.h +1 -0
@@ -22,6 +22,7 @@#include "target_arch_elf.h" #include "elf.h" +#include "user/tswap-target.h" /* this flag is uneffective under linux too, should be deleted */ #ifndef MAP_DENYWRITE
include/exec/cpu-all.h +0 -8
@@ -36,14 +36,6 @@#define BSWAP_NEEDED #endif -#if TARGET_LONG_SIZE ==4 -#define tswapl (s) tswap32(s) -#define bswaptls (s) bswap32s(s) -#else -#define tswapl (s) tswap64(s) -#define bswaptls (s) bswap64s(s) -#endif -/* Target-endianness CPU memory access functions. These fit into the * {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h. */
include/exec/user/abitypes.h +1 -0
@@ -2,6 +2,7 @@#define EXEC_USER_ABITYPES_H #include "cpu.h" +#include "user/tswap-target.h" #ifdef TARGET_ABI32 #define TARGET_ABI_BITS 32
include/user/tswap-target.h new file +22 -0
@@ -0,0 +1,22 @@ +/* +* target-specific swap() definitions +* +* Copyright (c) 2003 Fabrice Bellard +* +* SPDX-License-Identifier: LGPL-2.1-or-later +*/ +#ifndef USER_TSWAP_H +#define USER_TSWAP_H + +#include "exec/cpu-defs.h" +#include "exec/tswap.h" + +#if TARGET_LONG_SIZE ==4 +#define tswapl (s) tswap32(s) +#define bswaptls (s) bswap32s(s) +#else +#define tswapl (s) tswap64(s) +#define bswaptls (s) bswap64s(s) +#endif + +#endif
bsd-user/signal.c +1 -0
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "qemu/log.h" #include "qemu.h" +#include "user/tswap-target.h" #include "gdbstub/user.h" #include "signal-common.h" #include "trace.h"
bsd-user/strace.c +1 -0
@@ -22,6 +22,7 @@#include <sys/ioccom.h> #include "qemu.h" +#include "user/tswap-target.h" #include "os-strace.h" /* OS dependent strace print functions */
linux-user/elfload.c +1 -0
@@ -7,6 +7,7 @@#include <sys/shm.h> #include "qemu.h" +#include "user/tswap-target.h" #include "user-internals.h" #include "signal-common.h" #include "loader.h"
linux-user/i386/signal.c +1 -0
@@ -21,6 +21,7 @@#include "user-internals.h" #include "signal-common.h" #include "linux-user/trace.h" +#include "user/tswap-target.h" /* from the Linux kernel - /arch/x86/include/uapi/asm/sigcontext.h */
linux-user/ppc/signal.c +1 -0
@@ -21,6 +21,7 @@#include "user-internals.h" #include "signal-common.h" #include "linux-user/trace.h" +#include "user/tswap-target.h" #include "vdso-asmoffset.h" /* See arch/powerpc/include/asm/ucontext.h. Only used for 32-bit PPC;
Signature · 1 line
2.41.0
[PULL 05/38] accel: Include missing 'exec/cpu_ldst.h' header
In reply to Philippe Mathieu-DaudéTheses files call cpu_ldl_code() which is declared in "exec/cpu_ldst.h".
Message-Id: <[email protected]>
--- accel/tcg/translator.c | 1 + target/hexagon/translate.c | 1 + target/microblaze/cpu.c | 1 + target/microblaze/translate.c | 1 + 4 files changed, 4 insertions(+)
accel/tcg/translator.c +1 -0
@@ -12,6 +12,7 @@#include "qemu/error-report.h" #include "exec/exec-all.h" #include "exec/translator.h" +#include "exec/cpu_ldst.h" #include "exec/plugin-gen.h" #include "tcg/tcg-op-common.h" #include "internal-target.h"
target/hexagon/translate.c +1 -0
@@ -23,6 +23,7 @@#include "exec/helper-gen.h" #include "exec/helper-proto.h" #include "exec/translation-block.h" +#include "exec/cpu_ldst.h" #include "exec/log.h" #include "internal.h" #include "attribs.h"
target/microblaze/cpu.c +1 -0
@@ -28,6 +28,7 @@#include "qemu/module.h" #include "hw/qdev-properties.h" #include "exec/exec-all.h" +#include "exec/cpu_ldst.h" #include "exec/gdbstub.h" #include "fpu/softfloat-helpers.h" #include "tcg/tcg.h"
target/microblaze/translate.c +1 -0
@@ -22,6 +22,7 @@#include "cpu.h" #include "disas/disas.h" #include "exec/exec-all.h" +#include "exec/cpu_ldst.h" #include "tcg/tcg-op.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h"
Signature · 1 line
2.41.0
[PULL 30/38] exec: Declare MMUAccessType type in 'mmu-access-type.h' header
In reply to Philippe Mathieu-DaudéThe MMUAccessType enum is declared in "hw/core/cpu.h". "hw/core/cpu.h" contains declarations related to CPUState and CPUClass. Some source files only require MMUAccessType and don't need to pull in all CPU* declarations. In order to simplify, create a new "exec/mmu-access-type.h" header.
Message-Id: <[email protected]>
--- include/exec/cpu_ldst.h | 1 + include/exec/exec-all.h | 1 + include/exec/mmu-access-type.h | 18 ++++++++++++++++++ include/hw/core/cpu.h | 8 +------- 4 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 include/exec/mmu-access-type.h
include/exec/cpu_ldst.h +1 -0
@@ -64,6 +64,7 @@#include "exec/memopidx.h" #include "exec/abi_ptr.h" +#include "exec/mmu-access-type.h" #include "qemu/int128.h" #include "cpu.h"
include/exec/exec-all.h +1 -0
@@ -25,6 +25,7 @@#include "exec/abi_ptr.h" #include "exec/cpu_ldst.h" #endif +#include "exec/mmu-access-type.h" #include "exec/translation-block.h" #include "qemu/clang-tsa.h"
include/exec/mmu-access-type.h new file +18 -0
@@ -0,0 +1,18 @@ +/* +* QEMU MMU Access type definitions +* +* Copyright (c) 2012 SUSE LINUX Products GmbH +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef EXEC_MMU_ACCESS_TYPE_H +#define EXEC_MMU_ACCESS_TYPE_H + +typedef enum MMUAccessType { +MMU_DATA_LOAD =0 , +MMU_DATA_STORE =1 , +MMU_INST_FETCH =2 +#define MMU_ACCESS_COUNT 3 +}MMUAccessType ; + +#endif
include/hw/core/cpu.h +1 -7
@@ -25,6 +25,7 @@#include "exec/hwaddr.h" #include "exec/vaddr.h" #include "exec/memattrs.h" +#include "exec/mmu-access-type.h" #include "exec/tlb-common.h" #include "qapi/qapi-types-run-state.h" #include "qemu/bitmap.h"
@@ -80,13 +81,6 @@ DECLARE_CLASS_CHECKERS(CPUClass, CPU,typedef struct ArchCPU CpuInstanceType ; \OBJECT_DECLARE_TYPE (ArchCPU, CpuClassType,CPU_MODULE_OBJ_NAME ); -typedef enum MMUAccessType { -MMU_DATA_LOAD =0 , -MMU_DATA_STORE =1 , -MMU_INST_FETCH =2 -#define MMU_ACCESS_COUNT 3 -}MMUAccessType ; -typedef struct CPUWatchpoint CPUWatchpoint ;/* see accel-cpu.h */
Signature · 1 line
2.41.0
[PULL 20/38] accel/whpx: Use accel-specific per-vcpu @dirty field
In reply to Philippe Mathieu-DaudéWHPX has a specific use of the CPUState::vcpu_dirty field (CPUState::vcpu_dirty is not used by common code). To make this field accel-specific, add and use a new @dirty variable in the AccelCPUState structure.
Message-Id: <[email protected]>
--- target/i386/whpx/whpx-all.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
target/i386/whpx/whpx-all.c +12 -11
@@ -237,6 +237,7 @@ struct AccelCPUState {uint64_t tpr;uint64_t apic_base;bool interruption_pending; +bool dirty;/* Must be the last field as it may have a tail */ WHV_RUN_VP_EXIT_CONTEXT exit_ctx;
@@ -839,7 +840,7 @@ static HRESULT CALLBACK whpx_emu_setreg_callback(* The emulator just successfully wrote the register state. We clear the * dirty state so we avoid the double write on resume of the VP. */ - cpu->vcpu_dirty = false; + cpu->accel->dirty = false;return hr; }
@@ -1394,7 +1395,7 @@ static int whpx_last_vcpu_stopping(CPUState *cpu)/* Returns the address of the next instruction that is about to be executed. */ static vaddr whpx_vcpu_get_pc (CPUState *cpu,bool exit_context_valid) { -if (cpu->vcpu_dirty) { +if (cpu->accel->dirty) {/* The CPU registers have been modified by other parts of QEMU. */ return cpu_env (cpu)->eip; }else if (exit_context_valid) {
@@ -1713,9 +1714,9 @@ static int whpx_vcpu_run(CPUState *cpu) } do { - if (cpu->vcpu_dirty) { + if (cpu->accel->dirty) { whpx_set_registers(cpu, WHPX_SET_RUNTIME_STATE); - cpu->vcpu_dirty = false; + cpu->accel->dirty = false; } if (exclusive_step_mode == WHPX_STEP_NONE) {
@@ -2063,9 +2064,9 @@ static int whpx_vcpu_run(CPUState *cpu)static void do_whpx_cpu_synchronize_state (CPUState *cpu,run_on_cpu_data arg) { -if (!cpu->vcpu_dirty) { +if (!cpu->accel->dirty) {whpx_get_registers (cpu); - cpu->vcpu_dirty = true; + cpu->accel->dirty = true; } }
@@ -2073,20 +2074,20 @@ static void do_whpx_cpu_synchronize_post_reset(CPUState *cpu, run_on_cpu_data arg) {whpx_set_registers (cpu,WHPX_SET_RESET_STATE ); - cpu->vcpu_dirty = false; + cpu->accel->dirty = false; }static void do_whpx_cpu_synchronize_post_init (CPUState *cpu,run_on_cpu_data arg) {whpx_set_registers (cpu,WHPX_SET_FULL_STATE ); - cpu->vcpu_dirty = false; + cpu->accel->dirty = false; }static void do_whpx_cpu_synchronize_pre_loadvm (CPUState *cpu,run_on_cpu_data arg) { - cpu->vcpu_dirty = true; + cpu->accel->dirty = true; }/*
@@ -2095,7 +2096,7 @@ static void do_whpx_cpu_synchronize_pre_loadvm(CPUState *cpu,void whpx_cpu_synchronize_state (CPUState *cpu) { -if (!cpu->vcpu_dirty) { +if (!cpu->accel->dirty) {run_on_cpu (cpu, do_whpx_cpu_synchronize_state,RUN_ON_CPU_NULL ); } }
@@ -2235,7 +2236,7 @@ int whpx_init_vcpu(CPUState *cpu) } vcpu->interruptable = true; - cpu->vcpu_dirty = true; + cpu->accel->dirty = true; cpu->accel = vcpu; max_vcpu_index =max (max_vcpu_index, cpu->cpu_index);qemu_add_vm_change_state_handler (whpx_cpu_update_state, env);
Signature · 1 line
2.41.0
Re: [PULL 20/38] accel/whpx: Use accel-specific per-vcpu @dirty field
Am 26.04.24 um 21:41 schrieb Philippe Mathieu-Daudé:
Quoted 18 lines
WHPX has a specific use of the
CPUState::vcpu_dirtyfield (CPUState::vcpu_dirtyis not used by common code). To make this field accel-specific, add and use a new @dirty variable in the AccelCPUState structure.Signed-off-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by Richard Henderson <[email protected]>Message-Id: <[email protected]>
--- target/i386/whpx/whpx-all.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)target/i386/whpx/whpx-all.c +0
-0
target/i386/whpx/whpx-all.c int whpx_init_vcpu(CPUState *cpu) · line 2238
Quoted 4 lines
target/i386/whpx/whpx-all.c +0
-1@@ -2235,7 +2236,7 @@ int whpx_init_vcpu(CPUState *cpu) } vcpu->interruptable = true; - cpu->vcpu_dirty = true;
Hi Philippe,
cpu->accel is NULL here. You probably wanted to write
+ vcpu->dirty = true;
instead of
+ cpu->accel->dirty = true;
I think your patch for nvmm_init_vcpu() in target/i386/nvmm/nvmm-all.c has the same issue.
With best regards,
Volker
Quoted 4 lines
target/i386/whpx/whpx-all.c +1
-0+ cpu->accel->dirty = true; cpu->accel = vcpu; max_vcpu_index =max (max_vcpu_index, cpu->cpu_index);qemu_add_vm_change_state_handler (whpx_cpu_update_state, env);
Re: [PULL 20/38] accel/whpx: Use accel-specific per-vcpu @dirty field
Quoted 28 lines · Volker Rümelin
Am 26.04.24 um 21:41 schrieb Philippe Mathieu-Daudé:
Quoted 18 lines
WHPX has a specific use of the
CPUState::vcpu_dirtyfield (CPUState::vcpu_dirtyis not used by common code). To make this field accel-specific, add and use a new @dirty variable in the AccelCPUState structure.Signed-off-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by Richard Henderson <[email protected]>Message-Id: <[email protected]>
--- target/i386/whpx/whpx-all.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)target/i386/whpx/whpx-all.c +0
-0target/i386/whpx/whpx-all.c int whpx_init_vcpu(CPUState *cpu) · line 2238
Quoted 4 lines
target/i386/whpx/whpx-all.c +0
-1@@ -2235,7 +2236,7 @@ int whpx_init_vcpu(CPUState *cpu) } vcpu->interruptable = true; - cpu->vcpu_dirty = true;Hi Philippe,
cpu->accelis NULL here. You probably wanted to write
Quoted 8 lines
+
vcpu->dirty= true;instead of
+
cpu->accel->dirty= true;I think your patch for
nvmm_init_vcpu()intarget/i386/nvmm/nvmm-all.chas the same issue.
Doh, sorry I missed that :/
I'll post fixes, thanks Volker!
Phil.
[PULL 38/38] plugins: Include missing 'qemu/bitmap.h' header
In reply to Philippe Mathieu-DaudéSince commit c006147122 ("plugins: create CPUPluginState and migrate plugin_mask") "qemu/plugin.h" uses DECLARE_BITMAP(), which is declared in "qemu/bitmap.h".
Message-Id: <[email protected]>
--- include/qemu/plugin.h | 1 + 1 file changed, 1 insertion(+)
include/qemu/plugin.h +1 -0
@@ -13,6 +13,7 @@#include "qemu/queue.h" #include "qemu/option.h" #include "qemu/plugin-event.h" +#include "qemu/bitmap.h" #include "exec/memopidx.h" #include "hw/core/cpu.h"
Signature · 1 line
2.41.0
[PULL 21/38] accel/nvmm: Use accel-specific per-vcpu @dirty field
In reply to Philippe Mathieu-DaudéNVMM has a specific use of the CPUState::vcpu_dirty field (CPUState::vcpu_dirty is not used by common code). To make this field accel-specific, add and use a new @dirty variable in the AccelCPUState structure.
Message-Id: <[email protected]>
--- target/i386/nvmm/nvmm-all.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
target/i386/nvmm/nvmm-all.c +11 -10
@@ -30,6 +30,7 @@ struct AccelCPUState {struct nvmm_vcpu vcpu;uint8_t tpr;bool stop; +bool dirty;/* Window-exiting for INTs/NMIs. */ bool int_window_exit;
@@ -507,7 +508,7 @@ nvmm_io_callback(struct nvmm_io *io) }/* Needed, otherwise infinite loop. */ - current_cpu->vcpu_dirty = false; + current_cpu->accel->dirty = false; } static void
@@ -516,7 +517,7 @@ nvmm_mem_callback(struct nvmm_mem *mem)cpu_physical_memory_rw (mem->gpa, mem->data, mem->size, mem->write);/* Needed, otherwise infinite loop. */ - current_cpu->vcpu_dirty = false; + current_cpu->accel->dirty = false; }static struct nvmm_assist_callbacks nvmm_callbacks = {
@@ -726,9 +727,9 @@ nvmm_vcpu_loop(CPUState *cpu)* Inner VCPU loop. */ do { - if (cpu->vcpu_dirty) { + if (cpu->accel->dirty) { nvmm_set_registers(cpu); - cpu->vcpu_dirty = false; + cpu->accel->dirty = false; } if (qcpu->stop) {
@@ -826,32 +827,32 @@ static void do_nvmm_cpu_synchronize_state(CPUState *cpu, run_on_cpu_data arg) {nvmm_get_registers (cpu); - cpu->vcpu_dirty = true; + cpu->accel->dirty = true; }static void do_nvmm_cpu_synchronize_post_reset (CPUState *cpu,run_on_cpu_data arg) {nvmm_set_registers (cpu); - cpu->vcpu_dirty = false; + cpu->accel->dirty = false; }static void do_nvmm_cpu_synchronize_post_init (CPUState *cpu,run_on_cpu_data arg) {nvmm_set_registers (cpu); - cpu->vcpu_dirty = false; + cpu->accel->dirty = false; }static void do_nvmm_cpu_synchronize_pre_loadvm (CPUState *cpu,run_on_cpu_data arg) { - cpu->vcpu_dirty = true; + cpu->accel->dirty = true; }void nvmm_cpu_synchronize_state (CPUState *cpu) { -if (!cpu->vcpu_dirty) { +if (!cpu->accel->dirty) {run_on_cpu (cpu, do_nvmm_cpu_synchronize_state,RUN_ON_CPU_NULL ); } }
@@ -981,7 +982,7 @@ nvmm_init_vcpu(CPUState *cpu) } } - cpu->vcpu_dirty = true; + cpu->accel->dirty = true; cpu->accel = qcpu;return 0 ;
Signature · 1 line
2.41.0
[PULL 25/38] exec/cpu-all: Remove unused tswapls() definitions
In reply to Philippe Mathieu-DaudéLast use of tswapls() was removed 2 years ago in commit aee14c77f4 ("linux-user: Rewrite do_getdents, do_getdents64").
Message-Id: <[email protected]>
--- include/exec/cpu-all.h | 2 -- 1 file changed, 2 deletions(-)
include/exec/cpu-all.h +0 -2
@@ -38,11 +38,9 @@#if TARGET_LONG_SIZE ==4 #define tswapl (s) tswap32(s) -#define tswapls (s) tswap32s((uint32_t *)(s))#define bswaptls (s) bswap32s(s)#else #define tswapl (s) tswap64(s) -#define tswapls (s) tswap64s((uint64_t *)(s))#define bswaptls (s) bswap64s(s)#endif
Signature · 1 line
2.41.0
[PULL 37/38] hw/core: Avoid including the full 'hw/core/cpu.h' in 'tcg-cpu-ops.h'
In reply to Philippe Mathieu-DaudéOnly include what is required, avoiding the full CPUState API from the huge "hw/core/cpu.h" header.
Message-Id: <[email protected]>
--- include/hw/core/tcg-cpu-ops.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
include/hw/core/tcg-cpu-ops.h +5 -1
@@ -10,7 +10,11 @@#ifndef TCG_CPU_OPS_H #define TCG_CPU_OPS_H -#include "hw/core/cpu.h" +#include "exec/breakpoint.h" +#include "exec/hwaddr.h" +#include "exec/memattrs.h" +#include "exec/mmu-access-type.h" +#include "exec/vaddr.h" struct TCGCPUOps {/**
Signature · 1 line
2.41.0
[PULL 24/38] exec/cpu-all: Remove unused 'qemu/thread.h' header
In reply to Philippe Mathieu-DaudéNothing is required from "qemu/thread.h" in "exec/cpu-all.h".
Message-Id: <[email protected]>
--- include/exec/cpu-all.h | 1 - 1 file changed, 1 deletion(-)
include/exec/cpu-all.h +0 -1
@@ -22,7 +22,6 @@#include "exec/cpu-common.h" #include "exec/memory.h" #include "exec/tswap.h" -#include "qemu/thread.h" #include "hw/core/cpu.h" /* some important defines:
Signature · 1 line
2.41.0
[PULL 29/38] exec: Declare abi_ptr type in its own 'abi_ptr.h' header
In reply to Philippe Mathieu-DaudéThe abi_ptr type is declared in "exec/cpu_ldst.h" with all the load/store helpers. Some source files requiring abi_ptr type don't need the load/store helpers. In order to simplify, create a new "exec/abi_ptr.h" header.
Message-Id: <[email protected]>
--- include/exec/abi_ptr.h | 33 +++++++++++++++++++++++++++++++++ include/exec/cpu_ldst.h | 17 +++-------------- include/exec/exec-all.h | 1 + include/exec/translator.h | 5 ++++- 4 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 include/exec/abi_ptr.h
include/exec/abi_ptr.h new file +33 -0
@@ -0,0 +1,33 @@ +/* +* QEMU abi_ptr type definitions +* +* SPDX-License-Identifier: LGPL-2.1-or-later +*/ +#ifndef EXEC_ABI_PTR_H +#define EXEC_ABI_PTR_H + +#include "cpu-param.h" + +#if defined(CONFIG_USER_ONLY ) +/* +* sparc32plus has 64bit long but 32bit space address +* this can make bad result with g2h() and h2g() +*/ +#if TARGET_VIRT_ADDR_SPACE_BITS <=32 +typedef uint32_t abi_ptr ; +#define TARGET_ABI_FMT_ptr "%x" +#else +typedef uint64_t abi_ptr ; +#define TARGET_ABI_FMT_ptr "%"PRIx64 +#endif + +#else /* !CONFIG_USER_ONLY */ + +#include "exec/target_long.h" + +typedef target_ulong abi_ptr ; +#define TARGET_ABI_FMT_ptr TARGET_FMT_lx + +#endif /* !CONFIG_USER_ONLY */ + +#endif
include/exec/cpu_ldst.h +3 -14
@@ -63,20 +63,11 @@#define CPU_LDST_H #include "exec/memopidx.h" +#include "exec/abi_ptr.h" #include "qemu/int128.h" #include "cpu.h" #if defined(CONFIG_USER_ONLY ) -/* sparc32plus has 64bit long but 32bit space address -* this can make bad result with g2h() and h2g() -*/ -#if TARGET_VIRT_ADDR_SPACE_BITS <=32 -typedef uint32_t abi_ptr ; -#define TARGET_ABI_FMT_ptr "%x" -#else -typedef uint64_t abi_ptr ; -#define TARGET_ABI_FMT_ptr "%"PRIx64 -#endif #ifndef TARGET_TAGGED_ADDRESSES static inline abi_ptr cpu_untagged_addr (CPUState *cs,abi_ptr x)
@@ -120,10 +111,8 @@ static inline bool guest_range_valid_untagged(abi_ulong start, abi_ulong len)assert (h2g_valid (x)); \h2g_nocheck (x); \ }) -#else -typedef vaddr abi_ptr ; -#define TARGET_ABI_FMT_ptr VADDR_PRIx -#endif + +#endif /* CONFIG_USER_ONLY */ uint32_t cpu_ldub_data (CPUArchState *env,abi_ptr ptr);int cpu_ldsb_data (CPUArchState *env,abi_ptr ptr);
include/exec/exec-all.h +1 -0
@@ -22,6 +22,7 @@#include "cpu.h" #if defined(CONFIG_USER_ONLY ) +#include "exec/abi_ptr.h" #include "exec/cpu_ldst.h" #endif #include "exec/translation-block.h"
include/exec/translator.h +4 -1
@@ -19,7 +19,10 @@*/ #include "qemu/bswap.h" -#include "exec/cpu_ldst.h" /* for abi_ptr */ +#include "exec/cpu-common.h" +#include "exec/cpu-defs.h" +#include "exec/abi_ptr.h" +#include "cpu.h" /** * gen_intermediate_code
Signature · 1 line
2.41.0
[PULL 34/38] exec: Rename 'exec/user/guest-base.h' as 'user/guest-base.h'
In reply to Philippe Mathieu-DaudéThe include/user/ directory contains the user-emulation specific headers. Move guest-base.h there too.
Message-Id: <[email protected]>
---
include/exec/cpu-all.h | 2 +-
include/{exec => }/user/guest-base.h | 4 ++--
tcg/tcg.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
rename include/{exec => }/user/guest-base.h (72%)include/exec/cpu-all.h +1 -1
@@ -65,7 +65,7 @@#if defined(CONFIG_USER_ONLY )#include "exec/user/abitypes.h" -#include "exec/user/guest-base.h" +#include "user/guest-base.h" extern bool have_guest_base;
include/user/guest-base.h renamed from include/exec/user/guest-base.h +2 -2
@@ -4,8 +4,8 @@* Copyright (c) 2003 Fabrice Bellard */ -#ifndef EXEC_USER_GUEST_BASE_H -#define EXEC_USER_GUEST_BASE_H +#ifndef USER_GUEST_BASE_H +#define USER_GUEST_BASE_H extern uintptr_t guest_base;
tcg/tcg.c +1 -1
@@ -57,7 +57,7 @@#include "tcg-internal.h" #include "tcg/perf.h" #ifdef CONFIG_USER_ONLY -#include "exec/user/guest-base.h" +#include "user/guest-base.h" #endif /* Forward declarations for functions declared in tcg-target.c.inc and
Signature · 1 line
2.41.0
[PULL 31/38] exec: Declare CPUBreakpoint/CPUWatchpoint type in 'breakpoint.h' header
In reply to Philippe Mathieu-DaudéThe CPUBreakpoint and CPUWatchpoint structures are declared in "hw/core/cpu.h", which contains declarations related to CPUState and CPUClass. Some source files only require the BP/WP definitions and don't need to pull in all CPU* API. In order to simplify, create a new "exec/breakpoint.h" header.
Message-Id: <[email protected]>
--- include/exec/breakpoint.h | 30 ++++++++++++++++++++++++++++++ include/hw/core/cpu.h | 16 +--------------- target/arm/internals.h | 1 + target/ppc/internal.h | 1 + target/riscv/debug.h | 2 ++ 5 files changed, 35 insertions(+), 15 deletions(-) create mode 100644 include/exec/breakpoint.h
include/exec/breakpoint.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* QEMU breakpoint & watchpoint definitions +* +* Copyright (c) 2012 SUSE LINUX Products GmbH +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef EXEC_BREAKPOINT_H +#define EXEC_BREAKPOINT_H + +#include "qemu/queue.h" +#include "exec/vaddr.h" +#include "exec/memattrs.h" + +typedef struct CPUBreakpoint { +vaddr pc; +int flags;/* BP_* */ +QTAILQ_ENTRY (CPUBreakpoint) entry; +}CPUBreakpoint ; + +typedef struct CPUWatchpoint { +vaddr vaddr; +vaddr len; +vaddr hitaddr; +MemTxAttrs hitattrs; +int flags;/* BP_* */ +QTAILQ_ENTRY (CPUWatchpoint) entry; +}CPUWatchpoint ; + +#endif
include/hw/core/cpu.h +1 -15
@@ -22,6 +22,7 @@#include "hw/qdev-core.h" #include "disas/dis-asm.h" +#include "exec/breakpoint.h" #include "exec/hwaddr.h" #include "exec/vaddr.h" #include "exec/memattrs.h"
@@ -347,21 +348,6 @@ typedef struct CPUNegativeOffsetState {bool can_do_io; } CPUNegativeOffsetState; -typedef struct CPUBreakpoint { -vaddr pc; -int flags;/* BP_* */ -QTAILQ_ENTRY (CPUBreakpoint) entry; -}CPUBreakpoint ; - -struct CPUWatchpoint { -vaddr vaddr; -vaddr len; -vaddr hitaddr; -MemTxAttrs hitattrs; -int flags;/* BP_* */ -QTAILQ_ENTRY (CPUWatchpoint) entry; -}; -struct KVMState ;struct kvm_run ;
target/arm/internals.h +1 -0
@@ -25,6 +25,7 @@#ifndef TARGET_ARM_INTERNALS_H #define TARGET_ARM_INTERNALS_H +#include "exec/breakpoint.h" #include "hw/registerfields.h" #include "tcg/tcg-gvec-desc.h" #include "syndrome.h"
target/ppc/internal.h +1 -0
@@ -18,6 +18,7 @@#ifndef PPC_INTERNAL_H #define PPC_INTERNAL_H +#include "exec/breakpoint.h" #include "hw/registerfields.h" /* PM instructions */
target/riscv/debug.h +2 -0
@@ -22,6 +22,8 @@#ifndef RISCV_DEBUG_H #define RISCV_DEBUG_H +#include "exec/breakpoint.h" +#define RV_MAX_TRIGGERS 2/* register index of tdata CSRs */
Signature · 1 line
2.41.0
[PULL 36/38] exec: Move CPUTLBEntry helpers to cputlb.c
In reply to Philippe Mathieu-DaudéThe following CPUTLBEntry helpers are only used in accel/tcg/cputlb.c:
- tlb_index()
- tlb_entry()
- tlb_read_idx()
- tlb_addr_write()
Move them to this file, allowing to remove the huge "cpu.h" header inclusion from "exec/cpu_ldst.h".
Message-Id: <[email protected]>
--- include/exec/cpu_ldst.h | 55 ----------------------------------------- accel/tcg/cputlb.c | 51 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 55 deletions(-)
include/exec/cpu_ldst.h +0 -55
@@ -70,7 +70,6 @@#include "exec/abi_ptr.h" #include "exec/mmu-access-type.h" #include "qemu/int128.h" -#include "cpu.h" #if defined(CONFIG_USER_ONLY )
@@ -296,60 +295,6 @@ Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, abi_ptr addr, Int128 cmpv, Int128 newv, MemOpIdx oi, uintptr_t retaddr); -#if !defined(CONFIG_USER_ONLY ) - -#include "tcg/oversized-guest.h" - -static inline uint64_t tlb_read_idx (const CPUTLBEntry *entry, -MMUAccessType access_type) -{ -/* Do not rearrange the CPUTLBEntry structure members. */ -QEMU_BUILD_BUG_ON (offsetof(CPUTLBEntry , addr_read) != -MMU_DATA_LOAD *sizeof (uint64_t )); -QEMU_BUILD_BUG_ON (offsetof(CPUTLBEntry , addr_write) != -MMU_DATA_STORE *sizeof (uint64_t )); -QEMU_BUILD_BUG_ON (offsetof(CPUTLBEntry , addr_code) != -MMU_INST_FETCH *sizeof (uint64_t )); - -#if TARGET_LONG_BITS ==32 -/* Use qatomic_read, in case of addr_write; only care about low bits. */ -const uint32_t *ptr = (uint32_t *)&entry->addr_idx[access_type]; - ptr +=HOST_BIG_ENDIAN ; -return qatomic_read (ptr); -#else -const uint64_t *ptr = &entry->addr_idx[access_type]; -# if TCG_OVERSIZED_GUEST -return *ptr; -# else -/* ofs might correspond to .addr_write, so use qatomic_read */ -return qatomic_read (ptr); -# endif -#endif -} - -static inline uint64_t tlb_addr_write (const CPUTLBEntry *entry) -{ -return tlb_read_idx (entry,MMU_DATA_STORE ); -} - -/* Find the TLB index corresponding to the mmu_idx + address pair. */ -static inline uintptr_t tlb_index (CPUState *cpu,uintptr_t mmu_idx, -vaddr addr) -{ -uintptr_t size_mask = cpu->neg.tlb.f[mmu_idx].mask >>CPU_TLB_ENTRY_BITS ; - -return (addr >>TARGET_PAGE_BITS ) & size_mask; -} - -/* Find the TLB entry corresponding to the mmu_idx + address pair. */ -static inline CPUTLBEntry *tlb_entry (CPUState *cpu,uintptr_t mmu_idx, -vaddr addr) -{ -return &cpu->neg.tlb.f[mmu_idx].table[tlb_index (cpu, mmu_idx, addr)]; -} - -#endif /* !defined(CONFIG_USER_ONLY) */ -#if TARGET_BIG_ENDIAN # define cpu_lduw_data cpu_lduw_be_data# define cpu_ldsw_data cpu_ldsw_be_data
accel/tcg/cputlb.c +51 -0
63 lines not on this page · raw message
Signature · 1 line
2.41.0
[PULL 17/38] accel/tcg: Include missing headers in 'tb-jmp-cache.h'
In reply to Philippe Mathieu-DaudéDue to missing headers, when including "tb-jmp-cache.h" we might get:
accel/tcg/tb-jmp-cache.h:21:21: error: field ‘rcu’ has incomplete type
21 | struct rcu_head rcu;
| ^~~
accel/tcg/tb-jmp-cache.h:24:9: error: unknown type name ‘vaddr’
24 | vaddr pc;
| ^~~~~Add the missing "qemu/rcu.h" and "exec/cpu-common.h" headers.
Message-Id: <[email protected]>
--- accel/tcg/tb-jmp-cache.h | 3 +++ 1 file changed, 3 insertions(+)
accel/tcg/tb-jmp-cache.h +3 -0
@@ -9,6 +9,9 @@#ifndef ACCEL_TCG_TB_JMP_CACHE_H #define ACCEL_TCG_TB_JMP_CACHE_H +#include "qemu/rcu.h" +#include "exec/cpu-common.h" +#define TB_JMP_CACHE_BITS 12#define TB_JMP_CACHE_SIZE (1 << TB_JMP_CACHE_BITS)
Signature · 1 line
2.41.0
[PULL 16/38] accel/tcg: Include missing 'hw/core/cpu.h' header
In reply to Philippe Mathieu-Daudétcg_cpu_init_cflags() accesses CPUState fields, so requires "hw/core/cpu.h" to get its structure definition.
Message-Id: <[email protected]>
--- accel/tcg/tcg-accel-ops.c | 2 ++ 1 file changed, 2 insertions(+)
accel/tcg/tcg-accel-ops.c +2 -0
@@ -37,6 +37,8 @@#include "exec/tb-flush.h" #include "exec/gdbstub.h" +#include "hw/core/cpu.h" +#include "tcg-accel-ops.h" #include "tcg-accel-ops-mttcg.h" #include "tcg-accel-ops-rr.h"
Signature · 1 line
2.41.0
[PULL 32/38] exec: Restrict TCG specific declarations of 'cputlb.h'
In reply to Philippe Mathieu-DaudéAvoid TCG specific declarations being used from non-TCG accelerators.
Message-Id: <[email protected]>
--- include/exec/cputlb.h | 5 +++++ 1 file changed, 5 insertions(+)
include/exec/cputlb.h +5 -0
@@ -22,9 +22,14 @@#include "exec/cpu-common.h" +#ifdef CONFIG_TCG +#if !defined(CONFIG_USER_ONLY )/* cputlb.c */ void tlb_protect_code (ram_addr_t ram_addr);void tlb_unprotect_code (ram_addr_t ram_addr);#endif + +#endif /* CONFIG_TCG */ +#endif
Signature · 1 line
2.41.0
[PULL 22/38] accel/hvf: Use accel-specific per-vcpu @dirty field
In reply to Philippe Mathieu-DaudéHVF has a specific use of the CPUState::vcpu_dirty field (CPUState::vcpu_dirty is not used by common code). To make this field accel-specific, add and use a new @dirty variable in the AccelCPUState structure.
Message-Id: <[email protected]>
--- include/hw/core/cpu.h | 3 +-- include/sysemu/hvf_int.h | 1 + accel/hvf/hvf-accel-ops.c | 10 +++++----- target/arm/hvf/hvf.c | 4 ++-- target/i386/hvf/hvf.c | 4 ++-- target/i386/hvf/x86hvf.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-)
include/hw/core/cpu.h +1 -2
@@ -525,6 +525,7 @@ struct CPUState {uint32_t kvm_fetch_index;uint64_t dirty_pages;int kvm_vcpu_stats_fd; +bool vcpu_dirty;/* Use by accel-block: CPU is executing an ioctl() */ QemuLockCnt in_ioctl_lock;
@@ -546,8 +547,6 @@ struct CPUState {int32_t exception_index;AccelCPUState *accel; -/* shared by kvm and hvf */ -bool vcpu_dirty;/* Used to keep track of an outstanding cpu throttle thread for migration * autoconverge
include/sysemu/hvf_int.h +1 -0
@@ -55,6 +55,7 @@ struct AccelCPUState {bool vtimer_masked;sigset_t unblock_ipi_mask;bool guest_debug_enabled; +bool dirty; };void assert_hvf_ok (hv_return_t ret);
accel/hvf/hvf-accel-ops.c +5 -5
@@ -204,15 +204,15 @@ static void hvf_set_phys_mem(MemoryRegionSection *section, bool add)static void do_hvf_cpu_synchronize_state (CPUState *cpu,run_on_cpu_data arg) { -if (!cpu->vcpu_dirty) { +if (!cpu->accel->dirty) {hvf_get_registers (cpu); - cpu->vcpu_dirty = true; + cpu->accel->dirty = true; } }static void hvf_cpu_synchronize_state (CPUState *cpu) { -if (!cpu->vcpu_dirty) { +if (!cpu->accel->dirty) {run_on_cpu (cpu, do_hvf_cpu_synchronize_state,RUN_ON_CPU_NULL ); } }
@@ -221,7 +221,7 @@ static void do_hvf_cpu_synchronize_set_dirty(CPUState *cpu, run_on_cpu_data arg) {/* QEMU state is the reference, push it to HVF now and on next entry */ - cpu->vcpu_dirty = true; + cpu->accel->dirty = true; }static void hvf_cpu_synchronize_post_reset (CPUState *cpu)
@@ -402,7 +402,7 @@ static int hvf_init_vcpu(CPUState *cpu)#else r =hv_vcpu_create ((hv_vcpuid_t *)&cpu->accel->fd,HV_VCPU_DEFAULT );#endif - cpu->vcpu_dirty =1 ; + cpu->accel->dirty = true;assert_hvf_ok (r); cpu->accel->guest_debug_enabled = false;
target/arm/hvf/hvf.c +2 -2
@@ -806,9 +806,9 @@ int hvf_put_registers(CPUState *cpu)static void flush_cpu_state (CPUState *cpu) { -if (cpu->vcpu_dirty) { +if (cpu->accel->dirty) {hvf_put_registers (cpu); - cpu->vcpu_dirty = false; + cpu->accel->dirty = false; } }
target/i386/hvf/hvf.c +2 -2
@@ -419,9 +419,9 @@ int hvf_vcpu_exec(CPUState *cpu) } do { - if (cpu->vcpu_dirty) { + if (cpu->accel->dirty) { hvf_put_registers(cpu); - cpu->vcpu_dirty = false; + cpu->accel->dirty = false; } if (hvf_inject_interrupts(cpu)) {
target/i386/hvf/x86hvf.c +1 -1
@@ -427,7 +427,7 @@ int hvf_process_events(CPUState *cs)X86CPU *cpu =X86_CPU (cs);CPUX86State *env = &cpu->env; -if (!cs->vcpu_dirty) { +if (!cs->accel->dirty) {/* light weight sync for CPU_INTERRUPT_HARD and IF_MASK */ env->eflags =rreg (cs->accel->fd,HV_X86_RFLAGS ); }
Signature · 1 line
2.41.0
[PULL 28/38] exec/user: Do not include 'cpu.h' in 'abitypes.h'
In reply to Philippe Mathieu-Daudé"exec/user/abitypes.h" requires:
- "exec/cpu-defs.h" (TARGET_LONG_BITS)
- "exec/tswap.h" (tswap32)
In order to avoid "cpu.h", pick the minimum required headers.
Assert this user-specific header is only included from user emulation.
Message-Id: <[email protected]>
--- include/exec/user/abitypes.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
include/exec/user/abitypes.h +6 -1
@@ -1,7 +1,12 @@#ifndef EXEC_USER_ABITYPES_H #define EXEC_USER_ABITYPES_H -#include "cpu.h" +#ifndef CONFIG_USER_ONLY +#error Cannot include this header from system emulation +#endif + +#include "exec/cpu-defs.h" +#include "exec/tswap.h" #include "user/tswap-target.h" #ifdef TARGET_ABI32
Signature · 1 line
2.41.0
[PULL 33/38] exec: Restrict 'cpu_ldst.h' to TCG accelerator
In reply to Philippe Mathieu-Daudé"exec/cpu_ldst.h" is specific to TCG, do not allow its inclusion from other accelerators.
Message-Id: <[email protected]>
--- include/exec/cpu_ldst.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
include/exec/cpu_ldst.h +5 -1
@@ -1,5 +1,5 @@/* -* Software MMU support +* Software MMU support (per-target) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public
@@ -62,6 +62,10 @@#ifndef CPU_LDST_H #define CPU_LDST_H +#ifndef CONFIG_TCG +#error Can only include this header with TCG +#endif +#include "exec/memopidx.h" #include "exec/abi_ptr.h" #include "exec/mmu-access-type.h"
Signature · 1 line
2.41.0
[PULL 35/38] exec: Restrict inclusion of 'user/guest-base.h'
In reply to Philippe Mathieu-DaudéDeclare 'have_guest_base' in "user/guest-base.h".
Very few files require this header, so explicitly include it there instead of "exec/cpu-all.h" which is used in many source files.
Assert this user-specific header is only included from user emulation.
Message-Id: <[email protected]>
--- include/exec/cpu-all.h | 3 --- include/exec/cpu_ldst.h | 2 ++ include/user/guest-base.h | 6 ++++++ bsd-user/main.c | 1 + linux-user/elfload.c | 1 + linux-user/main.c | 1 + 6 files changed, 11 insertions(+), 3 deletions(-)
include/exec/cpu-all.h +0 -3
@@ -65,9 +65,6 @@#if defined(CONFIG_USER_ONLY )#include "exec/user/abitypes.h" -#include "user/guest-base.h" - -extern bool have_guest_base;/* * If non-zero, the guest virtual address space is a contiguous subset
include/exec/cpu_ldst.h +2 -0
@@ -74,6 +74,8 @@ #if defined(CONFIG_USER_ONLY) +#include "user/guest-base.h" + #ifndef TARGET_TAGGED_ADDRESSES static inline abi_ptr cpu_untagged_addr(CPUState *cs, abi_ptr x) {
include/user/guest-base.h +6 -0
@@ -7,6 +7,12 @@#ifndef USER_GUEST_BASE_H #define USER_GUEST_BASE_H +#ifndef CONFIG_USER_ONLY +#error Cannot include this header from system emulation +#endif +extern uintptr_t guest_base; +extern bool have_guest_base; +#endif
bsd-user/main.c +1 -0
@@ -36,6 +36,7 @@#include "qemu/help_option.h" #include "qemu/module.h" #include "exec/exec-all.h" +#include "user/guest-base.h" #include "tcg/startup.h" #include "qemu/timer.h" #include "qemu/envlist.h"
linux-user/elfload.c +1 -0
@@ -8,6 +8,7 @@#include "qemu.h" #include "user/tswap-target.h" +#include "user/guest-base.h" #include "user-internals.h" #include "signal-common.h" #include "loader.h"
linux-user/main.c +1 -0
@@ -38,6 +38,7 @@#include "qemu/help_option.h" #include "qemu/module.h" #include "qemu/plugin.h" +#include "user/guest-base.h" #include "exec/exec-all.h" #include "exec/gdbstub.h" #include "gdbstub/user.h"
Signature · 1 line
2.41.0
[PULL 23/38] exec/cpu-all: Reduce 'qemu/rcu.h' header inclusion
In reply to Philippe Mathieu-Daudé"exec/cpu-all.h" doesn't need definitions from "qemu/rcu.h", however "exec/ram_addr.h" does.
Message-Id: <[email protected]>
--- include/exec/cpu-all.h | 1 - include/exec/ram_addr.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
include/exec/cpu-all.h +0 -1
@@ -24,7 +24,6 @@#include "exec/tswap.h" #include "qemu/thread.h" #include "hw/core/cpu.h" -#include "qemu/rcu.h" /* some important defines: *
include/exec/ram_addr.h +1 -0
@@ -26,6 +26,7 @@#include "exec/ramlist.h" #include "exec/ramblock.h" #include "exec/exec-all.h" +#include "qemu/rcu.h" extern uint64_t total_dirty_pages;
Signature · 1 line
2.41.0
Richard Henderson
AppliedQuoted 19 lines · Philippe Mathieu-Daudé
The following changes since commit
a118c4aff4087eafb68f7132b233ad548cf16376:Merge tag 'hw-misc-20240425' ofhttps://github.com/philmd/qemu into staging (2024-04-25 09:43:29 -0700)are available in the Git repository at:
https://github.com/philmd/qemu.git tags/accel-20240426for you to fetch changes up to
671558d290ffb93752d3245e7c5604b04b6dcdf2:plugins: Include missing 'qemu/bitmap.h' header (2024-04-26 21:36:19 +0200)Selfish PR, painfully tested commit by commit.
----------------------------------------------------------------
Accelerators patchesA lot of trivial cleanups and simplifications (moving methods around, adding/removing #include statements). Most notable changes:
Quoted 8 lines
- Rename
NEED_CPU_H->COMPILING_PER_TARGET
- Rename few template headers using the '.h.inc' suffix
- Extract some definitions / declarations into their own header:
-accel/tcg/user-retaddr.h(helper_retaddr)
-include/exec/abi_ptr.h(abi_ptr)
-include/exec/breakpoint.h(CPUBreakpoint, CPUWatchpoint)
-include/exec/mmu-access-type.h(MMUAccessType)
-include/user/tswap-target.h(tswapl, bswaptls)
Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/9.1 as appropriate.
r~