From nobody Mon Feb 9 12:43:17 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=1770301924; cv=none; d=zohomail.com; s=zohoarc; b=cF7y9zeHABhkRnbsSaYls3JELT3suxzGJ3MtaslO/CXDeyrlZrvs7AhULVsIMk1gXbYljlN9rhTpWh/X3JDWiU2Bn6AQmbiUfN4bZu3xnei3HsHrhilwuFFL4sR7IgHpuYW9oS52sfBJjWa5475EMdXtU2IzVx6UBvgh7cEfeSM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770301924; 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=E+EVlaYd4DFvMgTTrp6ruOR6cr2IXuAiLwM1qxEWucg=; b=BjJe1SrxanLZL3hnXTZZ5sDF7r41guTZy2/Wjk3+vniGnN5fryfR+maJMV1feYp6D2kuyU2s5jbPZ+6JzQXADTrLhue+BeU4AOeBTDbtyqPWyqSRRR5ibMKwo7zb0Ha+8NpAYPVisuIvR88yJCemuRg7D8LlPqQpQoYiPB6GkYY= 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 1770301924738589.7430484130607; Thu, 5 Feb 2026 06:32:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vo0K0-0001Wk-5f; Thu, 05 Feb 2026 09:27:04 -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 1vo0Jn-0001BB-3v for qemu-devel@nongnu.org; Thu, 05 Feb 2026 09:26:52 -0500 Received: from qs-2004c-snip4-10.eps.apple.com ([57.103.84.32] 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 1vo0Jj-00083o-M3 for qemu-devel@nongnu.org; Thu, 05 Feb 2026 09:26:50 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-100-percent-2 (Postfix) with ESMTPS id 23FE81800DA6; Thu, 5 Feb 2026 14:26:38 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-100-percent-2 (Postfix) with ESMTPSA id 9A3D61800D90; Thu, 5 Feb 2026 14:26:34 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1770301607; x=1772893607; bh=E+EVlaYd4DFvMgTTrp6ruOR6cr2IXuAiLwM1qxEWucg=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=gONRJ88pU+XI3nNh66sUojpMrLw3D0r7A5AzXffohjrrM7Qb8K2vM6ua0AcEjKLVn1ZMMgWult6LgdqLe+OZ71CfIbsCOet6ZRNr4YAXKDFDe89DFXlS6oQgECDvjWmCr5+TWnl8HSmVY5z/N7bdzJDRMTsD8crrjfhMudk9Mbiaw7bc5ncNFtNCtb0ubZ34ytQsU56qT4tgKcZnOOJCyJmQ/a3XlOSrTYa2dT/VpfnQOx3hzi82RJWSojIqTqWD1BSy/vKvbISv0JFhO+yekKndaMbSjLCj8Ra4PCYwM0zKjaehcXnWrlG2LSfw5DOdlngglTim2cDclJUQao6MiQ== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org, mohamed@unpredictable.fr Cc: Zhao Liu , Paolo Bonzini , Akihiko Odaki , Cameron Esfahani , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Shannon Zhao , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Phil Dennis-Jordan , "Michael S. Tsirkin" , Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Alexander Graf , Pedro Barbuda , Yanan Wang , Ani Sinha , Igor Mammedov , Marcel Apfelbaum , Peter Maydell , Eduardo Habkost , Roman Bolshakov , Pierrick Bouvier Subject: [PATCH v21 17/22] whpx: arm64: clamp down IPA size Date: Thu, 5 Feb 2026 15:25:35 +0100 Message-ID: <20260205142543.64818-18-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260205142543.64818-1-mohamed@unpredictable.fr> References: <20260205142543.64818-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: Y7m9015v_PRXQ696QRxWtj2ItiixJZGi X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjA1MDEwOSBTYWx0ZWRfX4T3VwFN+vH98 dzNchIvPmGKFqMkfSzzJVy6jz3E1EQlmpWP5y2jEfB9EcuD4DqOcTlr/hFbV3M+TyJjeJ/2ehva /Mtl6xr33xTY+iF2N47Tslv8KJ1Wt235fAYFCuhdB9B2ZMI1CSg58UkyL9qHe5l2BVu6VmMznC9 pWF6QMUgdVL2gJKOi8C6x/kYZ6wjiG72WVi78gd2TPJVS3NA3FiEas4mMQvjAgyopMTtROc13+r 1jPvOB6OZe8XT+Ndqdp34lp++V2Ajvmzi2c6hoD+FJ92Ih0/PMpZtXSYBMgIYrLmgf6lJbwdsCp Ub+5imlwzWQ2bdfoTjg9+uG8WMWfGTOCMUOVOsG2/dA45B/TyxItu0kokuU17M= X-Authority-Info-Out: v=2.4 cv=WtAm8Nfv c=1 sm=1 tr=0 ts=6984a8a5 cx=c_apl:c_apl_out:c_pps a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=HzLeVaNsDn8A:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=wAo57kR77d7e8uaIccUA:9 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: Y7m9015v_PRXQ696QRxWtj2ItiixJZGi X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-02-05_03,2026-02-05_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 bulkscore=0 phishscore=0 mlxscore=0 adultscore=0 lowpriorityscore=0 malwarescore=0 mlxlogscore=999 clxscore=1030 spamscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2602050109 X-JNJ: AAAAAAABswFJnqw50OcW0OmVT9ZmbIEgEkoypN9ilmzgr2bdlZEdDRGzeEusemfbEEF3VmCeqYh7HmW3Q5AJpIJcPkIlEEX0ugK2y1P7O7MPc13/tSDWCfxmEbYyapUaho0vt3bYLyKemA1Ghu1Ps7ee6MfcMkIdMuqI2JqSObiJiUXAgBukJbsRiMic7ZlYV72YRZJSFw7gxI2mNGK/oxMbIhFJm7j6JmNCicUdK6ShxP/nNr2bcBOZulFEIJB7SqJEjIscnkhaOb//+hip24xYaAL1UIxenZu76NWedf6SABGllt2HxgiiYSF5JXoJXI607K54Y1KX/69YRBbGUUoN9/mr2ZRfkNAiHHSfLUWnLxNgvT9HxZe3fgJSjhYmaN9bmOE41FRFmQ/k78IM7B9Sex2UVXv0BQACV4A2RpMhJ2DpveMlJJeYeLLPYNaUto6zc+eQMqeNlySeUyFz/DV8FADrQTRs/4RmwQOTDpIe6PtlnLIjBe3EToOV0PWeFfJNP5iZKkeBxmglPHJnEz+Nuj6cfYGNgleExTvdd2+q15Ung+XKAMn1r6+CHuLPRJUjhaseaJjolB05YCsdx2vESw6VWzYUwPOZbYTgXBcDfBJe71NFaGFm1DSJY7DLeRDmm93Zg9XyOs2nu8whpB2tjDWMJo0nK1Al6T8botki2JqmJThcuTbx1c4gGCGiiEMEPDC0iHy+AduWyojpzoQqMlNUtx9Szp7OxGcGJ0cp1um3tZGiusTLr5GA5hcHUOv84D5rngXvPkrij0JP+UQg2P0leKZldOp3AHgSm+qrTnU6sd0mWFJcYvDoPX6lL9I50c3E/C32B5HZwZZasnTeL2zCAZ9zIuyzXYioHNQca+6QmLZ3+CjAtzPLBQwBcAu5T1c6UmIx6JPiUfkUPGEKVIru4nW6Vmzbdo1wXEV2L9QNR7Qj8P94zQvfPg== 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.32; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.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: 1770301927606154100 Content-Type: text/plain; charset="utf-8" Code taken from HVF and adapted for WHPX use. Note that WHPX doesn't have a default vs maximum IPA distinction. Signed-off-by: Mohamed Mediouni Reviewed-by: Pierrick Bouvier --- hw/arm/virt.c | 32 ++++++++++++++++++++++++++ include/hw/core/boards.h | 1 + target/arm/whpx/meson.build | 2 ++ target/arm/whpx/whpx-all.c | 45 +++++++++++++++++++++++++++++++++++++ target/arm/whpx/whpx-stub.c | 15 +++++++++++++ target/arm/whpx_arm.h | 16 +++++++++++++ 6 files changed, 111 insertions(+) create mode 100644 target/arm/whpx/whpx-stub.c create mode 100644 target/arm/whpx_arm.h diff --git a/hw/arm/virt.c b/hw/arm/virt.c index b7eb0cec5e..77832b566e 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -72,6 +72,7 @@ #include "hw/core/irq.h" #include "kvm_arm.h" #include "hvf_arm.h" +#include "whpx_arm.h" #include "hw/firmware/smbios.h" #include "qapi/visitor.h" #include "qapi/qapi-visit-common.h" @@ -3360,6 +3361,36 @@ static int virt_kvm_type(MachineState *ms, const cha= r *type_str) return fixed_ipa ? 0 : requested_pa_size; } =20 +static int virt_whpx_get_physical_address_range(MachineState *ms) +{ + VirtMachineState *vms =3D VIRT_MACHINE(ms); + + int max_ipa_size =3D whpx_arm_get_ipa_bit_size(); + + /* We freeze the memory map to compute the highest gpa */ + virt_set_memmap(vms, max_ipa_size); + + int requested_ipa_size =3D 64 - clz64(vms->highest_gpa); + + /* + * If we're <=3D the default IPA size just use the default. + * If we're above the default but below the maximum, round up to + * the maximum. whpx_arm_get_max_ipa_bit_size() conveniently only + * returns values that are valid ARM PARange values. + */ + if (requested_ipa_size <=3D max_ipa_size) { + requested_ipa_size =3D max_ipa_size; + } else { + error_report("-m and ,maxmem option values " + "require an IPA range (%d bits) larger than " + "the one supported by the host (%d bits)", + requested_ipa_size, max_ipa_size); + return -1; + } + + return requested_ipa_size; +} + static int virt_hvf_get_physical_address_range(MachineState *ms) { VirtMachineState *vms =3D VIRT_MACHINE(ms); @@ -3459,6 +3490,7 @@ static void virt_machine_class_init(ObjectClass *oc, = const void *data) mc->get_default_cpu_node_id =3D virt_get_default_cpu_node_id; mc->kvm_type =3D virt_kvm_type; mc->hvf_get_physical_address_range =3D virt_hvf_get_physical_address_r= ange; + mc->whpx_get_physical_address_range =3D virt_whpx_get_physical_address= _range; assert(!mc->get_hotplug_handler); mc->get_hotplug_handler =3D virt_machine_get_hotplug_handler; hc->pre_plug =3D virt_machine_device_pre_plug_cb; diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index 07f8938752..0b2aefb126 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -278,6 +278,7 @@ struct MachineClass { void (*wakeup)(MachineState *state); int (*kvm_type)(MachineState *machine, const char *arg); int (*hvf_get_physical_address_range)(MachineState *machine); + int (*whpx_get_physical_address_range)(MachineState *machine); =20 BlockInterfaceType block_default_type; int units_per_default_bus; diff --git a/target/arm/whpx/meson.build b/target/arm/whpx/meson.build index 1de2ef0283..3df632c9d3 100644 --- a/target/arm/whpx/meson.build +++ b/target/arm/whpx/meson.build @@ -1,3 +1,5 @@ arm_system_ss.add(when: 'CONFIG_WHPX', if_true: files( 'whpx-all.c', )) + +arm_common_system_ss.add(when: 'CONFIG_WHPX', if_false: files('whpx-stub.c= ')) diff --git a/target/arm/whpx/whpx-all.c b/target/arm/whpx/whpx-all.c index 192d7ec7a8..850f6ec81f 100644 --- a/target/arm/whpx/whpx-all.c +++ b/target/arm/whpx/whpx-all.c @@ -35,6 +35,7 @@ #include "system/whpx-accel-ops.h" #include "system/whpx-all.h" #include "system/whpx-common.h" +#include "whpx_arm.h" #include "hw/arm/bsa.h" #include "arm-powerctl.h" =20 @@ -633,6 +634,40 @@ static void whpx_cpu_update_state(void *opaque, bool r= unning, RunState state) { } =20 +uint32_t whpx_arm_get_ipa_bit_size(void) +{ + WHV_CAPABILITY whpx_cap; + UINT32 whpx_cap_size; + HRESULT hr; + hr =3D whp_dispatch.WHvGetCapability( + WHvCapabilityCodePhysicalAddressWidth, &whpx_cap, + sizeof(whpx_cap), &whpx_cap_size); + if (FAILED(hr)) { + error_report("WHPX: failed to get supported " + "physical address width, hr=3D%08lx", hr); + } + + /* + * We clamp any IPA size we want to back the VM with to a valid PARange + * value so the guest doesn't try and map memory outside of the valid = range. + * This logic just clamps the passed in IPA bit size to the first valid + * PARange value <=3D to it. + */ + return round_down_to_parange_bit_size(whpx_cap.PhysicalAddressWidth); +} + +static void clamp_id_aa64mmfr0_parange_to_ipa_size(ARMISARegisters *isar) +{ + uint32_t ipa_size =3D whpx_arm_get_ipa_bit_size(); + uint64_t id_aa64mmfr0; + + /* Clamp down the PARange to the IPA size the kernel supports. */ + uint8_t index =3D round_down_to_parange_index(ipa_size); + id_aa64mmfr0 =3D GET_IDREG(isar, ID_AA64MMFR0); + id_aa64mmfr0 =3D (id_aa64mmfr0 & ~R_ID_AA64MMFR0_PARANGE_MASK) | index; + SET_IDREG(isar, ID_AA64MMFR0, id_aa64mmfr0); +} + int whpx_init_vcpu(CPUState *cpu) { HRESULT hr; @@ -706,6 +741,7 @@ int whpx_init_vcpu(CPUState *cpu) val.Reg64 =3D deposit64(arm_cpu->mp_affinity, 31, 1, 1 /* RES1 */); whpx_set_reg(cpu, WHvArm64RegisterMpidrEl1, val); =20 + clamp_id_aa64mmfr0_parange_to_ipa_size(&arm_cpu->isar); return 0; } =20 @@ -722,6 +758,8 @@ int whpx_accel_init(AccelState *as, MachineState *ms) UINT32 whpx_cap_size; WHV_PARTITION_PROPERTY prop; WHV_CAPABILITY_FEATURES features; + MachineClass *mc =3D MACHINE_GET_CLASS(ms); + int pa_range =3D 0; =20 whpx =3D &whpx_global; /* on arm64 Windows Hypervisor Platform, vGICv3 always used */ @@ -732,6 +770,13 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } =20 + if (mc->whpx_get_physical_address_range) { + pa_range =3D mc->whpx_get_physical_address_range(ms); + if (pa_range < 0) { + return -EINVAL; + } + } + whpx->mem_quota =3D ms->ram_size; =20 hr =3D whp_dispatch.WHvGetCapability( diff --git a/target/arm/whpx/whpx-stub.c b/target/arm/whpx/whpx-stub.c new file mode 100644 index 0000000000..32e434a5f6 --- /dev/null +++ b/target/arm/whpx/whpx-stub.c @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * WHPX stubs for ARM + * + * Copyright (c) 2025 Mohamed Mediouni + * + */ + +#include "qemu/osdep.h" +#include "whpx_arm.h" + +uint32_t whpx_arm_get_ipa_bit_size(void) +{ + g_assert_not_reached(); +} diff --git a/target/arm/whpx_arm.h b/target/arm/whpx_arm.h new file mode 100644 index 0000000000..de7406b66f --- /dev/null +++ b/target/arm/whpx_arm.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * WHPX support -- ARM specifics + * + * Copyright (c) 2025 Mohamed Mediouni + * + */ + +#ifndef QEMU_WHPX_ARM_H +#define QEMU_WHPX_ARM_H + +#include "target/arm/cpu-qom.h" + +uint32_t whpx_arm_get_ipa_bit_size(void); + +#endif --=20 2.50.1 (Apple Git-155)