target/arm: Allow CONFIG_TCG=n builds
v7 cover target/arm: Allow CONFIG_TCG=n builds
Resending with the remaining patches now that arm next was merged.
CI run: https://gitlab.com/farosas/qemu/-/pipelines/791478895
v7:
https://lore.kernel.org/r/[email protected]
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 (1):
target/arm: move cpu_tcg to tcg/cpu32.c
Fabiano Rosas (7):
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 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 -
configs/devices/aarch64-softmmu/default.mak | 4 -
configs/devices/arm-softmmu/default.mak | 39 --
hw/arm/Kconfig | 43 +-
hw/arm/virt.c | 6 +-
target/arm/Kconfig | 7 +
target/arm/cortex-regs.c | 69 +++
target/arm/cpregs.h | 6 +
target/arm/cpu.c | 69 +++
target/arm/cpu64.c | 399 +---------------
target/arm/internals.h | 7 +-
target/arm/meson.build | 2 +-
target/arm/{cpu_tcg.c => tcg/cpu32.c} | 141 +-----
target/arm/tcg/cpu64.c | 438 ++++++++++++++++++
target/arm/tcg/meson.build | 2 +
tests/avocado/migration.py | 83 +++-
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 +
23 files changed, 772 insertions(+), 601 deletions(-)
create mode 100644 target/arm/cortex-regs.c
rename target/arm/{cpu_tcg.c => tcg/cpu32.c} (87%)
create mode 100644 target/arm/tcg/cpu64.cSignature · 1 line
2.35.3
PATCH RESEND v7 1/9 target/arm: Move cortex sysregs into a separate file
The 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
Re: [PATCH RESEND v7 1/9] target/arm: Move cortex sysregs into a separate file
Quoted 14 lines · Fabiano Rosas
The file
cpu_tcg.cis 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.Signed-off-by Fabiano Rosas<[email protected]>--- 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(-)
Quoted 1 line
create mode 100644
target/arm/cortex-regs.c
r~
PATCH RESEND v7 2/9 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 RESEND v7 3/9 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 RESEND v7 4/9 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
Re: [PATCH RESEND v7 4/9] target/arm: move cpu_tcg to tcg/cpu32.c
Quoted 9 lines · Fabiano Rosas
From: Claudio Fontana <[email protected]>
move the module containing cpu models definitions for 32bit TCG-only CPUs to tcg/ and rename it for clarity.
Signed-off-by Claudio Fontana <[email protected]>Signed-off-by Fabiano Rosas <[email protected]>Reviewed-by Richard Henderson <[email protected]>---
...
Quoted 13 lines
tests/qtest/arm-cpu-features.c +2
-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",
tests/qtest/arm-cpu-features.c static void test_query_cpu_model_expansion_kvm(const void *data) · line 520
Quoted 10 lines
tests/qtest/arm-cpu-features.c +7
-0+"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" );
FWIW:
PATCH RESEND v7 5/9 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
Re: [PATCH RESEND v7 5/9] tests/avocado: Pass parameters to migration test
Quoted 10 lines · Fabiano Rosas
The 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.
I still don't understand this patch. Don't we run the migration-test on all hosts already? David ?
Quoted 124 lines
Signed-off-by Fabiano Rosas <[email protected]>--- tests/avocado/migration.py | 83 +++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 5 deletions(-)tests/avocado/migration.py +78
-6@@ -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() --
Quoted 1 line
2.35.3
thanks
-- PMM
Re: [PATCH RESEND v7 5/9] tests/avocado: Pass parameters to migration test
Quoted 6 lines · Peter Maydell
Quoted 5 lines · Fabiano Rosas
The migration tests are currently broken for an aarch64 host because the tests pass no 'machine' and 'cpu' options on the QEMU command line.
Quoted 9 lines
Quoted 5 lines
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.
I still don't understand this patch. Don't we run the migration-test on all hosts already? David ?
We run on all hosts but for each host we only take the QEMU binary that matches the host architecture. So if you want to test aarch64 migration, you need an aarch64 host.
If you run on an x86_64 host (without this patch):
$ ../configure #all targets $ make check-avocado AVOCADO_TESTS=../tests/avocado/migration.py
You'll see:
(1/3) ... migration.py:Migration.test_migration_with_tcp_localhost: PASS (0.21 s) (2/3) ... migration.py:Migration.test_migration_with_unix: PASS (0.18 s) (3/3) ... migration.py:Migration.test_migration_with_exec: PASS (0.21 s)
All three tests ran using qemu-system-x86_64.
The issue I'm trying to solve is that when run on a aarch64 host, the test will fail because (being generic) it doesn't pass the '-machine virt' option and there is no architecture-specific information in it at all.
If we need to pass '-machine virt' to the arm machine, then something needs to change to add architecture-specific knowledge into the test. My first version hardcoded the usual "if arch == foo". That was frowned upon, so this version creates a class for each architecture like other tests do (e.g. boot_linux.py).
The downside of this is that we need to explicitly enumerate the host architectures on which we want the test to run. I chose a few of the obvious, but we might need to add more.
The upside is that we could now enable the test to run with all the targets present in the build. If we remove the @skip decorators from this patch, we'd get (note the arch strings):
(01/12) ... migration.py:Aarch64.test_migration_with_tcp_localhost: PASS (0.19 s) (02/12) ... migration.py:Aarch64.test_migration_with_unix: PASS (0.16 s) (03/12) ... migration.py:Aarch64.test_migration_with_exec: PASS (0.20 s)
^
(04/12) ... migration.py:X86_64.test_migration_with_tcp_localhost: PASS (0.21 s)
(05/12) ... migration.py:X86_64.test_migration_with_unix: PASS (0.18 s)
(06/12) ... migration.py:X86_64.test_migration_with_exec: PASS (0.21 s)
^
(07/12) ... migration.py:PPC64.test_migration_with_tcp_localhost: PASS (0.20 s)
(08/12) ... migration.py:PPC64.test_migration_with_unix: PASS (0.17 s)
(09/12) ... migration.py:PPC64.test_migration_with_exec: PASS (0.20 s)
^Re: [PATCH RESEND v7 5/9] tests/avocado: Pass parameters to migration test
Quoted 33 lines · Fabiano Rosas
Quoted 6 lines · Peter Maydell
Quoted 5 lines · Fabiano Rosas
The migration tests are currently broken for an aarch64 host because the tests pass no 'machine' and 'cpu' options on the QEMU command line.
Quoted 9 lines
Quoted 5 lines
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.
I still don't understand this patch. Don't we run the migration-test on all hosts already? David ?
We run on all hosts but for each host we only take the QEMU binary that matches the host architecture. So if you want to test aarch64 migration, you need an aarch64 host.
If you run on an
x86_64host (without this patch):$ ../configure #all targets $ make check-avocado AVOCADO_TESTS=../tests/avocado/migration.pyYou'll see:
(1/3) ... migration.py:Migration.test_migration_with_tcp_localhost: PASS (0.21 s) (2/3) ... migration.py:Migration.test_migration_with_unix: PASS (0.18 s) (3/3) ... migration.py:Migration.test_migration_with_exec: PASS (0.21 s)
Quoted 6 lines
All three tests ran using qemu-system-x86_64.
The issue I'm trying to solve is that when run on a aarch64 host, the test will fail because (being generic) it doesn't pass the '-machine virt' option and there is no architecture-specific information in it at all.
But my point is that we already CI on aarch64 hosts, so what is happening there that means the test doesn't fail already ?
-- PMM
Re: [PATCH RESEND v7 5/9] tests/avocado: Pass parameters to migration test
Quoted 36 lines · Peter Maydell
Quoted 35 lines · Fabiano Rosas
Quoted 6 lines · Peter Maydell
Quoted 5 lines · Fabiano Rosas
The migration tests are currently broken for an aarch64 host because the tests pass no 'machine' and 'cpu' options on the QEMU command line.
Quoted 9 lines
Quoted 5 lines
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.
I still don't understand this patch. Don't we run the migration-test on all hosts already? David ?
We run on all hosts but for each host we only take the QEMU binary that matches the host architecture. So if you want to test aarch64 migration, you need an aarch64 host.
If you run on an
x86_64host (without this patch):$ ../configure #all targets $ make check-avocado AVOCADO_TESTS=../tests/avocado/migration.pyYou'll see:
(1/3) ... migration.py:Migration.test_migration_with_tcp_localhost: PASS (0.21 s) (2/3) ... migration.py:Migration.test_migration_with_unix: PASS (0.18 s) (3/3) ... migration.py:Migration.test_migration_with_exec: PASS (0.21 s)
All three tests ran using qemu-system-x86_64.
Quoted 8 lines
Quoted 4 lines
The issue I'm trying to solve is that when run on a aarch64 host, the test will fail because (being generic) it doesn't pass the '-machine virt' option and there is no architecture-specific information in it at all.
But my point is that we already CI on aarch64 hosts, so what is happening there that means the test doesn't fail already ?
I don't see check-avocado on the custom runners job descriptions (.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml). It seems we don't run avocado there at all.
For the regular jobs, there's the avocado-cfi-aarch64 job which depends on the build-cfi-aarch64 job that is being skipped at the moment. But that wouldn't catch this bug because it runs on an x86 host and this particular test gets skipped.
Re: [PATCH RESEND v7 5/9] tests/avocado: Pass parameters to migration test
In reply to Peter MaydellQuoted 6 lines · * Peter Maydell ([email protected]) wrote:
Quoted 5 lines · Fabiano Rosas
The migration tests are currently broken for an aarch64 host because the tests pass no 'machine' and 'cpu' options on the QEMU command line.
Quoted 8 lines
Quoted 5 lines
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.
I still don't understand this patch. Don't we run the migration-test on all hosts already? David ?
I don't run the avocado tests.
Dave
Quoted 129 lines
Quoted 124 lines
Signed-off-by Fabiano Rosas <[email protected]>--- tests/avocado/migration.py | 83 +++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 5 deletions(-)tests/avocado/migration.py +78
-6@@ -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() --Quoted 1 line
2.35.3
thanks
-- PMM
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
PATCH RESEND v7 6/9 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 RESEND v7 7/9 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 RESEND v7 8/9 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
@@ -214,3 +214,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 RESEND v7 9/9 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
Re: [PATCH RESEND v7 9/9] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 3 lines · Fabiano Rosas
It is possible to have a build with both TCG and KVM disabled due to Xen requiring the i386 and
x86_64binaries to be present in an aarch64 host.
Ouch.
Just curious: why are they needed?
Quoted 11 lines
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.
Signed-off-by Fabiano Rosas <[email protected]>---
This currently affects Arm, but will also affect x86 after the xenpvh series gets merged. This patch fixes both scenarios.
Re: [PATCH RESEND v7 9/9] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 9 lines · Juan Quintela
Quoted 3 lines · Fabiano Rosas
It is possible to have a build with both TCG and KVM disabled due to Xen requiring the i386 and
x86_64binaries to be present in an aarch64 host.Ouch.
Just curious: why are they needed?
From https://wiki.xenproject.org/wiki/QEMU_Upstream:
Why is qemu-system-i386 used even on x86_64 and even non-x86?
QEMU in a Xen system only provides device model (DM) emulation and not any CPU instruction emulation, so the nominal arch doesn't actually matter and Xen builds i386 everywhere as a basically arbitrary choice.
It happens that the Xen DM part of QEMU is quite closely tied to the x86 scaffolding for various historical reasons, so we end up using qemu-system-i386 even e.g. on ARM! There is no practical difference between qemu-system-i386 and qemu-system-x86_64, they should be interchangeable. However only qemu-system-i386 is regularly tested by Xen Project (via osstest).
Quoted 7 lines
Quoted 7 lines
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.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Fabiano Rosas <[email protected]>---
This currently affects Arm, but will also affect x86 after the xenpvh series gets merged. This patch fixes both scenarios.Reviewed-by Juan Quintela <[email protected]>
Thanks!
Re: [PATCH RESEND v7 9/9] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 20 lines · Fabiano Rosas
Quoted 9 lines · Juan Quintela
Quoted 3 lines · Fabiano Rosas
It is possible to have a build with both TCG and KVM disabled due to Xen requiring the i386 and
x86_64binaries to be present in an aarch64 host.Ouch.
Just curious: why are they needed?
From https://wiki.xenproject.org/wiki/QEMU_Upstream:
Why is qemu-system-i386 used even on
x86_64and even non-x86?QEMU in a Xen system only provides device model (DM) emulation and not any CPU instruction emulation, so the nominal arch doesn't actually matter and Xen builds i386 everywhere as a basically arbitrary choice.
Quoted 6 lines
It happens that the Xen DM part of QEMU is quite closely tied to the x86 scaffolding for various historical reasons, so we end up using qemu-system-i386 even e.g. on ARM! There is no practical difference between qemu-system-i386 and qemu-system-x86_64, they should be interchangeable. However only qemu-system-i386 is regularly tested by Xen Project (via osstest).
That said with the xenpvh model that was added recently we should be able to finally build a Xen only qemu-system-aarch64 which while functionally the same will be less head scratching for users.
Quoted 16 lines
Quoted 8 lines
Quoted 8 lines
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.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Fabiano Rosas <[email protected]>---
This currently affects Arm, but will also affect x86 after the xenpvh series gets merged. This patch fixes both scenarios.Reviewed-by Juan Quintela <[email protected]>Thanks!
Signature · 2 lines
Alex Bennée Virtualisation Tech Lead @ Linaro
Re: [PATCH RESEND v7 9/9] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 29 lines · Alex Bennée
Quoted 20 lines · Fabiano Rosas
Quoted 9 lines · Juan Quintela
Quoted 3 lines · Fabiano Rosas
It is possible to have a build with both TCG and KVM disabled due to Xen requiring the i386 and
x86_64binaries to be present in an aarch64 host.Ouch.
Just curious: why are they needed?
From https://wiki.xenproject.org/wiki/QEMU_Upstream:
Why is qemu-system-i386 used even on
x86_64and even non-x86?QEMU in a Xen system only provides device model (DM) emulation and not any CPU instruction emulation, so the nominal arch doesn't actually matter and Xen builds i386 everywhere as a basically arbitrary choice.
Quoted 6 lines
It happens that the Xen DM part of QEMU is quite closely tied to the x86 scaffolding for various historical reasons, so we end up using qemu-system-i386 even e.g. on ARM! There is no practical difference between qemu-system-i386 and qemu-system-x86_64, they should be interchangeable. However only qemu-system-i386 is regularly tested by Xen Project (via osstest).
Quoted 4 lines
That said with the xenpvh model that was added recently we should be able to finally build a Xen only qemu-system-aarch64 which while functionally the same will be less head scratching for users.
It would be nice if we could eventually restrict the x86 build to the x86 host and the aarch64 build to the aarch64 host like we do for the other HW accels.
Re: [PATCH RESEND v7 9/9] tests/qtest: Fix tests when no KVM or TCG are present
In reply to Fabiano RosasQuoted 12 lines · Fabiano Rosas
It is possible to have a build with both TCG and KVM disabled due to Xen requiring the i386 and
x86_64binaries 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.
Signed-off-by Fabiano Rosas <[email protected]>---
...
tests/qtest/boot-serial-test.c line 21
Quoted 10 lines
tests/qtest/boot-serial-test.c +2
-0@@ -17,6 +17,9 @@#include "libqtest.h" #include "libqos/libqos-spapr.h" +static bool has_tcg; +static bool has_kvm;
Any special reason for putting these here instead of making them local variables in the main() function?
Quoted 5 lines
tests/qtest/boot-serial-test.c +0
-0static 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 ();
tests/qtest/boot-serial-test.c int main(int argc, char *argv[]) · line 298
Quoted 10 lines
tests/qtest/boot-serial-test.c +7
-0int 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 );
Could you please put the new code below the g_test_init() ? Just to avoid the problem that has been reported here:
https://lists.gnu.org/archive/html/qemu-devel/2023-02/msg08331.html
Thanks,
Thomas
Quoted 56 lines
tests/qtest/boot-serial-test.c +0
-0for (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) {
Re: [PATCH RESEND v7 9/9] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 22 lines · Thomas Huth
Quoted 12 lines · Fabiano Rosas
It is possible to have a build with both TCG and KVM disabled due to Xen requiring the i386 and
x86_64binaries 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.
Signed-off-by Fabiano Rosas <[email protected]>---
...
Quoted 8 lines
tests/qtest/boot-serial-test.c +0
-0@@ -17,6 +17,9 @@#include "libqtest.h" #include "libqos/libqos-spapr.h"
Quoted 6 lines
tests/qtest/boot-serial-test.c line 21
Quoted 2 lines
tests/qtest/boot-serial-test.c +2
-0+static bool has_tcg; +static bool has_kvm;Any special reason for putting these here instead of making them local variables in the
main()function?
Yes, Phillipe was doing work in the same file and I put it here to minimize conflicts.
https://lore.kernel.org/r/[email protected]
Quoted 19 lines
Quoted 5 lines
tests/qtest/boot-serial-test.c +0
-0static 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 ();tests/qtest/boot-serial-test.c int main(int argc, char *argv[]) · line 298
Quoted 10 lines
tests/qtest/boot-serial-test.c +7
-0int 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 );Could you please put the new code below the
g_test_init()? Just to avoid the problem that has been reported here:
I could, but I don't understand why we need this. What does having "code" before g_test_init() causes? Should I move the qtest_get_arch() that's already there as well?
Re: [PATCH RESEND v7 9/9] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 55 lines · Fabiano Rosas
Quoted 22 lines · Thomas Huth
Quoted 12 lines · Fabiano Rosas
It is possible to have a build with both TCG and KVM disabled due to Xen requiring the i386 and
x86_64binaries 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.
Signed-off-by Fabiano Rosas <[email protected]>---
...
Quoted 8 lines
tests/qtest/boot-serial-test.c +0
-0@@ -17,6 +17,9 @@#include "libqtest.h" #include "libqos/libqos-spapr.h" Quoted 6 lines
tests/qtest/boot-serial-test.c line 21
Quoted 2 lines
tests/qtest/boot-serial-test.c +2
-0+static bool has_tcg; +static bool has_kvm;Any special reason for putting these here instead of making them local variables in the
main()function?Yes, Phillipe was doing work in the same file and I put it here to minimize conflicts.
https://lore.kernel.org/r/[email protected]
Quoted 19 lines
Quoted 5 lines
tests/qtest/boot-serial-test.c +0
-0static 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 ();tests/qtest/boot-serial-test.c int main(int argc, char *argv[]) · line 298
Quoted 10 lines
tests/qtest/boot-serial-test.c +7
-0int 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 );Could you please put the new code below the
g_test_init()? Just to avoid the problem that has been reported here:
Quoted 6 lines
I could, but I don't understand why we need this. What does having "code" before
g_test_init()causes? Should I move theqtest_get_arch()that's already there as well?
Oh, the issue is the early return? I guess it makes sense.
Re: [PATCH RESEND v7 9/9] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 57 lines · Fabiano Rosas
Quoted 55 lines · Fabiano Rosas
Quoted 22 lines · Thomas Huth
Quoted 12 lines · Fabiano Rosas
It is possible to have a build with both TCG and KVM disabled due to Xen requiring the i386 and
x86_64binaries 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.
Signed-off-by Fabiano Rosas <[email protected]>---
...
Quoted 8 lines
tests/qtest/boot-serial-test.c +0
-0@@ -17,6 +17,9 @@#include "libqtest.h" #include "libqos/libqos-spapr.h" Quoted 6 lines
tests/qtest/boot-serial-test.c line 21
Quoted 2 lines
tests/qtest/boot-serial-test.c +2
-0+static bool has_tcg; +static bool has_kvm;Any special reason for putting these here instead of making them local variables in the
main()function?Yes, Phillipe was doing work in the same file and I put it here to minimize conflicts.
https://lore.kernel.org/r/[email protected]
Quoted 19 lines
Quoted 5 lines
tests/qtest/boot-serial-test.c +0
-0static 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 ();tests/qtest/boot-serial-test.c int main(int argc, char *argv[]) · line 298
Quoted 10 lines
tests/qtest/boot-serial-test.c +7
-0int 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 );Could you please put the new code below the
g_test_init()? Just to avoid the problem that has been reported here:
Quoted 8 lines
Quoted 6 lines
I could, but I don't understand why we need this. What does having "code" before
g_test_init()causes? Should I move theqtest_get_arch()that's already there as well?Oh, the issue is the early return? I guess it makes sense.
Yes, as far as I've undrestood the issue: If we call a function that starts a QEMU subprocess (like qtest_has_device() or qtest_has_accel()), then this could spoil the output since the TAP version from g_test_init() should come first.
qtest_get_arch() is not a problem, since it does not start a QEMU subprocess.
Thomas