Accel & exec patches for 2024-12-20
Subsystems (16)
[PULL 19/59] linux-user/aarch64: Include missing 'user/abitypes.h' header
In reply to Philippe Mathieu-Daudéarm_set_mte_tcf0() uses the abi_long type which is defined in "user/abitypes.h". Include it in order to avoid when refactoring:
In file included from ../../target/arm/gdbstub64.c:28:
../linux-user/aarch64/mte_user_helper.h:30:42: error: unknown type name ‘abi_long’; did you mean ‘u_long’?
30 | void arm_set_mte_tcf0(CPUArchState *env, abi_long value);
| ^~~~~~~~Message-Id: <[email protected]>
--- linux-user/aarch64/mte_user_helper.h | 2 ++ 1 file changed, 2 insertions(+)
linux-user/aarch64/mte_user_helper.h +2 -0
@@ -9,6 +9,8 @@#ifndef AARCH64_MTE_USER_HELPER_H #define AARCH64_MTE USER_HELPER_H +#include "user/abitypes.h" +#ifndef PR_MTE_TCF_SHIFT # define PR_MTE_TCF_SHIFT 1# define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT)
Signature · 1 line
2.47.1
[PULL 53/59] target/mips: Remove tswap() calls in semihosting uhi_fstat_cb()
In reply to Philippe Mathieu-DaudéIn preparation of heterogeneous emulation where cores with different endianness can run concurrently, we need to remove the tswap() calls -- which use a fixed per-binary endianness.
Get the endianness of the UHI CPU accessed using mips_env_is_bigendian() and replace the tswap() calls by bswap() ones when necessary.
Message-Id: <[email protected]>
--- target/mips/tcg/system/mips-semi.c | 43 +++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 13 deletions(-)
target/mips/tcg/system/mips-semi.c +30 -13
@@ -168,6 +168,7 @@ static void uhi_fstat_cb(CPUState *cs, uint64_t ret, int err)if (!err) {CPUMIPSState *env =cpu_env (cs); +bool swap_needed =HOST_BIG_ENDIAN !=mips_env_is_bigendian (env);target_ulong addr = env->active_tc.gpr[5 ];UHIStat *dst =lock_user (VERIFY_WRITE , addr,sizeof (UHIStat),1 );struct gdb_stat s;
@@ -179,19 +180,35 @@ static void uhi_fstat_cb(CPUState *cs, uint64_t ret, int err)memcpy (&s, dst,sizeof (struct gdb_stat ));memset (dst,0 ,sizeof (UHIStat)); - dst->uhi_st_dev =tswap16 (be32_to_cpu (s.gdb_st_dev)); - dst->uhi_st_ino =tswap16 (be32_to_cpu (s.gdb_st_ino)); - dst->uhi_st_mode =tswap32 (be32_to_cpu (s.gdb_st_mode)); - dst->uhi_st_nlink =tswap16 (be32_to_cpu (s.gdb_st_nlink)); - dst->uhi_st_uid =tswap16 (be32_to_cpu (s.gdb_st_uid)); - dst->uhi_st_gid =tswap16 (be32_to_cpu (s.gdb_st_gid)); - dst->uhi_st_rdev =tswap16 (be32_to_cpu (s.gdb_st_rdev)); - dst->uhi_st_size =tswap64 (be64_to_cpu (s.gdb_st_size)); - dst->uhi_st_atime =tswap64 (be32_to_cpu (s.gdb_st_atime)); - dst->uhi_st_mtime =tswap64 (be32_to_cpu (s.gdb_st_mtime)); - dst->uhi_st_ctime =tswap64 (be32_to_cpu (s.gdb_st_ctime)); - dst->uhi_st_blksize =tswap64 (be64_to_cpu (s.gdb_st_blksize)); - dst->uhi_st_blocks =tswap64 (be64_to_cpu (s.gdb_st_blocks)); + dst->uhi_st_dev =be32_to_cpu (s.gdb_st_dev); + dst->uhi_st_ino =be32_to_cpu (s.gdb_st_ino); + dst->uhi_st_mode =be32_to_cpu (s.gdb_st_mode); + dst->uhi_st_nlink =be32_to_cpu (s.gdb_st_nlink); + dst->uhi_st_uid =be32_to_cpu (s.gdb_st_uid); + dst->uhi_st_gid =be32_to_cpu (s.gdb_st_gid); + dst->uhi_st_rdev =be32_to_cpu (s.gdb_st_rdev); + dst->uhi_st_size =be64_to_cpu (s.gdb_st_size); + dst->uhi_st_atime =be32_to_cpu (s.gdb_st_atime); + dst->uhi_st_mtime =be32_to_cpu (s.gdb_st_mtime); + dst->uhi_st_ctime =be32_to_cpu (s.gdb_st_ctime); + dst->uhi_st_blksize =be64_to_cpu (s.gdb_st_blksize); + dst->uhi_st_blocks =be64_to_cpu (s.gdb_st_blocks); + +if (swap_needed) { + dst->uhi_st_dev =bswap16 (dst->uhi_st_dev); + dst->uhi_st_ino =bswap16 (dst->uhi_st_ino); + dst->uhi_st_mode =bswap32 (dst->uhi_st_mode); + dst->uhi_st_nlink =bswap16 (dst->uhi_st_nlink); + dst->uhi_st_uid =bswap16 (dst->uhi_st_uid); + dst->uhi_st_gid =bswap16 (dst->uhi_st_gid); + dst->uhi_st_rdev =bswap16 (dst->uhi_st_rdev); + dst->uhi_st_size =bswap64 (dst->uhi_st_size); + dst->uhi_st_atime =bswap64 (dst->uhi_st_atime); + dst->uhi_st_mtime =bswap64 (dst->uhi_st_mtime); + dst->uhi_st_ctime =bswap64 (dst->uhi_st_ctime); + dst->uhi_st_blksize =bswap64 (dst->uhi_st_blksize); + dst->uhi_st_blocks =bswap64 (dst->uhi_st_blocks); + }unlock_user (dst, addr,sizeof (UHIStat)); }
Signature · 1 line
2.47.1
[PULL 55/59] hw/xen: Remove unnecessary 'exec/cpu-common.h' header
In reply to Philippe Mathieu-DaudéNothing requires definitions from "exec/cpu-common.h", do not include this header.
Message-Id: <[email protected]>
--- include/hw/xen/xen.h | 2 -- 1 file changed, 2 deletions(-)
include/hw/xen/xen.h +0 -2
@@ -24,8 +24,6 @@#define __XEN_INTERFACE_VERSION__ 0x00040e00#endif -#include "exec/cpu-common.h" -/* xen-machine.c */ enum xen_mode {XEN_DISABLED =0 ,/* xen support disabled (default) */
Signature · 1 line
2.47.1
[PULL 57/59] system/accel-ops: Remove unnecessary 'exec/cpu-common.h' header
In reply to Philippe Mathieu-DaudéSince commit c4b3f46c151 ("include/exec: Move vaddr defines to separate file") we only need to include "exec/vaddr.h" to get the 'vaddr' type definition, no need for "exec/cpu-common.h".
Message-Id: <[email protected]>
--- include/system/accel-ops.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/system/accel-ops.h +1 -1
@@ -10,7 +10,7 @@#ifndef ACCEL_OPS_H #define ACCEL_OPS_H -#include "exec/cpu-common.h" +#include "exec/vaddr.h" #include "qom/object.h" #define ACCEL_OPS_SUFFIX "-ops"
Signature · 1 line
2.47.1
[PULL 07/59] ppc/e500: Avoid abuse of container_get()
In reply to Philippe Mathieu-DaudéFrom: Peter Xu <[email protected]>
container_get() is going to become strict on not allowing to return a non-container.
Switch the e500 user to use object_resolve_path_component() explicitly.
Message-ID: <[email protected]>
--- hw/pci-host/ppce500.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/pci-host/ppce500.c +2 -2
@@ -418,8 +418,8 @@ static const VMStateDescription vmstate_ppce500_pci = {static void e500_pcihost_bridge_realize (PCIDevice *d,Error **errp) {PPCE500PCIBridgeState *b =PPC_E500_PCI_BRIDGE (d); -PPCE500CCSRState *ccsr =CCSR (container_get (qdev_get_machine (), -"/e500-ccsr" )); +PPCE500CCSRState *ccsr =CCSR ( +object_resolve_path_component (qdev_get_machine (),"e500-ccsr" ));memory_region_init_alias (&b->bar0,OBJECT (ccsr),"e500-pci-bar0" , &ccsr->ccsr_space,0 ,int128_get64 (ccsr->ccsr_space.size));
Signature · 1 line
2.47.1
[PULL 59/59] util/qemu-timer: fix indentation
In reply to Philippe Mathieu-DaudéFrom: Alex Bennée <[email protected]>
Purely cosmetic.
Message-ID: <[email protected]>
--- util/qemu-timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
util/qemu-timer.c +1 -1
@@ -680,7 +680,7 @@ int64_t qemu_clock_advance_virtual_time(int64_t dest) aio_context =qemu_get_aio_context (); deadline =qemu_clock_deadline_ns_all (QEMU_CLOCK_VIRTUAL , -QEMU_TIMER_ATTR_ALL ); +QEMU_TIMER_ATTR_ALL );/* * A deadline of < 0 indicates this timer is not enabled, so we * won't get far trying to run it forward.
Signature · 1 line
2.47.1
[PULL 45/59] accel/tcg: Declare cpu_loop_exit_requested() in 'exec/cpu-common.h'
In reply to Philippe Mathieu-DaudéMove cpu_loop_exit_requested() declaration to "exec/cpu-common.h", along with the related cpu_loop_exit_noexc(), cpu_loop_exit(), cpu_loop_exit_atomic() and cpu_loop_exit_restore() methods.
Message-Id: <[email protected]>
--- include/exec/cpu-common.h | 18 ++++++++++++++++++ include/exec/exec-all.h | 17 ----------------- accel/tcg/cpu-exec.c | 2 +- target/arm/tcg/helper-a64.c | 1 + target/s390x/tcg/mem_helper.c | 1 + 5 files changed, 21 insertions(+), 18 deletions(-)
include/exec/cpu-common.h +18 -0
@@ -186,6 +186,7 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,void list_cpus (void );#ifdef CONFIG_TCG +#include "qemu/atomic.h" bool tcg_cflags_has (CPUState *cpu,uint32_t flags);void tcg_cflags_set (CPUState *cpu,uint32_t flags);
@@ -218,6 +219,23 @@ bool cpu_unwind_state_data(CPUState *cpu, uintptr_t host_pc, uint64_t *data);*/ bool cpu_restore_state (CPUState *cpu,uintptr_t host_pc); +/** +* cpu_loop_exit_requested: +* @cpu: The CPU state to be tested +* +* Indicate if somebody asked for a return of the CPU to the main loop +* (e.g., via cpu_exit() or cpu_interrupt()). +* +* This is helpful for architectures that support interruptible +* instructions. After writing back all state to registers/memory, this +* call can be used to check if it makes sense to return to the main loop +* or to continue executing the interruptible instruction. +*/ +static inline bool cpu_loop_exit_requested (CPUState *cpu) +{ +return (int32_t )qatomic_read (&cpu->neg.icount_decr.u32) <0 ; +} + G_NORETURN void cpu_loop_exit_noexc(CPUState *cpu); G_NORETURN void cpu_loop_exit_atomic(CPUState *cpu, uintptr_t pc);#endif /* CONFIG_TCG */
include/exec/exec-all.h +0 -17
@@ -27,23 +27,6 @@#include "exec/mmu-access-type.h" #include "exec/translation-block.h" -/** -* cpu_loop_exit_requested: -* @cpu: The CPU state to be tested -* -* Indicate if somebody asked for a return of the CPU to the main loop -* (e.g., via cpu_exit() or cpu_interrupt()). -* -* This is helpful for architectures that support interruptible -* instructions. After writing back all state to registers/memory, this -* call can be used to check if it makes sense to return to the main loop -* or to continue executing the interruptible instruction. -*/ -static inline bool cpu_loop_exit_requested (CPUState *cpu) -{ -return (int32_t )qatomic_read (&cpu->neg.icount_decr.u32) <0 ; -} -#if !defined(CONFIG_USER_ONLY ) && defined(CONFIG_TCG )/* cputlb.c */ /**
accel/tcg/cpu-exec.c +1 -1
@@ -25,7 +25,7 @@#include "hw/core/tcg-cpu-ops.h" #include "trace.h" #include "disas/disas.h" -#include "exec/exec-all.h" +#include "exec/cpu-common.h" #include "exec/page-protection.h" #include "tcg/tcg.h" #include "qemu/atomic.h"
target/arm/tcg/helper-a64.c +1 -0
@@ -28,6 +28,7 @@#include "qemu/bitops.h" #include "internals.h" #include "qemu/crc32c.h" +#include "exec/cpu-common.h" #include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "qemu/int128.h"
target/s390x/tcg/mem_helper.c +1 -0
@@ -24,6 +24,7 @@#include "s390x-internal.h" #include "tcg_s390x.h" #include "exec/helper-proto.h" +#include "exec/cpu-common.h" #include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/cpu_ldst.h"
Signature · 1 line
2.47.1
Stefan Hajnoczi
AppliedApplied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/10.0 for any user-visible changes.