From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3C406C83F26 for ; Fri, 25 Jul 2025 08:57:33 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufEDz-0007rl-7F; Fri, 25 Jul 2025 04:56:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ufEDw-0007jR-2c for qemu-devel@nongnu.org; Fri, 25 Jul 2025 04:56:16 -0400 Received: from p-west3-cluster2-host9-snip4-10.eps.apple.com ([57.103.74.13] helo=outbound.ms.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ufEDt-0001vn-VQ for qemu-devel@nongnu.org; Fri, 25 Jul 2025 04:56:15 -0400 Received: from outbound.ms.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-west-3a-20-percent-0 (Postfix) with ESMTPS id 628B61800221; Fri, 25 Jul 2025 08:56:09 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=2+oeV/qLEBELCeNzr/+3bJX/+e9peu0Bo6BJXQ9Vgx8=; h=From:To:Subject:Date:Message-Id:MIME-Version:x-icloud-hme; b=WzUM2qj9Rh5yskebJs96JJmdDxrEKRMItGzmTRisA+S05uT3Bhx+StXE+bhEs1ijDhTZ4Mx4qX5XcTA/PG1ydTQjSi6I+1Av/Sxsc3mjk3yTBZkEVvXSx78UT9Uf3nQvWPEkVhEgpSRZ0OMvIYUiWanrrjS+Z4PQt/Q6JV5aUB0MfBAFSjDjnWKoyu6Q3ktOjIKqZR/OrES8EIQ9XUiCILODjdLZefp8mGuOiae+cr5zSERioSMUgCJkZgrK1wISKMYQSb72wlH0jthRUx8BkQDyWceH8QW8vn4BxE/28Kbvh2jjIvzkfXQ801PMtCcieGyTpYgtPYZRlyAlGI51wg== X-Client-IP: 46.189.47.18 Received: from localhost.localdomain (ms-asmtp-me-k8s.p00.prod.me.com [17.57.154.37]) by p00-icloudmta-asmtp-us-west-3a-20-percent-0 (Postfix) with ESMTPSA id 75F21180020A; Fri, 25 Jul 2025 08:56:06 +0000 (UTC) From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Mads Ynddal , qemu-arm@nongnu.org, Paolo Bonzini , "Michael S. Tsirkin" , Ani Sinha , Igor Mammedov , Cameron Esfahani , Phil Dennis-Jordan , Peter Maydell , Alexander Graf , Shannon Zhao , Roman Bolshakov , Mohamed Mediouni Subject: [PATCH v2 6/9] hw/arm, target/arm: nested virtualisation on HVF Date: Fri, 25 Jul 2025 10:55:42 +0200 Message-Id: <20250725085545.93619-7-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250725085545.93619-1-mohamed@unpredictable.fr> References: <20250725085545.93619-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzI1MDA3NSBTYWx0ZWRfXwb539ZTEQaE3 bkX0dF7m2wP66UlmVS6oL+A8F0+uyJLqTuYMLFa4QqNwnSw5ZCQsmYLYFqOVIxqTASkaCiYb4ow VlbyKn/nXwBY7dHeAG71p2UnX49ZI4vKiEHQQepNyixu9sTCmaTfN2RelDAKUq0egEo7abviQCH 7KVauCsmOs38hkd49zjBBmU3l8Bb1Z2VxmCBfeqYBhUHeLOXgt9KB7tKEco9ZyyYpoN+dELELRw oKmgMe7EI1yIcRlDpxUfB234UrWRzUqWPpMtepdQe5jKsmeG1E2YWBtoUzYvSuLfz2LCAoZxo= X-Proofpoint-ORIG-GUID: gaDKiDnxaunoXy-MnL-biczS5jkbx3Ub X-Proofpoint-GUID: gaDKiDnxaunoXy-MnL-biczS5jkbx3Ub X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-25_02,2025-07-24_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0 spamscore=0 clxscore=1030 malwarescore=0 mlxscore=0 adultscore=0 mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2507250075 Received-SPF: pass client-ip=57.103.74.13; envelope-from=mohamed@unpredictable.fr; helo=outbound.ms.icloud.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Mohamed Mediouni --- hw/arm/virt.c | 9 ++++++--- target/arm/hvf-stub.c | 15 +++++++++++++++ target/arm/hvf/hvf.c | 35 +++++++++++++++++++++++++++++++++++ target/arm/hvf_arm.h | 3 +++ 4 files changed, 59 insertions(+), 3 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index a26bde4c75..ab27547707 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -817,8 +817,7 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem) g_assert_not_reached(); } - if (kvm_enabled() && vms->virt && - (revision != 3 || !kvm_irqchip_in_kernel())) { + if (kvm_enabled() && vms->virt && (revision != 3 || !kvm_irqchip_in_kernel())) { error_report("KVM EL2 is only supported with in-kernel GICv3"); exit(1); } @@ -2278,7 +2277,8 @@ static void machvirt_init(MachineState *machine) exit(1); } - if (vms->virt && !kvm_enabled() && !tcg_enabled() && !qtest_enabled()) { + if (vms->virt && !kvm_enabled() && !tcg_enabled() + &&!hvf_enabled() && !qtest_enabled()) { error_report("mach-virt: %s does not support providing " "Virtualization extensions to the guest CPU", current_accel_name()); @@ -2548,6 +2548,9 @@ static void virt_set_virt(Object *obj, bool value, Error **errp) VirtMachineState *vms = VIRT_MACHINE(obj); vms->virt = value; +#if defined(CONFIG_HVF) && defined(__aarch64__) + hvf_arm_el2_enable(value); +#endif } static bool virt_get_highmem(Object *obj, Error **errp) diff --git a/target/arm/hvf-stub.c b/target/arm/hvf-stub.c index ff137267a0..95ec4ea62f 100644 --- a/target/arm/hvf-stub.c +++ b/target/arm/hvf-stub.c @@ -18,3 +18,18 @@ uint32_t hvf_arm_get_max_ipa_bit_size(void) { g_assert_not_reached(); } + +bool hvf_arm_el2_supported(void) +{ + g_assert_not_reached(); +} + +bool hvf_arm_el2_enabled(void) +{ + g_assert_not_reached(); +} + +void hvf_arm_el2_enable(bool) +{ + g_assert_not_reached(); +} diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 7b4e8297af..c32e6ab289 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -26,6 +26,7 @@ #include "system/address-spaces.h" #include "system/memory.h" #include "hw/boards.h" +#include "hw/arm/virt.h" #include "hw/irq.h" #include "qemu/main-loop.h" #include "system/cpus.h" @@ -891,6 +892,10 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) (1ULL << ARM_FEATURE_PMU) | (1ULL << ARM_FEATURE_GENERIC_TIMER); + if (hvf_arm_el2_enabled()) { + ahcf->features |= 1ULL << ARM_FEATURE_EL2; + } + /* We set up a small vcpu to extract host registers */ if (hv_vcpu_create(&fd, &exit, NULL) != HV_SUCCESS) { @@ -964,6 +969,25 @@ uint32_t hvf_arm_get_max_ipa_bit_size(void) return round_down_to_parange_bit_size(max_ipa_size); } +bool hvf_arm_el2_supported(void) +{ + bool is_nested_virt_supported; + hv_return_t ret = hv_vm_config_get_el2_supported(&is_nested_virt_supported); + assert_hvf_ok(ret); + return is_nested_virt_supported; +} + +static bool is_nested_virt_enabled = false; +bool hvf_arm_el2_enabled(void) +{ + return is_nested_virt_enabled; +} + +void hvf_arm_el2_enable(bool enable) +{ + is_nested_virt_enabled = enable; +} + void hvf_arm_set_cpu_features_from_host(ARMCPU *cpu) { if (!arm_host_cpu_features.dtb_compatible) { @@ -1000,6 +1024,13 @@ hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range) } chosen_ipa_bit_size = pa_range; + if (hvf_arm_el2_enabled()) { + ret = hv_vm_config_set_el2_enabled(config, true); + if (ret != HV_SUCCESS) { + goto cleanup; + } + } + ret = hv_vm_create(config); if (hvf_irqchip_in_kernel()) { /* @@ -1146,6 +1177,10 @@ static bool hvf_handle_psci_call(CPUState *cpu) int target_el = 1; int32_t ret = 0; + if (hvf_arm_el2_enabled()) { + target_el = 2; + } + trace_hvf_psci_call(param[0], param[1], param[2], param[3], arm_cpu_mp_affinity(arm_cpu)); diff --git a/target/arm/hvf_arm.h b/target/arm/hvf_arm.h index ea82f2691d..bf55e7ae28 100644 --- a/target/arm/hvf_arm.h +++ b/target/arm/hvf_arm.h @@ -24,5 +24,8 @@ void hvf_arm_set_cpu_features_from_host(ARMCPU *cpu); uint32_t hvf_arm_get_default_ipa_bit_size(void); uint32_t hvf_arm_get_max_ipa_bit_size(void); +bool hvf_arm_el2_supported(void); +bool hvf_arm_el2_enabled(void); +void hvf_arm_el2_enable(bool); #endif -- 2.39.5 (Apple Git-154)