Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2230485/?format=api
{ "id": 2230485, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2230485/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260429190532.26538-6-mohamed@unpredictable.fr/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/1.1/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20260429190532.26538-6-mohamed@unpredictable.fr>", "date": "2026-04-29T19:05:22", "name": "[v21,05/15] hw/arm, target/arm: nested virtualisation on HVF", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "ad07564add3dc326a4e6fd1ba08f0862ce04ad4b", "submitter": { "id": 91318, "url": "http://patchwork.ozlabs.org/api/1.1/people/91318/?format=api", "name": "Mohamed Mediouni", "email": "mohamed@unpredictable.fr" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260429190532.26538-6-mohamed@unpredictable.fr/mbox/", "series": [ { "id": 502138, "url": "http://patchwork.ozlabs.org/api/1.1/series/502138/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502138", "date": "2026-04-29T19:05:29", "name": "HVF: Add support for platform vGIC and nested virtualisation", "version": 21, "mbox": "http://patchwork.ozlabs.org/series/502138/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2230485/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2230485/checks/", "tags": {}, "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=unpredictable.fr header.i=@unpredictable.fr\n header.a=rsa-sha256 header.s=sig1 header.b=Sr6Qp476;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g5RdQ1MwQz1xqf\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 30 Apr 2026 05:07:38 +1000 (AEST)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wIAET-0001kh-GD; Wed, 29 Apr 2026 15:06:01 -0400", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <mohamed@unpredictable.fr>)\n id 1wIAER-0001j8-FI\n for qemu-devel@nongnu.org; Wed, 29 Apr 2026 15:05:59 -0400", "from p-west3-cluster3-host11-snip4-1.eps.apple.com ([57.103.72.212]\n helo=outbound.ms.icloud.com)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <mohamed@unpredictable.fr>)\n id 1wIAEO-0000Kl-SC\n for qemu-devel@nongnu.org; Wed, 29 Apr 2026 15:05:59 -0400", "from outbound.ms.icloud.com (unknown [127.0.0.2])\n by p00-icloudmta-asmtp-us-west-3a-60-percent-6 (Postfix) with ESMTPS id\n 217F218002FE; Wed, 29 Apr 2026 19:05:52 +0000 (UTC)", "from localhost.localdomain (unknown [17.57.154.37])\n by p00-icloudmta-asmtp-us-west-3a-60-percent-6 (Postfix) with ESMTPSA id\n 0656718000C6; Wed, 29 Apr 2026 19:05:49 +0000 (UTC)" ], "X-ICL-Out-Info": "\n HUtFAUMHWwJACUgBTUQeDx5WFlZNRAJCTQFIHV8DWRxBAUkdXw9LVxQEFVwFVgZXFHkNXR1FDlYZWgxSD1sOHBZLWFUJCgZdGFgVVgl3HlwASx1XBFQfUxJVHR0LRUtAEwRJB01fDl4fBBdGGVUERx5dVl4eGQJRHFYNV0NUBF9QSQxBUGxaAEcXSB1dGVlvUF0cDhhZG0AVXRFQGVYJXhUXHkFNWgJWTQVKA18BWwZCAEkKXQJYAF4LTgZeD0YEXVQXWwxaDlYwTBZDH1IPWxNNGVEBUkVUAgdYRxRHDg8TTAtHAlo0Vh9UGVoD", "Dkim-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1777489555; x=1780081555;\n bh=yZx98LY09BbocJ00r+qP/G0lHxvenoMAqxbVzoJVGvM=;\n h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme;\n b=Sr6Qp476EEXI24h9Ujz6MKi0y9lVP4PcMrVelIzu5nS+Uea+p8jS8CBgHyJaefMZHB2xARe3qrjvZBKTDKVlw0lJ675UIYtYSItjMDBq/mtmF+aMBhbNVVvSMKO/D26ptnFwKJhp+CmmUIjSM5oCfV8tNIHXbjy/W9flthJz98bmaO977tEPvNYkGGp1md8C9ULoDK5WktVo6nMXvM/ouQm5QDMDIvdpqZKH3Y1olIgdl2oihSsktbyAgJgZiFUkHdi8Aqhrsk0E+TcliOV1LWE28gZ3BSfJn4IHFlOSVMLVNJKT7dJeK/+YNbCEUfkAbX3LgnsVjVdB+IeRPYvsYw==", "mail-alias-created-date": "1752046281608", "From": "Mohamed Mediouni <mohamed@unpredictable.fr>", "To": "qemu-devel@nongnu.org", "Cc": "Phil Dennis-Jordan <phil@philjordan.eu>,\n Yanan Wang <wangyanan55@huawei.com>, Paolo Bonzini <pbonzini@redhat.com>,\n Roman Bolshakov <rbolshakov@ddn.com>,\n =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>,\n qemu-arm@nongnu.org, Zhao Liu <zhao1.liu@intel.com>,\n Alexander Graf <agraf@csgraf.de>, Eduardo Habkost <eduardo@habkost.net>,\n Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,\n Peter Maydell <peter.maydell@linaro.org>,\n Mohamed Mediouni <mohamed@unpredictable.fr>,\n Manos Pitsidianakis <manos.pitsidianakis@linaro.org>", "Subject": "[PATCH v21 05/15] hw/arm, target/arm: nested virtualisation on HVF", "Date": "Wed, 29 Apr 2026 21:05:22 +0200", "Message-ID": "<20260429190532.26538-6-mohamed@unpredictable.fr>", "X-Mailer": "git-send-email 2.50.1", "In-Reply-To": "<20260429190532.26538-1-mohamed@unpredictable.fr>", "References": "<20260429190532.26538-1-mohamed@unpredictable.fr>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Proofpoint-ORIG-GUID": "kspU_qUsSzrKKmFb6jubd9SpNh7-zUtU", "X-Proofpoint-Spam-Details-Enc": "AW1haW4tMjYwNDI5MDE5MCBTYWx0ZWRfX6F4K8/9kStRJ\n CMR6ZKTunqQ6Td2vjHQwDjXKDrgLYjRU7vt92usi3TJXkR6MRFi5e4vu+L/CB23GoNQP/AYzza0\n 30jjTPZi2UUB6uMdeCPSq3KdQvhP82ot/rHEOIYBGljibb41nRRti1yy8nqwmAJgABHM+jxWSI8\n EKEonzrY1JJ26v6gj7hModGeQsmJnfztVlKDXYIyX0TZwtUtGUjiE42h/S/bdNpSN6MiEh01Ht+\n WuI6ODetJIxdQA5u+8J8YayVVMOUvhHBYtcEvdpExhgAjrPm6aSsbl/5+zgbZTmBk59b6x8jE4C\n wcAENiX6c4aoKH/vNumrVO5LhFEuRFuRwFftE1FsJabW2l6d0S9+ZkxgnC6ozM=", "X-Proofpoint-GUID": "kspU_qUsSzrKKmFb6jubd9SpNh7-zUtU", "X-Authority-Info-Out": "v=2.4 cv=d7H4CBjE c=1 sm=1 tr=0 ts=69f25692\n cx=c_apl:c_pps:t_out a=qkKslKyYc0ctBTeLUVfTFg==:117 a=A5OVakUREuEA:10\n a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=G65AtosZd4T4P2EQXfAA:9\n a=cvBusfyB2V15izCimMoJ:22", "Received-SPF": "pass client-ip=57.103.72.212;\n 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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n SPF_HELO_PASS=-0.001,\n 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": "qemu development <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "Add hvf_arm_el2_supported for querying EL2 availability.\nAn hvf_nested_virt_enable workaround is added as nested virt has\nto be enabled early on HVF.\n\nAnd adds hvf_nested_virt_enabled.\n\nSigned-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>\nReviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>\n---\n accel/hvf/hvf-all.c | 5 +++++\n accel/stubs/hvf-stub.c | 10 ++++++++++\n hw/arm/virt.c | 5 +++++\n include/system/hvf.h | 5 +++++\n target/arm/hvf/hvf.c | 42 ++++++++++++++++++++++++++++++++++++++++--\n 5 files changed, 65 insertions(+), 2 deletions(-)", "diff": "diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c\nindex add265e0c8..48c653630f 100644\n--- a/accel/hvf/hvf-all.c\n+++ b/accel/hvf/hvf-all.c\n@@ -24,6 +24,11 @@\n \n bool hvf_allowed;\n bool hvf_kernel_irqchip;\n+bool hvf_nested_virt;\n+\n+void hvf_nested_virt_enable(bool nested_virt) {\n+ hvf_nested_virt = nested_virt;\n+}\n \n const char *hvf_return_string(hv_return_t ret)\n {\ndiff --git a/accel/stubs/hvf-stub.c b/accel/stubs/hvf-stub.c\nindex 6bd08759ba..dc365c5307 100644\n--- a/accel/stubs/hvf-stub.c\n+++ b/accel/stubs/hvf-stub.c\n@@ -11,3 +11,13 @@\n \n bool hvf_allowed;\n bool hvf_kernel_irqchip;\n+bool hvf_nested_virt;\n+\n+void hvf_nested_virt_enable(bool nested_virt) {\n+ /*\n+ * This is called unconditionally from hw/arm/virt.c\n+ * because we don't know if HVF is going to be used\n+ * as that step of initialisation happens later.\n+ * As such, do nothing here instead of marking as unreachable.\n+ */\n+}\ndiff --git a/hw/arm/virt.c b/hw/arm/virt.c\nindex 47400214a2..ca50411020 100644\n--- a/hw/arm/virt.c\n+++ b/hw/arm/virt.c\n@@ -2987,6 +2987,11 @@ static void virt_set_virt(Object *obj, bool value, Error **errp)\n VirtMachineState *vms = VIRT_MACHINE(obj);\n \n vms->virt = value;\n+ /*\n+ * At this point, HVF is not initialised yet.\n+ * However, it needs to know if nested virt is enabled at init time.\n+ */\n+ hvf_nested_virt_enable(value);\n }\n \n static bool virt_get_highmem(Object *obj, Error **errp)\ndiff --git a/include/system/hvf.h b/include/system/hvf.h\nindex dc8da85979..a961df8b95 100644\n--- a/include/system/hvf.h\n+++ b/include/system/hvf.h\n@@ -28,11 +28,16 @@ extern bool hvf_allowed;\n #define hvf_enabled() (hvf_allowed)\n extern bool hvf_kernel_irqchip;\n #define hvf_irqchip_in_kernel() (hvf_kernel_irqchip)\n+extern bool hvf_nested_virt;\n+#define hvf_nested_virt_enabled() (hvf_nested_virt)\n #else /* !CONFIG_HVF_IS_POSSIBLE */\n #define hvf_enabled() 0\n #define hvf_irqchip_in_kernel() 0\n+#define hvf_nested_virt_enabled() 0\n #endif /* !CONFIG_HVF_IS_POSSIBLE */\n \n+void hvf_nested_virt_enable(bool nested_virt);\n+\n #define TYPE_HVF_ACCEL ACCEL_CLASS_NAME(\"hvf\")\n \n typedef struct HVFState HVFState;\ndiff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c\nindex a028c99e24..09f41094e5 100644\n--- a/target/arm/hvf/hvf.c\n+++ b/target/arm/hvf/hvf.c\n@@ -27,6 +27,7 @@\n #include \"system/memory.h\"\n #include \"hw/core/boards.h\"\n #include \"hw/core/irq.h\"\n+#include \"hw/arm/virt.h\"\n #include \"qemu/main-loop.h\"\n #include \"system/cpus.h\"\n #include \"arm-powerctl.h\"\n@@ -1103,6 +1104,10 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)\n (1ULL << ARM_FEATURE_PMU) |\n (1ULL << ARM_FEATURE_GENERIC_TIMER);\n \n+ if (hvf_nested_virt_enabled()) {\n+ ahcf->features |= 1ULL << ARM_FEATURE_EL2;\n+ }\n+\n for (i = 0; i < ARRAY_SIZE(regs); i++) {\n r |= hv_vcpu_config_get_feature_reg(config, regs[i].reg,\n &host_isar.idregs[regs[i].index]);\n@@ -1218,6 +1223,19 @@ void hvf_arch_vcpu_destroy(CPUState *cpu)\n assert_hvf_ok(ret);\n }\n \n+static bool hvf_arm_el2_supported(void)\n+{\n+ bool is_nested_virt_supported;\n+ if (__builtin_available(macOS 15.0, *)) {\n+ hv_return_t ret = hv_vm_config_get_el2_supported(&is_nested_virt_supported);\n+ assert_hvf_ok(ret);\n+ } else {\n+ return false;\n+ }\n+ return is_nested_virt_supported;\n+}\n+\n+\n hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range)\n {\n hv_return_t ret;\n@@ -1229,6 +1247,20 @@ hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range)\n }\n chosen_ipa_bit_size = pa_range;\n \n+ if (__builtin_available(macOS 15.0, *)) {\n+ if (hvf_nested_virt_enabled()) {\n+ if (!hvf_arm_el2_supported()) {\n+ error_report(\"Nested virtualization not supported on this system.\");\n+ goto cleanup;\n+ }\n+ ret = hv_vm_config_set_el2_enabled(config, true);\n+ if (ret != HV_SUCCESS) {\n+ error_report(\"Failed to enable nested virtualization.\");\n+ goto cleanup;\n+ }\n+ }\n+ }\n+\n ret = hv_vm_create(config);\n if (hvf_irqchip_in_kernel()) {\n if (__builtin_available(macOS 15.0, *)) {\n@@ -1420,6 +1452,13 @@ static void hvf_psci_cpu_off(ARMCPU *arm_cpu)\n assert(ret == QEMU_ARM_POWERCTL_RET_SUCCESS);\n }\n \n+static int hvf_psci_get_target_el(void)\n+{\n+ if (hvf_nested_virt_enabled()) {\n+ return 2;\n+ }\n+ return 1;\n+}\n /*\n * Handle a PSCI call.\n *\n@@ -1441,7 +1480,6 @@ static bool hvf_handle_psci_call(CPUState *cpu, int *excp_ret)\n CPUState *target_cpu_state;\n ARMCPU *target_cpu;\n uint64_t entry;\n- int target_el = 1;\n int32_t ret = 0;\n \n trace_arm_psci_call(param[0], param[1], param[2], param[3],\n@@ -1495,7 +1533,7 @@ static bool hvf_handle_psci_call(CPUState *cpu, int *excp_ret)\n entry = param[2];\n context_id = param[3];\n ret = arm_set_cpu_on(mpidr, entry, context_id,\n- target_el, target_aarch64);\n+ hvf_psci_get_target_el(), target_aarch64);\n break;\n case QEMU_PSCI_0_1_FN_CPU_OFF:\n case QEMU_PSCI_0_2_FN_CPU_OFF:\n", "prefixes": [ "v21", "05/15" ] }