From patchwork Mon Nov 14 11:01:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9427215 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 091D260476 for ; Mon, 14 Nov 2016 11:03:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EDD472094F for ; Mon, 14 Nov 2016 11:03:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E298A2856F; Mon, 14 Nov 2016 11:03:56 +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 34BE32094F for ; Mon, 14 Nov 2016 11:03:55 +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 1c6F13-0001Qq-2c; Mon, 14 Nov 2016 11:01:33 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c6F12-0001Qk-Ff for xen-devel@lists.xen.org; Mon, 14 Nov 2016 11:01:32 +0000 Received: from [193.109.254.147] by server-9.bemta-6.messagelabs.com id A2/3B-16838-B8999285; Mon, 14 Nov 2016 11:01:31 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNIsWRWlGSWpSXmKPExsXitHRDpG73TM0 IgzNtAhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa0bzvvWsBc/YKtqfzGFpYFzD2sXIySEh4C/x +tl/FhCbTUBfYveLT0wgtoiAusTpjotgNcwCeRKdHz+yg9jCAjES7S//gdWzCKhKPHndwAZi8 wp4SPzecpkZYqacxPnjP4FsDg5OAU+JHR/NQcJCQCXbm64yQ9hqEtf6L7FDtApKnJz5hAVilY TEwRcvwFolBLgl/nbbT2Dkm4WkahaSqgWMTKsYNYpTi8pSi3QNTfWSijLTM0pyEzNzdA0NzPR yU4uLE9NTcxKTivWS83M3MQIDigEIdjB+WxZwiFGSg0lJlDc+UjNCiC8pP6UyI7E4I76oNCe1 +BCjDAeHkgTv8RlAOcGi1PTUirTMHGBow6QlOHiURHjPgaR5iwsSc4sz0yFSpxh1Od5tfveAS YglLz8vVUqctxukSACkKKM0D24ELM4uMcpKCfMyAh0lxFOQWpSbWYIq/4pRnINRSZj3E8gUns y8ErhNr4COYAI6Ype5BsgRJYkIKakGxuk6zh943ZfF6/+K/7K+r2OWgfdc1jRpj4mvd2/8Oqt vb7a3ZEMR37JO/S3T3rfPmFugPfVUikjqulNu7Md1WL0usbTHFHYFPzG2nGMoz1pneWtFD3Pb hUNPLglNzn3XfuR80PMHJt7TXtjM88tcmyniFrF7fTyTsAnLyQXhcWc/Tk/reG3XosRSnJFoq MVcVJwIAA6NKbyuAgAA X-Env-Sender: prvs=11933e973=Andrew.Cooper3@citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1479121289!62107099!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: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22389 invoked from network); 14 Nov 2016 11:01:30 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 14 Nov 2016 11:01:30 -0000 X-IronPort-AV: E=Sophos;i="5.31,638,1473120000"; d="scan'208";a="389328401" From: Andrew Cooper To: Xen-devel Date: Mon, 14 Nov 2016 11:01:26 +0000 Message-ID: <1479121286-6390-2-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1479121286-6390-1-git-send-email-andrew.cooper3@citrix.com> References: <1479121286-6390-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Andrew Cooper , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH for-4.8 2/2] x86/traps: Don't call hvm_hypervisor_cpuid_leaf() for PV guests 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 Luckily, hvm_hypervisor_cpuid_leaf() and vmx_hypervisor_cpuid_leaf() are safe to execute in the context of a PV guest, but HVM-specific feature flags shouldn't be visible to PV guests. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Wei Liu --- xen/arch/x86/traps.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 14abb62..d56d76e 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -928,6 +928,11 @@ int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx, break; case 4: + if ( !has_hvm_container_domain(currd) ) + { + *eax = *ebx = *ecx = *edx = 0; + break; + } hvm_hypervisor_cpuid_leaf(sub_idx, eax, ebx, ecx, edx); break;