target/arm: Some CONFIG_TCG code movement
v2 cover target/arm: Some CONFIG_TCG code movement
since v1:
- patch 1: dropped. I will include it in the next series;
- patch 3: tcg_handle_semihosting does not need tcg_enabled, only CONFIG_TCG;
- patch 4 (new): moved alignment check and updated comment.
v1:
https://lore.kernel.org/r/[email protected]
Hi,
This is the second round of rebasing the patches from:
https://lore.kernel.org/r/[email protected]
These are the simpler ones that move code under CONFIG_TCG/tcg_enabled. No new directories or files.
Claudio Fontana (4):
target/arm: rename handle_semihosting to tcg_handle_semihosting target/arm: wrap psci call with tcg_enabled target/arm: wrap call to aarch64_sve_change_el in tcg_enabled() target/arm: only perform TCG cpu and machine inits if TCG enabled
Fabiano Rosas (1):
target/arm: Move PC alignment check
target/arm/cpu.c | 31 ++++++++++++++---------- target/arm/helper.c | 19 ++++++++------- target/arm/kvm.c | 18 +++++++------- target/arm/kvm_arm.h | 3 +-- target/arm/machine.c | 57 +++++++++++++++++++++++++------------------- 5 files changed, 71 insertions(+), 57 deletions(-)
Signature · 1 line
2.35.3
PATCH v2 1/5 target/arm: rename handle_semihosting to tcg_handle_semihosting
From: Claudio Fontana <[email protected]>
make it clearer from the name that this is a tcg-only function.
---
This function moves elsewhere in the original series, but the name change doesn't need to wait.
Originally from:
[RFC v14 38/80] target/arm: rename handle_semihosting to tcg_handle_semihosting
https://lore.kernel.org/r/[email protected]
--- target/arm/helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
target/arm/helper.c +2 -2
@@ -10293,7 +10293,7 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs)* trapped to the hypervisor in KVM. */ #ifdef CONFIG_TCG -static void handle_semihosting (CPUState *cs) +static void tcg_handle_semihosting (CPUState *cs) {ARMCPU *cpu =ARM_CPU (cs);CPUARMState *env = &cpu->env;
@@ -10354,7 +10354,7 @@ void arm_cpu_do_interrupt(CPUState *cs)*/ #ifdef CONFIG_TCG if (cs->exception_index ==EXCP_SEMIHOST ) { -handle_semihosting (cs); +tcg_handle_semihosting (cs);return ; }#endif
Signature · 1 line
2.35.3
PATCH v2 2/5 target/arm: wrap psci call with tcg_enabled
In reply to Fabiano RosasFrom: Claudio Fontana <[email protected]>
for "all" builds (tcg + kvm), we want to avoid doing the psci check if tcg is built-in, but not enabled.
---
Originally from:
[RFC v14 39/80] target/arm: replace CONFIG_TCG with tcg_enabled
https://lore.kernel.org/r/[email protected]
--- target/arm/helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
target/arm/helper.c +2 -1
@@ -26,6 +26,7 @@#include "sysemu/cpus.h" #include "sysemu/cpu-timers.h" #include "sysemu/kvm.h" +#include "sysemu/tcg.h" #include "qemu/range.h" #include "qapi/qapi-commands-machine-target.h" #include "qapi/error.h"
@@ -10341,7 +10342,7 @@ void arm_cpu_do_interrupt(CPUState *cs) env->exception.syndrome); } -if (arm_is_psci_call (cpu, cs->exception_index)) { +if (tcg_enabled () &&arm_is_psci_call (cpu, cs->exception_index)) {arm_handle_psci_call (cpu);qemu_log_mask (CPU_LOG_INT ,"...handled as PSCI call\n" );return ;
Signature · 1 line
2.35.3
PATCH v2 3/5 target/arm: wrap call to aarch64_sve_change_el in tcg_enabled()
In reply to Fabiano RosasFrom: Claudio Fontana <[email protected]>
---
Originally from:
[RFC v14 42/80] target/arm: wrap call to aarch64_sve_change_el in tcg_enabled()
https://lore.kernel.org/r/[email protected]
--- target/arm/helper.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
target/arm/helper.c +7 -5
@@ -10107,11 +10107,13 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs)unsigned int cur_el =arm_current_el (env);int rt; -/* -* Note that new_el can never be 0. If cur_el is 0, then -* el0_a64 is is_a64(), else el0_a64 is ignored. -*/ -aarch64_sve_change_el (env, cur_el, new_el,is_a64 (env)); +if (tcg_enabled ()) { +/* +* Note that new_el can never be 0. If cur_el is 0, then +* el0_a64 is is_a64(), else el0_a64 is ignored. +*/ +aarch64_sve_change_el (env, cur_el, new_el,is_a64 (env)); + }if (cur_el < new_el) {/* Entry vector offset depends on whether the implemented EL
Signature · 1 line
2.35.3
PATCH v2 4/5 target/arm: Move PC alignment check
In reply to Fabiano RosasMove this earlier to make the next patch diff cleaner. While here update the comment slightly to not give the impression that the misalignment affects only TCG.
--- target/arm/machine.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
target/arm/machine.c +9 -9
@@ -811,6 +811,15 @@ static int cpu_post_load(void *opaque, int version_id) } } +/* +* Misaligned thumb pc is architecturally impossible. Fail the +* incoming migration. For TCG it would trigger the assert in +* thumb_tr_translate_insn(). +*/ +if (!is_a64 (env) && env->thumb && (env->regs[15 ] &1 )) { +return -1 ; + } +hw_breakpoint_update_all (cpu);hw_watchpoint_update_all (cpu);
@@ -828,15 +837,6 @@ static int cpu_post_load(void *opaque, int version_id) } } -/* -* Misaligned thumb pc is architecturally impossible. -* We have an assert in thumb_tr_translate_insn to verify this. -* Fail an incoming migrate to avoid this assert. -*/ -if (!is_a64 (env) && env->thumb && (env->regs[15 ] &1 )) { -return -1 ; - } -if (!kvm_enabled ()) {pmu_op_finish (&cpu->env); }
Signature · 1 line
2.35.3
Re: [PATCH v2 4/5] target/arm: Move PC alignment check
Quoted 8 lines · Fabiano Rosas
Move this earlier to make the next patch diff cleaner. While here update the comment slightly to not give the impression that the misalignment affects only TCG.
Signed-off-by Fabiano Rosas<[email protected]>--- target/arm/machine.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
r~
PATCH v2 5/5 target/arm: only perform TCG cpu and machine inits if TCG enabled
In reply to Fabiano RosasFrom: Claudio Fontana <[email protected]>
of note, cpreg lists were previously initialized by TCG first, and then thrown away and replaced with the data coming from KVM.
Now we just initialize once, either for TCG or for KVM.
---
Originally from:
[RFC v14 16/80] target/arm: only perform TCG cpu and machine inits if TCG enabled
https://lore.kernel.org/r/[email protected]
--- target/arm/cpu.c | 31 +++++++++++++++++------------- target/arm/kvm.c | 18 +++++++++--------- target/arm/kvm_arm.h | 3 +-- target/arm/machine.c | 45 +++++++++++++++++++++++++------------------- 4 files changed, 54 insertions(+), 43 deletions(-)
target/arm/cpu.c +18 -13
@@ -525,9 +525,11 @@ static void arm_cpu_reset_hold(Object *obj) }#endif -hw_breakpoint_update_all (cpu); -hw_watchpoint_update_all (cpu); -arm_rebuild_hflags (env); +if (tcg_enabled ()) { +hw_breakpoint_update_all (cpu); +hw_watchpoint_update_all (cpu); +arm_rebuild_hflags (env); + } }#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )
@@ -1600,6 +1602,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) } } +#ifdef CONFIG_TCG {uint64_t scale;
@@ -1625,7 +1628,8 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) cpu->gt_timer[GTIMER_HYPVIRT ] =timer_new (QEMU_CLOCK_VIRTUAL , scale, arm_gt_hvtimer_cb, cpu); } -#endif +#endif /* CONFIG_TCG */ +#endif /* !CONFIG_USER_ONLY */ cpu_exec_realizefn (cs, &local_err);if (local_err !=NULL ) {
@@ -1943,17 +1947,16 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)unset_feature (env,ARM_FEATURE_PMU ); }if (arm_feature (env,ARM_FEATURE_PMU )) { -pmu_init (cpu); - -if (!kvm_enabled ()) { +if (tcg_enabled ()) { +pmu_init (cpu);arm_register_pre_el_change_hook (cpu, &pmu_pre_el_change,0 );arm_register_el_change_hook (cpu, &pmu_post_el_change,0 ); - }#ifndef CONFIG_USER_ONLY - cpu->pmu_timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , arm_pmu_timer_cb, - cpu); + cpu->pmu_timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , arm_pmu_timer_cb, + cpu);#endif + } }else { cpu->isar.id_aa64dfr0 =FIELD_DP64 (cpu->isar.id_aa64dfr0,ID_AA64DFR0 ,PMUVER ,0 );
@@ -2049,10 +2052,12 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)set_feature (env,ARM_FEATURE_VBAR ); } -register_cp_regs_for_features (cpu); -arm_cpu_register_gdb_regs_for_features (cpu); +if (tcg_enabled ()) { +register_cp_regs_for_features (cpu); +init_cpreg_list (cpu); + } -init_cpreg_list (cpu); +arm_cpu_register_gdb_regs_for_features (cpu);#ifndef CONFIG_USER_ONLY MachineState *ms =MACHINE (qdev_get_machine ());
target/arm/kvm.c +9 -9
@@ -438,9 +438,11 @@ static uint64_t *kvm_arm_get_cpreg_ptr(ARMCPU *cpu, uint64_t regidx)return &cpu->cpreg_values[res - cpu->cpreg_indexes]; } -/* Initialize the ARMCPU cpreg list according to the kernel's -* definition of what CPU registers it knows about (and throw away -* the previous TCG-created cpreg list). +/* +* Initialize the ARMCPU cpreg list according to the kernel's +* definition of what CPU registers it knows about. +* +* The parallel for TCG is init_cpreg_list() */ int kvm_arm_init_cpreg_list (ARMCPU *cpu) {
@@ -482,12 +484,10 @@ int kvm_arm_init_cpreg_list(ARMCPU *cpu) arraylen++; } - cpu->cpreg_indexes =g_renew (uint64_t, cpu->cpreg_indexes, arraylen); - cpu->cpreg_values =g_renew (uint64_t, cpu->cpreg_values, arraylen); - cpu->cpreg_vmstate_indexes =g_renew (uint64_t, cpu->cpreg_vmstate_indexes, - arraylen); - cpu->cpreg_vmstate_values =g_renew (uint64_t, cpu->cpreg_vmstate_values, - arraylen); + cpu->cpreg_indexes =g_new (uint64_t, arraylen); + cpu->cpreg_values =g_new (uint64_t, arraylen); + cpu->cpreg_vmstate_indexes =g_new (uint64_t, arraylen); + cpu->cpreg_vmstate_values =g_new (uint64_t, arraylen); cpu->cpreg_array_len = arraylen; cpu->cpreg_vmstate_array_len = arraylen;
target/arm/kvm_arm.h +1 -2
@@ -70,8 +70,7 @@ void kvm_arm_register_device(MemoryRegion *mr, uint64_t devid, uint64_t group,* @cpu: ARMCPU * * Initialize the ARMCPU cpreg list according to the kernel's -* definition of what CPU registers it knows about (and throw away -* the previous TCG-created cpreg list). +* definition of what CPU registers it knows about. * * Returns: 0 if success, else < 0 error code */
target/arm/machine.c +26 -19
88 lines not on this page · raw message
Signature · 1 line
2.35.3
Re: [PATCH v2 5/5] target/arm: only perform TCG cpu and machine inits if TCG enabled
Quoted 16 lines · Fabiano Rosas
From: Claudio Fontana<[email protected]>
of note, cpreg lists were previously initialized by TCG first, and then thrown away and replaced with the data coming from KVM.
Now we just initialize once, either for TCG or for KVM.
Signed-off-by Claudio Fontana<[email protected]>[moved arm_cpu_register_gdb_regs_for_features out of tcg_enabled]Signed-off-by Fabiano Rosas<[email protected]>Reviewed-by Richard Henderson<[email protected]>---
Originally from:
[RFC v14 16/80] target/arm: only perform TCG cpu and machine inits if TCG enabled
https://lore.kernel.org/r/[email protected]
Quoted 6 lines
--- target/arm/cpu.c | 31 +++++++++++++++++------------- target/arm/kvm.c | 18 +++++++++--------- target/arm/kvm_arm.h | 3 +-- target/arm/machine.c | 45 +++++++++++++++++++++++++------------------- 4 files changed, 54 insertions(+), 43 deletions(-)
r~
Quoted 16 lines · Fabiano Rosas
since v1:
- patch 1: dropped. I will include it in the next series;- patch 3:
tcg_handle_semihostingdoes not needtcg_enabled, onlyCONFIG_TCG;- patch 4 (new): moved alignment check and updated comment.
v1:
https://lore.kernel.org/r/[email protected]Hi,
This is the second round of rebasing the patches from:
https://lore.kernel.org/r/[email protected]
Quoted 8 lines
These are the simpler ones that move code under CONFIG_TCG/tcg_enabled. No new directories or files.
Claudio Fontana (4):
target/arm: renamehandle_semihostingtotcg_handle_semihostingtarget/arm: wrap psci call withtcg_enabledtarget/arm: wrap call toaarch64_sve_change_elintcg_enabled()target/arm: only perform TCG cpu and machine inits if TCG enabled
Peter,
let's drop this series please. I need to double check patch 5.
I'll resend it later on all along with the v2 of my latest RFC:
[RFC PATCH 00/27] target/arm: Allow CONFIG_TCG=n builds
https://lore.kernel.org/r/[email protected]