kvm: add support for guest physical bits
v4 cover kvm: add support for guest physical bits
The matching kernel bits are here:
https://lore.kernel.org/kvm/[email protected]/T/
ovmf test patches are here:
https://github.com/kraxel/edk2/commits/devel/guest-phys-bits/
Gerd Hoffmann (2):
kvm: add support for guest physical bits
target/i386: add guest-phys-bits cpu property
target/i386/cpu.h | 1 + target/i386/cpu.c | 14 ++++++++++++++ target/i386/kvm/kvm-cpu.c | 31 ++++++++++++++++++++++++++++++- 3 files changed, 45 insertions(+), 1 deletion(-)
Signature · 1 line
2.44.0
PATCH v4 1/2 kvm: add support for guest physical bits
Query kvm for supported guest physical address bits, in cpuid function 80000008, eax[23:16]. Usually this is identical to host physical address bits. With NPT or EPT being used this might be restricted to 48 (max 4-level paging address space size) even if the host cpu supports more physical address bits.
When set pass this to the guest, using cpuid too. Guest firmware can use this to figure how big the usable guest physical address space is, so PCI bar mapping are actually reachable.
--- target/i386/cpu.h | 1 + target/i386/cpu.c | 1 + target/i386/kvm/kvm-cpu.c | 31 ++++++++++++++++++++++++++++++- 3 files changed, 32 insertions(+), 1 deletion(-)
target/i386/cpu.h +1 -0
@@ -2026,6 +2026,7 @@ struct ArchCPU {/* Number of physical address bits supported */ uint32_t phys_bits; +uint32_t guest_phys_bits;/* in order to simplify APIC support, we leave this pointer to the user */
target/i386/cpu.c +1 -0
@@ -6570,6 +6570,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,if (env->features[FEAT_8000_0001_EDX ] &CPUID_EXT2_LM ) {/* 64 bit processor */ *eax |= (cpu_x86_virtual_addr_width (env) <<8 ); + *eax |= (cpu->guest_phys_bits <<16 ); } *ebx = env->features[FEAT_8000_0008_EBX ];if (cs->nr_cores * cs->nr_threads >1 ) {
target/i386/kvm/kvm-cpu.c +30 -1
@@ -18,10 +18,33 @@#include "kvm_i386.h" #include "hw/core/accel-cpu.h" +static void kvm_set_guest_phys_bits (CPUState *cs) +{ +X86CPU *cpu =X86_CPU (cs); +uint32_t eax, guest_phys_bits; + + eax =kvm_arch_get_supported_cpuid (cs->kvm_state,0x80000008 ,0 ,R_EAX ); + guest_phys_bits = (eax >>16 ) &0xff ; +if (!guest_phys_bits) { +return ; + } + +if (cpu->guest_phys_bits ==0 || + cpu->guest_phys_bits > guest_phys_bits) { + cpu->guest_phys_bits = guest_phys_bits; + } + +if (cpu->host_phys_bits_limit && + cpu->guest_phys_bits > cpu->host_phys_bits_limit) { + cpu->guest_phys_bits = cpu->host_phys_bits_limit; + } +} +static bool kvm_cpu_realizefn (CPUState *cs,Error **errp) {X86CPU *cpu =X86_CPU (cs);CPUX86State *env = &cpu->env; +bool ret;/* * The realize order is important, since x86_cpu_realize() checks if
@@ -50,7 +73,13 @@ static bool kvm_cpu_realizefn(CPUState *cs, Error **errp) MSR_IA32_UCODE_REV); } } -return host_cpu_realizefn (cs, errp); + ret =host_cpu_realizefn (cs, errp); +if (!ret) { +return ret; + } + +kvm_set_guest_phys_bits (cs); +return true; }static bool lmce_supported (void )
Signature · 1 line
2.44.0
Quoted 58 lines · Gerd Hoffmann
Query kvm for supported guest physical address bits, in cpuid function 80000008, eax[23:16]. Usually this is identical to host physical address bits. With NPT or EPT being used this might be restricted to 48 (max 4-level paging address space size) even if the host cpu supports more physical address bits.
When set pass this to the guest, using cpuid too. Guest firmware can use this to figure how big the usable guest physical address space is, so PCI bar mapping are actually reachable.
Signed-off-by Gerd Hoffmann <[email protected]>--- target/i386/cpu.h | 1 + target/i386/cpu.c | 1 + target/i386/kvm/kvm-cpu.c | 31 ++++++++++++++++++++++++++++++- 3 files changed, 32 insertions(+), 1 deletion(-)target/i386/cpu.h +1
-0@@ -2026,6 +2026,7 @@ struct ArchCPU {/* Number of physical address bits supported */ uint32_t phys_bits; +uint32_t guest_phys_bits;/* in order to simplify APIC support, we leave this pointer to the user */ target/i386/cpu.c +1
-0@@ -6570,6 +6570,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,if (env->features[FEAT_8000_0001_EDX ] &CPUID_EXT2_LM ) {/* 64 bit processor */ *eax |= (cpu_x86_virtual_addr_width (env) <<8 ); + *eax |= (cpu->guest_phys_bits <<16 ); } *ebx = env->features[FEAT_8000_0008_EBX ];if (cs->nr_cores * cs->nr_threads >1 ) {target/i386/kvm/kvm-cpu.c +9
-0@@ -18,10 +18,33 @@#include "kvm_i386.h" #include "hw/core/accel-cpu.h" +static void kvm_set_guest_phys_bits (CPUState *cs) +{ +X86CPU *cpu =X86_CPU (cs); +uint32_t eax, guest_phys_bits; + + eax =kvm_arch_get_supported_cpuid (cs->kvm_state,0x80000008 ,0 ,R_EAX ); + guest_phys_bits = (eax >>16 ) &0xff ; +if (!guest_phys_bits) { +return ;
target/i386/kvm/kvm-cpu.c line 39
Quoted 10 lines
target/i386/kvm/kvm-cpu.c +10
-0+ } + +if (cpu->guest_phys_bits ==0 || + cpu->guest_phys_bits > guest_phys_bits) { + cpu->guest_phys_bits = guest_phys_bits; + } + +if (cpu->host_phys_bits_limit && + cpu->guest_phys_bits > cpu->host_phys_bits_limit) { + cpu->guest_phys_bits = cpu->host_phys_bits_limit;
host_phys_bits_limit takes effect only when cpu->host_phys_bits is set.
If users pass configuration like "-cpu qemu64,phys-bits=52,host-phys-bits-limit=45", the cpu->guest_phys_bits will be set to 45. I think this is not what we want, though the usage seems insane.
We can guard it as
if (cpu->host_phys_bits && cpu->host_phys_bits_limit &&
cpu->guest_phys_bits > cpu->host_phys_bits_limt)
{
}
Simpler, we can guard with cpu->phys_bits like below, because cpu->host_phys_bits_limit is used to guard cpu->phys_bits in host_cpu_realizefn()
if (cpu->guest_phys_bits > cpu->phys_bits) {
cpu->guest_phys_bits = cpu->phys_bits;
}with this resolved,
Quoted 26 lines
target/i386/kvm/kvm-cpu.c +11
-1+ } +} +static bool kvm_cpu_realizefn (CPUState *cs,Error **errp) {X86CPU *cpu =X86_CPU (cs);CPUX86State *env = &cpu->env; +bool ret;/* * The realize order is important, since x86_cpu_realize() checks if @@ -50,7 +73,13 @@ static bool kvm_cpu_realizefn(CPUState *cs, Error **errp) MSR_IA32_UCODE_REV); } } -return host_cpu_realizefn (cs, errp); + ret =host_cpu_realizefn (cs, errp); +if (!ret) { +return ret; + } + +kvm_set_guest_phys_bits (cs); +return true; }static bool lmce_supported (void )
Quoted 11 lines
target/i386/kvm/kvm-cpu.c line 39
Quoted 3 lines
target/i386/kvm/kvm-cpu.c +3
-0+if (cpu->host_phys_bits_limit && + cpu->guest_phys_bits > cpu->host_phys_bits_limit) { + cpu->guest_phys_bits = cpu->host_phys_bits_limit;
host_phys_bits_limittakes effect only whencpu->host_phys_bitsis set.If users pass configuration like "-cpu qemu64,phys-bits=52,host-phys-bits-limit=45", the
cpu->guest_phys_bitswill be set to 45. I think this is not what we want, though the usage seems insane.
Quoted 6 lines
We can guard it as
if (
cpu->host_phys_bits&&cpu->host_phys_bits_limit&&cpu->guest_phys_bits > cpu->host_phys_bits_limt){
}
Yes, makes sense.
Quoted 7 lines
Simpler, we can guard with
cpu->phys_bitslike below, becausecpu->host_phys_bits_limitis used to guardcpu->phys_bitsinhost_cpu_realizefn()if (cpu->guest_phys_bits > cpu->phys_bits) { cpu->guest_phys_bits = cpu->phys_bits; }
I think I prefer the first version. The logic is already difficult enough to follow because it is spread across a bunch of files due to the different cases we have to handle (tcg, kvm-with-host_phys_bits, kvm-without-host_phys_bits).
It's not in any way performance-critical, so I happily trade some extra checks for code which is easier to read.
take care,
Gerd
Paolo Bonzini
maintainerQuoted 16 lines · Xiaoyao Li
If users pass configuration like "-cpu qemu64,phys-bits=52,host-phys-bits-limit=45", the
cpu->guest_phys_bitswill be set to 45. I think this is not what we want, though the usage seems insane.We can guard it as
if (
cpu->host_phys_bits&&cpu->host_phys_bits_limit&&cpu->guest_phys_bits > cpu->host_phys_bits_limt){
}Simpler, we can guard with
cpu->phys_bitslike below, becausecpu->host_phys_bits_limitis used to guardcpu->phys_bitsinhost_cpu_realizefn()
Quoted 8 lines
if (cpu->guest_phys_bits > cpu->phys_bits) { cpu->guest_phys_bits = cpu->phys_bits; }with this resolved,
Reviewed-by Xiaoyao Li <[email protected]>
[oops sorry - I noticed now that this email was never sent, so I am sending it for archival]
There are more issues:
1) for compatibility with older machine types, the GuestPhysAddrSize should remain 0. One possibility is to have "-1" as "accelerator default" and "0" as "show it as zero in CPUID".
2) a "guest-phys-bits is not user-configurable in 32 bit" error is probably a good idea just like it does for cpu->phys_bits
3) I think the order of the patches makes more sense if the property is added first and KVM is adjusted second.
I'll post a v5 myself (mostly because it has to include the creation of 9.1 machine types).
Paolo
Quoted 27 lines
Quoted 16 lines
target/i386/kvm/kvm-cpu.c +4
-1+ } +} +static bool kvm_cpu_realizefn (CPUState *cs,Error **errp) {X86CPU *cpu =X86_CPU (cs);CPUX86State *env = &cpu->env; +bool ret;/* * The realize order is important, since x86_cpu_realize() checks if @@ -50,7 +73,13 @@ static bool kvm_cpu_realizefn(CPUState *cs, Error **errp) MSR_IA32_UCODE_REV); } } -return host_cpu_realizefn (cs, errp);target/i386/kvm/kvm-cpu.c static bool kvm_cpu_realizefn(CPUState *cs, Error **errp) · line 85
Quoted 10 lines
target/i386/kvm/kvm-cpu.c +7
-0+ ret =host_cpu_realizefn (cs, errp); +if (!ret) { +return ret; + } + +kvm_set_guest_phys_bits (cs); +return true; }static bool lmce_supported (void )Ther
PATCH v4 2/2 target/i386: add guest-phys-bits cpu property
In reply to Gerd HoffmannAllows to set guest-phys-bits (cpuid leaf 80000008, eax[23:16]) via -cpu $model,guest-phys-bits=$nr.
--- target/i386/cpu.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
target/i386/cpu.c +13 -0
@@ -7380,6 +7380,14 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)if (cpu->phys_bits ==0 ) { cpu->phys_bits =TCG_PHYS_ADDR_BITS ; } +if (cpu->guest_phys_bits && + (cpu->guest_phys_bits > cpu->phys_bits || + cpu->guest_phys_bits <32 )) { +error_setg (errp,"guest-phys-bits should be between 32 and %u " +" (but is %u)" , + cpu->phys_bits, cpu->guest_phys_bits); +return ; + } }else {/* For 32 bit systems don't use the user set value, but keep * phys_bits consistent with what we tell the guest.
@@ -7388,6 +7396,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)error_setg (errp,"phys-bits is not user-configurable in 32 bit" );return ; } +if (cpu->guest_phys_bits !=0 ) { +error_setg (errp,"guest-phys-bits is not user-configurable in 32 bit" ); +return ; + }if (env->features[FEAT_1_EDX ] & (CPUID_PSE36 |CPUID_PAE )) { cpu->phys_bits =36 ;
@@ -7888,6 +7900,7 @@ static Property x86_cpu_properties[] = {DEFINE_PROP_BOOL ("x-force-features" ,X86CPU , force_features, false),DEFINE_PROP_BOOL ("kvm" ,X86CPU , expose_kvm, true),DEFINE_PROP_UINT32 ("phys-bits" ,X86CPU , phys_bits,0 ), +DEFINE_PROP_UINT32 ("guest-phys-bits" ,X86CPU , guest_phys_bits,0 ),DEFINE_PROP_BOOL ("host-phys-bits" ,X86CPU , host_phys_bits, false),DEFINE_PROP_UINT8 ("host-phys-bits-limit" ,X86CPU , host_phys_bits_limit,0 ), DEFINE_PROP_BOOL("fill-mtrr-mask", X86CPU, fill_mtrr_mask, true),
Signature · 1 line
2.44.0