KVM: x86/xen: update Xen CPUID Leaf 4
Subsystems (5)
v7 cover KVM: x86/xen: update Xen CPUID Leaf 4
Patch #2 was the original patch. It has been expended to a series in v6.
Paul Durrant (2):
KVM: x86/cpuid: generalize kvm_update_kvm_cpuid_base() and also
capture limit
KVM: x86/xen: update Xen CPUID Leaf 4 (tsc info) sub-leaves, if
present
arch/x86/include/asm/kvm_host.h | 8 +++++++- arch/x86/include/asm/xen/hypervisor.h | 4 +++- arch/x86/kvm/cpuid.c | 26 +++++++++++++++----------- arch/x86/kvm/x86.c | 1 + arch/x86/kvm/xen.c | 26 ++++++++++++++++++++++++++ arch/x86/kvm/xen.h | 7 +++++++ 6 files changed, 59 insertions(+), 13 deletions(-)
---
Cc: Borislav Petkov <[email protected]>
Cc: Boris Ostrovsky <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: David Woodhouse <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: Sean Christopherson <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Signature · 1 line
2.20.1
PATCH v7 1/2 KVM: x86/cpuid: generalize kvm_update_kvm_cpuid_base() and also capture limit
A subsequent patch will need to acquire the CPUID leaf range for emulated Xen so explicitly pass the signature of the hypervisor we're interested in to the new function. Also introduce a new kvm_hypervisor_cpuid structure so we can neatly store both the base and limit leaf indices.
---
Cc: Sean Christopherson <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: David Woodhouse <[email protected]>
v7:
- Morph kvm_update_hypervisor_cpuid() into kvm_get_hypervisor_cpuid()
- Place the definition of struct kvm_hypervisor_cpuid to avoid churn in patch #2.
v6:
- New in this version
--- arch/x86/include/asm/kvm_host.h | 7 ++++++- arch/x86/kvm/cpuid.c | 24 +++++++++++++----------- 2 files changed, 19 insertions(+), 12 deletions(-)
arch/x86/include/asm/kvm_host.h +6 -1
@@ -678,6 +678,11 @@ struct kvm_vcpu_hv { } nested; }; +struct kvm_hypervisor_cpuid { +u32 base; +u32 limit; +}; +/* Xen HVM per vcpu emulation context */ struct kvm_vcpu_xen {u64 hypercall_rip;
@@ -826,7 +831,7 @@ struct kvm_vcpu_arch {int cpuid_nent;struct kvm_cpuid_entry2 *cpuid_entries; -u32 kvm_cpuid_base; +struct kvm_hypervisor_cpuid kvm_cpuid;u64 reserved_gpa_bits;int maxphyaddr;
arch/x86/kvm/cpuid.c +13 -11
@@ -180,15 +180,15 @@ static int kvm_cpuid_check_equal(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2return 0 ; } -static void kvm_update_kvm_cpuid_base (struct kvm_vcpu *vcpu) +static struct kvm_hypervisor_cpuid kvm_get_hypervisor_cpuid (struct kvm_vcpu *vcpu, +const char *sig) { -u32 function; +struct kvm_hypervisor_cpuid cpuid = {};struct kvm_cpuid_entry2 *entry; +u32 base; - vcpu->arch.kvm_cpuid_base =0 ; - -for_each_possible_hypervisor_cpuid_base (function) { - entry =kvm_find_cpuid_entry (vcpu, function); +for_each_possible_hypervisor_cpuid_base (base) { + entry =kvm_find_cpuid_entry (vcpu, base);if (entry) {u32 signature[3 ];
@@ -197,19 +197,21 @@ static void kvm_update_kvm_cpuid_base(struct kvm_vcpu *vcpu) signature[1 ] = entry->ecx; signature[2 ] = entry->edx; -BUILD_BUG_ON (sizeof (signature) >sizeof (KVM_SIGNATURE )); -if (!memcmp (signature,KVM_SIGNATURE ,sizeof (signature))) { - vcpu->arch.kvm_cpuid_base = function; +if (!memcmp (signature, sig,sizeof (signature))) { + cpuid.base = base; + cpuid.limit = entry->eax;break ; } } } + +return cpuid; }static struct kvm_cpuid_entry2 *__kvm_find_kvm_cpuid_features (struct kvm_vcpu *vcpu,struct kvm_cpuid_entry2 *entries,int nent) { -u32 base = vcpu->arch.kvm_cpuid_base; +u32 base = vcpu->arch.kvm_cpuid.base;if (!base)return NULL ;
@@ -439,7 +441,7 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2, vcpu->arch.cpuid_entries = e2; vcpu->arch.cpuid_nent = nent; -kvm_update_kvm_cpuid_base (vcpu); + vcpu->arch.kvm_cpuid =kvm_get_hypervisor_cpuid (vcpu,KVM_SIGNATURE );kvm_vcpu_after_set_cpuid (vcpu);return 0 ;
Signature · 1 line
2.20.1
PATCH v7 2/2 KVM: x86/xen: update Xen CPUID Leaf 4 (tsc info) sub-leaves, if present
In reply to Paul DurrantThe scaling information in subleaf 1 should match the values set by KVM in the 'vcpu_info' sub-structure 'time_info' (a.k.a. pvclock_vcpu_time_info) which is shared with the guest, but is not directly available to the VMM. The offset values are not set since a TSC offset is already applied. The TSC frequency should also be set in sub-leaf 2.
---
Cc: Sean Christopherson <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: Boris Ostrovsky <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: David Woodhouse <[email protected]>
v7:
- Add a definition of XEN_SIGNATURE into asm/xen/hypervisor.h and use that
v6:
- Stash Xen cpuid base and limit values when cpuid is set
- Re-name kvm_xen_setup_tsc_info() to kvm_xen_update_tsc_info()
v5:
- Drop the caching of the CPUID entry pointers and only update the sub-leaves if the CPU frequency has actually changed
v4:
- Update commit comment
v3:
- Add leaf limit check in kvm_xen_set_cpuid()
v2:
- Make sure sub-leaf pointers are NULLed if the time leaf is removed
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/include/asm/xen/hypervisor.h | 4 +++- arch/x86/kvm/cpuid.c | 2 ++ arch/x86/kvm/x86.c | 1 + arch/x86/kvm/xen.c | 26 ++++++++++++++++++++++++++ arch/x86/kvm/xen.h | 7 +++++++ 6 files changed, 40 insertions(+), 1 deletion(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -703,6 +703,7 @@ struct kvm_vcpu_xen {struct hrtimer timer;int poll_evtchn;struct timer_list poll_timer; +struct kvm_hypervisor_cpuid cpuid; };struct kvm_queued_exception {
arch/x86/include/asm/xen/hypervisor.h +3 -1
@@ -38,9 +38,11 @@ extern struct start_info *xen_start_info;#include <asm/processor.h> +#define XEN_SIGNATURE "XenVMMXenVMM" +static inline uint32_t xen_cpuid_base (void ) { -return hypervisor_cpuid_base ("XenVMMXenVMM" ,2 ); +return hypervisor_cpuid_base (XEN_SIGNATURE ,2 ); }struct pci_dev ;
arch/x86/kvm/cpuid.c +2 -0
@@ -25,6 +25,7 @@#include "mmu.h" #include "trace.h" #include "pmu.h" +#include "xen.h" /* * Unlike "struct cpuinfo_x86.x86_capability", kvm_cpu_caps doesn't need to be
@@ -442,6 +443,7 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2, vcpu->arch.cpuid_nent = nent; vcpu->arch.kvm_cpuid =kvm_get_hypervisor_cpuid (vcpu,KVM_SIGNATURE ); + vcpu->arch.xen.cpuid =kvm_get_hypervisor_cpuid (vcpu,XEN_SIGNATURE );kvm_vcpu_after_set_cpuid (vcpu);return 0 ;
arch/x86/kvm/x86.c +1 -0
@@ -3158,6 +3158,7 @@ static int kvm_guest_time_update(struct kvm_vcpu *v) &vcpu->hv_clock.tsc_shift, &vcpu->hv_clock.tsc_to_system_mul); vcpu->hw_tsc_khz = tgt_tsc_khz; +kvm_xen_update_tsc_info (v); } vcpu->hv_clock.tsc_timestamp = tsc_timestamp;
arch/x86/kvm/xen.c +26 -0
@@ -22,6 +22,9 @@#include <xen/interface/event_channel.h> #include <xen/interface/sched.h> +#include <asm/xen/cpuid.h> + +#include "cpuid.h" #include "trace.h" static int kvm_xen_set_evtchn (struct kvm_xen_evtchn *xe,struct kvm *kvm);
@@ -2067,6 +2070,29 @@ void kvm_xen_destroy_vcpu(struct kvm_vcpu *vcpu)del_timer_sync (&vcpu->arch.xen.poll_timer); } +void kvm_xen_update_tsc_info (struct kvm_vcpu *vcpu) +{ +struct kvm_cpuid_entry2 *entry; +u32 function; + +if (!vcpu->arch.xen.cpuid.base) +return ; + + function = vcpu->arch.xen.cpuid.base |XEN_CPUID_LEAF (3 ); +if (function > vcpu->arch.xen.cpuid.limit) +return ; + + entry =kvm_find_cpuid_entry_index (vcpu, function,1 ); +if (entry) { + entry->ecx = vcpu->arch.hv_clock.tsc_to_system_mul; + entry->edx = vcpu->arch.hv_clock.tsc_shift; + } + + entry =kvm_find_cpuid_entry_index (vcpu, function,2 ); +if (entry) + entry->eax = vcpu->arch.hw_tsc_khz; +} +void kvm_xen_init_vm (struct kvm *kvm) {idr_init (&kvm->arch.xen.evtchn_ports);
arch/x86/kvm/xen.h +7 -0
@@ -9,6 +9,8 @@#ifndef __ARCH_X86_KVM_XEN_H__#define __ARCH_X86_KVM_XEN_H__ +#include <asm/xen/hypervisor.h> +#ifdef CONFIG_KVM_XEN #include <linux/jump_label_ratelimit.h>
@@ -32,6 +34,7 @@ int kvm_xen_set_evtchn_fast(struct kvm_xen_evtchn *xe,int kvm_xen_setup_evtchn (struct kvm *kvm,struct kvm_kernel_irq_routing_entry *e,const struct kvm_irq_routing_entry *ue); +void kvm_xen_update_tsc_info (struct kvm_vcpu *vcpu);static inline bool kvm_xen_msr_enabled (struct kvm *kvm) {
@@ -135,6 +138,10 @@ static inline bool kvm_xen_timer_enabled(struct kvm_vcpu *vcpu) {return false; } + +static inline void kvm_xen_update_tsc_info (struct kvm_vcpu *vcpu) +{ +}#endif int kvm_xen_hypercall (struct kvm_vcpu *vcpu);
Signature · 1 line
2.20.1
Re: [PATCH v7 1/2] KVM: x86/cpuid: generalize kvm_update_kvm_cpuid_base() and also capture limit
In reply to Paul DurrantQuoted 7 lines · Paul Durrant
A subsequent patch will need to acquire the CPUID leaf range for emulated Xen so explicitly pass the signature of the hypervisor we're interested in to the new function. Also introduce a new
kvm_hypervisor_cpuidstructure so we can neatly store both the base and limit leaf indices.Signed-off-by Paul Durrant <[email protected]>---
Re: [PATCH v7 2/2] KVM: x86/xen: update Xen CPUID Leaf 4 (tsc info) sub-leaves, if present
In reply to Paul DurrantQuoted 8 lines · Paul Durrant
The scaling information in subleaf 1 should match the values set by KVM in the '
vcpu_info' sub-structure 'time_info' (a.k.a.pvclock_vcpu_time_info) which is shared with the guest, but is not directly available to the VMM. The offset values are not set since a TSC offset is already applied. The TSC frequency should also be set in sub-leaf 2.Signed-off-by Paul Durrant <[email protected]>---
Quoted 9 lines · Paul Durrant
Patch #2 was the original patch. It has been expended to a series in v6.
Paul Durrant (2):
KVM: x86/cpuid: generalizekvm_update_kvm_cpuid_base()and also
capture limit
KVM: x86/xen: update Xen CPUID Leaf 4 (tsc info) sub-leaves, if
present[...]
Applied to kvm-x86 misc, thanks!
[1/2] KVM: x86/cpuid: generalize kvm_update_kvm_cpuid_base() and also capture limit
https://github.com/kvm-x86/linux/commit/e3ac476711ca [2/2] KVM: x86/xen: update Xen CPUID Leaf 4 (tsc info) sub-leaves, if present https://github.com/kvm-x86/linux/commit/509d19565173
--
https://github.com/kvm-x86/linux/tree/next
https://github.com/kvm-x86/linux/tree/fixes