From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jin Dongming Subject: [PATCH 09/11] kvm, x86: unify sigbus handling, post1 Date: Thu, 14 Oct 2010 17:52:51 +0900 Message-ID: <4CB6C4E3.9000001@np.css.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Cc: Dean Nelson , Marcelo Tosatti , Avi Kivity , Huang Ying , Hidetoshi Seto , "qemu-devel@nongnu.org" To: KVM list Return-path: Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:41429 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753088Ab0JNIv0 (ORCPT ); Thu, 14 Oct 2010 04:51:26 -0400 Received: from m2.gw.fujitsu.co.jp ([10.0.50.72]) by fgwmail7.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id o9E8pPOg001553 for (envelope-from jin.dongming@np.css.fujitsu.com); Thu, 14 Oct 2010 17:51:25 +0900 Received: from smail (m2 [127.0.0.1]) by outgoing.m2.gw.fujitsu.co.jp (Postfix) with ESMTP id 11EC445DE51 for ; Thu, 14 Oct 2010 17:51:25 +0900 (JST) Received: from s2.gw.fujitsu.co.jp (s2.gw.fujitsu.co.jp [10.0.50.92]) by m2.gw.fujitsu.co.jp (Postfix) with ESMTP id DBA7A45DE4E for ; Thu, 14 Oct 2010 17:51:24 +0900 (JST) Received: from s2.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id C42FD1DB803B for ; Thu, 14 Oct 2010 17:51:24 +0900 (JST) Received: from m004.s.css.fujitsu.com (m004.s.css.fujitsu.com [10.23.4.34]) by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id 7C5E11DB803A for ; Thu, 14 Oct 2010 17:51:24 +0900 (JST) Sender: kvm-owner@vger.kernel.org List-ID: Explicitly duplicate blocks for next cleanup. Signed-off-by: Hidetoshi Seto Tested-by: Jin Dongming --- qemu-kvm.c | 56 +++++++++++++++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 23 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index 16bc006..d96394b 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -1223,12 +1223,20 @@ static void kvm_handle_sigbus(CPUState *env, int code, void *vaddr) { #if defined(KVM_CAP_MCE) && defined(TARGET_I386) /* env == NULL: when main thread received a SIGBUS */ - if (!env && (first_cpu->mcg_cap & MCG_SER_P) && vaddr - && code == BUS_MCEERR_AO) { + if (!env && vaddr && (code == BUS_MCEERR_AR || code == BUS_MCEERR_AO)) { ram_addr_t ram_addr; target_phys_addr_t paddr; - /* Hope we are lucky for AO MCE */ + /* Give up MCE forwarding if immediate action required on main thread */ + if (code == BUS_MCEERR_AR) { + goto out; + } + + /* Check if recoverable MCE support is enabled */ + if (!(first_cpu->mcg_cap & MCG_SER_P)){ + goto out; + } + if (do_qemu_ram_addr_from_host(vaddr, &ram_addr) || !kvm_physical_memory_addr_from_ram(kvm_state, ram_addr, &paddr)) { fprintf(stderr, "Hardware memory error for memory used by " @@ -1236,19 +1244,22 @@ static void kvm_handle_sigbus(CPUState *env, int code, void *vaddr) (unsigned long long)vaddr); return; } + /* Broadcast SRAO UCR to all vcpu threads */ kvm_mce_inj_srao_broadcast(paddr); return; } /* env != NULL: when vcpu thread received a SIGBUS */ - if (env && (env->mcg_cap & MCG_SER_P) && vaddr - && (code == BUS_MCEERR_AR || code == BUS_MCEERR_AO)) { + if (env && vaddr && (code == BUS_MCEERR_AR || code == BUS_MCEERR_AO)) { ram_addr_t ram_addr; unsigned long paddr; - /* - * If there is an MCE excpetion being processed, ignore this SRAO MCE - */ + /* Check if recoverable MCE support is enabled */ + if (!(env->mcg_cap & MCG_SER_P)){ + goto out; + } + + /* If there is an MCE exception being processed, ignore this SRAO MCE */ if (code == BUS_MCEERR_AO && kvm_mce_in_progress(env)) { return; } @@ -1256,13 +1267,9 @@ static void kvm_handle_sigbus(CPUState *env, int code, void *vaddr) if (do_qemu_ram_addr_from_host(vaddr, &ram_addr) || !kvm_physical_memory_addr_from_ram(kvm_state, ram_addr, &paddr)) { fprintf(stderr, "Hardware memory error for memory used by " - "QEMU itself instaed of guest system!\n"); - /* Hope we are lucky for AO MCE */ - if (code == BUS_MCEERR_AO) { - return; - } else { - hardware_memory_error(); - } + "QEMU itself instead of guest system!: %llx\n", + (unsigned long long)vaddr); + goto out; } if (code == BUS_MCEERR_AR) { /* Fake an Intel architectural Data Load SRAR UCR */ @@ -1273,15 +1280,18 @@ static void kvm_handle_sigbus(CPUState *env, int code, void *vaddr) } return; } +out: #endif - { - if (code == BUS_MCEERR_AO) { - return; - } else if (code == BUS_MCEERR_AR) { - hardware_memory_error(); - } else { - sigbus_reraise(); - } + /* Hope we are lucky for AO MCE */ + if (code == BUS_MCEERR_AO) { + return; + } + + /* Abort in either way */ + if (code == BUS_MCEERR_AR) { + hardware_memory_error(); + } else { + sigbus_reraise(); } } -- 1.7.1.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=45386 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P6JX9-0003Pn-DY for qemu-devel@nongnu.org; Thu, 14 Oct 2010 04:51:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P6JX5-0004Gp-9D for qemu-devel@nongnu.org; Thu, 14 Oct 2010 04:51:28 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:44288) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P6JX4-0004GX-PX for qemu-devel@nongnu.org; Thu, 14 Oct 2010 04:51:27 -0400 Received: from m4.gw.fujitsu.co.jp ([10.0.50.74]) by fgwmail6.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id o9E8pPRm024056 for (envelope-from jin.dongming@np.css.fujitsu.com); Thu, 14 Oct 2010 17:51:25 +0900 Received: from smail (m4 [127.0.0.1]) by outgoing.m4.gw.fujitsu.co.jp (Postfix) with ESMTP id 3465C45DE60 for ; Thu, 14 Oct 2010 17:51:25 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (s4.gw.fujitsu.co.jp [10.0.50.94]) by m4.gw.fujitsu.co.jp (Postfix) with ESMTP id 01D7245DE6E for ; Thu, 14 Oct 2010 17:51:25 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id DBB74EF8005 for ; Thu, 14 Oct 2010 17:51:24 +0900 (JST) Received: from m004.s.css.fujitsu.com (m004.s.css.fujitsu.com [10.23.4.34]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id 7937BEF8003 for ; Thu, 14 Oct 2010 17:51:24 +0900 (JST) Message-ID: <4CB6C4E3.9000001@np.css.fujitsu.com> Date: Thu, 14 Oct 2010 17:52:51 +0900 From: Jin Dongming MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 09/11] kvm, x86: unify sigbus handling, post1 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: KVM list Cc: Hidetoshi Seto , Dean Nelson , Marcelo Tosatti , "qemu-devel@nongnu.org" , Avi Kivity , Huang Ying Explicitly duplicate blocks for next cleanup. Signed-off-by: Hidetoshi Seto Tested-by: Jin Dongming --- qemu-kvm.c | 56 +++++++++++++++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 23 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index 16bc006..d96394b 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -1223,12 +1223,20 @@ static void kvm_handle_sigbus(CPUState *env, int code, void *vaddr) { #if defined(KVM_CAP_MCE) && defined(TARGET_I386) /* env == NULL: when main thread received a SIGBUS */ - if (!env && (first_cpu->mcg_cap & MCG_SER_P) && vaddr - && code == BUS_MCEERR_AO) { + if (!env && vaddr && (code == BUS_MCEERR_AR || code == BUS_MCEERR_AO)) { ram_addr_t ram_addr; target_phys_addr_t paddr; - /* Hope we are lucky for AO MCE */ + /* Give up MCE forwarding if immediate action required on main thread */ + if (code == BUS_MCEERR_AR) { + goto out; + } + + /* Check if recoverable MCE support is enabled */ + if (!(first_cpu->mcg_cap & MCG_SER_P)){ + goto out; + } + if (do_qemu_ram_addr_from_host(vaddr, &ram_addr) || !kvm_physical_memory_addr_from_ram(kvm_state, ram_addr, &paddr)) { fprintf(stderr, "Hardware memory error for memory used by " @@ -1236,19 +1244,22 @@ static void kvm_handle_sigbus(CPUState *env, int code, void *vaddr) (unsigned long long)vaddr); return; } + /* Broadcast SRAO UCR to all vcpu threads */ kvm_mce_inj_srao_broadcast(paddr); return; } /* env != NULL: when vcpu thread received a SIGBUS */ - if (env && (env->mcg_cap & MCG_SER_P) && vaddr - && (code == BUS_MCEERR_AR || code == BUS_MCEERR_AO)) { + if (env && vaddr && (code == BUS_MCEERR_AR || code == BUS_MCEERR_AO)) { ram_addr_t ram_addr; unsigned long paddr; - /* - * If there is an MCE excpetion being processed, ignore this SRAO MCE - */ + /* Check if recoverable MCE support is enabled */ + if (!(env->mcg_cap & MCG_SER_P)){ + goto out; + } + + /* If there is an MCE exception being processed, ignore this SRAO MCE */ if (code == BUS_MCEERR_AO && kvm_mce_in_progress(env)) { return; } @@ -1256,13 +1267,9 @@ static void kvm_handle_sigbus(CPUState *env, int code, void *vaddr) if (do_qemu_ram_addr_from_host(vaddr, &ram_addr) || !kvm_physical_memory_addr_from_ram(kvm_state, ram_addr, &paddr)) { fprintf(stderr, "Hardware memory error for memory used by " - "QEMU itself instaed of guest system!\n"); - /* Hope we are lucky for AO MCE */ - if (code == BUS_MCEERR_AO) { - return; - } else { - hardware_memory_error(); - } + "QEMU itself instead of guest system!: %llx\n", + (unsigned long long)vaddr); + goto out; } if (code == BUS_MCEERR_AR) { /* Fake an Intel architectural Data Load SRAR UCR */ @@ -1273,15 +1280,18 @@ static void kvm_handle_sigbus(CPUState *env, int code, void *vaddr) } return; } +out: #endif - { - if (code == BUS_MCEERR_AO) { - return; - } else if (code == BUS_MCEERR_AR) { - hardware_memory_error(); - } else { - sigbus_reraise(); - } + /* Hope we are lucky for AO MCE */ + if (code == BUS_MCEERR_AO) { + return; + } + + /* Abort in either way */ + if (code == BUS_MCEERR_AR) { + hardware_memory_error(); + } else { + sigbus_reraise(); } } -- 1.7.1.1