diff options
author | Wei Yongjun <yjwei@cn.fujitsu.com> | 2010-07-14 20:51:58 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-08-01 23:40:53 -0400 |
commit | c19b8bd60e19308d5583ef200ddcc782d85d9543 (patch) | |
tree | ac58a35ca5f79a4bf5f36445ecc8e7d2c10178b4 /arch | |
parent | 9195c4da26bbf8860e2e7b648dbf4ab465c7933a (diff) |
KVM: x86 emulator: fix xchg instruction emulation
If the destination is a memory operand and the memory cannot
map to a valid page, the xchg instruction emulation and locked
instruction will not work on io regions and stuck in endless
loop. We should emulate exchange as write to fix it.
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Acked-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kvm/x86.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 689c2c3182ab..97aab036dabf 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -3562,6 +3562,10 @@ static int emulator_cmpxchg_emulated(unsigned long addr, | |||
3562 | goto emul_write; | 3562 | goto emul_write; |
3563 | 3563 | ||
3564 | page = gfn_to_page(vcpu->kvm, gpa >> PAGE_SHIFT); | 3564 | page = gfn_to_page(vcpu->kvm, gpa >> PAGE_SHIFT); |
3565 | if (is_error_page(page)) { | ||
3566 | kvm_release_page_clean(page); | ||
3567 | goto emul_write; | ||
3568 | } | ||
3565 | 3569 | ||
3566 | kaddr = kmap_atomic(page, KM_USER0); | 3570 | kaddr = kmap_atomic(page, KM_USER0); |
3567 | kaddr += offset_in_page(gpa); | 3571 | kaddr += offset_in_page(gpa); |