From patchwork Tue Sep 15 15:35:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 7187081 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E12F89F380 for ; Tue, 15 Sep 2015 15:35:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1C22620452 for ; Tue, 15 Sep 2015 15:35:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F07320495 for ; Tue, 15 Sep 2015 15:35:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752759AbbIOPfQ (ORCPT ); Tue, 15 Sep 2015 11:35:16 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:34372 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752709AbbIOPfO (ORCPT ); Tue, 15 Sep 2015 11:35:14 -0400 Received: by wicfx3 with SMTP id fx3so34532974wic.1; Tue, 15 Sep 2015 08:35:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=hCDAAi7Yz3lQ+nFWgRSvgAbSRcuUjDDxsQgvb7ys0AU=; b=j1Cw09ddFTNDF7kIPWXJD+6EqgufCryasyENfDS2kThOoA4KjImnC35AtnF5NK6BMJ mbHOU/0spnd3QxPW8PUW6yOuTBE9CGw/cWxvyWiMhDxdb888S61+TI3q/n/n0K6zv6P7 8cElRz/ejim++AD6y0F9dHkxFqDIZSpLbFcqD1Q6P82soiELol5qH3w12+9oGYTlxDaU RWRwX0kWQwKzqKq0zVtQuUoo57nOvcmCWawEitbyP/o1VF/XFnm1BjceSMIYO3tQ2v0r VRAc9m+pcDiObhMki4RQEAYxm+DNCHOczh9fsSE0/unXTDGK+Jjhq7GzWZq3tQIctgeK 8a5g== X-Received: by 10.180.218.103 with SMTP id pf7mr8444721wic.6.1442331313215; Tue, 15 Sep 2015 08:35:13 -0700 (PDT) Received: from 640k.lan ([94.39.138.45]) by smtp.gmail.com with ESMTPSA id ka10sm6907090wjc.30.2015.09.15.08.35.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Sep 2015 08:35:11 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: guangrong.xiao@linux.intel.com Subject: [PATCH] KVM: VMX: align vmx->nested.nested_vmx_secondary_ctls_high to vmx->rdtscp_enabled Date: Tue, 15 Sep 2015 17:35:04 +0200 Message-Id: <1442331304-29939-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham 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 The SECONDARY_EXEC_RDTSCP must be available iff RDTSCP is enabled in the guest. Signed-off-by: Paolo Bonzini --- arch/x86/kvm/vmx.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 4df94e2b7c23..fb7a35ad9b02 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -8678,9 +8678,14 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu) exec_control); } - if (nested && !vmx->rdtscp_enabled) - vmx->nested.nested_vmx_secondary_ctls_high &= - ~SECONDARY_EXEC_RDTSCP; + if (nested) { + if (vmx->rdtscp_enabled) + vmx->nested.nested_vmx_secondary_ctls_high |= + SECONDARY_EXEC_RDTSCP; + else + vmx->nested.nested_vmx_secondary_ctls_high &= + ~SECONDARY_EXEC_RDTSCP; + } } /* Exposing INVPCID only when PCID is exposed */