From patchwork Wed Jul 19 11:57:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9851867 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 DDB4D60392 for ; Wed, 19 Jul 2017 12:00:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA97A274D0 for ; Wed, 19 Jul 2017 12:00:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF58D28426; Wed, 19 Jul 2017 12:00:07 +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 4C357274D0 for ; Wed, 19 Jul 2017 12:00:07 +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 1dXncD-0005Nt-Uo; Wed, 19 Jul 2017 11:58:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXncC-0005Kj-I5 for xen-devel@lists.xen.org; Wed, 19 Jul 2017 11:58:04 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 6F/DD-01732-B494F695; Wed, 19 Jul 2017 11:58:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHSDva63Z36 kQV+jrMWSj4tZHBg9ju7+zRTAGMWamZeUX5HAmnHnp1lBF0/F5R37mRsYL3B2MXJySAj4S9xs 2MUIYrMJ6EvsfvGJCcQWEVCXON1xkbWLkYuDWWAWo8TrXT9YQBLCAmESc9ftBytiEVCVWHLqA zOIzSvgKbFo7V9GiKFyEueP/wSLcwp4STQ9/AjWKwRU83P/JWYIW03iWv8ldoheQYmTM5+A1T ALSEgcfPGCeQIj7ywkqVlIUgsYmVYxahSnFpWlFukameolFWWmZ5TkJmbm6BoaGOvlphYXJ6a n5iQmFesl5+duYgQGTz0DA+MOxtYTfocYJTmYlER55/DmRwrxJeWnVGYkFmfEF5XmpBYfYpTh 4FCS4LXzAMoJFqWmp1akZeYAwxgmLcHBoyTC+9YdKM1bXJCYW5yZDpE6xajL8WrC/29MQix5+ XmpUuK8S0GKBECKMkrz4EbAYuoSo6yUMC8jAwODEE9BalFuZgmq/CtGcQ5GJWFed5BLeDLzSu A2vQI6ggnoCGHfHJAjShIRUlINjNN3Lqhv32n4X77xorB7cn7iuRzXdwz/PExYnVu6e98E5RY cmLLjYe/X+rkfk2f29n+s25I6uSPdKcrllvTbDTMXlH8weplavaw5K2a2ZMsPZT2OR7+SPGd/ mLzf6BuPWab/gg8xp30/7L2Rdaj16rytGWJ5HVs2O02fJDy/unT65yliEr9C5yqxFGckGmoxF xUnAgAHI/fDpAIAAA== X-Env-Sender: prvs=366acc0af=Andrew.Cooper3@citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1500465480!102112072!3 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.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13658 invoked from network); 19 Jul 2017 11:58:03 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-15.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 19 Jul 2017 11:58:03 -0000 X-IronPort-AV: E=Sophos;i="5.40,380,1496102400"; d="scan'208";a="440444016" From: Andrew Cooper To: Xen-devel Date: Wed, 19 Jul 2017 12:57:56 +0100 Message-ID: <1500465477-23793-6-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1500465477-23793-1-git-send-email-andrew.cooper3@citrix.com> References: <1500465477-23793-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Kevin Tian , Jun Nakajima , Jan Beulich Subject: [Xen-devel] [PATCH 5/6] x86/vvmx: Fix handing of the MSR_BITMAP field with VMCS shadowing 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 Currently, the following sequence of actions: * VMPTRLD (creates a mapping, likely pointing at gfn 0 for an empty vmcs) * VMWRITE CPU_BASED_VM_EXEC_CONTROL (completed by hardware) * VMWRITE MSR_BITMAP (completed by hardware) * VMLAUNCH results in an L2 guest running with ACTIVATE_MSR_BITMAP set, but Xen using a stale mapping (likely gfn 0) when reading the interception bitmap. The MSR_BITMAP field needs unconditionally intercepting even with VMCS shadowing, so Xen's mapping of the bitmap can be updated. Signed-off-by: Andrew Cooper Reviewed-by: Sergey Dyasli Acked-by: Kevin Tian --- CC: Jan Beulich CC: Jun Nakajima CC: Kevin Tian --- xen/arch/x86/hvm/vmx/vvmx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 0d08789..f84478e 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -98,13 +98,15 @@ int nvmx_vcpu_initialise(struct vcpu *v) clear_page(vw); /* - * For the following 4 encodings, we need to handle them in VMM. + * For the following 6 encodings, we need to handle them in VMM. * Let them vmexit as usual. */ set_bit(IO_BITMAP_A, vw); set_bit(VMCS_HIGH(IO_BITMAP_A), vw); set_bit(IO_BITMAP_B, vw); set_bit(VMCS_HIGH(IO_BITMAP_B), vw); + set_bit(MSR_BITMAP, vw); + set_bit(VMCS_HIGH(MSR_BITMAP), vw); unmap_domain_page(vw); }