From patchwork Thu Oct 14 08:54:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jin Dongming X-Patchwork-Id: 67803 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4B645B70E1 for ; Thu, 14 Oct 2010 20:08:09 +1100 (EST) Received: from localhost ([127.0.0.1]:34819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P6Jkn-0003JW-LD for incoming@patchwork.ozlabs.org; Thu, 14 Oct 2010 05:05:37 -0400 Received: from [140.186.70.92] (port=46037 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P6JYb-0004Q2-52 for qemu-devel@nongnu.org; Thu, 14 Oct 2010 04:53:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P6JYT-0004T9-36 for qemu-devel@nongnu.org; Thu, 14 Oct 2010 04:52:54 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:44346) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P6JYS-0004So-JB for qemu-devel@nongnu.org; Thu, 14 Oct 2010 04:52:53 -0400 Received: from m5.gw.fujitsu.co.jp ([10.0.50.75]) by fgwmail6.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id o9E8qp6K024587 for (envelope-from jin.dongming@np.css.fujitsu.com); Thu, 14 Oct 2010 17:52:51 +0900 Received: from smail (m5 [127.0.0.1]) by outgoing.m5.gw.fujitsu.co.jp (Postfix) with ESMTP id E4DE445DE51 for ; Thu, 14 Oct 2010 17:52:50 +0900 (JST) Received: from s5.gw.fujitsu.co.jp (s5.gw.fujitsu.co.jp [10.0.50.95]) by m5.gw.fujitsu.co.jp (Postfix) with ESMTP id BC4F245DE4E for ; Thu, 14 Oct 2010 17:52:50 +0900 (JST) Received: from s5.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s5.gw.fujitsu.co.jp (Postfix) with ESMTP id 7E270E08001 for ; Thu, 14 Oct 2010 17:52:50 +0900 (JST) Received: from m004.s.css.fujitsu.com (m004.s.css.fujitsu.com [10.23.4.34]) by s5.gw.fujitsu.co.jp (Postfix) with ESMTP id 2BCCA1DB803F for ; Thu, 14 Oct 2010 17:52:47 +0900 (JST) Received: from m004.css.fujitsu.com (m004 [127.0.0.1]) by m004.s.css.fujitsu.com (Postfix) with ESMTP id 0933350EBE1; Thu, 14 Oct 2010 17:52:47 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.101.76]) by m004.s.css.fujitsu.com (Postfix) with ESMTP id A924E50EBE3; Thu, 14 Oct 2010 17:52:46 +0900 (JST) X-SecurityPolicyCheck: OK by SHieldMailChecker v1.5.1 Message-ID: <4CB6C534.4070303@np.css.fujitsu.com> Date: Thu, 14 Oct 2010 17:54:12 +0900 From: Jin Dongming User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; ja; rv:1.9.2.7) Gecko/20100713 Thunderbird/3.1.1 MIME-Version: 1.0 To: KVM list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Hidetoshi Seto , Dean Nelson , Marcelo Tosatti , "qemu-devel@nongnu.org" , Avi Kivity , Huang Ying Subject: [Qemu-devel] [PATCH 10/11] kvm, x86: unify sigbus handling, post2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Cleanup to finish unification. Signed-off-by: Hidetoshi Seto Tested-by: Jin Dongming --- qemu-kvm.c | 41 ++++++++++++----------------------------- 1 files changed, 12 insertions(+), 29 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index d96394b..d2b2459 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -1222,45 +1222,24 @@ static void kvm_mce_inj_srao_broadcast(target_phys_addr_t paddr) 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 && vaddr && (code == BUS_MCEERR_AR || code == BUS_MCEERR_AO)) { + if (vaddr && (code == BUS_MCEERR_AO || code == BUS_MCEERR_AR)) { ram_addr_t ram_addr; target_phys_addr_t paddr; + CPUState *target_env; /* Give up MCE forwarding if immediate action required on main thread */ - if (code == BUS_MCEERR_AR) { + if (!env && 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 " - "QEMU itself instead of guest system!: %llx\n", - (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 && vaddr && (code == BUS_MCEERR_AR || code == BUS_MCEERR_AO)) { - ram_addr_t ram_addr; - unsigned long paddr; - - /* Check if recoverable MCE support is enabled */ - if (!(env->mcg_cap & MCG_SER_P)){ + target_env = env ? env : first_cpu; + if (!target_env || !(target_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)) { + if (env && code == BUS_MCEERR_AO && kvm_mce_in_progress(env)) { return; } @@ -1273,10 +1252,14 @@ static void kvm_handle_sigbus(CPUState *env, int code, void *vaddr) } if (code == BUS_MCEERR_AR) { /* Fake an Intel architectural Data Load SRAR UCR */ - kvm_mce_inj_srar_dataload(env, paddr); + kvm_mce_inj_srar_dataload(target_env, paddr); } else { /* Fake an Intel architectural Memory scrubbing UCR */ - kvm_mce_inj_srao_memscrub(env, paddr); + if (env) { + kvm_mce_inj_srao_memscrub(target_env, paddr); + } else { + kvm_mce_inj_srao_broadcast(paddr); + } } return; }