From nobody Mon Apr 13 10:58:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1772874506; cv=none; d=zohomail.com; s=zohoarc; b=QwerhptGkNHmPmD0RMp+IhgUBmYGQa2kg4yE9rBebYrLMTKuMG9j0CUov6r9rDSSuE+FR5RFBCsZtRJQIxiMEKqZTRt41psZQ6KJ/nvD/gGkfMX6EM7gXH+qz34YTFVmaYPYVJRqKPe/omlhgfGj5iaFsTfRS9FTon8cgVw6sf8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772874506; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Y1w+e/5Nu/r4eEn8jsNGQIW/Mli5pSCotqFMq4Mz5y0=; b=H675dy6cA9NP0VYiMaI6mrvkXxchCe7q2nR7DOPL5dV5CIzeu1leJ+MXPtml4j4Gr0E9QQNVCbXEngSym/1+b1IzaJA1oimxTujmj4j9uSV/SvmOlQ8CAYyJ0pP0lgEj1+nkWperbDdIdeYRKpVvxYapy+fg6q5qmc9Erd7v+OQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772874506931406.88941087096975; Sat, 7 Mar 2026 01:08:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyncC-0006jS-R8; Sat, 07 Mar 2026 04:06:28 -0500 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 1vync7-0006g8-QS for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:23 -0500 Received: from qs-2007a-snip4-1.eps.apple.com ([57.103.84.132] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vync4-0000yv-EA for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:22 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id 919E8180013B; Sat, 7 Mar 2026 09:06:18 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id E2FAC180011C; Sat, 7 Mar 2026 09:06:16 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1772874379; x=1775466379; bh=Y1w+e/5Nu/r4eEn8jsNGQIW/Mli5pSCotqFMq4Mz5y0=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=P8MMSf9o5ugyGqFTMdJxRO0jJAKoJZzYvqWZPe4M20hup71dhxNuLBT0x+aL5n8DI3ob+h9Tb1DE5UHfx1xTAmsIZ2+PU04hEed43rFChUFw8N1RoVvEMCJOogJgB77izBIAK4g/V19L/+J0giuRegVXV8ryrdihs1GeMNf4lvy7hzE5SJeXwHfWoNVA/pIWHAZNQ+ZaNE+/Qgy/+gSgwRKbvPBPcZ4/gNm0OxVqCZvHjHm38ZwQJIosuPW2Yg7l8bjKVep2DaQdLraRMlsV1O/4N9rOZyOEkgYLk9Uj6pb76s1rArECj1AyC97YnngpdtcnAiVdonCAlJbtTp92QQ== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Phil Dennis-Jordan , Roman Bolshakov , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Manos Pitsidianakis , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [PATCH v17 05/14] hw/arm, target/arm: nested virtualisation on HVF Date: Sat, 7 Mar 2026 10:05:57 +0100 Message-ID: <20260307090606.95300-6-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260307090606.95300-1-mohamed@unpredictable.fr> References: <20260307090606.95300-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: HxgNSdPH8EYRAvsWiPnNElyVhLDyPwxV X-Proofpoint-GUID: HxgNSdPH8EYRAvsWiPnNElyVhLDyPwxV X-Authority-Info-Out: v=2.4 cv=Criys34D c=1 sm=1 tr=0 ts=69abea8b cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=0QeE6rx795gg9bSW8oEA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA3MDA4MyBTYWx0ZWRfXwlQIUUdBqUS7 Ed6fqwgTNyjZHdeIA6tl8psERaBZlrVmtzZ1lLu34kTQFy5DP6AXZ/ldwGuEPrVdQXxT5gdMecG 57fmK9Q1Sc0O0J976Ni9rB2+1K526UYZk3Wqs5uvcKnyc1IWiXtF1B/SFKqukUTCarr0kWeY/uV iGYyATe7rSAqOGqlbF+viApQsSw5VmZVY4jNxnFZIdY2IoQV2TmAOjWGHIU5Myieiwg2koJroJ7 hDvGQUvQ7/SmJ0OonMNLiXLm73QNZmukkVJ7xOfKzLR6IlZRyfZ9zBuSgnRx3Q01aKHWF8yxkiv GY8BiAMgpk1KltfGoaWYYA2+WyAdP4fM/chOqoqVZuKR13GPZGIbqme/2v/2L0= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-07_03,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1030 phishscore=0 malwarescore=0 mlxscore=0 bulkscore=0 spamscore=0 adultscore=0 mlxlogscore=860 suspectscore=0 lowpriorityscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603070083 X-JNJ: AAAAAAABgJTQRL21oDTA7FNpLnePRxFSccXttrQMPv2TriEH0M+KPGGGpHaB5sGYC7NkKOgPXZ54NZ9K1uSQzbuy+tcSMO79p1+QTCPQtHTYUP43BrnpdagqQC61Bn0NMH+p9SQaA3qaAteUUAk0oNcTJTH403EqsNmrJvhjStoVOidDcYJ6DxgN37SPCm9TzRYly8KDHH9TuXTChV7GZ+105F0v2CeM8/gGN4w8+vWg/VfcVGWGzTDFg5ct3GlrM8kY68a91dZ8Gx6pxQdLqK4EePPejCq/FEJ+9b/qIGZ9IlxykxJVsvjcs76i2Dh2roeridHGNbqqnKQzWYID6r82q1fZlmXxIVLC3P9efyAIWENgplzc4QqDpEPH4225fS8Z9MrlwYSMCWzXNfKENsWkg/AL1Zb7lR24kFHMEcmXuAGzxVvFzmb2EYC77IgoQsGtnu1r7nfn1r3KWNw2FB9XI3t0KUL8ZF+yAO3yRyObahGqnF9AHy3CM6f1mYQd0S2FhS7caNKxbby8CaL/zrIVFHn+bJCsvuD4v+8bgWW4ZCBTYLJ2GO4TFA/p/Hp0OWMSosZVEykukbGdGdlMks+SHNA/83AQgcgxDT5HRs2BCei1J87MPnkber0h+McXJA7oJFn1VCY/CEasmH32at/cfG+0fV8Uwd7wFYJZGYQ5GgU3QFvMJ14UDyBm0C0dWwSFQRK4SAeW4QeM8OONHBxYNrX6PsVixybbqWv2ACqXi0CvBK8WJtnKYqY= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=57.103.84.132; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 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_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1772874509268154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Mohamed Mediouni --- accel/hvf/hvf-all.c | 1 + accel/stubs/hvf-stub.c | 1 + hw/arm/virt.c | 5 +++++ include/system/hvf.h | 5 +++++ target/arm/hvf/hvf.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 52 insertions(+), 2 deletions(-) diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c index a296b108bc..1c1437b467 100644 --- a/accel/hvf/hvf-all.c +++ b/accel/hvf/hvf-all.c @@ -24,6 +24,7 @@ =20 bool hvf_allowed; bool hvf_kernel_irqchip; +bool hvf_nested_virt; =20 const char *hvf_return_string(hv_return_t ret) { diff --git a/accel/stubs/hvf-stub.c b/accel/stubs/hvf-stub.c index 6bd08759ba..cec1cbb056 100644 --- a/accel/stubs/hvf-stub.c +++ b/accel/stubs/hvf-stub.c @@ -11,3 +11,4 @@ =20 bool hvf_allowed; bool hvf_kernel_irqchip; +bool hvf_nested_virt; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7a6fad1094..90769936d0 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2661,6 +2661,11 @@ static void virt_set_virt(Object *obj, bool value, E= rror **errp) VirtMachineState *vms =3D VIRT_MACHINE(obj); =20 vms->virt =3D value; + /* + * At this point, HVF is not initialised yet. + * However, it needs to know if nested virt is enabled at init time. + */ + hvf_nested_virt_enable(value); } =20 static bool virt_get_highmem(Object *obj, Error **errp) diff --git a/include/system/hvf.h b/include/system/hvf.h index dc8da85979..0f0632f7ae 100644 --- a/include/system/hvf.h +++ b/include/system/hvf.h @@ -28,9 +28,14 @@ extern bool hvf_allowed; #define hvf_enabled() (hvf_allowed) extern bool hvf_kernel_irqchip; #define hvf_irqchip_in_kernel() (hvf_kernel_irqchip) +extern bool hvf_nested_virt; +#define hvf_nested_virt_enabled() (hvf_nested_virt) +#define hvf_nested_virt_enable(enable) hvf_nested_virt =3D enable #else /* !CONFIG_HVF_IS_POSSIBLE */ #define hvf_enabled() 0 #define hvf_irqchip_in_kernel() 0 +#define hvf_nested_virt_enabled() 0 +#define hvf_nested_virt_enable(enable) 0 #endif /* !CONFIG_HVF_IS_POSSIBLE */ =20 #define TYPE_HVF_ACCEL ACCEL_CLASS_NAME("hvf") diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 22d476cda9..e2d23d89f4 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -27,6 +27,7 @@ #include "system/memory.h" #include "hw/core/boards.h" #include "hw/core/irq.h" +#include "hw/arm/virt.h" #include "qemu/main-loop.h" #include "system/cpus.h" #include "arm-powerctl.h" @@ -1103,6 +1104,10 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPU= Features *ahcf) (1ULL << ARM_FEATURE_PMU) | (1ULL << ARM_FEATURE_GENERIC_TIMER); =20 + if (hvf_nested_virt_enabled()) { + ahcf->features |=3D 1ULL << ARM_FEATURE_EL2; + } + for (i =3D 0; i < ARRAY_SIZE(regs); i++) { r |=3D hv_vcpu_config_get_feature_reg(config, regs[i].reg, &host_isar.idregs[regs[i].inde= x]); @@ -1218,6 +1223,19 @@ void hvf_arch_vcpu_destroy(CPUState *cpu) assert_hvf_ok(ret); } =20 +static bool hvf_arm_el2_supported(void) +{ + bool is_nested_virt_supported; + if (__builtin_available(macOS 15.0, *)) { + hv_return_t ret =3D hv_vm_config_get_el2_supported(&is_nested_virt= _supported); + assert_hvf_ok(ret); + } else { + return false; + } + return is_nested_virt_supported; +} + + hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range) { hv_return_t ret; @@ -1229,6 +1247,20 @@ hv_return_t hvf_arch_vm_create(MachineState *ms, uin= t32_t pa_range) } chosen_ipa_bit_size =3D pa_range; =20 + if (__builtin_available(macOS 15.0, *)) { + if (hvf_nested_virt_enabled()) { + if (!hvf_arm_el2_supported()) { + error_report("Nested virtualization not supported on this = system."); + goto cleanup; + } + ret =3D hv_vm_config_set_el2_enabled(config, true); + if (ret !=3D HV_SUCCESS) { + error_report("Failed to enable nested virtualization."); + goto cleanup; + } + } + } + ret =3D hv_vm_create(config); if (hvf_irqchip_in_kernel()) { if (__builtin_available(macOS 15.0, *)) { @@ -1420,6 +1452,13 @@ static void hvf_psci_cpu_off(ARMCPU *arm_cpu) assert(ret =3D=3D QEMU_ARM_POWERCTL_RET_SUCCESS); } =20 +static int hvf_psci_get_target_el(void) +{ + if (hvf_nested_virt_enabled()) { + return 2; + } + return 1; +} /* * Handle a PSCI call. * @@ -1441,7 +1480,6 @@ static bool hvf_handle_psci_call(CPUState *cpu, int *= excp_ret) CPUState *target_cpu_state; ARMCPU *target_cpu; target_ulong entry; - int target_el =3D 1; int32_t ret =3D 0; =20 trace_arm_psci_call(param[0], param[1], param[2], param[3], @@ -1495,7 +1533,7 @@ static bool hvf_handle_psci_call(CPUState *cpu, int *= excp_ret) entry =3D param[2]; context_id =3D param[3]; ret =3D arm_set_cpu_on(mpidr, entry, context_id, - target_el, target_aarch64); + hvf_psci_get_target_el(), target_aarch64); break; case QEMU_PSCI_0_1_FN_CPU_OFF: case QEMU_PSCI_0_2_FN_CPU_OFF: --=20 2.50.1 (Apple Git-155)