Received: by 2002:ac2:4c03:0:0:0:0:0 with SMTP id t3csp175854lfq; Fri, 11 Dec 2020 07:18:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJx75wXhzfsMGtgZjwF1nIK4Kx+aASxG50wINvvu/1hDJJKikvHMnnMMuxegWK3ynsTo+sdN X-Received: by 2002:a67:c316:: with SMTP id r22mr13289553vsj.30.1607699887237; Fri, 11 Dec 2020 07:18:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607699887; cv=none; d=google.com; s=arc-20160816; b=vbWQ7VlVgE6nzvvd6DkRT2mm/uvpS1bwFjHXqvnsWEDLUPp+fnCOwgtfsW+16x9HxI 4I43JmWNCWc2ZKCkqEwJ15dD/eaIFLPT5so9qOVFTokJcb39KRRKx6gMtrVMHFp2Mqx5 F097JmylpkWJhyPs4NaQFNZvW4zR0509qRtOVnIF6MDQbGj3hSan9Qvla9o4eBhKYXmG wEuB8GnBkcgDvhQ1PynsoyJsqF0Vjqsccdpl89iuj68u2Ztu+abvxGdab4wPyOpQK4jD QLQGhkkKr8nwnhYe03oWF09nih8ai8zZH+5wOc7j6JN9//2CEd3mkZZFo9+y7QzY/mY1 Kuow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=ESjjnwWn7/dutkfL9pFUPNg6rNpFVShg1hLckqdmOvk=; b=FLkT0JHRZsz6+9OnZ0HUmkMtH1Kki5JwUWKXQrjIYtHPWNvEHKpdlld7we6b2lOTVS +1JQEU4XvuMfLUsV86BRxhjTXFj1XUADkQ4y+9LBosoph0eBDKmKgj1B8zQZqfgvWhj7 NblJle0G5R5AMF8G/OwZt8CPYHUzvA103eiaVWnvAmTqUSSD512beeaZzzhwkiSDdxkd Bith3ccNqViA+yDwZab3b9EWpH3oJ25WIMvM6PMpP4qzkv+nnrwJx/ZmTDC+hQTleNI3 sQkjN9JgcpYjvpoLrjply+UfOaw0CpykSdUV2PrmaWMMip94xsxkM/6rxy8rAvESmj4f vbng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a14si1555164uaq.242.2020.12.11.07.18.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Dec 2020 07:18:07 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Received: from localhost ([::1]:51440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knkBK-0004sF-HV for alex.bennee@linaro.org; Fri, 11 Dec 2020 10:18:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knk6w-000861-L1; Fri, 11 Dec 2020 10:13:35 -0500 Received: from mail.csgraf.de ([188.138.100.120]:36588 helo=zulu616.server4you.de) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knk6u-0001uv-8Z; Fri, 11 Dec 2020 10:13:34 -0500 Received: from localhost.localdomain (dynamic-077-007-081-179.77.7.pool.telefonica.de [77.7.81.179]) by csgraf.de (Postfix) with ESMTPSA id CE51739003C7; Fri, 11 Dec 2020 16:13:07 +0100 (CET) From: Alexander Graf To: qemu-devel@nongnu.org Subject: [PATCH v5 11/11] hvf: arm: Implement -cpu host Date: Fri, 11 Dec 2020 16:13:00 +0100 Message-Id: <20201211151300.85322-12-agraf@csgraf.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201211151300.85322-1-agraf@csgraf.de> References: <20201211151300.85322-1-agraf@csgraf.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=188.138.100.120; envelope-from=agraf@csgraf.de; helo=zulu616.server4you.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Richard Henderson , Cameron Esfahani , Roman Bolshakov , qemu-arm@nongnu.org, Marcel Apfelbaum , Frank Yang , Paolo Bonzini , Peter Collingbourne Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: c2ScXHB309/D Now that we have working system register sync, we push more target CPU properties into the virtual machine. That might be useful in some situations, but is not the typical case that users want. So let's add a -cpu host option that allows them to explicitly pass all CPU capabilities of their host CPU into the guest. Signed-off-by: Alexander Graf Acked-by: Roman Bolshakov --- include/sysemu/hvf.h | 2 ++ target/arm/cpu.c | 9 ++++++--- target/arm/cpu.h | 2 ++ target/arm/hvf/hvf.c | 41 +++++++++++++++++++++++++++++++++++++++++ target/arm/kvm_arm.h | 2 -- 5 files changed, 51 insertions(+), 5 deletions(-) diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h index f893768df9..7eb61cf094 100644 --- a/include/sysemu/hvf.h +++ b/include/sysemu/hvf.h @@ -19,6 +19,8 @@ #ifdef CONFIG_HVF uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, int reg); +struct ARMCPU; +void hvf_arm_set_cpu_features_from_host(struct ARMCPU *cpu); extern bool hvf_allowed; #define hvf_enabled() (hvf_allowed) #else /* !CONFIG_HVF */ diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 86cf167d1d..228d9a1dee 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2276,12 +2276,16 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) #endif } -#ifdef CONFIG_KVM +#if defined(CONFIG_KVM) || defined(CONFIG_HVF) static void arm_host_initfn(Object *obj) { ARMCPU *cpu = ARM_CPU(obj); +#ifdef CONFIG_KVM kvm_arm_set_cpu_features_from_host(cpu); +#else + hvf_arm_set_cpu_features_from_host(cpu); +#endif if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { aarch64_add_sve_properties(obj); } @@ -2293,7 +2297,6 @@ static const TypeInfo host_arm_cpu_type_info = { .parent = TYPE_AARCH64_CPU, .instance_init = arm_host_initfn, }; - #endif static void arm_cpu_instance_init(Object *obj) @@ -2352,7 +2355,7 @@ static void arm_cpu_register_types(void) type_register_static(&arm_cpu_type_info); -#ifdef CONFIG_KVM +#if defined(CONFIG_KVM) || defined(CONFIG_HVF) type_register_static(&host_arm_cpu_type_info); #endif diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 7e6c881a7e..5e8d9c07c9 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2855,6 +2855,8 @@ bool write_cpustate_to_list(ARMCPU *cpu, bool kvm_sync); #define ARM_CPU_TYPE_NAME(name) (name ARM_CPU_TYPE_SUFFIX) #define CPU_RESOLVING_TYPE TYPE_ARM_CPU +#define TYPE_ARM_HOST_CPU "host-" TYPE_ARM_CPU + #define cpu_signal_handler cpu_arm_signal_handler #define cpu_list arm_cpu_list diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index bc955c097f..87b32dc8c9 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -372,6 +372,47 @@ static uint64_t hvf_get_reg(CPUState *cpu, int rt) return val; } +void hvf_arm_set_cpu_features_from_host(ARMCPU *cpu) +{ + ARMISARegisters host_isar; + const struct isar_regs { + int reg; + uint64_t *val; + } regs[] = { + { HV_SYS_REG_ID_AA64PFR0_EL1, &host_isar.id_aa64pfr0 }, + { HV_SYS_REG_ID_AA64PFR1_EL1, &host_isar.id_aa64pfr1 }, + { HV_SYS_REG_ID_AA64DFR0_EL1, &host_isar.id_aa64dfr0 }, + { HV_SYS_REG_ID_AA64DFR1_EL1, &host_isar.id_aa64dfr1 }, + { HV_SYS_REG_ID_AA64ISAR0_EL1, &host_isar.id_aa64isar0 }, + { HV_SYS_REG_ID_AA64ISAR1_EL1, &host_isar.id_aa64isar1 }, + { HV_SYS_REG_ID_AA64MMFR0_EL1, &host_isar.id_aa64mmfr0 }, + { HV_SYS_REG_ID_AA64MMFR1_EL1, &host_isar.id_aa64mmfr1 }, + { HV_SYS_REG_ID_AA64MMFR2_EL1, &host_isar.id_aa64mmfr2 }, + }; + hv_vcpu_t fd; + hv_vcpu_exit_t *exit; + int i; + + cpu->dtb_compatible = "arm,arm-v8"; + cpu->env.features = (1ULL << ARM_FEATURE_V8) | + (1ULL << ARM_FEATURE_NEON) | + (1ULL << ARM_FEATURE_AARCH64) | + (1ULL << ARM_FEATURE_PMU) | + (1ULL << ARM_FEATURE_GENERIC_TIMER); + + /* We set up a small vcpu to extract host registers */ + + assert_hvf_ok(hv_vcpu_create(&fd, &exit, NULL)); + for (i = 0; i < ARRAY_SIZE(regs); i++) { + assert_hvf_ok(hv_vcpu_get_sys_reg(fd, regs[i].reg, regs[i].val)); + } + assert_hvf_ok(hv_vcpu_get_sys_reg(fd, HV_SYS_REG_MIDR_EL1, &cpu->midr)); + assert_hvf_ok(hv_vcpu_destroy(fd)); + + cpu->isar = host_isar; + cpu->reset_sctlr = 0x00c50078; +} + void hvf_arch_vcpu_destroy(CPUState *cpu) { } diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index eb81b7059e..081727a37e 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -214,8 +214,6 @@ bool kvm_arm_create_scratch_host_vcpu(const uint32_t *cpus_to_try, */ void kvm_arm_destroy_scratch_host_vcpu(int *fdarray); -#define TYPE_ARM_HOST_CPU "host-" TYPE_ARM_CPU - /** * ARMHostCPUFeatures: information about the host CPU (identified * by asking the host kernel) -- 2.24.3 (Apple Git-128)