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=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 4A02BC49ED7 for ; Mon, 16 Sep 2019 18:10:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 20E98206A4 for ; Mon, 16 Sep 2019 18:10:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390274AbfIPSKE (ORCPT ); Mon, 16 Sep 2019 14:10:04 -0400 Received: from mga11.intel.com ([192.55.52.93]:13972 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726887AbfIPSKE (ORCPT ); Mon, 16 Sep 2019 14:10:04 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Sep 2019 11:10:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,513,1559545200"; d="scan'208";a="177121916" Received: from sjchrist-coffee.jf.intel.com (HELO linux.intel.com) ([10.54.74.41]) by orsmga007.jf.intel.com with ESMTP; 16 Sep 2019 11:10:03 -0700 Date: Mon, 16 Sep 2019 11:10:03 -0700 From: Sean Christopherson To: Oliver Upton Cc: kvm@vger.kernel.org, Paolo Bonzini , Radim =?utf-8?B?S3LEjW3DocWZ?= , Jim Mattson , Peter Shier , Krish Sadhukhan Subject: Re: [PATCH v4 4/9] KVM: nVMX: check GUEST_IA32_PERF_GLOBAL_CTRL on VM-Entry Message-ID: <20190916181003.GG18871@linux.intel.com> References: <20190906210313.128316-1-oupton@google.com> <20190906210313.128316-5-oupton@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190906210313.128316-5-oupton@google.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Fri, Sep 06, 2019 at 02:03:08PM -0700, Oliver Upton wrote: > Add condition to nested_vmx_check_guest_state() to check the validity of > GUEST_IA32_PERF_GLOBAL_CTRL. Per Intel's SDM Vol 3 26.3.1.1: > > If the "load IA32_PERF_GLOBAL_CTRL" VM-entry control is 1, bits > reserved in the IA32_PERF_GLOBAL_CTRL MSR must be 0 in the field for that > register. > > Suggested-by: Jim Mattson > Co-developed-by: Krish Sadhukhan > Signed-off-by: Krish Sadhukhan > Signed-off-by: Oliver Upton > Reviewed-by: Jim Mattson > Reviewed-by: Peter Shier > --- > arch/x86/kvm/vmx/nested.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c > index 9ba90b38d74b..6c3aa3bcede3 100644 > --- a/arch/x86/kvm/vmx/nested.c > +++ b/arch/x86/kvm/vmx/nested.c > @@ -10,6 +10,7 @@ > #include "hyperv.h" > #include "mmu.h" > #include "nested.h" > +#include "pmu.h" > #include "trace.h" > #include "x86.h" > > @@ -2732,6 +2733,7 @@ static int nested_vmx_check_guest_state(struct kvm_vcpu *vcpu, > u32 *exit_qual) > { > bool ia32e; > + struct kvm_pmu *pmu = vcpu_to_pmu(vcpu); Nit: I wouldn't bother with a local variable, just call vcpu_to_pmu() when invoking kvm_is_valid_perf_global_ctrl(), especially since you need a line break anyways. > > *exit_qual = ENTRY_FAIL_DEFAULT; > > @@ -2748,6 +2750,11 @@ static int nested_vmx_check_guest_state(struct kvm_vcpu *vcpu, > return -EINVAL; > } > > + if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL && > + !kvm_is_valid_perf_global_ctrl(pmu, > + vmcs12->guest_ia32_perf_global_ctrl)) > + return -EINVAL; > + > /* > * If the load IA32_EFER VM-entry control is 1, the following checks > * are performed on the field for the IA32_EFER MSR: > -- > 2.23.0.187.g17f5b7556c-goog >