Skip to content

Commit 9de6fe3

Browse files
calmisisuryasaimadhu
authored andcommitted
KVM: x86: Emulate split-lock access as a write in emulator
Emulate split-lock accesses as writes if split lock detection is on to avoid #AC during emulation, which will result in a panic(). This should never occur for a well-behaved guest, but a malicious guest can manipulate the TLB to trigger emulation of a locked instruction[1]. More discussion can be found at [2][3]. [1] https://lkml.kernel.org/r/8c5b11c9-58df-38e7-a514-dc12d687b198@redhat.com [2] https://lkml.kernel.org/r/20200131200134.GD18946@linux.intel.com [3] https://lkml.kernel.org/r/20200227001117.GX9940@linux.intel.com Suggested-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Borislav Petkov <bp@suse.de> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Link: https://lkml.kernel.org/r/20200410115517.084300242@linutronix.de
1 parent d7e94db commit 9de6fe3

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

arch/x86/kvm/x86.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5839,6 +5839,7 @@ static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,
58395839
{
58405840
struct kvm_host_map map;
58415841
struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
5842+
u64 page_line_mask;
58425843
gpa_t gpa;
58435844
char *kaddr;
58445845
bool exchanged;
@@ -5853,7 +5854,16 @@ static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,
58535854
(gpa & PAGE_MASK) == APIC_DEFAULT_PHYS_BASE)
58545855
goto emul_write;
58555856

5856-
if (((gpa + bytes - 1) & PAGE_MASK) != (gpa & PAGE_MASK))
5857+
/*
5858+
* Emulate the atomic as a straight write to avoid #AC if SLD is
5859+
* enabled in the host and the access splits a cache line.
5860+
*/
5861+
if (boot_cpu_has(X86_FEATURE_SPLIT_LOCK_DETECT))
5862+
page_line_mask = ~(cache_line_size() - 1);
5863+
else
5864+
page_line_mask = PAGE_MASK;
5865+
5866+
if (((gpa + bytes - 1) & page_line_mask) != (gpa & page_line_mask))
58575867
goto emul_write;
58585868

58595869
if (kvm_vcpu_map(vcpu, gpa_to_gfn(gpa), &map))

0 commit comments

Comments
 (0)