summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorJim Mattson <jmattson@google.com>2020-06-03 16:56:22 -0700
committerPaolo Bonzini <pbonzini@redhat.com>2020-07-08 16:21:45 -0400
commit8a14fe4f0c54f27c89389d13c4a1e467a88c35ea (patch)
tree05019b573db700cca2a4cf8406966e5f899f61d4 /arch/x86/include/asm
parent1aa561b1a4c0ae2a9a9b9c21a84b5ca66b4775d8 (diff)
downloadlinux-stable-8a14fe4f0c54f27c89389d13c4a1e467a88c35ea.tar.gz
linux-stable-8a14fe4f0c54f27c89389d13c4a1e467a88c35ea.tar.bz2
linux-stable-8a14fe4f0c54f27c89389d13c4a1e467a88c35ea.zip
kvm: x86: Move last_cpu into kvm_vcpu_arch as last_vmentry_cpu
Both the vcpu_vmx structure and the vcpu_svm structure have a 'last_cpu' field. Move the common field into the kvm_vcpu_arch structure. For clarity, rename it to 'last_vmentry_cpu.' Suggested-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Jim Mattson <jmattson@google.com> Reviewed-by: Oliver Upton <oupton@google.com> Reviewed-by: Peter Shier <pshier@google.com> Message-Id: <20200603235623.245638-6-jmattson@google.com> 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, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 89e1a66ebee9..2357763bf7f2 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -827,6 +827,9 @@ struct kvm_vcpu_arch {
/* Flush the L1 Data cache for L1TF mitigation on VMENTER */
bool l1tf_flush_l1d;
+ /* Host CPU on which VM-entry was most recently attempted */
+ unsigned int last_vmentry_cpu;
+
/* AMD MSRC001_0015 Hardware Configuration */
u64 msr_hwcr;
};