starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:10 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

hw/arm, accel/hvf, whpx: unify get_physical_address_range between WHPX and HVF

Browse Source 
Signed-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Mohamed Mediouni
2026-02-10 11:34:49 +00:00
committed by Peter Maydell
parent ea475a5ebb
commit 293984563e
10 changed files with 33 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
accel/hvf/hvf-all.c
View File

@@ -18,6 +18,7 @@
#include "system/hvf_int.h"
#include "hw/core/cpu.h"
#include "hw/core/boards.h"
#include "target/arm/hvf_arm.h"
#include "trace.h"
bool hvf_allowed;
@@ -186,8 +187,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;
}

43
hw/arm/virt.c
View File

@@ -3361,12 +3361,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);
@@ -3375,39 +3374,8 @@ static int virt_whpx_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. whpx_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);
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.
* the maximum. hvf/whpx_arch_get_max_ipa_bit_size() conveniently only
* return values that are valid ARM PARange values.
*/
if (requested_ipa_size <= default_ipa_size) {
requested_ipa_size = default_ipa_size;
@@ -3489,8 +3457,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data)
mc->get_valid_cpu_types = virt_get_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;

4
include/hw/core/boards.h
View File

@@ -277,8 +277,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;

4
include/system/hvf_int.h
View File

@@ -57,6 +57,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);
void hvf_kick_vcpu_thread(CPUState *cpu);
/* Must be called by the owning thread */
@@ -107,5 +109,7 @@ int hvf_update_guest_debug(CPUState *cpu);
bool hvf_arch_supports_guest_debug(void);
bool hvf_arch_cpu_realize(CPUState *cpu, Error **errp);
uint32_t hvf_arch_get_default_ipa_bit_size(void);
uint32_t hvf_arch_get_max_ipa_bit_size(void);
#endif

20
target/arm/hvf-stub.c
View File

@@ -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();
}

6
target/arm/hvf/hvf.c
View File

@@ -825,7 +825,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. */
@@ -921,7 +921,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);
@@ -930,7 +930,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);

3
target/arm/hvf_arm.h
View File

@@ -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

1
target/arm/meson.build
View File

@@ -41,7 +41,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(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING',
if_true: files('common-semi-target.c'))
arm_common_system_ss.add(files(

5
target/arm/whpx/whpx-all.c
View File

@@ -770,8 +770,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;
}

11
target/i386/hvf/hvf.c
View File

@@ -228,6 +228,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);