From patchwork Fri Jul 1 17:52:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9210323 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CB314607D6 for ; Fri, 1 Jul 2016 17:55:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1EDD2852F for ; Fri, 1 Jul 2016 17:55:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B649A28533; Fri, 1 Jul 2016 17:55:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 304962852F for ; Fri, 1 Jul 2016 17:55:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bJ2ch-0005RB-FY; Fri, 01 Jul 2016 17:53:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bJ2cg-0005R5-K0 for xen-devel@lists.xen.org; Fri, 01 Jul 2016 17:53:02 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 12/E0-20705-DFDA6775; Fri, 01 Jul 2016 17:53:01 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRWlGSWpSXmKPExsXitHRDpO7ftWX hBg2L5C2WfFzM4sDocXT3b6YAxijWzLyk/IoE1ozt3y+wFRzgqTjVtISpgfEcVxcjJ4eEgL/E xDWnWEFsNgF9id0vPjGB2CIC6hKnOy4Cxbk4mAVmMUq83vWDBSQhLOAoseXqEjCbRUBF4smW2 cwgNq+Ap8SjGQeYIIbKSZw//hMsLiSgJnGt/xI7RI2gxMmZT8B6mQUkJA6+eAFUwwFUzy3xt9 t+AiPPLCRVs5BULWBkWsWoXpxaVJZapGuhl1SUmZ5RkpuYmaNraGCsl5taXJyYnpqTmFSsl5y fu4kRGCIMQLCD8UK78yFGSQ4mJVFel+ll4UJ8SfkplRmJxRnxRaU5qcWHGGU4OJQkeMvWAOUE i1LTUyvSMnOAwQqTluDgURLhXQCS5i0uSMwtzkyHSJ1iVJQS57UBSQiAJDJK8+DaYBFyiVFWS piXEegQIZ6C1KLczBJU+VeM4hyMSsK8k0Cm8GTmlcBNfwW0mAloMXNpMcjikkSElFQDo4vLv6 TvZfyzoioM5z2c+FWjzORRTZHnfE+5ebxs3w8vTNnbLiUhs+hryWzZV/MPChivOjV9JUv/m74 fxnEX1/34zLjfUSTqR2dq5bPwCaWtk66fmPHzQvXk5K9BnTGznsnNfN9lf+jAgR/iy1wmnrvc 9M3yZe/ujO23Pn629C0I091w5/rpF35KLMUZiYZazEXFiQCy7qKRiwIAAA== X-Env-Sender: prvs=98327f9ff=Andrew.Cooper3@citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1467395579!40902685!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6811 invoked from network); 1 Jul 2016 17:53:01 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 1 Jul 2016 17:53:01 -0000 X-IronPort-AV: E=Sophos;i="5.26,558,1459814400"; d="scan'208";a="364005227" From: Andrew Cooper To: Xen-devel Date: Fri, 1 Jul 2016 18:52:54 +0100 Message-ID: <1467395574-15074-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 , Kevin Tian , Jun Nakajima , Jan Beulich Subject: [Xen-devel] [PATCH] x86/VT-x: Dump VMCS on VMLAUNCH/VMRESUME failure X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP If a VMLAUNCH/VMRESUME fails due to invalid control or host state, dump the VMCS before crashing the domain. Signed-off-by: Andrew Cooper Acked-by: Kevin Tian Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Jun Nakajima CC: Kevin Tian --- xen/arch/x86/hvm/vmx/vmcs.c | 5 +++++ xen/include/asm-x86/hvm/vmx/vmcs.h | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 46b63b6..1bd875a 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1637,6 +1637,11 @@ void vmx_vmentry_failure(void) __vmread(VM_INSTRUCTION_ERROR, &error); gprintk(XENLOG_ERR, "VM%s error: %#lx\n", curr->arch.hvm_vmx.launched ? "RESUME" : "LAUNCH", error); + + if ( error == VMX_INSN_INVALID_CONTROL_STATE || + error == VMX_INSN_INVALID_HOST_STATE ) + vmcs_dump_vcpu(curr); + domain_crash_synchronous(); } diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 9f1729d..1e33d9c 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -567,6 +567,10 @@ enum vmcs_field { #define VMX_GUEST_MSR 0 #define VMX_HOST_MSR 1 +/* VM Instruction error numbers. */ +#define VMX_INSN_INVALID_CONTROL_STATE 7 +#define VMX_INSN_INVALID_HOST_STATE 8 + void vmx_disable_intercept_for_msr(struct vcpu *v, u32 msr, int type); void vmx_enable_intercept_for_msr(struct vcpu *v, u32 msr, int type); int vmx_read_guest_msr(u32 msr, u64 *val);