From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from outbound.qs.icloud.com (p-east3-cluster1-host10-snip4-3.eps.apple.com [57.103.87.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB8962FB98B for ; Sat, 20 Sep 2025 14:02:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=57.103.87.96 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758376977; cv=none; b=oleWh+IJdLqLf3qyDhdyYiOhnqodyMJ4MLEQHWMpjIw+TxBwKP1UaxN2zmV268VgpTAZ1wk7OALg/En47AkT5Sl3mX3AWgsiUHvE+cKrkDgXe6+irbwDHgbi5WgJQj70pM0s84xqjZUquBWxUV6CPt/ubNFXL47jL/mTcDeKO3A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758376977; c=relaxed/simple; bh=kCKVgmYlCjobL+vTDQ8t21nhtxD8Ro6Uhx9fB38izgA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nJ6PaBEVZKkRTL0PLGXr7RXZc49V3TqvENIFLYxD3QIgzL1ULWbRS98rJImT9s362YflI9y7nX9Zprv6zRp6cIavWzuToiEbIGv2heGj3QQE4KfpFiwVM+07CbBDPIPPS3hDxivRF3erV8YeLW10XxRFpabN1CcxiGbV7edfRXE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=unpredictable.fr; spf=pass smtp.mailfrom=unpredictable.fr; dkim=pass (2048-bit key) header.d=unpredictable.fr header.i=@unpredictable.fr header.b=P1Ep/Xbt; arc=none smtp.client-ip=57.103.87.96 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=unpredictable.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=unpredictable.fr Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=unpredictable.fr header.i=@unpredictable.fr header.b="P1Ep/Xbt" Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-100-percent-3 (Postfix) with ESMTPS id 99F8E1817068; Sat, 20 Sep 2025 14:02:51 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=l47ShR3yc+s9lDuu6R+V9xY1Vhd6/20jPB9AbLb/Opc=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=P1Ep/XbtyG6MWCl8xubUmooiDOMSyX7plVQRztwD04tTilok6Eh33T5+rdGqLNpwATjA6fmSx9sVcuD6xs90BW2h3m6EybKKdb7p/VE3D7+Mh+8IMuPpccAx41aIqtgzx+2festmLrW1L+5uF97eaCrDlabflnGFu2r0q/IaKqMreTk+8hh/N9npqrLDx2yYDfefEygpJ97Z09Aj3s6u8fmtUK+ZmUq16jPFm+MrAppy40NBMnxeQV2w7nSbJ9RV6x8kZxAsC5QO7DSDhrSJdcpMJkYJKizf/MJycplvV1Tr6E65JBsAenPmwTPZ/R9j9vy4w4aU84zvXBUuGCR4BA== mail-alias-created-date: 1752046281608 Received: from localhost.localdomain (qs-asmtp-me-k8s.p00.prod.me.com [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-100-percent-3 (Postfix) with ESMTPSA id 058B918172D7; Sat, 20 Sep 2025 14:02:14 +0000 (UTC) From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Shannon Zhao , Yanan Wang , Phil Dennis-Jordan , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Paolo Bonzini , Zhao Liu , "Michael S. Tsirkin" , kvm@vger.kernel.org, Igor Mammedov , qemu-arm@nongnu.org, Richard Henderson , Roman Bolshakov , Pedro Barbuda , Alexander Graf , Sunil Muthuswamy , Eduardo Habkost , Ani Sinha , Marcel Apfelbaum , Mohamed Mediouni , Peter Maydell , Pierrick Bouvier Subject: [PATCH v6 16/23] hw/arm, accel/hvf, whpx: unify get_physical_address_range between WHPX and HVF Date: Sat, 20 Sep 2025 16:01:17 +0200 Message-ID: <20250920140124.63046-17-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250920140124.63046-1-mohamed@unpredictable.fr> References: <20250920140124.63046-1-mohamed@unpredictable.fr> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTIwMDEzNiBTYWx0ZWRfX6cKorakJhLF/ HG3b5fNKtOd19M+bBQzfmioc7I9h5JoPxN6eH5aLysIGTZG+8AiQ3U7zAmfA8FN+LphErQqTNe3 2QJ23vqHmAw2d/0kC+F3UsNMAMQcQslxqVv8I2v2WldLbHkec/7IYFuqeTKgnJBBxVAz/JnteUh Ez+f5mv15awnxERMGa7g3jkymhnl6QIyiZGJFYRvPbcVrXv+XVrGLxypTw23v8e5i1nWP+u4J7T 4GSl7MASgSrVfD1f8UHV1k2DksIYXNN3jrcuHWa6TGB73G0jzX/rRfXYh3xSXJU213OMeqGx8= X-Proofpoint-ORIG-GUID: cmUXp0vwt5Z4qa6CwC3Cj9BNtQYvndZd X-Proofpoint-GUID: cmUXp0vwt5Z4qa6CwC3Cj9BNtQYvndZd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-09-20_05,2025-09-19_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxlogscore=999 malwarescore=0 adultscore=0 mlxscore=0 suspectscore=0 spamscore=0 clxscore=1030 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2509200136 X-JNJ: AAAAAAABE2loG5JZbXg/q7OCiGHoEfilORGrA0BIKu4MY+vFFfObt97A1jQGhHIF7dZelpAkVHHHH1p2Lw6JKDgeTMHXqzhEAynSBx7xUGhb8/fJ0mVmJWnJQDWoyKVSN+Jhz8qaw4z9o0Mrr7hPnJ7GmPCO9Xw9u3p3n0xblNcaXSSeRtwEajKcRFqnxauxUgOGPkzMFZnEW3BKWLuuqOLSc9WWZ4Mo4PN/R8Sa2Q/jo8FUb4RP3/8+JkQGQElbyWs1n2lyBNMnA+5XDoukRcPNyEOgynxECZn6hlZyROpp+I2K+yut/LUd7pPsyhD4+uolf6jjk/rP8X9CsdIZQM8T1FRWS5DpTO8RtpmaT1APLdiFDrIqR4OjYnQbbHd4+isc1A2skrCVeULGiSfed3WPBybkxfMLNrkCJmoH3DlArKCkMeZfAP0j+nVmWHw9dC7BNm49n6BiErS6urJ+h/I/wQNNa5/IA37UNTfqTjnee2g9sv6cHmafw7mr4fTErK0TywWfBQAI7cvcR46gxUr+DFE4/+CDBYBVbRd/+vCbtDJ5aZfqDgBSbZdQhZuUPDa09XMbRT/tuf6/ik38sJpo9InIEPdJML0pWFWqG2rmys/E9I2pnjNRBYNc2k0SZ81OAKvgQZWUUNWuPOOjpbM0dN5IQTHJIOkZn4I/zeHwr6+uk+o2hcoG9WQ6PTShNsXUzIhUbmLXEufPFSC9EQWpDMnnI6C5eTBKN3AWsGO0FnivRPeR8XThJbh7AoE30Le2ZAmUIoIPk+juhXM0NIRGtkrh5LbPKK5ss6z6nFh165A/6Awm2TjIXk9is+jDg7Hy/BcQx5Alh+JA/UUIpgCz1sRA5+ikKna4nYWx+0B8UD7z7BpdOqHDG6Ll2806Fq9Ne8D4qhZPtzklrNKVjpMQUrnvmw== Signed-off-by: Mohamed Mediouni Reviewed-by: Pierrick Bouvier --- accel/hvf/hvf-all.c | 7 +++++-- hw/arm/virt.c | 41 ++++---------------------------------- include/hw/boards.h | 4 ++-- include/system/hvf_int.h | 2 ++ target/arm/hvf-stub.c | 20 ------------------- target/arm/hvf/hvf.c | 6 +++--- target/arm/hvf_arm.h | 3 --- target/arm/meson.build | 1 - target/arm/whpx/whpx-all.c | 5 +++-- target/i386/hvf/hvf.c | 11 ++++++++++ 10 files changed, 30 insertions(+), 70 deletions(-) delete mode 100644 target/arm/hvf-stub.c diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c index 0a4b498e83..8229ad8640 100644 --- a/accel/hvf/hvf-all.c +++ b/accel/hvf/hvf-all.c @@ -17,6 +17,7 @@ #include "system/hvf_int.h" #include "hw/core/cpu.h" #include "hw/boards.h" +#include "target/arm/hvf_arm.h" #include "trace.h" bool hvf_allowed; @@ -256,8 +257,10 @@ static int hvf_accel_init(AccelState *as, MachineState *ms) int pa_range = 36; MachineClass *mc = MACHINE_GET_CLASS(ms); - if (mc->hvf_get_physical_address_range) { - pa_range = mc->hvf_get_physical_address_range(ms); + + if (mc->get_physical_address_range) { + pa_range = mc->get_physical_address_range(ms, + hvf_arch_get_default_ipa_bit_size(), hvf_arch_get_max_ipa_bit_size()); if (pa_range < 0) { return -EINVAL; } diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 1583902305..fd4eaee68d 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3237,43 +3237,11 @@ static int virt_kvm_type(MachineState *ms, const char *type_str) return fixed_ipa ? 0 : requested_pa_size; } -static int virt_whpx_get_physical_address_range(MachineState *ms) +static int virt_get_physical_address_range(MachineState *ms, + int default_ipa_size, int max_ipa_size) { VirtMachineState *vms = VIRT_MACHINE(ms); - int max_ipa_size = 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 = 64 - clz64(vms->highest_gpa); - - /* - * If we're <= the default IPA size just use the default. - * If we're above the default but below the maximum, round up to - * the maximum. hvf_arm_get_max_ipa_bit_size() conveniently only - * returns values that are valid ARM PARange values. - */ - if (requested_ipa_size <= max_ipa_size) { - requested_ipa_size = 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 = VIRT_MACHINE(ms); - - int default_ipa_size = hvf_arm_get_default_ipa_bit_size(); - int max_ipa_size = hvf_arm_get_max_ipa_bit_size(); - /* We freeze the memory map to compute the highest gpa */ virt_set_memmap(vms, max_ipa_size); @@ -3282,7 +3250,7 @@ static int virt_hvf_get_physical_address_range(MachineState *ms) /* * If we're <= the default IPA size just use the default. * If we're above the default but below the maximum, round up to - * the maximum. hvf_arm_get_max_ipa_bit_size() conveniently only + * the maximum. hvf_arch_get_max_ipa_bit_size() conveniently only * returns values that are valid ARM PARange values. */ if (requested_ipa_size <= default_ipa_size) { @@ -3358,8 +3326,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) mc->valid_cpu_types = valid_cpu_types; mc->get_default_cpu_node_id = virt_get_default_cpu_node_id; mc->kvm_type = virt_kvm_type; - mc->hvf_get_physical_address_range = virt_hvf_get_physical_address_range; - mc->whpx_get_physical_address_range = virt_whpx_get_physical_address_range; + mc->get_physical_address_range = virt_get_physical_address_range; assert(!mc->get_hotplug_handler); mc->get_hotplug_handler = virt_machine_get_hotplug_handler; hc->pre_plug = virt_machine_device_pre_plug_cb; diff --git a/include/hw/boards.h b/include/hw/boards.h index 3d01fb8cc9..aecf5ca92e 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -275,8 +275,8 @@ struct MachineClass { void (*reset)(MachineState *state, ResetType type); 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); + int (*get_physical_address_range)(MachineState *machine, + int default_ipa_size, int max_ipa_size); BlockInterfaceType block_default_type; int units_per_default_bus; diff --git a/include/system/hvf_int.h b/include/system/hvf_int.h index a3b06a3e75..8b6447c238 100644 --- a/include/system/hvf_int.h +++ b/include/system/hvf_int.h @@ -71,6 +71,8 @@ void assert_hvf_ok_impl(hv_return_t ret, const char *file, unsigned int line, const char *hvf_return_string(hv_return_t ret); int hvf_arch_init(void); hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range); +uint32_t hvf_arch_get_default_ipa_bit_size(void); +uint32_t hvf_arch_get_max_ipa_bit_size(void); int hvf_arch_init_vcpu(CPUState *cpu); void hvf_arch_vcpu_destroy(CPUState *cpu); int hvf_vcpu_exec(CPUState *); diff --git a/target/arm/hvf-stub.c b/target/arm/hvf-stub.c deleted file mode 100644 index ff137267a0..0000000000 --- a/target/arm/hvf-stub.c +++ /dev/null @@ -1,20 +0,0 @@ -/* - * QEMU Hypervisor.framework (HVF) stubs for ARM - * - * Copyright (c) Linaro - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#include "qemu/osdep.h" -#include "hvf_arm.h" - -uint32_t hvf_arm_get_default_ipa_bit_size(void) -{ - g_assert_not_reached(); -} - -uint32_t hvf_arm_get_max_ipa_bit_size(void) -{ - g_assert_not_reached(); -} diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index b77db99079..d77b8c7e1a 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -850,7 +850,7 @@ static uint64_t hvf_get_reg(CPUState *cpu, int rt) static void clamp_id_aa64mmfr0_parange_to_ipa_size(ARMISARegisters *isar) { uint32_t ipa_size = chosen_ipa_bit_size ? - chosen_ipa_bit_size : hvf_arm_get_max_ipa_bit_size(); + chosen_ipa_bit_size : hvf_arch_get_max_ipa_bit_size(); uint64_t id_aa64mmfr0; /* Clamp down the PARange to the IPA size the kernel supports. */ @@ -940,7 +940,7 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) return r == HV_SUCCESS; } -uint32_t hvf_arm_get_default_ipa_bit_size(void) +uint32_t hvf_arch_get_default_ipa_bit_size(void) { uint32_t default_ipa_size; hv_return_t ret = hv_vm_config_get_default_ipa_size(&default_ipa_size); @@ -949,7 +949,7 @@ uint32_t hvf_arm_get_default_ipa_bit_size(void) return default_ipa_size; } -uint32_t hvf_arm_get_max_ipa_bit_size(void) +uint32_t hvf_arch_get_max_ipa_bit_size(void) { uint32_t max_ipa_size; hv_return_t ret = hv_vm_config_get_max_ipa_size(&max_ipa_size); diff --git a/target/arm/hvf_arm.h b/target/arm/hvf_arm.h index ea82f2691d..5d19d82e5d 100644 --- a/target/arm/hvf_arm.h +++ b/target/arm/hvf_arm.h @@ -22,7 +22,4 @@ void hvf_arm_init_debug(void); 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); - #endif diff --git a/target/arm/meson.build b/target/arm/meson.build index 85cd68b9f4..6c49145611 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -33,7 +33,6 @@ arm_common_system_ss.add(files('cpu.c')) arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files( 'cpu32-stubs.c')) arm_common_system_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) -arm_common_system_ss.add(when: 'CONFIG_HVF', if_false: files('hvf-stub.c')) arm_common_system_ss.add(files( 'arch_dump.c', 'arm-powerctl.c', diff --git a/target/arm/whpx/whpx-all.c b/target/arm/whpx/whpx-all.c index 62fd6c230a..19513b50a3 100644 --- a/target/arm/whpx/whpx-all.c +++ b/target/arm/whpx/whpx-all.c @@ -808,8 +808,9 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } - if (mc->whpx_get_physical_address_range) { - pa_range = mc->whpx_get_physical_address_range(ms); + if (mc->get_physical_address_range) { + pa_range = mc->get_physical_address_range(ms, + whpx_arm_get_ipa_bit_size(), whpx_arm_get_ipa_bit_size()); if (pa_range < 0) { return -EINVAL; } diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index 8445cadece..0994b8643d 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -225,6 +225,17 @@ int hvf_arch_init(void) return 0; } +/* 48-bit on all Intel Macs. Function currently unused. */ +uint32_t hvf_arch_get_default_ipa_bit_size(void) +{ + g_assert_not_reached(); +} + +uint32_t hvf_arch_get_max_ipa_bit_size(void) +{ + g_assert_not_reached(); +} + hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range) { return hv_vm_create(HV_VM_DEFAULT); -- 2.50.1 (Apple Git-155)