From patchwork Tue Feb 23 19:10:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 8395651 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 959099F1D4 for ; Tue, 23 Feb 2016 19:13:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C36FB20303 for ; Tue, 23 Feb 2016 19:13:06 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DBB73202F0 for ; Tue, 23 Feb 2016 19:13:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aYILn-0005KH-Gf; Tue, 23 Feb 2016 19:10:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aYILm-0005KC-50 for xen-devel@lists.xen.org; Tue, 23 Feb 2016 19:10:22 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id C0/E7-23864-D9EACC65; Tue, 23 Feb 2016 19:10:21 +0000 X-Env-Sender: prvs=8544ffb4f=Andrew.Cooper3@citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1456254619!17019789!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32065 invoked from network); 23 Feb 2016 19:10:20 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 23 Feb 2016 19:10:20 -0000 X-IronPort-AV: E=Sophos;i="5.22,490,1449532800"; d="scan'208";a="340342138" From: Andrew Cooper To: Xen-devel Date: Tue, 23 Feb 2016 19:10:16 +0000 Message-ID: <1456254616-4728-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA1 Cc: Andrew Cooper , Jan Beulich Subject: [Xen-devel] [PATCH] x86/hvm: Print %cs:%rip in triple fault error message X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It provides a little more information than just "something went wrong". Signed-off-by: Andrew Cooper --- CC: Jan Beulich --- xen/arch/x86/hvm/emulate.c | 2 +- xen/arch/x86/hvm/hvm.c | 8 ++++++-- xen/include/asm-x86/hvm/emulate.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index fef7905..1f2d4a7 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -1907,7 +1907,7 @@ struct segment_register *hvmemul_get_seg_reg( return &hvmemul_ctxt->seg_reg[seg]; } -static const char *guest_x86_mode_to_str(int mode) +const char *guest_x86_mode_to_str(int mode) { switch ( mode ) { diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index a29c421..87b3cce 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2887,10 +2887,14 @@ void hvm_triple_fault(void) struct vcpu *v = current; struct domain *d = v->domain; u8 reason = d->arch.hvm_domain.params[HVM_PARAM_TRIPLE_FAULT_REASON]; + const char *mode_str = guest_x86_mode_to_str(hvm_guest_x86_mode(v)); + struct segment_register cs; + + hvm_get_segment_register(v, x86_seg_cs, &cs); gprintk(XENLOG_INFO, - "Triple fault - invoking HVM shutdown action %d\n", - reason); + "Triple fault %s @ %04x:%08lx - invoking HVM shutdown action %d\n", + mode_str, cs.sel, guest_cpu_user_regs()->rip, reason); domain_shutdown(d, reason); } diff --git a/xen/include/asm-x86/hvm/emulate.h b/xen/include/asm-x86/hvm/emulate.h index 142d1b6..c7148c9 100644 --- a/xen/include/asm-x86/hvm/emulate.h +++ b/xen/include/asm-x86/hvm/emulate.h @@ -64,6 +64,7 @@ int hvmemul_do_pio_buffer(uint16_t port, uint8_t dir, void *buffer); +const char *guest_x86_mode_to_str(int mode); void hvm_dump_emulation_state(const char *prefix, struct hvm_emulate_ctxt *hvmemul_ctxt);