target/arm: Allow CONFIG_TCG=n builds
v7 cover target/arm: Allow CONFIG_TCG=n builds
Changes since v6:
Now using the same feature set for -cpu max for both qtests and TCG. This requires a slightly awkward code movement to expose aa32_max_features to non-tcg code, but we gain by not having a different environment for the tests.
Also applied Richard's suggestion of creating a new cortex-regs.c file.
CI run: https://gitlab.com/farosas/qemu/-/pipelines/786195517
v6:
https://lore.kernel.org/r/[email protected]
v5 resend:
https://lore.kernel.org/r/[email protected]
v5:
https://lore.kernel.org/r/[email protected]
v4:
https://lore.kernel.org/r/[email protected]
v3:
https://lore.kernel.org/r/[email protected]
v2:
https://lore.kernel.org/r/[email protected]
v1:
https://lore.kernel.org/r/[email protected]
Claudio Fontana (3):
target/arm: move helpers to tcg/
target/arm: Move psci.c into the tcg directory
target/arm: move cpu_tcg to tcg/cpu32.c
Fabiano Rosas (16):
target/arm: Wrap breakpoint/watchpoint updates with tcg_enabled target/arm: Wrap TCG-only code in debug_helper.c target/arm: move translate modules to tcg/ target/arm: Wrap arm_rebuild_hflags calls with tcg_enabled target/arm: Move hflags code into the tcg directory target/arm: Move regime_using_lpae_format into internal.h target/arm: Don't access TCG code when debugging with KVM cpu-defs.h: Expose CPUTLBEntryFull to non-TCG code target/arm: Move cortex sysregs into a separate file target/arm: Move 64-bit TCG CPUs into tcg/ target/arm: Move aa32_max_features out of cpu_tcg.c tests/avocado: Pass parameters to migration test tests/avocado: add machine:none tag to version.py arm/Kconfig: Always select SEMIHOSTING when TCG is present arm/Kconfig: Do not build TCG-only boards on a KVM-only build tests/qtest: Fix tests when no KVM or TCG are present
Philippe Mathieu-Daudé (1):
gitlab-ci: Check building KVM-only aarch64 target
.gitlab-ci.d/crossbuilds.yml | 11 +
.../custom-runners/ubuntu-22.04-aarch64.yml | 4 -
MAINTAINERS | 1 +
configs/devices/aarch64-softmmu/default.mak | 4 -
configs/devices/arm-softmmu/default.mak | 39 --
hw/arm/Kconfig | 43 +-
hw/arm/boot.c | 6 +-
hw/arm/virt.c | 6 +-
hw/intc/armv7m_nvic.c | 20 +-
include/exec/cpu-defs.h | 6 +
target/arm/Kconfig | 7 +
target/arm/arm-powerctl.c | 7 +-
target/arm/cortex-regs.c | 69 +++
target/arm/cpregs.h | 6 +
target/arm/cpu.c | 78 ++-
target/arm/cpu64.c | 399 +-------------
target/arm/debug_helper.c | 490 +++++++++---------
target/arm/helper.c | 411 +--------------
target/arm/internals.h | 30 +-
target/arm/machine.c | 12 +-
target/arm/meson.build | 48 +-
target/arm/ptw.c | 4 +
target/arm/tcg-stubs.c | 27 +
target/arm/{ => tcg}/a32-uncond.decode | 0
target/arm/{ => tcg}/a32.decode | 0
target/arm/{cpu_tcg.c => tcg/cpu32.c} | 141 +----
target/arm/tcg/cpu64.c | 438 ++++++++++++++++
target/arm/{ => tcg}/crypto_helper.c | 0
target/arm/{ => tcg}/helper-a64.c | 0
target/arm/tcg/hflags.c | 403 ++++++++++++++
target/arm/{ => tcg}/iwmmxt_helper.c | 0
target/arm/{ => tcg}/m-nocp.decode | 0
target/arm/{ => tcg}/m_helper.c | 0
target/arm/tcg/meson.build | 52 ++
target/arm/{ => tcg}/mte_helper.c | 0
target/arm/{ => tcg}/mve.decode | 0
target/arm/{ => tcg}/mve_helper.c | 0
target/arm/{ => tcg}/neon-dp.decode | 0
target/arm/{ => tcg}/neon-ls.decode | 0
target/arm/{ => tcg}/neon-shared.decode | 0
target/arm/{ => tcg}/neon_helper.c | 0
target/arm/{ => tcg}/op_helper.c | 0
target/arm/{ => tcg}/pauth_helper.c | 0
target/arm/{ => tcg}/psci.c | 0
target/arm/{ => tcg}/sme-fa64.decode | 0
target/arm/{ => tcg}/sme.decode | 0
target/arm/{ => tcg}/sme_helper.c | 0
target/arm/{ => tcg}/sve.decode | 0
target/arm/{ => tcg}/sve_helper.c | 0
target/arm/{ => tcg}/t16.decode | 0
target/arm/{ => tcg}/t32.decode | 0
target/arm/{ => tcg}/tlb_helper.c | 18 -
target/arm/{ => tcg}/translate-a64.c | 0
target/arm/{ => tcg}/translate-a64.h | 0
target/arm/{ => tcg}/translate-m-nocp.c | 0
target/arm/{ => tcg}/translate-mve.c | 0
target/arm/{ => tcg}/translate-neon.c | 0
target/arm/{ => tcg}/translate-sme.c | 0
target/arm/{ => tcg}/translate-sve.c | 0
target/arm/{ => tcg}/translate-vfp.c | 0
target/arm/{ => tcg}/translate.c | 0
target/arm/{ => tcg}/translate.h | 0
target/arm/{ => tcg}/vec_helper.c | 0
target/arm/{ => tcg}/vec_internal.h | 0
target/arm/{ => tcg}/vfp-uncond.decode | 0
target/arm/{ => tcg}/vfp.decode | 0
tests/avocado/migration.py | 83 ++-
tests/avocado/version.py | 1 +
tests/qtest/arm-cpu-features.c | 12 +-
tests/qtest/bios-tables-test.c | 4 +
tests/qtest/boot-serial-test.c | 10 +
tests/qtest/migration-test.c | 5 +
tests/qtest/pxe-test.c | 6 +
tests/qtest/vmgenid-test.c | 6 +
74 files changed, 1592 insertions(+), 1315 deletions(-)
create mode 100644 target/arm/cortex-regs.c
create mode 100644 target/arm/tcg-stubs.c
rename target/arm/{ => tcg}/a32-uncond.decode (100%)
rename target/arm/{ => tcg}/a32.decode (100%)
rename target/arm/{cpu_tcg.c => tcg/cpu32.c} (87%)
create mode 100644 target/arm/tcg/cpu64.c
rename target/arm/{ => tcg}/crypto_helper.c (100%)
rename target/arm/{ => tcg}/helper-a64.c (100%)
create mode 100644 target/arm/tcg/hflags.c
rename target/arm/{ => tcg}/iwmmxt_helper.c (100%)
rename target/arm/{ => tcg}/m-nocp.decode (100%)
rename target/arm/{ => tcg}/m_helper.c (100%)
create mode 100644 target/arm/tcg/meson.build
rename target/arm/{ => tcg}/mte_helper.c (100%)
rename target/arm/{ => tcg}/mve.decode (100%)
rename target/arm/{ => tcg}/mve_helper.c (100%)
rename target/arm/{ => tcg}/neon-dp.decode (100%)
rename target/arm/{ => tcg}/neon-ls.decode (100%)
rename target/arm/{ => tcg}/neon-shared.decode (100%)
rename target/arm/{ => tcg}/neon_helper.c (100%)
rename target/arm/{ => tcg}/op_helper.c (100%)
rename target/arm/{ => tcg}/pauth_helper.c (100%)
rename target/arm/{ => tcg}/psci.c (100%)
rename target/arm/{ => tcg}/sme-fa64.decode (100%)
rename target/arm/{ => tcg}/sme.decode (100%)
rename target/arm/{ => tcg}/sme_helper.c (100%)
rename target/arm/{ => tcg}/sve.decode (100%)
rename target/arm/{ => tcg}/sve_helper.c (100%)
rename target/arm/{ => tcg}/t16.decode (100%)
rename target/arm/{ => tcg}/t32.decode (100%)
rename target/arm/{ => tcg}/tlb_helper.c (94%)
rename target/arm/{ => tcg}/translate-a64.c (100%)
rename target/arm/{ => tcg}/translate-a64.h (100%)
rename target/arm/{ => tcg}/translate-m-nocp.c (100%)
rename target/arm/{ => tcg}/translate-mve.c (100%)
rename target/arm/{ => tcg}/translate-neon.c (100%)
rename target/arm/{ => tcg}/translate-sme.c (100%)
rename target/arm/{ => tcg}/translate-sve.c (100%)
rename target/arm/{ => tcg}/translate-vfp.c (100%)
rename target/arm/{ => tcg}/translate.c (100%)
rename target/arm/{ => tcg}/translate.h (100%)
rename target/arm/{ => tcg}/vec_helper.c (100%)
rename target/arm/{ => tcg}/vec_internal.h (100%)
rename target/arm/{ => tcg}/vfp-uncond.decode (100%)
rename target/arm/{ => tcg}/vfp.decode (100%)Signature · 1 line
2.35.3
PATCH v7 1/20 target/arm: Wrap breakpoint/watchpoint updates with tcg_enabled
This is in preparation for restricting compilation of some parts of debug_helper.c to TCG only.
--- target/arm/cpu.c | 6 ++++-- target/arm/debug_helper.c | 16 ++++++++++++---- target/arm/machine.c | 7 +++++-- 3 files changed, 21 insertions(+), 8 deletions(-)
target/arm/cpu.c +4 -2
@@ -539,8 +539,10 @@ static void arm_cpu_reset_hold(Object *obj) }#endif -hw_breakpoint_update_all (cpu); -hw_watchpoint_update_all (cpu); +if (tcg_enabled ()) { +hw_breakpoint_update_all (cpu); +hw_watchpoint_update_all (cpu); + }arm_rebuild_hflags (env); }
target/arm/debug_helper.c +12 -4
@@ -939,7 +939,9 @@ static void dbgwvr_write(CPUARMState *env, const ARMCPRegInfo *ri, value &= ~3ULL ;raw_write (env, ri, value); -hw_watchpoint_update (cpu, i); +if (tcg_enabled ()) { +hw_watchpoint_update (cpu, i); + } } static void dbgwcr_write(CPUARMState *env, const ARMCPRegInfo *ri,
@@ -949,7 +951,9 @@ static void dbgwcr_write(CPUARMState *env, const ARMCPRegInfo *ri,int i = ri->crm;raw_write (env, ri, value); -hw_watchpoint_update (cpu, i); +if (tcg_enabled ()) { +hw_watchpoint_update (cpu, i); + } }void hw_breakpoint_update (ARMCPU *cpu,int n)
@@ -1062,7 +1066,9 @@ static void dbgbvr_write(CPUARMState *env, const ARMCPRegInfo *ri,int i = ri->crm;raw_write (env, ri, value); -hw_breakpoint_update (cpu, i); +if (tcg_enabled ()) { +hw_breakpoint_update (cpu, i); + } } static void dbgbcr_write(CPUARMState *env, const ARMCPRegInfo *ri,
@@ -1079,7 +1085,9 @@ static void dbgbcr_write(CPUARMState *env, const ARMCPRegInfo *ri, value =deposit64 (value,8 ,1 ,extract64 (value,7 ,1 ));raw_write (env, ri, value); -hw_breakpoint_update (cpu, i); +if (tcg_enabled ()) { +hw_breakpoint_update (cpu, i); + } }void define_debug_regs (ARMCPU *cpu)
target/arm/machine.c +5 -2
@@ -2,6 +2,7 @@#include "cpu.h" #include "qemu/error-report.h" #include "sysemu/kvm.h" +#include "sysemu/tcg.h" #include "kvm_arm.h" #include "internals.h" #include "migration/cpu.h"
@@ -848,8 +849,10 @@ static int cpu_post_load(void *opaque, int version_id)return -1 ; } -hw_breakpoint_update_all (cpu); -hw_watchpoint_update_all (cpu); +if (tcg_enabled ()) { +hw_breakpoint_update_all (cpu); +hw_watchpoint_update_all (cpu); + }/* * TCG gen_update_fp_context() relies on the invariant that
Signature · 1 line
2.35.3
PATCH v7 2/20 target/arm: Wrap TCG-only code in debug_helper.c
In reply to Fabiano RosasThe next few patches will move helpers under CONFIG_TCG. We'd prefer to keep the debug helpers and debug registers close together, so rearrange the file a bit to be able to wrap the helpers with a TCG ifdef.
--- target/arm/debug_helper.c | 476 +++++++++++++++++++------------------- 1 file changed, 239 insertions(+), 237 deletions(-)
target/arm/debug_helper.c +239 -237
@@ -12,8 +12,9 @@#include "cpregs.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" +#include "sysemu/tcg.h" - +#ifdef CONFIG_TCG /* Return the Exception Level targeted by debug exceptions. */ static int arm_debug_target_el (CPUARMState *env) {
@@ -536,6 +537,243 @@ void HELPER(exception_swstep)(CPUARMState *env, uint32_t syndrome)raise_exception_debug (env,EXCP_UDEF , syndrome); } +void hw_watchpoint_update (ARMCPU *cpu,int n) +{ +CPUARMState *env = &cpu->env; +vaddr len =0 ; +vaddr wvr = env->cp15.dbgwvr[n]; +uint64_t wcr = env->cp15.dbgwcr[n]; +int mask; +int flags =BP_CPU |BP_STOP_BEFORE_ACCESS ; + +if (env->cpu_watchpoint[n]) { +cpu_watchpoint_remove_by_ref (CPU (cpu), env->cpu_watchpoint[n]); + env->cpu_watchpoint[n] =NULL ; + } + +if (!FIELD_EX64 (wcr,DBGWCR ,E )) { +/* E bit clear : watchpoint disabled */ +return ; + } + +switch (FIELD_EX64 (wcr,DBGWCR ,LSC )) { +case 0 : +/* LSC 00 is reserved and must behave as if the wp is disabled */ +return ; +case 1 : + flags |=BP_MEM_READ ; +break ; +case 2 : + flags |=BP_MEM_WRITE ; +break ; +case 3 : + flags |=BP_MEM_ACCESS ; +break ; + } + +/* +* Attempts to use both MASK and BAS fields simultaneously are +* CONSTRAINED UNPREDICTABLE; we opt to ignore BAS in this case, +* thus generating a watchpoint for every byte in the masked region. +*/ + mask =FIELD_EX64 (wcr,DBGWCR ,MASK ); +if (mask ==1 || mask ==2 ) { +/* +* Reserved values of MASK; we must act as if the mask value was +* some non-reserved value, or as if the watchpoint were disabled. +* We choose the latter. +*/ +return ; + }else if (mask) { +/* Watchpoint covers an aligned area up to 2GB in size */ + len =1ULL << mask; +/* +* If masked bits in WVR are not zero it's CONSTRAINED UNPREDICTABLE +* whether the watchpoint fires when the unmasked bits match; we opt +* to generate the exceptions. +*/ + wvr &= ~(len -1 ); + }else { +/* Watchpoint covers bytes defined by the byte address select bits */ +int bas =FIELD_EX64 (wcr,DBGWCR ,BAS ); +int basstart; + +if (extract64 (wvr,2 ,1 )) { +/* +* Deprecated case of an only 4-aligned address. BAS[7:4] are +* ignored, and BAS[3:0] define which bytes to watch. +*/ + bas &=0xf ; + } + +if (bas ==0 ) { +/* This must act as if the watchpoint is disabled */ +return ; + } + +/* +* The BAS bits are supposed to be programmed to indicate a contiguous +* range of bytes. Otherwise it is CONSTRAINED UNPREDICTABLE whether +* we fire for each byte in the word/doubleword addressed by the WVR. +* We choose to ignore any non-zero bits after the first range of 1s. +*/ + basstart =ctz32 (bas); + len =cto32 (bas >> basstart); + wvr += basstart; + } + +cpu_watchpoint_insert (CPU (cpu), wvr, len, flags, + &env->cpu_watchpoint[n]); +} + +void hw_watchpoint_update_all (ARMCPU *cpu) +{ +int i; +CPUARMState *env = &cpu->env; + +/* +* Completely clear out existing QEMU watchpoints and our array, to +* avoid possible stale entries following migration load. +*/ +cpu_watchpoint_remove_all (CPU (cpu),BP_CPU ); +memset (env->cpu_watchpoint,0 ,sizeof (env->cpu_watchpoint)); + +for (i =0 ; i <ARRAY_SIZE (cpu->env.cpu_watchpoint); i++) { +hw_watchpoint_update (cpu, i); + } +} + +void hw_breakpoint_update (ARMCPU *cpu,int n) +{ +CPUARMState *env = &cpu->env; +uint64_t bvr = env->cp15.dbgbvr[n]; +uint64_t bcr = env->cp15.dbgbcr[n]; +vaddr addr; +int bt; +int flags =BP_CPU ; + +if (env->cpu_breakpoint[n]) { +cpu_breakpoint_remove_by_ref (CPU (cpu), env->cpu_breakpoint[n]); + env->cpu_breakpoint[n] =NULL ; + } + +if (!extract64 (bcr,0 ,1 )) { +/* E bit clear : watchpoint disabled */ +return ; + } + + bt =extract64 (bcr,20 ,4 ); + +switch (bt) { +case 4 :/* unlinked address mismatch (reserved if AArch64) */ +case 5 :/* linked address mismatch (reserved if AArch64) */ +qemu_log_mask (LOG_UNIMP , +"arm: address mismatch breakpoint types not implemented\n" ); +return ; +case 0 :/* unlinked address match */ +case 1 :/* linked address match */ + { +/* +* Bits [1:0] are RES0. +* +* It is IMPLEMENTATION DEFINED whether bits [63:49] +* ([63:53] for FEAT_LVA) are hardwired to a copy of the sign bit +* of the VA field ([48] or [52] for FEAT_LVA), or whether the +* value is read as written. It is CONSTRAINED UNPREDICTABLE +* whether the RESS bits are ignored when comparing an address. +* Therefore we are allowed to compare the entire register, which +* lets us avoid considering whether FEAT_LVA is actually enabled. +* +* The BAS field is used to allow setting breakpoints on 16-bit +* wide instructions; it is CONSTRAINED UNPREDICTABLE whether +* a bp will fire if the addresses covered by the bp and the addresses +* covered by the insn overlap but the insn doesn't start at the +* start of the bp address range. We choose to require the insn and +* the bp to have the same address. The constraints on writing to +* BAS enforced in dbgbcr_write mean we have only four cases: +* 0b0000 => no breakpoint +* 0b0011 => breakpoint on addr +* 0b1100 => breakpoint on addr + 2 +* 0b1111 => breakpoint on addr +* See also figure D2-3 in the v8 ARM ARM (DDI0487A.c). +*/ +int bas =extract64 (bcr,5 ,4 ); + addr = bvr & ~3ULL ; +if (bas ==0 ) { +return ; + } +if (bas ==0xc ) { + addr +=2 ; + } +break ; + } +case 2 :/* unlinked context ID match */ +case 8 :/* unlinked VMID match (reserved if no EL2) */ +case 10 :/* unlinked context ID and VMID match (reserved if no EL2) */ +qemu_log_mask (LOG_UNIMP , +"arm: unlinked context breakpoint types not implemented\n" ); +return ; +case 9 :/* linked VMID match (reserved if no EL2) */ +case 11 :/* linked context ID and VMID match (reserved if no EL2) */ +case 3 :/* linked context ID match */ +default : +/* +* We must generate no events for Linked context matches (unless +* they are linked to by some other bp/wp, which is handled in +* updates for the linking bp/wp). We choose to also generate no events +* for reserved values. +*/ +return ; + } + +cpu_breakpoint_insert (CPU (cpu), addr, flags, &env->cpu_breakpoint[n]); +} + +void hw_breakpoint_update_all (ARMCPU *cpu) +{ +int i; +CPUARMState *env = &cpu->env; + +/* +* Completely clear out existing QEMU breakpoints and our array, to +* avoid possible stale entries following migration load. +*/ +cpu_breakpoint_remove_all (CPU (cpu),BP_CPU ); +memset (env->cpu_breakpoint,0 ,sizeof (env->cpu_breakpoint)); + +for (i =0 ; i <ARRAY_SIZE (cpu->env.cpu_breakpoint); i++) { +hw_breakpoint_update (cpu, i); + } +} + +#if !defined(CONFIG_USER_ONLY ) + +vaddr arm_adjust_watchpoint_address (CPUState *cs,vaddr addr,int len) +{ +ARMCPU *cpu =ARM_CPU (cs); +CPUARMState *env = &cpu->env; + +/* +* In BE32 system mode, target memory is stored byteswapped (on a +* little-endian host system), and by the time we reach here (via an +* opcode helper) the addresses of subword accesses have been adjusted +* to account for that, which means that watchpoints will not match. +* Undo the adjustment here. +*/ +if (arm_sctlr_b (env)) { +if (len ==1 ) { + addr ^=3 ; + }else if (len ==2 ) { + addr ^=2 ; + } + } + +return addr; +} + +#endif /* !CONFIG_USER_ONLY */ +#endif /* CONFIG_TCG */ +/* * Check for traps to "powerdown debug" registers, which are controlled * by MDCR.TDOSA
@@ -813,112 +1051,6 @@ static const ARMCPRegInfo debug_lpae_cp_reginfo[] = { .access = PL0_R, .type = ARM_CP_CONST | ARM_CP_64BIT, .resetvalue = 0 }, }; -void hw_watchpoint_update (ARMCPU *cpu,int n) -{ -CPUARMState *env = &cpu->env; -vaddr len =0 ; -vaddr wvr = env->cp15.dbgwvr[n]; -uint64_t wcr = env->cp15.dbgwcr[n]; -int mask; -int flags =BP_CPU |BP_STOP_BEFORE_ACCESS ; - -if (env->cpu_watchpoint[n]) { -cpu_watchpoint_remove_by_ref (CPU (cpu), env->cpu_watchpoint[n]); - env->cpu_watchpoint[n] =NULL ; - } - -if (!FIELD_EX64 (wcr,DBGWCR ,E )) { -/* E bit clear : watchpoint disabled */ -return ; - } - -switch (FIELD_EX64 (wcr,DBGWCR ,LSC )) { -case 0 : -/* LSC 00 is reserved and must behave as if the wp is disabled */ -return ; -case 1 : - flags |=BP_MEM_READ ; -break ; -case 2 : - flags |=BP_MEM_WRITE ; -break ; -case 3 : - flags |=BP_MEM_ACCESS ; -break ; - } - -/* -* Attempts to use both MASK and BAS fields simultaneously are -* CONSTRAINED UNPREDICTABLE; we opt to ignore BAS in this case, -* thus generating a watchpoint for every byte in the masked region. -*/ - mask =FIELD_EX64 (wcr,DBGWCR ,MASK ); -if (mask ==1 || mask ==2 ) { -/* -* Reserved values of MASK; we must act as if the mask value was -* some non-reserved value, or as if the watchpoint were disabled. -* We choose the latter. -*/ -return ; - }else if (mask) { -/* Watchpoint covers an aligned area up to 2GB in size */ - len =1ULL << mask; -/* -* If masked bits in WVR are not zero it's CONSTRAINED UNPREDICTABLE -* whether the watchpoint fires when the unmasked bits match; we opt -* to generate the exceptions. -*/ - wvr &= ~(len -1 ); - }else { -/* Watchpoint covers bytes defined by the byte address select bits */ -int bas =FIELD_EX64 (wcr,DBGWCR ,BAS ); -int basstart; - -if (extract64 (wvr,2 ,1 )) { -/* -* Deprecated case of an only 4-aligned address. BAS[7:4] are -* ignored, and BAS[3:0] define which bytes to watch. -*/ - bas &=0xf ; - } - -if (bas ==0 ) { -/* This must act as if the watchpoint is disabled */ -return ; - } - -/* -* The BAS bits are supposed to be programmed to indicate a contiguous -* range of bytes. Otherwise it is CONSTRAINED UNPREDICTABLE whether -* we fire for each byte in the word/doubleword addressed by the WVR. -* We choose to ignore any non-zero bits after the first range of 1s. -*/ - basstart =ctz32 (bas); - len =cto32 (bas >> basstart); - wvr += basstart; - } - -cpu_watchpoint_insert (CPU (cpu), wvr, len, flags, - &env->cpu_watchpoint[n]); -} - -void hw_watchpoint_update_all (ARMCPU *cpu) -{ -int i; -CPUARMState *env = &cpu->env; - -/* -* Completely clear out existing QEMU watchpoints and our array, to -* avoid possible stale entries following migration load. -*/ -cpu_watchpoint_remove_all (CPU (cpu),BP_CPU ); -memset (env->cpu_watchpoint,0 ,sizeof (env->cpu_watchpoint)); - -for (i =0 ; i <ARRAY_SIZE (cpu->env.cpu_watchpoint); i++) { -hw_watchpoint_update (cpu, i); - } -} -static void dbgwvr_write (CPUARMState *env,const ARMCPRegInfo *ri,uint64_t value) {
@@ -956,109 +1088,6 @@ static void dbgwcr_write(CPUARMState *env, const ARMCPRegInfo *ri, } } -void hw_breakpoint_update (ARMCPU *cpu,int n) -{ -CPUARMState *env = &cpu->env; -uint64_t bvr = env->cp15.dbgbvr[n]; -uint64_t bcr = env->cp15.dbgbcr[n]; -vaddr addr; -int bt; -int flags =BP_CPU ; - -if (env->cpu_breakpoint[n]) { -cpu_breakpoint_remove_by_ref (CPU (cpu), env->cpu_breakpoint[n]); - env->cpu_breakpoint[n] =NULL ; - } - -if (!extract64 (bcr,0 ,1 )) { -/* E bit clear : watchpoint disabled */ -return ; - } - - bt =extract64 (bcr,20 ,4 ); - -switch (bt) { -case 4 :/* unlinked address mismatch (reserved if AArch64) */ -case 5 :/* linked address mismatch (reserved if AArch64) */ -qemu_log_mask (LOG_UNIMP , -"arm: address mismatch breakpoint types not implemented\n" ); -return ; -case 0 :/* unlinked address match */ -case 1 :/* linked address match */ - { -/* -* Bits [1:0] are RES0. -* -* It is IMPLEMENTATION DEFINED whether bits [63:49] -* ([63:53] for FEAT_LVA) are hardwired to a copy of the sign bit -* of the VA field ([48] or [52] for FEAT_LVA), or whether the -* value is read as written. It is CONSTRAINED UNPREDICTABLE -* whether the RESS bits are ignored when comparing an address. -* Therefore we are allowed to compare the entire register, which -* lets us avoid considering whether FEAT_LVA is actually enabled. -* -* The BAS field is used to allow setting breakpoints on 16-bit -* wide instructions; it is CONSTRAINED UNPREDICTABLE whether -* a bp will fire if the addresses covered by the bp and the addresses -* covered by the insn overlap but the insn doesn't start at the -* start of the bp address range. We choose to require the insn and -* the bp to have the same address. The constraints on writing to -* BAS enforced in dbgbcr_write mean we have only four cases: -* 0b0000 => no breakpoint -* 0b0011 => breakpoint on addr -* 0b1100 => breakpoint on addr + 2 -* 0b1111 => breakpoint on addr -* See also figure D2-3 in the v8 ARM ARM (DDI0487A.c). -*/ -int bas =extract64 (bcr,5 ,4 ); - addr = bvr & ~3ULL ; -if (bas ==0 ) { -return ; - } -if (bas ==0xc ) { - addr +=2 ; - } -break ; - } -case 2 :/* unlinked context ID match */ -case 8 :/* unlinked VMID match (reserved if no EL2) */ -case 10 :/* unlinked context ID and VMID match (reserved if no EL2) */ -qemu_log_mask (LOG_UNIMP , -"arm: unlinked context breakpoint types not implemented\n" ); -return ; -case 9 :/* linked VMID match (reserved if no EL2) */ -case 11 :/* linked context ID and VMID match (reserved if no EL2) */ -case 3 :/* linked context ID match */ -default : -/* -* We must generate no events for Linked context matches (unless -* they are linked to by some other bp/wp, which is handled in -* updates for the linking bp/wp). We choose to also generate no events -* for reserved values. -*/ -return ; - } - -cpu_breakpoint_insert (CPU (cpu), addr, flags, &env->cpu_breakpoint[n]); -} - -void hw_breakpoint_update_all (ARMCPU *cpu) -{ -int i; -CPUARMState *env = &cpu->env; - -/* -* Completely clear out existing QEMU breakpoints and our array, to -* avoid possible stale entries following migration load. -*/ -cpu_breakpoint_remove_all (CPU (cpu),BP_CPU ); -memset (env->cpu_breakpoint,0 ,sizeof (env->cpu_breakpoint)); - -for (i =0 ; i <ARRAY_SIZE (cpu->env.cpu_breakpoint); i++) { -hw_breakpoint_update (cpu, i); - } -} -static void dbgbvr_write (CPUARMState *env,const ARMCPRegInfo *ri,uint64_t value) {
@@ -1210,30 +1239,3 @@ void define_debug_regs(ARMCPU *cpu)g_free (dbgwcr_el1_name); } } - -#if !defined(CONFIG_USER_ONLY ) - -vaddr arm_adjust_watchpoint_address (CPUState *cs,vaddr addr,int len) -{ -ARMCPU *cpu =ARM_CPU (cs); -CPUARMState *env = &cpu->env; - -/* -* In BE32 system mode, target memory is stored byteswapped (on a -* little-endian host system), and by the time we reach here (via an -* opcode helper) the addresses of subword accesses have been adjusted -* to account for that, which means that watchpoints will not match. -* Undo the adjustment here. -*/ -if (arm_sctlr_b (env)) { -if (len ==1 ) { - addr ^=3 ; - }else if (len ==2 ) { - addr ^=2 ; - } - } - -return addr; -} - -#endif
Signature · 1 line
2.35.3
PATCH v7 3/20 target/arm: move translate modules to tcg/
In reply to Fabiano RosasIntroduce the target/arm/tcg directory. Its purpose is to hold the TCG code that is selected by CONFIG_TCG.
---
MAINTAINERS | 1 +
target/arm/meson.build | 30 ++++-------------------
target/arm/{ => tcg}/a32-uncond.decode | 0
target/arm/{ => tcg}/a32.decode | 0
target/arm/{ => tcg}/m-nocp.decode | 0
target/arm/tcg/meson.build | 32 +++++++++++++++++++++++++
target/arm/{ => tcg}/mve.decode | 0
target/arm/{ => tcg}/neon-dp.decode | 0
target/arm/{ => tcg}/neon-ls.decode | 0
target/arm/{ => tcg}/neon-shared.decode | 0
target/arm/{ => tcg}/sme-fa64.decode | 0
target/arm/{ => tcg}/sme.decode | 0
target/arm/{ => tcg}/sve.decode | 0
target/arm/{ => tcg}/t16.decode | 0
target/arm/{ => tcg}/t32.decode | 0
target/arm/{ => tcg}/translate-a64.c | 0
target/arm/{ => tcg}/translate-a64.h | 0
target/arm/{ => tcg}/translate-m-nocp.c | 0
target/arm/{ => tcg}/translate-mve.c | 0
target/arm/{ => tcg}/translate-neon.c | 0
target/arm/{ => tcg}/translate-sme.c | 0
target/arm/{ => tcg}/translate-sve.c | 0
target/arm/{ => tcg}/translate-vfp.c | 0
target/arm/{ => tcg}/translate.c | 0
target/arm/{ => tcg}/translate.h | 0
target/arm/{ => tcg}/vfp-uncond.decode | 0
target/arm/{ => tcg}/vfp.decode | 0
27 files changed, 37 insertions(+), 26 deletions(-)
rename target/arm/{ => tcg}/a32-uncond.decode (100%)
rename target/arm/{ => tcg}/a32.decode (100%)
rename target/arm/{ => tcg}/m-nocp.decode (100%)
create mode 100644 target/arm/tcg/meson.build
rename target/arm/{ => tcg}/mve.decode (100%)
rename target/arm/{ => tcg}/neon-dp.decode (100%)
rename target/arm/{ => tcg}/neon-ls.decode (100%)
rename target/arm/{ => tcg}/neon-shared.decode (100%)
rename target/arm/{ => tcg}/sme-fa64.decode (100%)
rename target/arm/{ => tcg}/sme.decode (100%)
rename target/arm/{ => tcg}/sve.decode (100%)
rename target/arm/{ => tcg}/t16.decode (100%)
rename target/arm/{ => tcg}/t32.decode (100%)
rename target/arm/{ => tcg}/translate-a64.c (100%)
rename target/arm/{ => tcg}/translate-a64.h (100%)
rename target/arm/{ => tcg}/translate-m-nocp.c (100%)
rename target/arm/{ => tcg}/translate-mve.c (100%)
rename target/arm/{ => tcg}/translate-neon.c (100%)
rename target/arm/{ => tcg}/translate-sme.c (100%)
rename target/arm/{ => tcg}/translate-sve.c (100%)
rename target/arm/{ => tcg}/translate-vfp.c (100%)
rename target/arm/{ => tcg}/translate.c (100%)
rename target/arm/{ => tcg}/translate.h (100%)
rename target/arm/{ => tcg}/vfp-uncond.decode (100%)
rename target/arm/{ => tcg}/vfp.decode (100%)MAINTAINERS +1 -0
@@ -161,6 +161,7 @@ M: Peter Maydell <[email protected]> L: [email protected] S: Maintained F: target/arm/ +F: target/arm/tcg/ F: tests/tcg/arm/ F: tests/tcg/aarch64/ F: tests/qtest/arm-cpu-features.c
target/arm/meson.build +4 -26
@@ -1,22 +1,4 @@ -gen = [ - decodetree.process('sve.decode', extra_args: '--decode=disas_sve'), - decodetree.process('sme.decode', extra_args: '--decode=disas_sme'), - decodetree.process('sme-fa64.decode', extra_args: '--static-decode=disas_sme_fa64'), - decodetree.process('neon-shared.decode', extra_args: '--decode=disas_neon_shared'), - decodetree.process('neon-dp.decode', extra_args: '--decode=disas_neon_dp'), - decodetree.process('neon-ls.decode', extra_args: '--decode=disas_neon_ls'), - decodetree.process('vfp.decode', extra_args: '--decode=disas_vfp'), - decodetree.process('vfp-uncond.decode', extra_args: '--decode=disas_vfp_uncond'), - decodetree.process('m-nocp.decode', extra_args: '--decode=disas_m_nocp'), - decodetree.process('mve.decode', extra_args: '--decode=disas_mve'), - decodetree.process('a32.decode', extra_args: '--static-decode=disas_a32'), - decodetree.process('a32-uncond.decode', extra_args: '--static-decode=disas_a32_uncond'), - decodetree.process('t32.decode', extra_args: '--static-decode=disas_t32'), - decodetree.process('t16.decode', extra_args: ['-w', '16', '--static-decode=disas_t16']), -] - arm_ss = ss.source_set() -arm_ss.add(gen) arm_ss.add(files( 'cpu.c', 'crypto_helper.c',
@@ -29,11 +11,6 @@ arm_ss.add(files( 'neon_helper.c', 'op_helper.c', 'tlb_helper.c', - 'translate.c', - 'translate-m-nocp.c', - 'translate-mve.c', - 'translate-neon.c', - 'translate-vfp.c', 'vec_helper.c', 'vfp_helper.c', 'cpu_tcg.c',
@@ -50,9 +27,6 @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'pauth_helper.c', 'sve_helper.c', 'sme_helper.c', - 'translate-a64.c', - 'translate-sve.c', - 'translate-sme.c', )) arm_softmmu_ss = ss.source_set()
@@ -67,5 +41,9 @@ arm_softmmu_ss.add(files( subdir('hvf') +if 'CONFIG_TCG' in config_all + subdir('tcg') +endif + target_arch += {'arm': arm_ss} target_softmmu_arch += {'arm': arm_softmmu_ss}
target/arm/tcg/a32-uncond.decode renamed from target/arm/a32-uncond.decode +0 -0
target/arm/tcg/a32.decode renamed from target/arm/a32.decode +0 -0
target/arm/tcg/m-nocp.decode renamed from target/arm/m-nocp.decode +0 -0
target/arm/tcg/meson.build new file +32 -0
@@ -0,0 +1,32 @@ +gen = [ + decodetree.process('sve.decode', extra_args: '--decode=disas_sve'), + decodetree.process('sme.decode', extra_args: '--decode=disas_sme'), + decodetree.process('sme-fa64.decode', extra_args: '--static-decode=disas_sme_fa64'), + decodetree.process('neon-shared.decode', extra_args: '--decode=disas_neon_shared'), + decodetree.process('neon-dp.decode', extra_args: '--decode=disas_neon_dp'), + decodetree.process('neon-ls.decode', extra_args: '--decode=disas_neon_ls'), + decodetree.process('vfp.decode', extra_args: '--decode=disas_vfp'), + decodetree.process('vfp-uncond.decode', extra_args: '--decode=disas_vfp_uncond'), + decodetree.process('m-nocp.decode', extra_args: '--decode=disas_m_nocp'), + decodetree.process('mve.decode', extra_args: '--decode=disas_mve'), + decodetree.process('a32.decode', extra_args: '--static-decode=disas_a32'), + decodetree.process('a32-uncond.decode', extra_args: '--static-decode=disas_a32_uncond'), + decodetree.process('t32.decode', extra_args: '--static-decode=disas_t32'), + decodetree.process('t16.decode', extra_args: ['-w', '16', '--static-decode=disas_t16']), +] + +arm_ss.add(gen) + +arm_ss.add(files( + 'translate.c', + 'translate-m-nocp.c', + 'translate-mve.c', + 'translate-neon.c', + 'translate-vfp.c', +)) + +arm_ss.add(when: 'TARGET_AARCH64', if_true: files( + 'translate-a64.c', + 'translate-sve.c', + 'translate-sme.c', +))
target/arm/tcg/mve.decode renamed from target/arm/mve.decode +0 -0
target/arm/tcg/neon-dp.decode renamed from target/arm/neon-dp.decode +0 -0
target/arm/tcg/neon-ls.decode renamed from target/arm/neon-ls.decode +0 -0
target/arm/tcg/neon-shared.decode renamed from target/arm/neon-shared.decode +0 -0
target/arm/tcg/sme-fa64.decode renamed from target/arm/sme-fa64.decode +0 -0
target/arm/tcg/sme.decode renamed from target/arm/sme.decode +0 -0
target/arm/tcg/sve.decode renamed from target/arm/sve.decode +0 -0
target/arm/tcg/t16.decode renamed from target/arm/t16.decode +0 -0
target/arm/tcg/t32.decode renamed from target/arm/t32.decode +0 -0
target/arm/tcg/translate-a64.c renamed from target/arm/translate-a64.c +0 -0
target/arm/tcg/translate-a64.h renamed from target/arm/translate-a64.h +0 -0
target/arm/tcg/translate-m-nocp.c renamed from target/arm/translate-m-nocp.c +0 -0
target/arm/tcg/translate-mve.c renamed from target/arm/translate-mve.c +0 -0
target/arm/tcg/translate-neon.c renamed from target/arm/translate-neon.c +0 -0
target/arm/tcg/translate-sme.c renamed from target/arm/translate-sme.c +0 -0
target/arm/tcg/translate-sve.c renamed from target/arm/translate-sve.c +0 -0
target/arm/tcg/translate-vfp.c renamed from target/arm/translate-vfp.c +0 -0
target/arm/tcg/translate.c renamed from target/arm/translate.c +0 -0
target/arm/tcg/translate.h renamed from target/arm/translate.h +0 -0
target/arm/tcg/vfp-uncond.decode renamed from target/arm/vfp-uncond.decode +0 -0
target/arm/tcg/vfp.decode renamed from target/arm/vfp.decode +0 -0
Signature · 1 line
2.35.3
PATCH v7 4/20 target/arm: move helpers to tcg/
In reply to Fabiano RosasFrom: Claudio Fontana <[email protected]>
---
target/arm/meson.build | 15 ++-------------
target/arm/tcg-stubs.c | 23 +++++++++++++++++++++++
target/arm/{ => tcg}/crypto_helper.c | 0
target/arm/{ => tcg}/helper-a64.c | 0
target/arm/{ => tcg}/iwmmxt_helper.c | 0
target/arm/{ => tcg}/m_helper.c | 0
target/arm/tcg/meson.build | 13 +++++++++++++
target/arm/{ => tcg}/mte_helper.c | 0
target/arm/{ => tcg}/mve_helper.c | 0
target/arm/{ => tcg}/neon_helper.c | 0
target/arm/{ => tcg}/op_helper.c | 0
target/arm/{ => tcg}/pauth_helper.c | 0
target/arm/{ => tcg}/sme_helper.c | 0
target/arm/{ => tcg}/sve_helper.c | 0
target/arm/{ => tcg}/tlb_helper.c | 0
target/arm/{ => tcg}/vec_helper.c | 0
target/arm/{ => tcg}/vec_internal.h | 0
17 files changed, 38 insertions(+), 13 deletions(-)
create mode 100644 target/arm/tcg-stubs.c
rename target/arm/{ => tcg}/crypto_helper.c (100%)
rename target/arm/{ => tcg}/helper-a64.c (100%)
rename target/arm/{ => tcg}/iwmmxt_helper.c (100%)
rename target/arm/{ => tcg}/m_helper.c (100%)
rename target/arm/{ => tcg}/mte_helper.c (100%)
rename target/arm/{ => tcg}/mve_helper.c (100%)
rename target/arm/{ => tcg}/neon_helper.c (100%)
rename target/arm/{ => tcg}/op_helper.c (100%)
rename target/arm/{ => tcg}/pauth_helper.c (100%)
rename target/arm/{ => tcg}/sme_helper.c (100%)
rename target/arm/{ => tcg}/sve_helper.c (100%)
rename target/arm/{ => tcg}/tlb_helper.c (100%)
rename target/arm/{ => tcg}/vec_helper.c (100%)
rename target/arm/{ => tcg}/vec_internal.h (100%)target/arm/meson.build +2 -13
@@ -1,17 +1,9 @@ arm_ss = ss.source_set() arm_ss.add(files( 'cpu.c', - 'crypto_helper.c', 'debug_helper.c', 'gdbstub.c', 'helper.c', - 'iwmmxt_helper.c', - 'm_helper.c', - 'mve_helper.c', - 'neon_helper.c', - 'op_helper.c', - 'tlb_helper.c', - 'vec_helper.c', 'vfp_helper.c', 'cpu_tcg.c', ))
@@ -22,11 +14,6 @@ arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: fil arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'cpu64.c', 'gdbstub64.c', - 'helper-a64.c', - 'mte_helper.c', - 'pauth_helper.c', - 'sve_helper.c', - 'sme_helper.c', )) arm_softmmu_ss = ss.source_set()
@@ -43,6 +30,8 @@ subdir('hvf') if 'CONFIG_TCG' in config_all subdir('tcg') +else + arm_ss.add(files('tcg-stubs.c')) endif target_arch += {'arm': arm_ss}
target/arm/tcg-stubs.c new file +23 -0
@@ -0,0 +1,23 @@ +/* +* QEMU ARM stubs for some TCG helper functions +* +* Copyright 2021 SUSE LLC +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "internals.h" + +void write_v7m_exception (CPUARMState *env,uint32_t new_exc) +{ +g_assert_not_reached (); +} + +void raise_exception_ra (CPUARMState *env,uint32_t excp,uint32_t syndrome, +uint32_t target_el,uintptr_t ra) +{ +g_assert_not_reached (); +}
target/arm/tcg/crypto_helper.c renamed from target/arm/crypto_helper.c +0 -0
target/arm/tcg/helper-a64.c renamed from target/arm/helper-a64.c +0 -0
target/arm/tcg/iwmmxt_helper.c renamed from target/arm/iwmmxt_helper.c +0 -0
target/arm/tcg/m_helper.c renamed from target/arm/m_helper.c +0 -0
target/arm/tcg/meson.build +13 -0
@@ -23,10 +23,23 @@ arm_ss.add(files( 'translate-mve.c', 'translate-neon.c', 'translate-vfp.c', + 'crypto_helper.c', + 'iwmmxt_helper.c', + 'm_helper.c', + 'mve_helper.c', + 'neon_helper.c', + 'op_helper.c', + 'tlb_helper.c', + 'vec_helper.c', )) arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'translate-a64.c', 'translate-sve.c', 'translate-sme.c', + 'helper-a64.c', + 'mte_helper.c', + 'pauth_helper.c', + 'sme_helper.c', + 'sve_helper.c', ))
target/arm/tcg/mte_helper.c renamed from target/arm/mte_helper.c +0 -0
target/arm/tcg/mve_helper.c renamed from target/arm/mve_helper.c +0 -0
target/arm/tcg/neon_helper.c renamed from target/arm/neon_helper.c +0 -0
target/arm/tcg/op_helper.c renamed from target/arm/op_helper.c +0 -0
target/arm/tcg/pauth_helper.c renamed from target/arm/pauth_helper.c +0 -0
target/arm/tcg/sme_helper.c renamed from target/arm/sme_helper.c +0 -0
target/arm/tcg/sve_helper.c renamed from target/arm/sve_helper.c +0 -0
target/arm/tcg/tlb_helper.c renamed from target/arm/tlb_helper.c +0 -0
target/arm/tcg/vec_helper.c renamed from target/arm/vec_helper.c +0 -0
target/arm/tcg/vec_internal.h renamed from target/arm/vec_internal.h +0 -0
Signature · 1 line
2.35.3
PATCH v7 5/20 target/arm: Move psci.c into the tcg directory
In reply to Fabiano RosasFrom: Claudio Fontana <[email protected]>
---
target/arm/meson.build | 1 -
target/arm/tcg/meson.build | 4 ++++
target/arm/{ => tcg}/psci.c | 0
3 files changed, 4 insertions(+), 1 deletion(-)
rename target/arm/{ => tcg}/psci.c (100%)target/arm/meson.build +0 -1
@@ -22,7 +22,6 @@ arm_softmmu_ss.add(files( 'arm-powerctl.c', 'machine.c', 'monitor.c', - 'psci.c', 'ptw.c', ))
target/arm/tcg/meson.build +4 -0
@@ -43,3 +43,7 @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'sme_helper.c', 'sve_helper.c', )) + +arm_softmmu_ss.add(files( + 'psci.c', +))
target/arm/tcg/psci.c renamed from target/arm/psci.c +0 -0
Signature · 1 line
2.35.3
PATCH v7 6/20 target/arm: Wrap arm_rebuild_hflags calls with tcg_enabled
In reply to Fabiano RosasThis is in preparation to moving the hflags code into its own file under the tcg/ directory.
--- hw/arm/boot.c | 6 +++++- hw/intc/armv7m_nvic.c | 20 +++++++++++++------- target/arm/arm-powerctl.c | 7 +++++-- target/arm/cpu.c | 3 ++- target/arm/helper.c | 18 +++++++++++++----- target/arm/machine.c | 5 ++++- 6 files changed, 42 insertions(+), 17 deletions(-)
hw/arm/boot.c +5 -1
@@ -15,6 +15,7 @@#include "hw/arm/boot.h" #include "hw/arm/linux-boot-if.h" #include "sysemu/kvm.h" +#include "sysemu/tcg.h" #include "sysemu/sysemu.h" #include "sysemu/numa.h" #include "hw/boards.h"
@@ -827,7 +828,10 @@ static void do_cpu_reset(void *opaque) info->secondary_cpu_reset_hook (cpu, info); } } -arm_rebuild_hflags (env); + +if (tcg_enabled ()) { +arm_rebuild_hflags (env); + } } }
hw/intc/armv7m_nvic.c +13 -7
@@ -18,6 +18,7 @@#include "hw/intc/armv7m_nvic.h" #include "hw/irq.h" #include "hw/qdev-properties.h" +#include "sysemu/tcg.h" #include "sysemu/runstate.h" #include "target/arm/cpu.h" #include "exec/exec-all.h"
@@ -2454,8 +2455,10 @@ static MemTxResult nvic_sysreg_write(void *opaque, hwaddr addr,/* This is UNPREDICTABLE; treat as RAZ/WI */ exit_ok: -/* Ensure any changes made are reflected in the cached hflags. */ -arm_rebuild_hflags (&s->cpu->env); +if (tcg_enabled ()) { +/* Ensure any changes made are reflected in the cached hflags. */ +arm_rebuild_hflags (&s->cpu->env); + }return MEMTX_OK ; }
@@ -2636,11 +2639,14 @@ static void armv7m_nvic_reset(DeviceState *dev) } } -/* -* We updated state that affects the CPU's MMUidx and thus its hflags; -* and we can't guarantee that we run before the CPU reset function. -*/ -arm_rebuild_hflags (&s->cpu->env); +if (tcg_enabled ()) { +/* +* We updated state that affects the CPU's MMUidx and thus its +* hflags; and we can't guarantee that we run before the CPU +* reset function. +*/ +arm_rebuild_hflags (&s->cpu->env); + } }static void nvic_systick_trigger (void *opaque,int n,int level)
target/arm/arm-powerctl.c +5 -2
@@ -15,6 +15,7 @@#include "arm-powerctl.h" #include "qemu/log.h" #include "qemu/main-loop.h" +#include "sysemu/tcg.h" #ifndef DEBUG_ARM_POWERCTL #define DEBUG_ARM_POWERCTL 0
@@ -127,8 +128,10 @@ static void arm_set_cpu_on_async_work(CPUState *target_cpu_state, target_cpu->env.regs[0 ] = info->context_id; } -/* CP15 update requires rebuilding hflags */ -arm_rebuild_hflags (&target_cpu->env); +if (tcg_enabled ()) { +/* CP15 update requires rebuilding hflags */ +arm_rebuild_hflags (&target_cpu->env); + }/* Start the new CPU at the requested address */ cpu_set_pc (target_cpu_state, info->entry);
target/arm/cpu.c +2 -1
@@ -542,8 +542,9 @@ static void arm_cpu_reset_hold(Object *obj)if (tcg_enabled ()) {hw_breakpoint_update_all (cpu);hw_watchpoint_update_all (cpu); + +arm_rebuild_hflags (env); } -arm_rebuild_hflags (env); }#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )
target/arm/helper.c +13 -5
@@ -5173,7 +5173,7 @@ static void sctlr_write(CPUARMState *env, const ARMCPRegInfo *ri,/* This may enable/disable the MMU, so do a TLB flush. */ tlb_flush (CPU (cpu)); -if (ri->type &ARM_CP_SUPPRESS_TB_END ) { +if (tcg_enabled () && ri->type &ARM_CP_SUPPRESS_TB_END ) {/* * Normally we would always end the TB on an SCTLR write; see the * comment in ARMCPRegInfo sctlr initialization below for why Xscale
@@ -6841,7 +6841,9 @@ void aarch64_set_svcr(CPUARMState *env, uint64_t new, uint64_t mask)memset (env->zarray,0 ,sizeof (env->zarray)); } -arm_rebuild_hflags (env); +if (tcg_enabled ()) { +arm_rebuild_hflags (env); + } } static void svcr_write(CPUARMState *env, const ARMCPRegInfo *ri,
@@ -9886,7 +9888,7 @@ void cpsr_write(CPUARMState *env, uint32_t val, uint32_t mask, } mask &= ~CACHED_CPSR_BITS ; env->uncached_cpsr = (env->uncached_cpsr & ~mask) | (val & mask); -if (rebuild_hflags) { +if (tcg_enabled () && rebuild_hflags) {arm_rebuild_hflags (env); } }
@@ -10445,7 +10447,10 @@ static void take_aarch32_exception(CPUARMState *env, int new_mode, env->regs[14 ] = env->regs[15 ] + offset; } env->regs[15 ] = newpc; -arm_rebuild_hflags (env); + +if (tcg_enabled ()) { +arm_rebuild_hflags (env); + } }static void arm_cpu_do_interrupt_aarch32_hyp (CPUState *cs)
@@ -11001,7 +11006,10 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs)pstate_write (env,PSTATE_DAIF | new_mode); env->aarch64 = true;aarch64_restore_sp (env, new_el); -helper_rebuild_hflags_a64 (env, new_el); + +if (tcg_enabled ()) { +helper_rebuild_hflags_a64 (env, new_el); + } env->pc = addr;
target/arm/machine.c +4 -1
@@ -871,7 +871,10 @@ static int cpu_post_load(void *opaque, int version_id)if (!kvm_enabled ()) {pmu_op_finish (&cpu->env); } -arm_rebuild_hflags (&cpu->env); + +if (tcg_enabled ()) { +arm_rebuild_hflags (&cpu->env); + }return 0 ; }
Signature · 1 line
2.35.3
PATCH v7 7/20 target/arm: Move hflags code into the tcg directory
In reply to Fabiano RosasThe hflags are used only for TCG code, so introduce a new file hflags.c to keep that code.
--- target/arm/helper.c | 393 +----------------------------------- target/arm/internals.h | 2 + target/arm/tcg-stubs.c | 4 + target/arm/tcg/hflags.c | 403 +++++++++++++++++++++++++++++++++++++ target/arm/tcg/meson.build | 1 + 5 files changed, 411 insertions(+), 392 deletions(-) create mode 100644 target/arm/tcg/hflags.c
target/arm/helper.c +1 -392
@@ -6669,32 +6669,6 @@ int sme_exception_el(CPUARMState *env, int el)return 0 ; } -/* This corresponds to the ARM pseudocode function IsFullA64Enabled(). */ -static bool sme_fa64 (CPUARMState *env,int el) -{ -if (!cpu_isar_feature (aa64_sme_fa64,env_archcpu (env))) { -return false; - } - -if (el <=1 && !el_is_in_host (env, el)) { -if (!FIELD_EX64 (env->vfp.smcr_el[1 ],SMCR ,FA64 )) { -return false; - } - } -if (el <=2 &&arm_is_el2_enabled (env)) { -if (!FIELD_EX64 (env->vfp.smcr_el[2 ],SMCR ,FA64 )) { -return false; - } - } -if (arm_feature (env,ARM_FEATURE_EL3 )) { -if (!FIELD_EX64 (env->vfp.smcr_el[3 ],SMCR ,FA64 )) { -return false; - } - } - -return true; -} -/* * Given that SVE is enabled, return the vector length for EL. */
@@ -11150,7 +11124,7 @@ int aa64_va_parameter_tbid(uint64_t tcr, ARMMMUIdx mmu_idx) } } -static int aa64_va_parameter_tcma (uint64_t tcr,ARMMMUIdx mmu_idx) +int aa64_va_parameter_tcma (uint64_t tcr,ARMMMUIdx mmu_idx) {if (regime_has_2_ranges (mmu_idx)) {return extract64 (tcr,57 ,2 );
@@ -11861,371 +11835,6 @@ ARMMMUIdx arm_mmu_idx(CPUARMState *env)return arm_mmu_idx_el (env,arm_current_el (env)); } -static inline bool fgt_svc (CPUARMState *env,int el) -{ -/* -* Assuming fine-grained-traps are active, return true if we -* should be trapping on SVC instructions. Only AArch64 can -* trap on an SVC at EL1, but we don't need to special-case this -* because if this is AArch32 EL1 then arm_fgt_active() is false. -* We also know el is 0 or 1. -*/ -return el ==0 ? -FIELD_EX64 (env->cp15.fgt_exec[FGTREG_HFGITR ],HFGITR_EL2 ,SVC_EL0 ) : -FIELD_EX64 (env->cp15.fgt_exec[FGTREG_HFGITR ],HFGITR_EL2 ,SVC_EL1 ); -} - -static CPUARMTBFlags rebuild_hflags_common (CPUARMState *env,int fp_el, -ARMMMUIdx mmu_idx, -CPUARMTBFlags flags) -{ -DP_TBFLAG_ANY (flags,FPEXC_EL , fp_el); -DP_TBFLAG_ANY (flags,MMUIDX ,arm_to_core_mmu_idx (mmu_idx)); - -if (arm_singlestep_active (env)) { -DP_TBFLAG_ANY (flags,SS_ACTIVE ,1 ); - } - -return flags; -} - -static CPUARMTBFlags rebuild_hflags_common_32 (CPUARMState *env,int fp_el, -ARMMMUIdx mmu_idx, -CPUARMTBFlags flags) -{ -bool sctlr_b =arm_sctlr_b (env); - -if (sctlr_b) { -DP_TBFLAG_A32 (flags,SCTLR__B ,1 ); - } -if (arm_cpu_data_is_big_endian_a32 (env, sctlr_b)) { -DP_TBFLAG_ANY (flags,BE_DATA ,1 ); - } -DP_TBFLAG_A32 (flags,NS , !access_secure_reg (env)); - -return rebuild_hflags_common (env, fp_el, mmu_idx, flags); -} - -static CPUARMTBFlags rebuild_hflags_m32 (CPUARMState *env,int fp_el, -ARMMMUIdx mmu_idx) -{ -CPUARMTBFlags flags = {}; -uint32_t ccr = env->v7m.ccr[env->v7m.secure]; - -/* Without HaveMainExt, CCR.UNALIGN_TRP is RES1. */ -if (ccr &R_V7M_CCR_UNALIGN_TRP_MASK ) { -DP_TBFLAG_ANY (flags,ALIGN_MEM ,1 ); - } - -if (arm_v7m_is_handler_mode (env)) { -DP_TBFLAG_M32 (flags,HANDLER ,1 ); - } - -/* -* v8M always applies stack limit checks unless CCR.STKOFHFNMIGN -* is suppressing them because the requested execution priority -* is less than 0. -*/ -if (arm_feature (env,ARM_FEATURE_V8 ) && - !((mmu_idx &ARM_MMU_IDX_M_NEGPRI ) && - (ccr &R_V7M_CCR_STKOFHFNMIGN_MASK ))) { -DP_TBFLAG_M32 (flags,STACKCHECK ,1 ); - } - -if (arm_feature (env,ARM_FEATURE_M_SECURITY ) && env->v7m.secure) { -DP_TBFLAG_M32 (flags,SECURE ,1 ); - } - -return rebuild_hflags_common_32 (env, fp_el, mmu_idx, flags); -} - -static CPUARMTBFlags rebuild_hflags_a32 (CPUARMState *env,int fp_el, -ARMMMUIdx mmu_idx) -{ -CPUARMTBFlags flags = {}; -int el =arm_current_el (env); - -if (arm_sctlr (env, el) &SCTLR_A ) { -DP_TBFLAG_ANY (flags,ALIGN_MEM ,1 ); - } - -if (arm_el_is_aa64 (env,1 )) { -DP_TBFLAG_A32 (flags,VFPEN ,1 ); - } - -if (el <2 && env->cp15.hstr_el2 &&arm_is_el2_enabled (env) && - (arm_hcr_el2_eff (env) & (HCR_E2H |HCR_TGE )) != (HCR_E2H |HCR_TGE )) { -DP_TBFLAG_A32 (flags,HSTR_ACTIVE ,1 ); - } - -if (arm_fgt_active (env, el)) { -DP_TBFLAG_ANY (flags,FGT_ACTIVE ,1 ); -if (fgt_svc (env, el)) { -DP_TBFLAG_ANY (flags,FGT_SVC ,1 ); - } - } - -if (env->uncached_cpsr &CPSR_IL ) { -DP_TBFLAG_ANY (flags,PSTATE__IL ,1 ); - } - -/* -* The SME exception we are testing for is raised via -* AArch64.CheckFPAdvSIMDEnabled(), as called from -* AArch32.CheckAdvSIMDOrFPEnabled(). -*/ -if (el ==0 - &&FIELD_EX64 (env->svcr,SVCR ,SM ) - && (!arm_is_el2_enabled (env) - || (arm_el_is_aa64 (env,2 ) && !(env->cp15.hcr_el2 &HCR_TGE ))) - &&arm_el_is_aa64 (env,1 ) - && !sme_fa64 (env, el)) { -DP_TBFLAG_A32 (flags,SME_TRAP_NONSTREAMING ,1 ); - } - -return rebuild_hflags_common_32 (env, fp_el, mmu_idx, flags); -} - -static CPUARMTBFlags rebuild_hflags_a64 (CPUARMState *env,int el,int fp_el, -ARMMMUIdx mmu_idx) -{ -CPUARMTBFlags flags = {}; -ARMMMUIdx stage1 =stage_1_mmu_idx (mmu_idx); -uint64_t tcr =regime_tcr (env, mmu_idx); -uint64_t sctlr; -int tbii, tbid; - -DP_TBFLAG_ANY (flags,AARCH64_STATE ,1 ); - -/* Get control bits for tagged addresses. */ - tbid =aa64_va_parameter_tbi (tcr, mmu_idx); - tbii = tbid & ~aa64_va_parameter_tbid (tcr, mmu_idx); - -DP_TBFLAG_A64 (flags,TBII , tbii); -DP_TBFLAG_A64 (flags,TBID , tbid); - -if (cpu_isar_feature (aa64_sve,env_archcpu (env))) { -int sve_el =sve_exception_el (env, el); - -/* -* If either FP or SVE are disabled, translator does not need len. -* If SVE EL > FP EL, FP exception has precedence, and translator -* does not need SVE EL. Save potential re-translations by forcing -* the unneeded data to zero. -*/ -if (fp_el !=0 ) { -if (sve_el > fp_el) { - sve_el =0 ; - } - }else if (sve_el ==0 ) { -DP_TBFLAG_A64 (flags,VL ,sve_vqm1_for_el (env, el)); - } -DP_TBFLAG_A64 (flags,SVEEXC_EL , sve_el); - } -if (cpu_isar_feature (aa64_sme,env_archcpu (env))) { -int sme_el =sme_exception_el (env, el); -bool sm =FIELD_EX64 (env->svcr,SVCR ,SM ); - -DP_TBFLAG_A64 (flags,SMEEXC_EL , sme_el); -if (sme_el ==0 ) { -/* Similarly, do not compute SVL if SME is disabled. */ -int svl =sve_vqm1_for_el_sm (env, el, true); -DP_TBFLAG_A64 (flags,SVL , svl); -if (sm) { -/* If SVE is disabled, we will not have set VL above. */ -DP_TBFLAG_A64 (flags,VL , svl); - } - } -if (sm) { -DP_TBFLAG_A64 (flags,PSTATE_SM ,1 ); -DP_TBFLAG_A64 (flags,SME_TRAP_NONSTREAMING , !sme_fa64 (env, el)); - } -DP_TBFLAG_A64 (flags,PSTATE_ZA ,FIELD_EX64 (env->svcr,SVCR ,ZA )); - } - - sctlr =regime_sctlr (env, stage1); - -if (sctlr &SCTLR_A ) { -DP_TBFLAG_ANY (flags,ALIGN_MEM ,1 ); - } - -if (arm_cpu_data_is_big_endian_a64 (el, sctlr)) { -DP_TBFLAG_ANY (flags,BE_DATA ,1 ); - } - -if (cpu_isar_feature (aa64_pauth,env_archcpu (env))) { -/* -* In order to save space in flags, we record only whether -* pauth is "inactive", meaning all insns are implemented as -* a nop, or "active" when some action must be performed. -* The decision of which action to take is left to a helper. -*/ -if (sctlr & (SCTLR_EnIA | SCTLR_EnIB | SCTLR_EnDA | SCTLR_EnDB)) { -DP_TBFLAG_A64 (flags,PAUTH_ACTIVE ,1 ); - } - } - -if (cpu_isar_feature (aa64_bti,env_archcpu (env))) { -/* Note that SCTLR_EL[23].BT == SCTLR_BT1. */ -if (sctlr & (el ==0 ?SCTLR_BT0 :SCTLR_BT1 )) { -DP_TBFLAG_A64 (flags,BT ,1 ); - } - } - -/* Compute the condition for using AccType_UNPRIV for LDTR et al. */ -if (!(env->pstate &PSTATE_UAO )) { -switch (mmu_idx) { -case ARMMMUIdx_E10_1: -case ARMMMUIdx_E10_1_PAN: -/* TODO: ARMv8.3-NV */ -DP_TBFLAG_A64 (flags,UNPRIV ,1 ); -break ; -case ARMMMUIdx_E20_2: -case ARMMMUIdx_E20_2_PAN: -/* -* Note that EL20_2 is gated by HCR_EL2.E2H == 1, but EL20_0 is -* gated by HCR_EL2.<E2H,TGE> == '11', and so is LDTR. -*/ -if (env->cp15.hcr_el2 &HCR_TGE ) { -DP_TBFLAG_A64 (flags,UNPRIV ,1 ); - } -break ; -default : -break ; - } - } - -if (env->pstate &PSTATE_IL ) { -DP_TBFLAG_ANY (flags,PSTATE__IL ,1 ); - } - -if (arm_fgt_active (env, el)) { -DP_TBFLAG_ANY (flags,FGT_ACTIVE ,1 ); -if (FIELD_EX64 (env->cp15.fgt_exec[FGTREG_HFGITR ],HFGITR_EL2 ,ERET )) { -DP_TBFLAG_A64 (flags,FGT_ERET ,1 ); - } -if (fgt_svc (env, el)) { -DP_TBFLAG_ANY (flags,FGT_SVC ,1 ); - } - } - -if (cpu_isar_feature (aa64_mte,env_archcpu (env))) { -/* -* Set MTE_ACTIVE if any access may be Checked, and leave clear -* if all accesses must be Unchecked: -* 1) If no TBI, then there are no tags in the address to check, -* 2) If Tag Check Override, then all accesses are Unchecked, -* 3) If Tag Check Fail == 0, then Checked access have no effect, -* 4) If no Allocation Tag Access, then all accesses are Unchecked. -*/ -if (allocation_tag_access_enabled (env, el, sctlr)) { -DP_TBFLAG_A64 (flags,ATA ,1 ); -if (tbid - && !(env->pstate &PSTATE_TCO ) - && (sctlr & (el ==0 ?SCTLR_TCF0 :SCTLR_TCF ))) { -DP_TBFLAG_A64 (flags,MTE_ACTIVE ,1 ); - } - } -/* And again for unprivileged accesses, if required. */ -if (EX_TBFLAG_A64 (flags,UNPRIV ) - && tbid - && !(env->pstate &PSTATE_TCO ) - && (sctlr &SCTLR_TCF0 ) - &&allocation_tag_access_enabled (env,0 , sctlr)) { -DP_TBFLAG_A64 (flags,MTE0_ACTIVE ,1 ); - } -/* Cache TCMA as well as TBI. */ -DP_TBFLAG_A64 (flags,TCMA ,aa64_va_parameter_tcma (tcr, mmu_idx)); - } - -return rebuild_hflags_common (env, fp_el, mmu_idx, flags); -} - -static CPUARMTBFlags rebuild_hflags_internal (CPUARMState *env) -{ -int el =arm_current_el (env); -int fp_el =fp_exception_el (env, el); -ARMMMUIdx mmu_idx =arm_mmu_idx_el (env, el); - -if (is_a64 (env)) { -return rebuild_hflags_a64 (env, el, fp_el, mmu_idx); - }else if (arm_feature (env,ARM_FEATURE_M )) { -return rebuild_hflags_m32 (env, fp_el, mmu_idx); - }else { -return rebuild_hflags_a32 (env, fp_el, mmu_idx); - } -} - -void arm_rebuild_hflags (CPUARMState *env) -{ - env->hflags =rebuild_hflags_internal (env); -} - -/* -* If we have triggered a EL state change we can't rely on the -* translator having passed it to us, we need to recompute. -*/ -void HELPER (rebuild_hflags_m32_newel )(CPUARMState *env) -{ -int el =arm_current_el (env); -int fp_el =fp_exception_el (env, el); -ARMMMUIdx mmu_idx =arm_mmu_idx_el (env, el); - - env->hflags =rebuild_hflags_m32 (env, fp_el, mmu_idx); -} - -void HELPER (rebuild_hflags_m32 )(CPUARMState *env,int el) -{ -int fp_el =fp_exception_el (env, el); -ARMMMUIdx mmu_idx =arm_mmu_idx_el (env, el); - - env->hflags =rebuild_hflags_m32 (env, fp_el, mmu_idx); -} - -/* -* If we have triggered a EL state change we can't rely on the -* translator having passed it to us, we need to recompute. -*/ -void HELPER (rebuild_hflags_a32_newel )(CPUARMState *env) -{ -int el =arm_current_el (env); -int fp_el =fp_exception_el (env, el); -ARMMMUIdx mmu_idx =arm_mmu_idx_el (env, el); - env->hflags =rebuild_hflags_a32 (env, fp_el, mmu_idx); -} - -void HELPER (rebuild_hflags_a32 )(CPUARMState *env,int el) -{ -int fp_el =fp_exception_el (env, el); -ARMMMUIdx mmu_idx =arm_mmu_idx_el (env, el); - - env->hflags =rebuild_hflags_a32 (env, fp_el, mmu_idx); -} - -void HELPER (rebuild_hflags_a64 )(CPUARMState *env,int el) -{ -int fp_el =fp_exception_el (env, el); -ARMMMUIdx mmu_idx =arm_mmu_idx_el (env, el); - - env->hflags =rebuild_hflags_a64 (env, el, fp_el, mmu_idx); -} - -static inline void assert_hflags_rebuild_correctly (CPUARMState *env) -{ -#ifdef CONFIG_DEBUG_TCG -CPUARMTBFlags c = env->hflags; -CPUARMTBFlags r =rebuild_hflags_internal (env); - -if (unlikely (c.flags != r.flags || c.flags2 != r.flags2)) { -fprintf (stderr,"TCG hflags mismatch " -"(current:(0x%08x,0x" TARGET_FMT_lx")" -" rebuilt:(0x%08x,0x" TARGET_FMT_lx")\n" , - c.flags, c.flags2, r.flags, r.flags2); -abort (); - } -#endif -} -static bool mve_no_pred (CPUARMState *env) {/*
target/arm/internals.h +2 -0
@@ -1073,6 +1073,7 @@ ARMVAParameters aa64_va_parameters(CPUARMState *env, uint64_t va,int aa64_va_parameter_tbi (uint64_t tcr,ARMMMUIdx mmu_idx);int aa64_va_parameter_tbid (uint64_t tcr,ARMMMUIdx mmu_idx); +int aa64_va_parameter_tcma (uint64_t tcr,ARMMMUIdx mmu_idx);/* Determine if allocation tags are available. */ static inline bool allocation_tag_access_enabled(CPUARMState *env, int el,
@@ -1383,4 +1384,5 @@ static inline bool arm_fgt_active(CPUARMState *env, int el) (!arm_feature(env, ARM_FEATURE_EL3) || (env->cp15.scr_el3 & SCR_FGTEN)); } +void assert_hflags_rebuild_correctly (CPUARMState *env);#endif
target/arm/tcg-stubs.c +4 -0
@@ -21,3 +21,7 @@ void raise_exception_ra(CPUARMState *env, uint32_t excp, uint32_t syndrome, {g_assert_not_reached (); } +/* Temporarily while cpu_get_tb_cpu_state() is still in common code */ +void assert_hflags_rebuild_correctly (CPUARMState *env) +{ +}
target/arm/tcg/hflags.c new file +403 -0
403 lines not on this page · raw message
target/arm/tcg/meson.build +1 -0
@@ -24,6 +24,7 @@ arm_ss.add(files( 'translate-neon.c', 'translate-vfp.c', 'crypto_helper.c', + 'hflags.c', 'iwmmxt_helper.c', 'm_helper.c', 'mve_helper.c',
Signature · 1 line
2.35.3
PATCH v7 8/20 target/arm: Move regime_using_lpae_format into internal.h
In reply to Fabiano RosasThis function is needed by common code (ptw.c), so move it along with the other regime_* functions in internal.h. When we enable the build without TCG, the tlb_helper.c file will not be present.
--- target/arm/internals.h | 21 ++++++++++++++++++--- target/arm/tcg/tlb_helper.c | 18 ------------------ 2 files changed, 18 insertions(+), 21 deletions(-)
target/arm/internals.h +18 -3
@@ -600,9 +600,6 @@ int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx);/* Return the MMU index for a v7M CPU in the specified security state */ ARMMMUIdx arm_v7m_mmu_idx_for_secstate (CPUARMState *env,bool secstate); -/* Return true if the translation regime is using LPAE format page tables */ -bool regime_using_lpae_format (CPUARMState *env,ARMMMUIdx mmu_idx); -/* * Return true if the stage 1 translation regime is using LPAE * format page tables
@@ -767,6 +764,24 @@ static inline uint64_t regime_tcr(CPUARMState *env, ARMMMUIdx mmu_idx)return env->cp15.tcr_el[regime_el (env, mmu_idx)]; } +/* Return true if the translation regime is using LPAE format page tables */ +static inline bool regime_using_lpae_format (CPUARMState *env,ARMMMUIdx mmu_idx) +{ +int el =regime_el (env, mmu_idx); +if (el ==2 ||arm_el_is_aa64 (env, el)) { +return true; + } +if (arm_feature (env,ARM_FEATURE_PMSA ) && +arm_feature (env,ARM_FEATURE_V8 )) { +return true; + } +if (arm_feature (env,ARM_FEATURE_LPAE ) + && (regime_tcr (env, mmu_idx) &TTBCR_EAE )) { +return true; + } +return false; +} +/** * arm_num_brps: Return number of implemented breakpoints. * Note that the ID register BRPS field is "number of bps - 1",
target/arm/tcg/tlb_helper.c +0 -18
@@ -12,24 +12,6 @@#include "exec/helper-proto.h" -/* Return true if the translation regime is using LPAE format page tables */ -bool regime_using_lpae_format (CPUARMState *env,ARMMMUIdx mmu_idx) -{ -int el =regime_el (env, mmu_idx); -if (el ==2 ||arm_el_is_aa64 (env, el)) { -return true; - } -if (arm_feature (env,ARM_FEATURE_PMSA ) && -arm_feature (env,ARM_FEATURE_V8 )) { -return true; - } -if (arm_feature (env,ARM_FEATURE_LPAE ) - && (regime_tcr (env, mmu_idx) &TTBCR_EAE )) { -return true; - } -return false; -} -/* * Returns true if the stage 1 translation regime is using LPAE format page * tables. Used when raising alignment exceptions, whose FSR changes depending
Signature · 1 line
2.35.3
PATCH v7 9/20 target/arm: Don't access TCG code when debugging with KVM
In reply to Fabiano RosasWhen TCG is disabled this part of the code should not be reachable, so wrap it with an ifdef for now.
--- target/arm/ptw.c | 4 ++++ 1 file changed, 4 insertions(+)
target/arm/ptw.c +4 -0
@@ -254,6 +254,7 @@ static bool S1_ptw_translate(CPUARMState *env, S1Translate *ptw, ptw->out_host =NULL ; ptw->out_rw = false; }else { +#ifdef CONFIG_TCG CPUTLBEntryFull *full;int flags;
@@ -270,6 +271,9 @@ static bool S1_ptw_translate(CPUARMState *env, S1Translate *ptw, ptw->out_rw = full->prot &PAGE_WRITE ; pte_attrs = full->pte_attrs; pte_secure = full->attrs.secure; +#else +g_assert_not_reached (); +#endif }if (regime_is_stage2 (s2_mmu_idx)) {
Signature · 1 line
2.35.3
PATCH v7 10/20 cpu-defs.h: Expose CPUTLBEntryFull to non-TCG code
In reply to Fabiano RosasThis struct has no dependencies on TCG code and it is being used in target/arm/ptw.c to simplify the passing around of page table walk results. Those routines can be reached by KVM code via the gdbstub breakpoint code, so take the structure out of CONFIG_TCG to make it visible when building with --disable-tcg.
--- include/exec/cpu-defs.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/exec/cpu-defs.h +6 -0
@@ -135,6 +135,10 @@ typedef struct CPUTLBEntry {QEMU_BUILD_BUG_ON (sizeof (CPUTLBEntry) != (1 <<CPU_TLB_ENTRY_BITS )); + +#endif /* !CONFIG_USER_ONLY && CONFIG_TCG */ + +#if !defined(CONFIG_USER_ONLY )/* * The full TLB entry, which is not accessed by generated TCG code, * so the layout is not as critical as that of CPUTLBEntry. This is
@@ -176,7 +180,9 @@ typedef struct CPUTLBEntryFull {TARGET_PAGE_ENTRY_EXTRA #endif } CPUTLBEntryFull; +#endif /* !CONFIG_USER_ONLY */ +#if !defined(CONFIG_USER_ONLY ) && defined(CONFIG_TCG )/* * Data elements that are per MMU mode, minus the bits accessed by * the TCG fast path.
Signature · 1 line
2.35.3
PATCH v7 11/20 target/arm: Move cortex sysregs into a separate file
In reply to Fabiano RosasThe file cpu_tcg.c is about to be moved into the tcg/ directory, so move the register definitions into a new file.
Also move the function declaration to the more appropriate cpregs.h.
--- target/arm/cortex-regs.c | 69 ++++++++++++++++++++++++++++++++++++++++ target/arm/cpregs.h | 6 ++++ target/arm/cpu64.c | 1 + target/arm/cpu_tcg.c | 59 ---------------------------------- target/arm/internals.h | 6 ---- target/arm/meson.build | 1 + 6 files changed, 77 insertions(+), 65 deletions(-) create mode 100644 target/arm/cortex-regs.c
target/arm/cortex-regs.c new file +69 -0
@@ -0,0 +1,69 @@ +/* +* ARM Cortex-A registers +* +* This code is licensed under the GNU GPL v2 or later. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "cpregs.h" + + +static uint64_t l2ctlr_read (CPUARMState *env,const ARMCPRegInfo *ri) +{ +ARMCPU *cpu =env_archcpu (env); + +/* Number of cores is in [25:24]; otherwise we RAZ */ +return (cpu->core_count -1 ) <<24 ; +} + +static const ARMCPRegInfo cortex_a72_a57_a53_cp_reginfo[] = { + { .name ="L2CTLR_EL1" , .state =ARM_CP_STATE_AA64 , + .opc0 =3 , .opc1 =1 , .crn =11 , .crm =0 , .opc2 =2 , + .access =PL1_RW , .readfn = l2ctlr_read, + .writefn = arm_cp_write_ignore }, + { .name ="L2CTLR" , + .cp =15 , .opc1 =1 , .crn =9 , .crm =0 , .opc2 =2 , + .access =PL1_RW , .readfn = l2ctlr_read, + .writefn = arm_cp_write_ignore }, + { .name ="L2ECTLR_EL1" , .state =ARM_CP_STATE_AA64 , + .opc0 =3 , .opc1 =1 , .crn =11 , .crm =0 , .opc2 =3 , + .access =PL1_RW , .type =ARM_CP_CONST , .resetvalue =0 }, + { .name ="L2ECTLR" , + .cp =15 , .opc1 =1 , .crn =9 , .crm =0 , .opc2 =3 , + .access =PL1_RW , .type =ARM_CP_CONST , .resetvalue =0 }, + { .name ="L2ACTLR" , .state =ARM_CP_STATE_BOTH , + .opc0 =3 , .opc1 =1 , .crn =15 , .crm =0 , .opc2 =0 , + .access =PL1_RW , .type =ARM_CP_CONST , .resetvalue =0 }, + { .name ="CPUACTLR_EL1" , .state =ARM_CP_STATE_AA64 , + .opc0 =3 , .opc1 =1 , .crn =15 , .crm =2 , .opc2 =0 , + .access =PL1_RW , .type =ARM_CP_CONST , .resetvalue =0 }, + { .name ="CPUACTLR" , + .cp =15 , .opc1 =0 , .crm =15 , + .access =PL1_RW , .type =ARM_CP_CONST |ARM_CP_64BIT , .resetvalue =0 }, + { .name ="CPUECTLR_EL1" , .state =ARM_CP_STATE_AA64 , + .opc0 =3 , .opc1 =1 , .crn =15 , .crm =2 , .opc2 =1 , + .access =PL1_RW , .type =ARM_CP_CONST , .resetvalue =0 }, + { .name ="CPUECTLR" , + .cp =15 , .opc1 =1 , .crm =15 , + .access =PL1_RW , .type =ARM_CP_CONST |ARM_CP_64BIT , .resetvalue =0 }, + { .name ="CPUMERRSR_EL1" , .state =ARM_CP_STATE_AA64 , + .opc0 =3 , .opc1 =1 , .crn =15 , .crm =2 , .opc2 =2 , + .access =PL1_RW , .type =ARM_CP_CONST , .resetvalue =0 }, + { .name ="CPUMERRSR" , + .cp =15 , .opc1 =2 , .crm =15 , + .access =PL1_RW , .type =ARM_CP_CONST |ARM_CP_64BIT , .resetvalue =0 }, + { .name ="L2MERRSR_EL1" , .state =ARM_CP_STATE_AA64 , + .opc0 =3 , .opc1 =1 , .crn =15 , .crm =2 , .opc2 =3 , + .access =PL1_RW , .type =ARM_CP_CONST , .resetvalue =0 }, + { .name ="L2MERRSR" , + .cp =15 , .opc1 =3 , .crm =15 , + .access =PL1_RW , .type =ARM_CP_CONST |ARM_CP_64BIT , .resetvalue =0 }, +}; + +void define_cortex_a72_a57_a53_cp_reginfo (ARMCPU *cpu) +{ +define_arm_cp_regs (cpu, cortex_a72_a57_a53_cp_reginfo); +}
target/arm/cpregs.h +6 -0
@@ -1071,4 +1071,10 @@ static inline bool arm_cpreg_in_idspace(const ARMCPRegInfo *ri) ri->crn, ri->crm); } +#ifdef CONFIG_USER_ONLY +static inline void define_cortex_a72_a57_a53_cp_reginfo (ARMCPU *cpu) { } +#else +void define_cortex_a72_a57_a53_cp_reginfo (ARMCPU *cpu); +#endif +#endif /* TARGET_ARM_CPREGS_H */
target/arm/cpu64.c +1 -0
@@ -29,6 +29,7 @@#include "qapi/visitor.h" #include "hw/qdev-properties.h" #include "internals.h" +#include "cpregs.h" static void aarch64_a35_initfn (Object *obj) {
target/arm/cpu_tcg.c +0 -59
65 lines not on this page · raw message
target/arm/internals.h +0 -6
@@ -1352,12 +1352,6 @@ void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp);void arm_cpu_lpa2_finalize (ARMCPU *cpu,Error **errp);#endif -#ifdef CONFIG_USER_ONLY -static inline void define_cortex_a72_a57_a53_cp_reginfo (ARMCPU *cpu) { } -#else -void define_cortex_a72_a57_a53_cp_reginfo (ARMCPU *cpu); -#endif -bool el_is_in_host (CPUARMState *env,int el);void aa32_max_features (ARMCPU *cpu);
target/arm/meson.build +1 -0
@@ -20,6 +20,7 @@ arm_softmmu_ss = ss.source_set() arm_softmmu_ss.add(files( 'arch_dump.c', 'arm-powerctl.c', + 'cortex-regs.c', 'machine.c', 'monitor.c', 'ptw.c',
Signature · 1 line
2.35.3
PATCH v7 12/20 target/arm: Move 64-bit TCG CPUs into tcg/
In reply to Fabiano RosasMove the 64-bit CPUs that are TCG-only:
- cortex-a35
- cortex-a55
- cortex-a72
- cortex-a76
- a64fx
- neoverse-n1
Keep the CPUs that can be used with KVM:
- cortex-a57
- cortex-a53
- max
- host
For the special case "max" CPU, there's a nuance that while KVM/HVF use the "host" model instead, we still cannot move all of the TCG code into the tcg directory because the qtests might reach the !kvm && !hvf branch.
--- hw/arm/virt.c | 6 +- target/arm/cpu64.c | 398 +-------------------------------- target/arm/internals.h | 1 + target/arm/tcg/cpu64.c | 438 +++++++++++++++++++++++++++++++++++++ target/arm/tcg/meson.build | 1 + 5 files changed, 445 insertions(+), 399 deletions(-) create mode 100644 target/arm/tcg/cpu64.c
hw/arm/virt.c +4 -2
@@ -206,14 +206,16 @@ static const int a15irqmap[] = {static const char *valid_cpus[] = {ARM_CPU_TYPE_NAME ("cortex-a7" ),ARM_CPU_TYPE_NAME ("cortex-a15" ), +#ifdef CONFIG_TCGARM_CPU_TYPE_NAME ("cortex-a35" ), -ARM_CPU_TYPE_NAME ("cortex-a53" ),ARM_CPU_TYPE_NAME ("cortex-a55" ), -ARM_CPU_TYPE_NAME ("cortex-a57" ),ARM_CPU_TYPE_NAME ("cortex-a72" ),ARM_CPU_TYPE_NAME ("cortex-a76" ),ARM_CPU_TYPE_NAME ("a64fx" ),ARM_CPU_TYPE_NAME ("neoverse-n1" ), +#endif +ARM_CPU_TYPE_NAME ("cortex-a53" ), +ARM_CPU_TYPE_NAME ("cortex-a57" ),ARM_CPU_TYPE_NAME ("host" ),ARM_CPU_TYPE_NAME ("max" ), };
target/arm/cpu64.c +1 -397
424 lines not on this page · raw message
target/arm/internals.h +1 -0
@@ -1350,6 +1350,7 @@ void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp);void arm_cpu_sme_finalize (ARMCPU *cpu,Error **errp);void arm_cpu_pauth_finalize (ARMCPU *cpu,Error **errp);void arm_cpu_lpa2_finalize (ARMCPU *cpu,Error **errp); +void aarch64_add_sve_properties (Object *obj);#endif bool el_is_in_host (CPUARMState *env,int el);
target/arm/tcg/cpu64.c new file +438 -0
438 lines not on this page · raw message
target/arm/tcg/meson.build +1 -0
@@ -35,6 +35,7 @@ arm_ss.add(files( )) arm_ss.add(when: 'TARGET_AARCH64', if_true: files( + 'cpu64.c', 'translate-a64.c', 'translate-sve.c', 'translate-sme.c',
Signature · 1 line
2.35.3
PATCH v7 13/20 target/arm: Move aa32_max_features out of cpu_tcg.c
In reply to Fabiano RosasIn preparation to moving the cpu_tcg.c code into a 32-bit, tcg-only file, move the aa32_max_features function which is shared between 32/64/tcg/non-tcg into cpu.c.
--- target/arm/cpu.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ target/arm/cpu_tcg.c | 69 -------------------------------------------- 2 files changed, 69 insertions(+), 69 deletions(-)
target/arm/cpu.c +69 -0
@@ -2153,6 +2153,75 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) acc->parent_realize (dev, errp); } +/* Share AArch32 -cpu max features with AArch64. */ +void aa32_max_features (ARMCPU *cpu) +{ +uint32_t t; + +/* Add additional features supported by QEMU */ + t = cpu->isar.id_isar5; + t =FIELD_DP32 (t,ID_ISAR5 ,AES ,2 );/* FEAT_PMULL */ + t =FIELD_DP32 (t,ID_ISAR5 ,SHA1 ,1 );/* FEAT_SHA1 */ + t =FIELD_DP32 (t,ID_ISAR5 ,SHA2 ,1 );/* FEAT_SHA256 */ + t =FIELD_DP32 (t,ID_ISAR5 ,CRC32 ,1 ); + t =FIELD_DP32 (t,ID_ISAR5 ,RDM ,1 );/* FEAT_RDM */ + t =FIELD_DP32 (t,ID_ISAR5 ,VCMA ,1 );/* FEAT_FCMA */ + cpu->isar.id_isar5 = t; + + t = cpu->isar.id_isar6; + t =FIELD_DP32 (t,ID_ISAR6 ,JSCVT ,1 );/* FEAT_JSCVT */ + t =FIELD_DP32 (t,ID_ISAR6 ,DP ,1 );/* Feat_DotProd */ + t =FIELD_DP32 (t,ID_ISAR6 ,FHM ,1 );/* FEAT_FHM */ + t =FIELD_DP32 (t,ID_ISAR6 ,SB ,1 );/* FEAT_SB */ + t =FIELD_DP32 (t,ID_ISAR6 ,SPECRES ,1 );/* FEAT_SPECRES */ + t =FIELD_DP32 (t,ID_ISAR6 ,BF16 ,1 );/* FEAT_AA32BF16 */ + t =FIELD_DP32 (t,ID_ISAR6 ,I8MM ,1 );/* FEAT_AA32I8MM */ + cpu->isar.id_isar6 = t; + + t = cpu->isar.mvfr1; + t =FIELD_DP32 (t,MVFR1 ,FPHP ,3 );/* FEAT_FP16 */ + t =FIELD_DP32 (t,MVFR1 ,SIMDHP ,2 );/* FEAT_FP16 */ + cpu->isar.mvfr1 = t; + + t = cpu->isar.mvfr2; + t =FIELD_DP32 (t,MVFR2 ,SIMDMISC ,3 );/* SIMD MaxNum */ + t =FIELD_DP32 (t,MVFR2 ,FPMISC ,4 );/* FP MaxNum */ + cpu->isar.mvfr2 = t; + + t = cpu->isar.id_mmfr3; + t =FIELD_DP32 (t,ID_MMFR3 ,PAN ,2 );/* FEAT_PAN2 */ + cpu->isar.id_mmfr3 = t; + + t = cpu->isar.id_mmfr4; + t =FIELD_DP32 (t,ID_MMFR4 ,HPDS ,1 );/* FEAT_AA32HPD */ + t =FIELD_DP32 (t,ID_MMFR4 ,AC2 ,1 );/* ACTLR2, HACTLR2 */ + t =FIELD_DP32 (t,ID_MMFR4 ,CNP ,1 );/* FEAT_TTCNP */ + t =FIELD_DP32 (t,ID_MMFR4 ,XNX ,1 );/* FEAT_XNX */ + t =FIELD_DP32 (t,ID_MMFR4 ,EVT ,2 );/* FEAT_EVT */ + cpu->isar.id_mmfr4 = t; + + t = cpu->isar.id_mmfr5; + t =FIELD_DP32 (t,ID_MMFR5 ,ETS ,1 );/* FEAT_ETS */ + cpu->isar.id_mmfr5 = t; + + t = cpu->isar.id_pfr0; + t =FIELD_DP32 (t,ID_PFR0 ,CSV2 ,2 );/* FEAT_CVS2 */ + t =FIELD_DP32 (t,ID_PFR0 ,DIT ,1 );/* FEAT_DIT */ + t =FIELD_DP32 (t,ID_PFR0 ,RAS ,1 );/* FEAT_RAS */ + cpu->isar.id_pfr0 = t; + + t = cpu->isar.id_pfr2; + t =FIELD_DP32 (t,ID_PFR2 ,CSV3 ,1 );/* FEAT_CSV3 */ + t =FIELD_DP32 (t,ID_PFR2 ,SSBS ,1 );/* FEAT_SSBS */ + cpu->isar.id_pfr2 = t; + + t = cpu->isar.id_dfr0; + t =FIELD_DP32 (t,ID_DFR0 ,COPDBG ,9 );/* FEAT_Debugv8p4 */ + t =FIELD_DP32 (t,ID_DFR0 ,COPSDBG ,9 );/* FEAT_Debugv8p4 */ + t =FIELD_DP32 (t,ID_DFR0 ,PERFMON ,6 );/* FEAT_PMUv3p5 */ + cpu->isar.id_dfr0 = t; +} +static ObjectClass *arm_cpu_class_by_name (const char *cpu_model) {ObjectClass *oc;
target/arm/cpu_tcg.c +0 -69
75 lines not on this page · raw message
Signature · 1 line
2.35.3
PATCH v7 14/20 target/arm: move cpu_tcg to tcg/cpu32.c
In reply to Fabiano RosasFrom: Claudio Fontana <[email protected]>
move the module containing cpu models definitions for 32bit TCG-only CPUs to tcg/ and rename it for clarity.
---
hw/arm/virt.c | 2 +-
target/arm/meson.build | 1 -
target/arm/{cpu_tcg.c => tcg/cpu32.c} | 13 +++----------
target/arm/tcg/meson.build | 1 +
tests/qtest/arm-cpu-features.c | 12 +++++++++---
5 files changed, 14 insertions(+), 15 deletions(-)
rename target/arm/{cpu_tcg.c => tcg/cpu32.c} (99%)hw/arm/virt.c +1 -1
@@ -204,9 +204,9 @@ static const int a15irqmap[] = { };static const char *valid_cpus[] = { +#ifdef CONFIG_TCGARM_CPU_TYPE_NAME ("cortex-a7" ),ARM_CPU_TYPE_NAME ("cortex-a15" ), -#ifdef CONFIG_TCGARM_CPU_TYPE_NAME ("cortex-a35" ),ARM_CPU_TYPE_NAME ("cortex-a55" ), ARM_CPU_TYPE_NAME("cortex-a72"),
target/arm/meson.build +0 -1
@@ -5,7 +5,6 @@ arm_ss.add(files( 'gdbstub.c', 'helper.c', 'vfp_helper.c', - 'cpu_tcg.c', )) arm_ss.add(zlib)
target/arm/tcg/cpu32.c renamed from target/arm/cpu_tcg.c +3 -10
@@ -1,5 +1,5 @@/* -* QEMU ARM TCG CPUs. +* QEMU ARM TCG-only CPUs. * * Copyright (c) 2012 SUSE LINUX Products GmbH *
@@ -10,9 +10,7 @@#include "qemu/osdep.h" #include "cpu.h" -#ifdef CONFIG_TCG #include "hw/core/tcg-cpu-ops.h" -#endif /* CONFIG_TCG */ #include "internals.h" #include "target/arm/idau.h" #if !defined(CONFIG_USER_ONLY )
@@ -27,7 +25,7 @@/* CPU models. These are not needed for the AArch64 linux-user build. */ #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) -#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG) +#if !defined(CONFIG_USER_ONLY) static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { CPUClass *cc = CPU_GET_CLASS(cs);
@@ -51,7 +49,7 @@ static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request) }return ret; } -#endif /* !CONFIG_USER_ONLY && CONFIG_TCG */ +#endif /* !CONFIG_USER_ONLY */ static void arm926_initfn (Object *obj) {
@@ -947,7 +945,6 @@ static void pxa270c5_initfn(Object *obj) cpu->reset_sctlr =0x00000078 ; } -#ifdef CONFIG_TCG static const struct TCGCPUOps arm_v7m_tcg_ops = { .initialize = arm_translate_init, .synchronize_from_tb = arm_cpu_synchronize_from_tb,
@@ -968,7 +965,6 @@ static const struct TCGCPUOps arm_v7m_tcg_ops = { .debug_check_breakpoint = arm_debug_check_breakpoint,#endif /* !CONFIG_USER_ONLY */ }; -#endif /* CONFIG_TCG */ static void arm_v7m_class_init (ObjectClass *oc,void *data) {
@@ -976,10 +972,7 @@ static void arm_v7m_class_init(ObjectClass *oc, void *data)CPUClass *cc =CPU_CLASS (oc); acc->info = data; -#ifdef CONFIG_TCG cc->tcg_ops = &arm_v7m_tcg_ops; -#endif /* CONFIG_TCG */ - cc->gdb_core_xml_file ="arm-m-profile.xml" ; }
target/arm/tcg/meson.build +1 -0
@@ -18,6 +18,7 @@ gen = [ arm_ss.add(gen) arm_ss.add(files( + 'cpu32.c', 'translate.c', 'translate-m-nocp.c', 'translate-mve.c',
tests/qtest/arm-cpu-features.c +9 -3
@@ -506,9 +506,15 @@ static void test_query_cpu_model_expansion_kvm(const void *data)QDict *resp;char *error; -assert_error (qts,"cortex-a15" , -"We cannot guarantee the CPU type 'cortex-a15' works " -"with KVM on this host" ,NULL ); +if (qtest_has_accel ("tcg" )) { +assert_error (qts,"cortex-a15" , +"We cannot guarantee the CPU type 'cortex-a15' works " +"with KVM on this host" ,NULL ); + }else { +assert_error (qts,"cortex-a15" , +"The CPU type 'cortex-a15' is not a " +"recognized ARM CPU type" ,NULL ); + }assert_has_feature_enabled (qts,"host" ,"aarch64" );
Signature · 1 line
2.35.3
PATCH v7 15/20 tests/avocado: Pass parameters to migration test
In reply to Fabiano RosasThe migration tests are currently broken for an aarch64 host because the tests pass no 'machine' and 'cpu' options on the QEMU command line.
Add a separate class to each architecture so that we can specify 'machine' and 'cpu' options instead of relying on defaults.
Add a skip decorator to keep the current behavior of only running migration tests when the qemu target matches the host architecture.
--- tests/avocado/migration.py | 83 +++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 5 deletions(-)
tests/avocado/migration.py +78 -5
@@ -11,6 +11,8 @@ import tempfile +import os + from avocado_qemu import QemuSystemTest from avocado import skipUnless
@@ -19,7 +21,7 @@ from avocado.utils.path import find_command -class Migration(QemuSystemTest): +class MigrationTest(QemuSystemTest): """ :avocado: tags=migration """
@@ -62,20 +64,91 @@ def _get_free_port(self): self.cancel('Failed to find a free port') return port - - def test_migration_with_tcp_localhost(self): + def migration_with_tcp_localhost(self): dest_uri = 'tcp:localhost:%u' % self._get_free_port() self.do_migrate(dest_uri) - def test_migration_with_unix(self): + def migration_with_unix(self): with tempfile.TemporaryDirectory(prefix='socket_') as socket_path: dest_uri = 'unix:%s/qemu-test.sock' % socket_path self.do_migrate(dest_uri) @skipUnless(find_command('nc', default=False), "'nc' command not found") - def test_migration_with_exec(self): + def migration_with_exec(self): """The test works for both netcat-traditional and netcat-openbsd packages.""" free_port = self._get_free_port() dest_uri = 'exec:nc -l localhost %u' % free_port src_uri = 'exec:nc localhost %u' % free_port self.do_migrate(dest_uri, src_uri) + + +@skipUnless('aarch64' in os.uname()[4], "host != target") +class Aarch64(MigrationTest): + """ + :avocado: tags=arch:aarch64 + :avocado: tags=machine:virt + :avocado: tags=cpu:max + """ + + def test_migration_with_tcp_localhost(self): + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.migration_with_unix() + + def test_migration_with_exec(self): + self.migration_with_exec() + + +@skipUnless('x86_64' in os.uname()[4], "host != target") +class X86_64(MigrationTest): + """ + :avocado: tags=arch:x86_64 + :avocado: tags=machine:pc + :avocado: tags=cpu:qemu64 + """ + + def test_migration_with_tcp_localhost(self): + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.migration_with_unix() + + def test_migration_with_exec(self): + self.migration_with_exec() + + +@skipUnless('ppc64le' in os.uname()[4], "host != target") +class PPC64(MigrationTest): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:pseries + :avocado: tags=cpu:power9_v2.0 + """ + + def test_migration_with_tcp_localhost(self): + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.migration_with_unix() + + def test_migration_with_exec(self): + self.migration_with_exec() + + +@skipUnless('s390x' in os.uname()[4], "host != target") +class S390X(MigrationTest): + """ + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + :avocado: tags=cpu:qemu + """ + + def test_migration_with_tcp_localhost(self): + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.migration_with_unix() + + def test_migration_with_exec(self): + self.migration_with_exec()
Signature · 1 line
2.35.3
PATCH v7 16/20 tests/avocado: add machine:none tag to version.py
In reply to Fabiano RosasThis test currently fails when run on a host for which the QEMU target has no default machine set:
ERROR| Output: qemu-system-aarch64: No machine specified, and there is no default
--- tests/avocado/version.py | 1 + 1 file changed, 1 insertion(+)
tests/avocado/version.py +1 -0
@@ -15,6 +15,7 @@ class Version(QemuSystemTest): """ :avocado: tags=quick + :avocado: tags=machine:none """ def test_qmp_human_info_version(self): self.vm.add_args('-nodefaults')
Signature · 1 line
2.35.3
PATCH v7 17/20 arm/Kconfig: Always select SEMIHOSTING when TCG is present
In reply to Fabiano RosasWe are about to enable the build without TCG, so CONFIG_SEMIHOSTING and CONFIG_ARM_COMPATIBLE_SEMIHOSTING cannot be unconditionally set in default.mak anymore. So reflect the change in a Kconfig.
Instead of using semihosting/Kconfig, use a target-specific file, so that the change doesn't affect other architectures which might implement semihosting in a way compatible with KVM.
The selection from ARM_v7M needs to be removed to avoid a cycle during parsing.
--- configs/devices/arm-softmmu/default.mak | 2 -- hw/arm/Kconfig | 1 - target/arm/Kconfig | 7 +++++++ 3 files changed, 7 insertions(+), 3 deletions(-)
configs/devices/arm-softmmu/default.mak +0 -2
@@ -40,6 +40,4 @@ CONFIG_MICROBIT=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y -CONFIG_SEMIHOSTING=y -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y CONFIG_ALLWINNER_H3=y
hw/arm/Kconfig +0 -1
@@ -316,7 +316,6 @@ config ARM_V7M # currently v7M must be included in a TCG build due to translate.c default y if TCG && (ARM || AARCH64) select PTIMER - select ARM_COMPATIBLE_SEMIHOSTING config ALLWINNER_A10 bool
target/arm/Kconfig +7 -0
@@ -4,3 +4,10 @@ config ARM config AARCH64 bool select ARM + +# This config exists just so we can make SEMIHOSTING default when TCG +# is selected without also changing it for other architectures. +config ARM_SEMIHOSTING + bool + default y if TCG && ARM + select ARM_COMPATIBLE_SEMIHOSTING
Signature · 1 line
2.35.3
PATCH v7 18/20 arm/Kconfig: Do not build TCG-only boards on a KVM-only build
In reply to Fabiano RosasMove all the CONFIG_FOO=y from default.mak into "default y if TCG" statements in Kconfig. That way they won't be selected when CONFIG_TCG=n.
I'm leaving CONFIG_ARM_VIRT in default.mak because it allows us to keep the two default.mak files not empty and keep aarch64-default.mak including arm-default.mak. That way we don't surprise anyone that's used to altering these files.
With this change we can start building with --disable-tcg.
--- configs/devices/aarch64-softmmu/default.mak | 4 -- configs/devices/arm-softmmu/default.mak | 37 ------------------ hw/arm/Kconfig | 42 ++++++++++++++++++++- 3 files changed, 41 insertions(+), 42 deletions(-)
configs/devices/aarch64-softmmu/default.mak +0 -4
@@ -2,7 +2,3 @@ # We support all the 32 bit boards so need all their config include ../arm-softmmu/default.mak - -CONFIG_XLNX_ZYNQMP_ARM=y -CONFIG_XLNX_VERSAL=y -CONFIG_SBSA_REF=y
configs/devices/arm-softmmu/default.mak +0 -37
@@ -4,40 +4,3 @@ # CONFIG_TEST_DEVICES=n CONFIG_ARM_VIRT=y -CONFIG_CUBIEBOARD=y -CONFIG_EXYNOS4=y -CONFIG_HIGHBANK=y -CONFIG_INTEGRATOR=y -CONFIG_FSL_IMX31=y -CONFIG_MUSICPAL=y -CONFIG_MUSCA=y -CONFIG_CHEETAH=y -CONFIG_SX1=y -CONFIG_NSERIES=y -CONFIG_STELLARIS=y -CONFIG_STM32VLDISCOVERY=y -CONFIG_REALVIEW=y -CONFIG_VERSATILE=y -CONFIG_VEXPRESS=y -CONFIG_ZYNQ=y -CONFIG_MAINSTONE=y -CONFIG_GUMSTIX=y -CONFIG_SPITZ=y -CONFIG_TOSA=y -CONFIG_Z2=y -CONFIG_NPCM7XX=y -CONFIG_COLLIE=y -CONFIG_ASPEED_SOC=y -CONFIG_NETDUINO2=y -CONFIG_NETDUINOPLUS2=y -CONFIG_OLIMEX_STM32_H405=y -CONFIG_MPS2=y -CONFIG_RASPI=y -CONFIG_DIGIC=y -CONFIG_SABRELITE=y -CONFIG_EMCRAFT_SF2=y -CONFIG_MICROBIT=y -CONFIG_FSL_IMX25=y -CONFIG_FSL_IMX7=y -CONFIG_FSL_IMX6UL=y -CONFIG_ALLWINNER_H3=y
hw/arm/Kconfig +41 -1
275 lines not on this page · raw message
Signature · 1 line
2.35.3
PATCH v7 19/20 gitlab-ci: Check building KVM-only aarch64 target
In reply to Fabiano RosasFrom: Philippe Mathieu-Daudé <[email protected]>
Add a manual new job to cross-build the aarch64 target with only the KVM accelerator enabled (in particular, no TCG).
Re-enable running the similar job on the project Aarch64 custom runner.
--- .gitlab-ci.d/crossbuilds.yml | 11 +++++++++++ .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-)
.gitlab-ci.d/crossbuilds.yml +11 -0
@@ -212,3 +212,14 @@ cross-arm64-xen-only: IMAGE: debian-arm64-cross ACCEL: xen EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-kvm + +# Similar job is run by qemu-project's custom runner by default +cross-arm64-kvm-only: + extends: .cross_accel_build_job + needs: + job: arm64-debian-cross-container + variables: + QEMU_JOB_OPTIONAL: 1 + IMAGE: debian-arm64-cross + ACCEL: kvm + EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-xen --without-default-devices
.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +0 -4
@@ -115,11 +115,7 @@ ubuntu-22.04-aarch64-notcg: - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - when: manual - allow_failure: true - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true script: - mkdir build - cd build
Signature · 1 line
2.35.3
PATCH v7 20/20 tests/qtest: Fix tests when no KVM or TCG are present
In reply to Fabiano RosasIt is possible to have a build with both TCG and KVM disabled due to Xen requiring the i386 and x86_64 binaries to be present in an aarch64 host.
If we build with --disable-tcg on the aarch64 host, we will end-up with a QEMU binary (x86) that does not support TCG nor KVM.
Fix tests that crash or hang in the above scenario. Do not include any test cases if TCG and KVM are missing.
---
This currently affects Arm, but will also affect x86 after the xenpvh series gets merged. This patch fixes both scenarios.
--- tests/qtest/bios-tables-test.c | 4 ++++ tests/qtest/boot-serial-test.c | 10 ++++++++++ tests/qtest/migration-test.c | 5 +++++ tests/qtest/pxe-test.c | 6 ++++++ tests/qtest/vmgenid-test.c | 6 ++++++ 5 files changed, 31 insertions(+)
tests/qtest/bios-tables-test.c +4 -0
@@ -2114,6 +2114,10 @@ int main(int argc, char *argv[])char *v_env =getenv ("V" );int ret; +if (!has_tcg && !has_kvm) { +return 0 ; + } +if (v_env) { verbosity_level =atoi (v_env); }
tests/qtest/boot-serial-test.c +10 -0
@@ -17,6 +17,9 @@#include "libqtest.h" #include "libqos/libqos-spapr.h" +static bool has_tcg; +static bool has_kvm; +static const uint8_t bios_avr[] = {0x88 ,0xe0 ,/* ldi r24, 0x08 */ 0x80 ,0x93 ,0xc1 ,0x00 ,/* sts 0x00C1, r24 ; Enable tx */
@@ -285,6 +288,13 @@ int main(int argc, char *argv[])const char *arch =qtest_get_arch ();int i; + has_tcg =qtest_has_accel ("tcg" ); + has_kvm =qtest_has_accel ("kvm" ); + +if (!has_tcg && !has_kvm) { +return 0 ; + } +g_test_init (&argc, &argv,NULL );for (i =0 ; tests[i].arch !=NULL ; i++) {
tests/qtest/migration-test.c +5 -0
@@ -2460,11 +2460,16 @@ static bool kvm_dirty_ring_supported(void)int main (int argc,char **argv) {const bool has_kvm =qtest_has_accel ("kvm" ); +const bool has_tcg =qtest_has_accel ("tcg" );const bool has_uffd =ufd_version_check ();const char *arch =qtest_get_arch ();g_autoptr (GError) err =NULL ;int ret; +if (!has_tcg && !has_kvm) { +return 0 ; + } +g_test_init (&argc, &argv,NULL );/*
tests/qtest/pxe-test.c +6 -0
@@ -130,6 +130,12 @@ int main(int argc, char *argv[]) {int ret;const char *arch =qtest_get_arch (); +bool has_tcg =qtest_has_accel ("tcg" ); +bool has_kvm =qtest_has_accel ("kvm" ); + +if (!has_tcg && !has_kvm) { +return 0 ; + } ret =boot_sector_init (disk);if (ret)
tests/qtest/vmgenid-test.c +6 -0
@@ -164,6 +164,12 @@ static void vmgenid_query_monitor_test(void)int main (int argc,char **argv) {int ret; +bool has_tcg =qtest_has_accel ("tcg" ); +bool has_kvm =qtest_has_accel ("kvm" ); + +if (!has_tcg && !has_kvm) { +return 0 ; + } ret =boot_sector_init (disk);if (ret) {
Signature · 1 line
2.35.3
Quoted 7 lines · Fabiano Rosas
Changes since v6:
Now using the same feature set for -cpu max for both qtests and TCG. This requires a slightly awkward code movement to expose
aa32_max_featuresto non-tcg code, but we gain by not having a different environment for the tests.
I'm ignoring this version, because I've already taken at least half of it into target-arm.next from the previous version.
thanks
-- PMM