From nobody Mon Feb 9 10:58:08 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=1768452758; cv=none; d=zohomail.com; s=zohoarc; b=kzvbnQCmta++ElrdB0zV+/o9BXL9NR90vb4VW2quiddPBZgoknlYVt6aVBpNXbfziwydumXzF5Q+990ueCmKo0z4UPvMpLW7ACSrOp9/jZv7s/mvkW5u44u0KrNZURRMkmNYeMAXopDa6jjadaZdxsPteozuJkJzsUhLu0kiUiE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768452758; 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=sYiD1Pfx25A6G4lq0LEyK+IX8HgqAlW2PW5/OpuYtCI=; b=krMApUJ+8at05WazFEZB2HMFu0BsRPQKb6xyY8x/p/w3rMZV1hWjB8XfZ3toWlFO9tVzYWrkQqi2+volh29FV89nM1JMZwixX3cgJqINIWL3X8VH0WBslHLD1fyYDBCtJS0DZSdJ20MKAKhuxv3JihZq2xs4MbMRIwjn2SubLLQ= 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 1768452757857615.20055476811; Wed, 14 Jan 2026 20:52:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vgFK9-0004bv-Ky; Wed, 14 Jan 2026 23:51:09 -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 1vgFK6-0004ZQ-Nu for qemu-devel@nongnu.org; Wed, 14 Jan 2026 23:51:07 -0500 Received: from p-west3-cluster2-host11-snip4-7.eps.apple.com ([57.103.74.90] 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 1vgFK3-00062u-7c for qemu-devel@nongnu.org; Wed, 14 Jan 2026 23:51:06 -0500 Received: from outbound.ms.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-west-3a-10-percent-0 (Postfix) with ESMTPS id 42CFB1800113; Thu, 15 Jan 2026 04:50:58 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.154.37]) by p00-icloudmta-asmtp-us-west-3a-10-percent-0 (Postfix) with ESMTPSA id A3216180010D; Thu, 15 Jan 2026 04:50:55 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=sYiD1Pfx25A6G4lq0LEyK+IX8HgqAlW2PW5/OpuYtCI=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=aS4l7bwh2anOlMf9CbJqNdAziFX+jH05NWa9sD44gdOD0hxNs4kY+PQmSnRm5bDOXs6nsm/T+eJPJyPE5MXFxvn8aPlGUI0UuQPR6ZTG5wSihysOUvHH/X+eBdotX327e2EsoOxJ2EqvPmtwyJ3b5Dd3rB7nDbs7oFfrgvLXiOVXiK2gP1gutCv5ok20kNz1hZ+hkYfmJa5yHZjsEvaq5cyAy934FItHOO3UQrdWt9huP2GrX2uhqeYx043lokyV/IPMhsas2o9/q4ZxmpHGQQWa5hzW+2r9TUXDKd513VLbwr+EKBJbNv03XasBXB/cEZ39C0hbKe02oAbCm9igcA== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Alexander Graf , Cameron Esfahani , Paolo Bonzini , Mads Ynddal , qemu-arm@nongnu.org, Phil Dennis-Jordan , Peter Maydell , Roman Bolshakov , Mohamed Mediouni Subject: [PATCH v7 04/10] hw/arm, target/arm: nested virtualisation on HVF Date: Thu, 15 Jan 2026 05:50:36 +0100 Message-ID: <20260115045042.70086-5-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260115045042.70086-1-mohamed@unpredictable.fr> References: <20260115045042.70086-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Info: v=2.4 cv=GM8F0+NK c=1 sm=1 tr=0 ts=69687233 cx=c_apl:c_apl_out:c_pps a=qkKslKyYc0ctBTeLUVfTFg==:117 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=0QeE6rx795gg9bSW8oEA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE1MDAyOSBTYWx0ZWRfX99jka0xIAsT4 z591MqvSwWUog+xKsK6jeH0o4I21SxI2JloYE1c8qNf1cONho+FDsoqpBG0/vA9aqSJXr9g8lHq XVzRdiX08Es4xTQuMfN8xSKWW0i7CPEc+C7/4xlGmCwao8m8Z4Q+vItk/iiVJtlqxlei06VriZ9 y3JRCSlhnt48SZ09Dna4pa7dsT2svf6LkHZ33ON6QtsxU9h+Ncma2jVWw+8AFWQpfI4651S+BB1 mczUz938FCGlxXcOCdxEg5N7CdP6npAM7SFPLuy5L5a8y3wKFrdwtebQFUk3chMderlTrC/WICs Y2FGdCzdBsLOxOFyJkQ X-Proofpoint-GUID: zZsvAC5iXBu47bNV9ndxmIR6yjjodIIv X-Proofpoint-ORIG-GUID: zZsvAC5iXBu47bNV9ndxmIR6yjjodIIv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-15_01,2026-01-14_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 adultscore=0 mlxlogscore=901 malwarescore=0 clxscore=1030 mlxscore=0 suspectscore=0 phishscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2601150029 X-JNJ: AAAAAAABhG/e2vJgfsiAMrveLE5JamPOgy/9+HMAoAeGtU36IoQgQcwjPl972ckyZfITvmuBlqIVIvX/D1w0nz6DZkpr47Ye6GDouOcokb4AgFCBcduZYeClBdJV5JyYWn6TgWzNo8IV5GAM1PQZ0QM5oxK/9m5W/jMk+wOYAHtU0NnYExXpyygqASn3iQmOI92qkRS/l+v+Fh2CyS3Qgg+nUiyEYcwCAmjgm3luvk9SKDkwpyNtGUtYhKS27PVV/gy8L4YW2BAfC2Mte8gsNeAJbwsWNs55vuyvIBe37uhtbtkEOz+BSsMQhgFKjvirHtCI/JGKWBDEagLhJbHnzWkJwsNy53R6mbXxiZhJ9CeGHZcl9V/CfZXgyAou6l56G4dJMbuRo7SPh3cfqnFgTY34VncNhLVkhrATgfz+uICEbHIo4EPEPnl6UKbx2L8zxq6txLZcVSzCRI2gvPzLP/CwKPMX7/2ucBq58BA5ok4im6cuRTii5a5AS6qz4mG0BM/NPWN7na7osMRAGJuBcT20i/6yxVZdXIXLEqEJ52nZUsUOD2kSyNnubm6tuY35McRSZyWOwX6nJYwFj2x5DU8h9p49L9CwSaso0P3f4ivC+/7hM37PhARanWjKEnpMbQDKUDPMMfp40/CgWw56ggV3KWNsC+9MIPc8oaGVb+ZvSt3jibgGN12J5FNzRxdlp2L+/I9z 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 (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.74.90; envelope-from=mohamed@unpredictable.fr; helo=outbound.ms.icloud.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: 1768452758460158500 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 | 8 +++++++- include/system/hvf.h | 5 +++++ target/arm/hvf/hvf.c | 36 ++++++++++++++++++++++++++++++++++-- 5 files changed, 48 insertions(+), 3 deletions(-) diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c index 929f53fd37..88f6d5accb 100644 --- a/accel/hvf/hvf-all.c +++ b/accel/hvf/hvf-all.c @@ -25,6 +25,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 b0fc6c4577..8f24fdef49 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2349,7 +2349,8 @@ static void machvirt_init(MachineState *machine) exit(1); } =20 - 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()); @@ -2619,6 +2620,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 a220699077..fe9b63bc76 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -28,6 +28,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" @@ -772,6 +773,10 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPUFe= atures *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]); @@ -879,6 +884,15 @@ void hvf_arch_vcpu_destroy(CPUState *cpu) assert_hvf_ok(ret); } =20 +static bool hvf_arm_el2_supported(void) +{ + bool is_nested_virt_supported; + hv_return_t ret =3D hv_vm_config_get_el2_supported(&is_nested_virt_sup= ported); + assert_hvf_ok(ret); + return is_nested_virt_supported; +} + + hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range) { hv_return_t ret; @@ -890,6 +904,18 @@ hv_return_t hvf_arch_vm_create(MachineState *ms, uint3= 2_t pa_range) } chosen_ipa_bit_size =3D pa_range; =20 + if (hvf_nested_virt_enabled()) { + if (!hvf_arm_el2_supported()) { + error_report("Nested virtualization not supported on this syst= em."); + 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); =20 cleanup: @@ -1024,6 +1050,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. * @@ -1045,7 +1078,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], @@ -1099,7 +1131,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)