From patchwork Wed Dec 22 02:52:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 425691 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBM2rbRb005275 for ; Wed, 22 Dec 2010 02:53:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752002Ab0LVCxQ (ORCPT ); Tue, 21 Dec 2010 21:53:16 -0500 Received: from mga01.intel.com ([192.55.52.88]:12861 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751835Ab0LVCxN (ORCPT ); Tue, 21 Dec 2010 21:53:13 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 21 Dec 2010 18:53:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.60,210,1291622400"; d="scan'208";a="870700549" Received: from yhuang-dev.sh.intel.com (HELO [10.239.13.101]) ([10.239.13.101]) by fmsmga001.fm.intel.com with ESMTP; 21 Dec 2010 18:53:12 -0800 Subject: QEMU, MCE, unpoison memory address across reboot From: Huang Ying To: Avi Kivity , Marcelo Tosatti Cc: "kvm@vger.kernel.org" , Andi Kleen , Dean Nelson Date: Wed, 22 Dec 2010 10:52:51 +0800 Message-ID: <1292986371.8743.113.camel@yhuang-dev> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 22 Dec 2010 02:53:38 +0000 (UTC) --- 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