From patchwork Thu Jan 28 10:55:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 8149211 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D474DBEEED for ; Thu, 28 Jan 2016 10:58:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0B02F20154 for ; Thu, 28 Jan 2016 10:58:26 +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 2F94C20320 for ; Thu, 28 Jan 2016 10:58:25 +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 1aOkF0-0005gq-Ie; Thu, 28 Jan 2016 10:55:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aOkEz-0005gb-3O for xen-devel@lists.xen.org; Thu, 28 Jan 2016 10:55:53 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id D1/02-21901-8B3F9A65; Thu, 28 Jan 2016 10:55:52 +0000 X-Env-Sender: prvs=828ccd7e0=Andrew.Cooper3@citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1453978550!18448083!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30639 invoked from network); 28 Jan 2016 10:55:51 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 28 Jan 2016 10:55:51 -0000 X-IronPort-AV: E=Sophos;i="5.22,358,1449532800"; d="scan'208";a="328194666" To: Jan Beulich References: <56A91122.50502@oracle.com> <1453921984-29197-1-git-send-email-andrew.cooper3@citrix.com> <56A9F0B202000078000CBE78@prv-mh.provo.novell.com> From: Andrew Cooper Message-ID: <56A9F3B4.5070406@citrix.com> Date: Thu, 28 Jan 2016 10:55:48 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.5.0 MIME-Version: 1.0 In-Reply-To: <56A9F0B202000078000CBE78@prv-mh.provo.novell.com> X-DLP: MIA1 Cc: Kevin Tian , Suravee Suthikulpanit , Xen-devel , AravindGopalakrishnan , Jun Nakajima , Boris Ostrovsky Subject: Re: [Xen-devel] [PATCH v2 2/2] x86/hvm: Don't intercept #UD exceptions in general 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 On 28/01/16 09:42, Jan Beulich wrote: >>>> On 27.01.16 at 20:13, wrote: >> --- a/xen/arch/x86/hvm/svm/vmcb.c >> +++ b/xen/arch/x86/hvm/svm/vmcb.c >> @@ -192,6 +192,7 @@ static int construct_vmcb(struct vcpu *v) >> >> vmcb->_exception_intercepts = >> HVM_TRAP_MASK >> + | (opt_hvm_fep ? (1U << TRAP_invalid_op) : 0) >> | (1U << TRAP_no_device); > This assumes a certain sequence of hypercalls by the tool stack > (i.e. set-cpuid only after all vCPU-s got created, or else the > intercept won't get enabled), which I think we should avoid. > Instead I think you'd better call the new hook from > hvm_vcpu_initialise(). Something like this (to be folded in) ? andrewcoop@andrewcoop:/local/xen.git/xen$ git diff diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 7a15d49..be5ead0 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2484,6 +2484,8 @@ int hvm_vcpu_initialise(struct vcpu *v) hvm_set_guest_tsc(v, 0); } + hvm_update_guest_vendor(v); + return 0; fail7: diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index be2dc32..9ea014f 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -192,7 +192,6 @@ static int construct_vmcb(struct vcpu *v) vmcb->_exception_intercepts = HVM_TRAP_MASK - | (opt_hvm_fep ? (1U << TRAP_invalid_op) : 0) | (1U << TRAP_no_device); if ( paging_mode_hap(v->domain) ) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index a12813a..5bc3c74 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1237,7 +1237,6 @@ static int construct_vmcs(struct vcpu *v) v->arch.hvm_vmx.exception_bitmap = HVM_TRAP_MASK | (paging_mode_hap(d) ? 0 : (1U << TRAP_page_fault)) - | (opt_hvm_fep ? (1U << TRAP_invalid_op) : 0) | (1U << TRAP_no_device); vmx_update_exception_bitmap(v);