From: Huang Ying <ying.huang@intel.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: "kvm@vger.kernel.org" <kvm@vger.kernel.org>,
Andi Kleen <andi@firstfloor.org>,
Dean Nelson <dnelson@redhat.com>
Subject: QEMU, MCE, unpoison memory address across reboot
Date: Wed, 22 Dec 2010 10:52:51 +0800 [thread overview]
Message-ID: <1292986371.8743.113.camel@yhuang-dev> (raw)
In Linux kernel HWPoison processing implementation, the virtual
address in processes mapping the error physical memory page is marked
as HWPoison. So that, the further accessing to the virtual
address will kill corresponding processes with SIGBUS.
If the error physical memory page is used by a KVM guest, the SIGBUS
will be sent to QEMU, and QEMU will simulate a MCE to report that
memory error to the guest OS. If the guest OS can not recover from
the error (for example, the page is accessed by kernel code), guest OS
will reboot the system. But because the underlying host virtual
address backing the guest physical memory is still poisoned, if the
guest system accesses the corresponding guest physical memory even
after rebooting, the SIGBUS will still be sent to QEMU and MCE will be
simulated. That is, guest system can not recover via rebooting.
In fact, across rebooting, the contents of guest physical memory page
need not to be kept. We can allocate a new host physical page to
back the corresponding guest physical address.
This patch fixes this issue in QEMU-KVM via invoke the unpoison
mechanism implemented in Linux kernel to clear the corresponding page
table entry, so that make it possible to allocate a new page to
recover the issue.
Signed-off-by: Huang Ying <ying.huang@intel.com>
---
kvm.h | 2 ++
kvm/include/linux/kvm.h | 2 ++
qemu-kvm.c | 40 ++++++++++++++++++++++++++++++++++++++++
target-i386/kvm.c | 2 ++
4 files changed, 46 insertions(+)
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -1803,6 +1803,7 @@ int kvm_on_sigbus_vcpu(CPUState *env, in
hardware_memory_error();
}
}
+ kvm_hwpoison_page_add(vaddr);
mce.addr = paddr;
r = kvm_set_mce(env, &mce);
if (r < 0) {
@@ -1841,6 +1842,7 @@ int kvm_on_sigbus(int code, void *addr)
"QEMU itself instead of guest system!: %p\n", addr);
return 0;
}
+ kvm_hwpoison_page_add(vaddr);
status = MCI_STATUS_VAL | MCI_STATUS_UC | MCI_STATUS_EN
| MCI_STATUS_MISCV | MCI_STATUS_ADDRV | MCI_STATUS_S
| 0xc0;
--- a/kvm/include/linux/kvm.h
+++ b/kvm/include/linux/kvm.h
@@ -663,6 +663,8 @@ struct kvm_clock_data {
/* Available with KVM_CAP_PIT_STATE2 */
#define KVM_GET_PIT2 _IOR(KVMIO, 0x9f, struct kvm_pit_state2)
#define KVM_SET_PIT2 _IOW(KVMIO, 0xa0, struct kvm_pit_state2)
+#define KVM_PPC_GET_PVINFO _IOW(KVMIO, 0xa1, struct kvm_ppc_pvinfo)
+#define KVM_UNPOISON_ADDRESS _IO(KVMIO, 0xa2)
/*
* ioctls for vcpu fds
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -1619,6 +1619,45 @@ int kvm_arch_init_irq_routing(void)
}
#endif
+struct HWPoisonPage;
+typedef struct HWPoisonPage HWPoisonPage;
+struct HWPoisonPage
+{
+ void *vaddr;
+ QLIST_ENTRY(HWPoisonPage) list;
+};
+
+static QLIST_HEAD(hwpoison_page_list, HWPoisonPage) hwpoison_page_list =
+ QLIST_HEAD_INITIALIZER(hwpoison_page_list);
+
+static void kvm_unpoison_all(void *param)
+{
+ HWPoisonPage *page, *next_page;
+ unsigned long address;
+ KVMState *s = param;
+
+ QLIST_FOREACH_SAFE(page, &hwpoison_page_list, list, next_page) {
+ address = (unsigned long)page->vaddr;
+ QLIST_REMOVE(page, list);
+ kvm_vm_ioctl(s, KVM_UNPOISON_ADDRESS, address);
+ qemu_free(page);
+ }
+}
+
+void kvm_hwpoison_page_add(void *vaddr)
+{
+ HWPoisonPage *page;
+
+ QLIST_FOREACH(page, &hwpoison_page_list, list) {
+ if (page->vaddr == vaddr)
+ return;
+ }
+
+ page = qemu_malloc(sizeof(HWPoisonPage));
+ page->vaddr = vaddr;
+ QLIST_INSERT_HEAD(&hwpoison_page_list, page, list);
+}
+
extern int no_hpet;
static int kvm_create_context(void)
@@ -1703,6 +1742,7 @@ static int kvm_create_context(void)
}
#endif
}
+ qemu_register_reset(kvm_unpoison_all, kvm_state);
return 0;
}
--- a/kvm.h
+++ b/kvm.h
@@ -221,4 +221,6 @@ int kvm_irqchip_in_kernel(void);
int kvm_set_irq(int irq, int level, int *status);
+void kvm_hwpoison_page_add(void *vaddr);
+
#endif
next reply other threads:[~2010-12-22 2:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-22 2:52 Huang Ying [this message]
2010-12-23 14:28 ` QEMU, MCE, unpoison memory address across reboot Marcelo Tosatti
2010-12-23 16:57 ` Andi Kleen
2010-12-24 1:21 ` Huang Ying
2010-12-24 3:30 ` Huang Ying
2010-12-27 21:27 ` Marcelo Tosatti
2010-12-26 12:27 ` Avi Kivity
2010-12-27 21:27 ` Marcelo Tosatti
2010-12-28 6:18 ` Huang Ying
2010-12-28 8:11 ` Avi Kivity
2010-12-28 8:32 ` Huang Ying
2010-12-28 9:05 ` Avi Kivity
2010-12-28 8:27 ` Gleb Natapov
2010-12-28 8:35 ` Huang Ying
2010-12-28 9:06 ` Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1292986371.8743.113.camel@yhuang-dev \
--to=ying.huang@intel.com \
--cc=andi@firstfloor.org \
--cc=avi@redhat.com \
--cc=dnelson@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox