From patchwork Mon Dec 19 16:37: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: 9480561 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 DE0FF60237 for ; Mon, 19 Dec 2016 16:42:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9C0A283F4 for ; Mon, 19 Dec 2016 16:42:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCC6128406; Mon, 19 Dec 2016 16:42:57 +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 470BF283F4 for ; Mon, 19 Dec 2016 16:42:57 +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 1cJ0zh-0003so-Ih; Mon, 19 Dec 2016 16:40:57 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cJ0zg-0003sh-UP for xen-devel@lists.xen.org; Mon, 19 Dec 2016 16:40:57 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 4E/C6-22326-89D08585; Mon, 19 Dec 2016 16:40:56 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrGLMWRWlGSWpSXmKPExsXitHSDve503og Ig6NLdCyWfFzM4sDocXT3b6YAxijWzLyk/IoE1owtF96wF7zlqVj26R5TA2MrVxcjJ4eEgL/E ontfWUBsNgF9id0vPjGB2CIC6hKnOy6ydjFycDAL+EkceuALYgoLhElM26QMYrIIqEpM+eMKU swr4Clx5cN7VoiBchLnj/9kBrGFBNQkrvVfYoeoEZQ4OfMJ2CJmAQmJgy9eME9g5J6FJDULSW oBI9MqRo3i1KKy1CJdQ0u9pKLM9IyS3MTMHF1DAzO93NTi4sT01JzEpGK95PzcTYzAMGAAgh2 MP5YFHGKU5GBSEuWdsjYkQogvKT+lMiOxOCO+qDQntfgQowwHh5IEbxxPRISQYFFqempFWmYO MCBh0hIcPEoivEe4gdK8xQWJucWZ6RCpU4y6HLeOL3nKJMSSl5+XKiXOqwQyQwCkKKM0D24EL DouMcpKCfMyAh0lxFOQWpSbWYIq/4pRnINRSZi3DGQKT2ZeCdymV0BHMAEdsbA7HOSIkkSElF QDo+S9JUotq9+GKKdwX4uYGVO7nlfjHR9PFNsGBr/Cy6zJkeVSi1uzL6sUX73JwdPakVO8qKj 4TVRo76uv2k1B/wLc2h5HJH5bmWj07J2L4CGd8yI2s50+S9oY1U+SleBVdVM4MSF3X4Webs/m Ao7gc2wSgvx3d6g9WPi5d8p7O+lbW7+9+JKlxFKckWioxVxUnAgAtNYCHYkCAAA= X-Env-Sender: prvs=154f58c42=Andrew.Cooper3@citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1482165653!48446482!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: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10460 invoked from network); 19 Dec 2016 16:40:55 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 19 Dec 2016 16:40:55 -0000 X-IronPort-AV: E=Sophos;i="5.33,374,1477958400"; d="scan'208";a="404421195" From: Andrew Cooper To: Xen-devel Date: Mon, 19 Dec 2016 16:37:54 +0000 Message-ID: <1482165475-26302-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Cc: Andrew Cooper , Jan Beulich Subject: [Xen-devel] [PATCH 1/2] x86/hvm: Don't emulate all instructions hitting the #UD intercept 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 Having the instruction emulator fill in all #UDs when using FEP is unhelpful when trying to test emulation behaviour against hardware. Restrict emulation from the #UD intercept to the cross-vendor case, and when a postive Forced Emulation Prefix has been identified. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 73d24df..12a6f46 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4002,13 +4002,15 @@ int hvm_msr_write_intercept(unsigned int msr, uint64_t msr_content, void hvm_ud_intercept(struct cpu_user_regs *regs) { + struct vcpu *cur = current; + bool should_emulate = + cur->domain->arch.x86_vendor != boot_cpu_data.x86_vendor; struct hvm_emulate_ctxt ctxt; hvm_emulate_init_once(&ctxt, regs); if ( opt_hvm_fep ) { - struct vcpu *cur = current; const struct segment_register *cs = &ctxt.seg_reg[x86_seg_cs]; uint32_t walk = (ctxt.seg_reg[x86_seg_ss].attr.fields.dpl == 3) ? PFEC_user_mode : 0; @@ -4032,9 +4034,17 @@ void hvm_ud_intercept(struct cpu_user_regs *regs) regs->eip = regs->_eip; add_taint(TAINT_HVM_FEP); + + should_emulate = true; } } + if ( !should_emulate ) + { + hvm_inject_hw_exception(TRAP_invalid_op, X86_EVENT_NO_EC); + return; + } + switch ( hvm_emulate_one(&ctxt) ) { case X86EMUL_UNHANDLEABLE: