diff options
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 59b59508ff07..2966c847d489 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
| @@ -806,7 +806,7 @@ EXPORT_SYMBOL_GPL(kvm_rdpmc); | |||
| 806 | * kvm-specific. Those are put in the beginning of the list. | 806 | * kvm-specific. Those are put in the beginning of the list. |
| 807 | */ | 807 | */ |
| 808 | 808 | ||
| 809 | #define KVM_SAVE_MSRS_BEGIN 9 | 809 | #define KVM_SAVE_MSRS_BEGIN 10 |
| 810 | static u32 msrs_to_save[] = { | 810 | static u32 msrs_to_save[] = { |
| 811 | MSR_KVM_SYSTEM_TIME, MSR_KVM_WALL_CLOCK, | 811 | MSR_KVM_SYSTEM_TIME, MSR_KVM_WALL_CLOCK, |
| 812 | MSR_KVM_SYSTEM_TIME_NEW, MSR_KVM_WALL_CLOCK_NEW, | 812 | MSR_KVM_SYSTEM_TIME_NEW, MSR_KVM_WALL_CLOCK_NEW, |
| @@ -925,6 +925,10 @@ static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) | |||
| 925 | */ | 925 | */ |
| 926 | getboottime(&boot); | 926 | getboottime(&boot); |
| 927 | 927 | ||
| 928 | if (kvm->arch.kvmclock_offset) { | ||
| 929 | struct timespec ts = ns_to_timespec(kvm->arch.kvmclock_offset); | ||
| 930 | boot = timespec_sub(boot, ts); | ||
| 931 | } | ||
| 928 | wc.sec = boot.tv_sec; | 932 | wc.sec = boot.tv_sec; |
| 929 | wc.nsec = boot.tv_nsec; | 933 | wc.nsec = boot.tv_nsec; |
| 930 | wc.version = version; | 934 | wc.version = version; |
| @@ -1996,6 +2000,9 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata) | |||
| 1996 | case MSR_KVM_STEAL_TIME: | 2000 | case MSR_KVM_STEAL_TIME: |
| 1997 | data = vcpu->arch.st.msr_val; | 2001 | data = vcpu->arch.st.msr_val; |
| 1998 | break; | 2002 | break; |
| 2003 | case MSR_KVM_PV_EOI_EN: | ||
| 2004 | data = vcpu->arch.pv_eoi.msr_val; | ||
| 2005 | break; | ||
| 1999 | case MSR_IA32_P5_MC_ADDR: | 2006 | case MSR_IA32_P5_MC_ADDR: |
| 2000 | case MSR_IA32_P5_MC_TYPE: | 2007 | case MSR_IA32_P5_MC_TYPE: |
| 2001 | case MSR_IA32_MCG_CAP: | 2008 | case MSR_IA32_MCG_CAP: |
| @@ -5106,17 +5113,20 @@ static void post_kvm_run_save(struct kvm_vcpu *vcpu) | |||
| 5106 | !kvm_event_needs_reinjection(vcpu); | 5113 | !kvm_event_needs_reinjection(vcpu); |
| 5107 | } | 5114 | } |
| 5108 | 5115 | ||
| 5109 | static void vapic_enter(struct kvm_vcpu *vcpu) | 5116 | static int vapic_enter(struct kvm_vcpu *vcpu) |
| 5110 | { | 5117 | { |
| 5111 | struct kvm_lapic *apic = vcpu->arch.apic; | 5118 | struct kvm_lapic *apic = vcpu->arch.apic; |
| 5112 | struct page *page; | 5119 | struct page *page; |
| 5113 | 5120 | ||
| 5114 | if (!apic || !apic->vapic_addr) | 5121 | if (!apic || !apic->vapic_addr) |
| 5115 | return; | 5122 | return 0; |
| 5116 | 5123 | ||
| 5117 | page = gfn_to_page(vcpu->kvm, apic->vapic_addr >> PAGE_SHIFT); | 5124 | page = gfn_to_page(vcpu->kvm, apic->vapic_addr >> PAGE_SHIFT); |
| 5125 | if (is_error_page(page)) | ||
| 5126 | return -EFAULT; | ||
| 5118 | 5127 | ||
| 5119 | vcpu->arch.apic->vapic_page = page; | 5128 | vcpu->arch.apic->vapic_page = page; |
| 5129 | return 0; | ||
| 5120 | } | 5130 | } |
| 5121 | 5131 | ||
| 5122 | static void vapic_exit(struct kvm_vcpu *vcpu) | 5132 | static void vapic_exit(struct kvm_vcpu *vcpu) |
| @@ -5423,7 +5433,11 @@ static int __vcpu_run(struct kvm_vcpu *vcpu) | |||
| 5423 | } | 5433 | } |
| 5424 | 5434 | ||
| 5425 | vcpu->srcu_idx = srcu_read_lock(&kvm->srcu); | 5435 | vcpu->srcu_idx = srcu_read_lock(&kvm->srcu); |
| 5426 | vapic_enter(vcpu); | 5436 | r = vapic_enter(vcpu); |
| 5437 | if (r) { | ||
| 5438 | srcu_read_unlock(&kvm->srcu, vcpu->srcu_idx); | ||
| 5439 | return r; | ||
| 5440 | } | ||
| 5427 | 5441 | ||
| 5428 | r = 1; | 5442 | r = 1; |
| 5429 | while (r > 0) { | 5443 | while (r > 0) { |