From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52E32C433E2 for ; Tue, 15 Sep 2020 23:25:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1829720708 for ; Tue, 15 Sep 2020 23:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600212341; bh=Nojxtf0IKTF6y3sMgAU9/V4ARUO5QuPOSjQSAopzrFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=v1wswoL+XGXW5/6S4NIb12Pi7dPDv54nWuLGmjYtQe+JkqHdAUj9VEKVtJYVRoSA3 iyk+eSh9R2WjtqLYD50iJ2NzT7xO/6AGpKGK+wooTcI/QU949qYF3aXG8lp6k5r3Fq qNhSKMiTBzEn9FNSqZqsMGYzzwKUyF9BisIS4H/Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727023AbgIOXZh (ORCPT ); Tue, 15 Sep 2020 19:25:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:48794 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727169AbgIOOh4 (ORCPT ); Tue, 15 Sep 2020 10:37:56 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9F2AB23C82; Tue, 15 Sep 2020 14:27:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600180050; bh=Nojxtf0IKTF6y3sMgAU9/V4ARUO5QuPOSjQSAopzrFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ldV1quGOsQd2b8PeWfXQJsAndq5yTncHRKRfHRNBNXcJhuNkLChZOcW1oREx4kAK1 KbTR4Yv4K98eEUXOJ1li9jZRAt+7Nb1Vawhz1kRCfTycAtcq5lv0FUA3uvNRmydXSd JB9CEfOGiqHr19sOc+7gxMXE56gm6ej+4QTFzhiA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chenyi Qiang , Xiaoyao Li , Jim Mattson , Paolo Bonzini , Sasha Levin Subject: [PATCH 5.8 059/177] KVM: nVMX: Fix the update value of nested load IA32_PERF_GLOBAL_CTRL control Date: Tue, 15 Sep 2020 16:12:10 +0200 Message-Id: <20200915140656.463046785@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915140653.610388773@linuxfoundation.org> References: <20200915140653.610388773@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chenyi Qiang [ Upstream commit c6b177a3beb9140dc0ba05b61c5142fcec5f2bf7 ] A minor fix for the update of VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL field in exit_ctls_high. Fixes: 03a8871add95 ("KVM: nVMX: Expose load IA32_PERF_GLOBAL_CTRL VM-{Entry,Exit} control") Signed-off-by: Chenyi Qiang Reviewed-by: Xiaoyao Li Message-Id: <20200828085622.8365-5-chenyi.qiang@intel.com> Reviewed-by: Jim Mattson Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- arch/x86/kvm/vmx/nested.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index 11e4df5600183..a5810928b011f 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -4620,7 +4620,7 @@ void nested_vmx_pmu_entry_exit_ctls_update(struct kvm_vcpu *vcpu) vmx->nested.msrs.entry_ctls_high &= ~VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL; vmx->nested.msrs.exit_ctls_high &= - ~VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL; + ~VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL; } } -- 2.25.1