KVM: CPUID: emulation flow adjustment and one minor refinement when updating maxphyaddr
v2 cover KVM: CPUID: emulation flow adjustment and one minor refinement when updating maxphyaddr
Patch 1 adjusts the execution flow of CPUID instruction emulation, which checks the leaf number first per CPUID specification.
Patch 2 moves physical address width updating to where we check the virtual address width in function kvm_update_cpuid() since they two use the same cpuid leaf, which makes it more reasonable and no functional change.
Xiaoyao Li (2):
KVM: CPUID: Check limit first when emulating CPUID instruction
KVM: CPUID: Put maxphyaddr updating together with virtual address
width checking
arch/x86/kvm/cpuid.c | 57 ++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 23 deletions(-)
Signature · 1 line
2.19.1
PATCH v2 1/2 KVM: CPUID: Check limit first when emulating CPUID instruction
When limit checking is required, it should be executed first, which is consistent with the CPUID specification.
---
v2:
- correctly set entry_found in no limit checking case.
--- arch/x86/kvm/cpuid.c | 51 ++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 21 deletions(-)
arch/x86/kvm/cpuid.c +30 -21
@@ -952,23 +952,36 @@ struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu,EXPORT_SYMBOL_GPL (kvm_find_cpuid_entry);/* -* If no match is found, check whether we exceed the vCPU's limit -* and return the content of the highest valid _standard_ leaf instead. -* This is to satisfy the CPUID specification. +* Based on CPUID specification, if leaf number exceeds the vCPU's limit, +* it should return the content of the highest valid _standard_ leaf instead. +* Note: *found is set true only means the queried leaf number doesn't exceed +* the maximum leaf number of basic or extented leaf. */ -static struct kvm_cpuid_entry2 *check_cpuid_limit (struct kvm_vcpu *vcpu, -u32 function,u32 index) +static struct kvm_cpuid_entry2 *cpuid_check_limit (struct kvm_vcpu *vcpu, +u32 function,u32 index, +bool *found) {struct kvm_cpuid_entry2 *maxlevel; +if (found) + *found = false; + maxlevel =kvm_find_cpuid_entry (vcpu, function &0x80000000 ,0 ); -if (!maxlevel || maxlevel->eax >= function) +if (!maxlevel)return NULL ; -if (function &0x80000000 ) { - maxlevel =kvm_find_cpuid_entry (vcpu,0 ,0 ); -if (!maxlevel) -return NULL ; + +if (maxlevel->eax >= function) { +if (found) + *found = true; +return kvm_find_cpuid_entry (vcpu, function, index); } + +if (function &0x80000000 ) + maxlevel =kvm_find_cpuid_entry (vcpu,0 ,0 ); + +if (!maxlevel) +return NULL ; +return kvm_find_cpuid_entry (vcpu, maxlevel->eax, index); }
@@ -979,24 +992,20 @@ bool kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx,struct kvm_cpuid_entry2 *best;bool entry_found = true; - best =kvm_find_cpuid_entry (vcpu, function, index); - -if (!best) { - entry_found = false; -if (!check_limit) - goto out; - - best =check_cpuid_limit (vcpu, function, index); - } +if (check_limit) + best =cpuid_check_limit (vcpu, function, index, &entry_found); +else + best =kvm_find_cpuid_entry (vcpu, function, index); -out:if (best) { *eax = best->eax; *ebx = best->ebx; *ecx = best->ecx; *edx = best->edx; - }else + }else { + entry_found = false; *eax = *ebx = *ecx = *edx =0 ; + }trace_kvm_cpuid (function, *eax, *ebx, *ecx, *edx, entry_found);return entry_found; }
Signature · 1 line
2.19.1
Re: [PATCH v2 1/2] KVM: CPUID: Check limit first when emulating CPUID instruction
Quoted 18 lines · Xiaoyao Li
When limit checking is required, it should be executed first, which is consistent with the CPUID specification.
Signed-off-by Xiaoyao Li <[email protected]>---
v2:
- correctly setentry_foundin no limit checking case.--- arch/x86/kvm/cpuid.c | 51 ++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 21 deletions(-)arch/x86/kvm/cpuid.c +0
-0
arch/x86/kvm/cpuid.c struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu, · line 958
Quoted 10 lines
arch/x86/kvm/cpuid.c +4
-3@@ -952,23 +952,36 @@ struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu,EXPORT_SYMBOL_GPL (kvm_find_cpuid_entry);/* -* If no match is found, check whether we exceed the vCPU's limit -* and return the content of the highest valid _standard_ leaf instead. -* This is to satisfy the CPUID specification. +* Based on CPUID specification, if leaf number exceeds the vCPU's limit, +* it should return the content of the highest valid _standard_ leaf instead. +* Note: *found is set true only means the queried leaf number doesn't exceed +* the maximum leaf number of basic or extented leaf.
Nit: "extented" should be "extended."
A more serious problem is that the CPUID specification you quote is Intel's specification. AMD CPUs return zeroes in EAX, EBX, ECX, and EDX for all undefined leaves, whatever the input value for EAX. This code is supposed to be vendor-agnostic, right?
Quoted 71 lines
arch/x86/kvm/cpuid.c +26
-19*/ -static struct kvm_cpuid_entry2 *check_cpuid_limit (struct kvm_vcpu *vcpu, -u32 function,u32 index) +static struct kvm_cpuid_entry2 *cpuid_check_limit (struct kvm_vcpu *vcpu, +u32 function,u32 index, +bool *found) {struct kvm_cpuid_entry2 *maxlevel; +if (found) + *found = false; + maxlevel =kvm_find_cpuid_entry (vcpu, function &0x80000000 ,0 ); -if (!maxlevel || maxlevel->eax >= function) +if (!maxlevel)return NULL ; -if (function &0x80000000 ) { - maxlevel =kvm_find_cpuid_entry (vcpu,0 ,0 ); -if (!maxlevel) -return NULL ; + +if (maxlevel->eax >= function) { +if (found) + *found = true; +return kvm_find_cpuid_entry (vcpu, function, index); } + +if (function &0x80000000 ) + maxlevel =kvm_find_cpuid_entry (vcpu,0 ,0 ); + +if (!maxlevel) +return NULL ; +return kvm_find_cpuid_entry (vcpu, maxlevel->eax, index); }@@ -979,24 +992,20 @@ bool kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx,struct kvm_cpuid_entry2 *best;bool entry_found = true; - best =kvm_find_cpuid_entry (vcpu, function, index); - -if (!best) { - entry_found = false; -if (!check_limit) - goto out; - - best =check_cpuid_limit (vcpu, function, index); - } +if (check_limit) + best =cpuid_check_limit (vcpu, function, index, &entry_found); +else + best =kvm_find_cpuid_entry (vcpu, function, index); -out:if (best) { *eax = best->eax; *ebx = best->ebx; *ecx = best->ecx; *edx = best->edx; - }else + }else { + entry_found = false; *eax = *ebx = *ecx = *edx =0 ; + }trace_kvm_cpuid (function, *eax, *ebx, *ecx, *edx, entry_found);return entry_found; } --2.19.1
Re: [PATCH v2 1/2] KVM: CPUID: Check limit first when emulating CPUID instruction
Quoted 32 lines · Jim Mattson
Quoted 18 lines · Xiaoyao Li
When limit checking is required, it should be executed first, which is consistent with the CPUID specification.
Signed-off-by Xiaoyao Li <[email protected]>---
v2:
- correctly setentry_foundin no limit checking case.--- arch/x86/kvm/cpuid.c | 51 ++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 21 deletions(-)arch/x86/kvm/cpuid.c +0
-0arch/x86/kvm/cpuid.c struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu, · line 958
Quoted 10 lines
arch/x86/kvm/cpuid.c +4
-3@@ -952,23 +952,36 @@ struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu,EXPORT_SYMBOL_GPL (kvm_find_cpuid_entry);/* -* If no match is found, check whether we exceed the vCPU's limit -* and return the content of the highest valid _standard_ leaf instead. -* This is to satisfy the CPUID specification. +* Based on CPUID specification, if leaf number exceeds the vCPU's limit, +* it should return the content of the highest valid _standard_ leaf instead. +* Note: *found is set true only means the queried leaf number doesn't exceed +* the maximum leaf number of basic or extented leaf. Nit: "extented" should be "extended."
Quoted 5 lines
A more serious problem is that the CPUID specification you quote is Intel's specification. AMD CPUs return zeroes in EAX, EBX, ECX, and EDX for all undefined leaves, whatever the input value for EAX. This code is supposed to be vendor-agnostic, right?
I checked the AMD spec and I didn't find the statement about "AMD CPUs return zeroes in EAX, EBX, ECX, and EDX for all undefined leaves". I don't have AMD machine at hand so that I can't test it to verify it.
Assume what you said about AMD CPUs is true, then the current codes in KVM makes AMD guest act as Intel CPU that returns the highest valid standard leaf if input value of EAX exceeds the limit.
Anyway, I find we cannot check the limit first for guest, otherwise the leaves 0x4000XXXX will be not readable. So please just ignore this patch.
PATCH v2 2/2 KVM: CPUID: Put maxphyaddr updating together with virtual address width checking
In reply to Xiaoyao LiSince both of maxphyaddr updating and virtual address width checking need to query the cpuid leaf 0x80000008. We can put them together.
--- arch/x86/kvm/cpuid.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/kvm/cpuid.c +4 -2
@@ -118,6 +118,7 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu) best->ebx =xstate_required_size (vcpu->arch.xcr0, true);/* +* Update physical address width and check virtual address width. * The existing code assumes virtual address is 48-bit or 57-bit in the * canonical address checks; exit if it is ever changed. */
@@ -127,7 +128,10 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu)if (vaddr_bits !=48 && vaddr_bits !=57 && vaddr_bits !=0 )return -EINVAL ; + + vcpu->arch.maxphyaddr = best->eax &0xff ; } + vcpu->arch.maxphyaddr =36 ; best =kvm_find_cpuid_entry (vcpu,KVM_CPUID_FEATURES ,0 ); if (kvm_hlt_in_guest(vcpu->kvm) && best &&
@@ -144,8 +148,6 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu) } } -/* Update physical-address width */ - vcpu->arch.maxphyaddr =cpuid_query_maxphyaddr (vcpu);kvm_mmu_reset_context (vcpu);kvm_pmu_refresh (vcpu);
Signature · 1 line
2.19.1
Re: [PATCH v2 2/2] KVM: CPUID: Put maxphyaddr updating together with virtual address width checking
Quoted 22 lines · Xiaoyao Li
Since both of maxphyaddr updating and virtual address width checking need to query the cpuid leaf
0x80000008. We can put them together.Signed-off-by Xiaoyao Li <[email protected]>--- arch/x86/kvm/cpuid.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)arch/x86/kvm/cpuid.c +1
-0@@ -118,6 +118,7 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu) best->ebx =xstate_required_size (vcpu->arch.xcr0, true);/* +* Update physical address width and check virtual address width. * The existing code assumes virtual address is 48-bit or 57-bit in the * canonical address checks; exit if it is ever changed. */
arch/x86/kvm/cpuid.c int kvm_update_cpuid(struct kvm_vcpu *vcpu) · line 134
Quoted 7 lines
arch/x86/kvm/cpuid.c +3
-0@@ -127,7 +128,10 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu)if (vaddr_bits !=48 && vaddr_bits !=57 && vaddr_bits !=0 )return -EINVAL ; + + vcpu->arch.maxphyaddr = best->eax &0xff ; } + vcpu->arch.maxphyaddr =36 ;
Perhaps I'm missing something, but it looks to me like you always set vcpu->arch.maxphyaddr to 36, regardless of what may be enumerated by leaf 0x80000008.
Is there really much of an advantage to open-coding cpuid_query_maxphyaddr() here?
Quoted 14 lines
arch/x86/kvm/cpuid.c +0
-3best =kvm_find_cpuid_entry (vcpu,KVM_CPUID_FEATURES ,0 ); if (kvm_hlt_in_guest(vcpu->kvm) && best &&@@ -144,8 +148,6 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu) } } -/* Update physical-address width */ - vcpu->arch.maxphyaddr =cpuid_query_maxphyaddr (vcpu);kvm_mmu_reset_context (vcpu);kvm_pmu_refresh (vcpu); --2.19.1
Re: [PATCH v2 2/2] KVM: CPUID: Put maxphyaddr updating together with virtual address width checking
Quoted 25 lines · Jim Mattson
Quoted 24 lines · Xiaoyao Li
Since both of maxphyaddr updating and virtual address width checking need to query the cpuid leaf
0x80000008. We can put them together.Signed-off-by Xiaoyao Li <[email protected]>--- arch/x86/kvm/cpuid.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)arch/x86/kvm/cpuid.c +1
-0@@ -118,6 +118,7 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu) best->ebx =xstate_required_size (vcpu->arch.xcr0, true);/* +* Update physical address width and check virtual address width. * The existing code assumes virtual address is 48-bit or 57-bit in the
* canonical address checks; exit if it is ever changed. */arch/x86/kvm/cpuid.c +0
-0@@ -127,7 +128,10 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu)
Quoted 10 lines
arch/x86/kvm/cpuid.c int kvm_update_cpuid(struct kvm_vcpu *vcpu) · line 134
Quoted 6 lines
arch/x86/kvm/cpuid.c +3
-0if (vaddr_bits !=48 && vaddr_bits !=57 && vaddr_bits !=0 )return -EINVAL ; + + vcpu->arch.maxphyaddr = best->eax &0xff ; } + vcpu->arch.maxphyaddr =36 ;Perhaps I'm missing something, but it looks to me like you always set
vcpu->arch.maxphyaddrto 36, regardless of what may be enumerated by leaf0x80000008.
Oh, I made a stupid mistake. It should be included in the else case.
Quoted 3 lines
Is there really much of an advantage to open-coding
cpuid_query_maxphyaddr()here?
Indeed not so much.
It can avoid two more kvm_find_cpuid_entry() calling that we don't handle leaf 0x80000008 twice in two place.
Quoted 14 lines
Quoted 14 lines
arch/x86/kvm/cpuid.c +0
-3best =kvm_find_cpuid_entry (vcpu,KVM_CPUID_FEATURES ,0 ); if (kvm_hlt_in_guest(vcpu->kvm) && best &&@@ -144,8 +148,6 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu) } } -/* Update physical-address width */ - vcpu->arch.maxphyaddr =cpuid_query_maxphyaddr (vcpu);kvm_mmu_reset_context (vcpu);kvm_pmu_refresh (vcpu); --2.19.1
Re: [PATCH v2 2/2] KVM: CPUID: Put maxphyaddr updating together with virtual address width checking
Quoted 41 lines · Xiaoyao Li
Quoted 25 lines · Jim Mattson
Quoted 24 lines · Xiaoyao Li
Since both of maxphyaddr updating and virtual address width checking need to query the cpuid leaf
0x80000008. We can put them together.Signed-off-by Xiaoyao Li <[email protected]>--- arch/x86/kvm/cpuid.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)arch/x86/kvm/cpuid.c +1
-0@@ -118,6 +118,7 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu) best->ebx =xstate_required_size (vcpu->arch.xcr0, true);/* +* Update physical address width and check virtual address width. * The existing code assumes virtual address is 48-bit or 57-bit in the
* canonical address checks; exit if it is ever changed. */arch/x86/kvm/cpuid.c +0
-0@@ -127,7 +128,10 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu)Quoted 10 lines
arch/x86/kvm/cpuid.c int kvm_update_cpuid(struct kvm_vcpu *vcpu) · line 134
Quoted 6 lines
arch/x86/kvm/cpuid.c +3
-0if (vaddr_bits !=48 && vaddr_bits !=57 && vaddr_bits !=0 )return -EINVAL ; + + vcpu->arch.maxphyaddr = best->eax &0xff ; } + vcpu->arch.maxphyaddr =36 ;Perhaps I'm missing something, but it looks to me like you always set
vcpu->arch.maxphyaddrto 36, regardless of what may be enumerated by leaf0x80000008.Oh, I made a stupid mistake. It should be included in the else case.
Quoted 1 line
Quoted 6 lines
Quoted 2 lines
Is there really much of an advantage to open-coding
cpuid_query_maxphyaddr()here?Indeed not so much.
It can avoid two morekvm_find_cpuid_entry()calling that we don't handle leaf0x80000008twice in two place.
I'm inclined to leave things as they are. As your previous attempt demonstrates, having the same logic replicated in multiple places is prone to error. I can't imagine that this would be a performance-sensitive path.
Quoted 15 lines
Quoted 14 lines
Quoted 14 lines
arch/x86/kvm/cpuid.c +0
-3best =kvm_find_cpuid_entry (vcpu,KVM_CPUID_FEATURES ,0 ); if (kvm_hlt_in_guest(vcpu->kvm) && best &&@@ -144,8 +148,6 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu) } } -/* Update physical-address width */ - vcpu->arch.maxphyaddr =cpuid_query_maxphyaddr (vcpu);kvm_mmu_reset_context (vcpu);kvm_pmu_refresh (vcpu); --2.19.1