aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorBoris Ostrovsky <boris.ostrovsky@oracle.com>2019-12-06 15:36:12 +0000
committerPaolo Bonzini <pbonzini@redhat.com>2020-01-30 18:45:55 +0100
commita6bd811f1209fe1c64c9f6fd578101d6436c6b6e (patch)
treea03422951a08c65df3fc51e92d9e02b8c396b9bc /arch/x86/include/asm
parentx86/KVM: Make sure KVM_VCPU_FLUSH_TLB flag is not missed (diff)
downloadlinux-dev-a6bd811f1209fe1c64c9f6fd578101d6436c6b6e.tar.xz
linux-dev-a6bd811f1209fe1c64c9f6fd578101d6436c6b6e.zip
x86/KVM: Clean up host's steal time structure
Now that we are mapping kvm_steal_time from the guest directly we don't need keep a copy of it in kvm_vcpu_arch.st. The same is true for the stime field. This is part of CVE-2019-3016. Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Reviewed-by: Joao Martins <joao.m.martins@oracle.com> Cc: stable@vger.kernel.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/kvm_host.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index f48a306e1d66..4925bdbfb516 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -685,10 +685,9 @@ struct kvm_vcpu_arch {
bool pvclock_set_guest_stopped_request;
struct {
+ u8 preempted;
u64 msr_val;
u64 last_steal;
- struct gfn_to_hva_cache stime;
- struct kvm_steal_time steal;
struct gfn_to_pfn_cache cache;
} st;