Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH] KVM: vmx/pmu: Add VMCS fields check before exposing
 LBR_FMT
To:     Like Xu <like.xu@linux.intel.com>
Cc:     Sean Christopherson <seanjc@google.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>,
        Wanpeng Li <wanpengli@tencent.com>,
        Jim Mattson <jmattson@google.com>,
        Joerg Roedel <joro@8bytes.org>, kvm@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20210203065027.314622-1-like.xu@linux.intel.com>
From:   Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <f1fa3086-b95b-58bc-3814-31fe08dc8be6@redhat.com>
Date:   Wed, 3 Feb 2021 10:42:22 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.6.0
MIME-Version: 1.0
In-Reply-To: <20210203065027.314622-1-like.xu@linux.intel.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 03/02/21 07:50, Like Xu wrote:
> Before KVM exposes guest LBR_FMT perf capabilities, it needs to check
> whether VMCS has GUEST_IA32_DEBUGCTL guest status field and vmx switch
> support on IA32_DEBUGCTL MSR (including VM_EXIT_SAVE_DEBUG_CONTROLS
> and VM_ENTRY_LOAD_DEBUG_CONTROLS). It helps nested LBR enablement.
> 
> Signed-off-by: Like Xu <like.xu@linux.intel.com>
> ---
>   arch/x86/kvm/vmx/capabilities.h | 9 ++++++++-
>   1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/x86/kvm/vmx/capabilities.h b/arch/x86/kvm/vmx/capabilities.h
> index d1d77985e889..ac3af06953a8 100644
> --- a/arch/x86/kvm/vmx/capabilities.h
> +++ b/arch/x86/kvm/vmx/capabilities.h
> @@ -378,6 +378,12 @@ static inline bool vmx_pt_mode_is_host_guest(void)
>   	return pt_mode == PT_MODE_HOST_GUEST;
>   }
>   
> +static inline bool cpu_has_vmx_lbr(void)
> +{
> +	return (vmcs_config.vmexit_ctrl & VM_EXIT_SAVE_DEBUG_CONTROLS) &&
> +		(vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_DEBUG_CONTROLS);
> +}
> +
>   static inline u64 vmx_get_perf_capabilities(void)
>   {
>   	u64 perf_cap = 0;
> @@ -385,7 +391,8 @@ static inline u64 vmx_get_perf_capabilities(void)
>   	if (boot_cpu_has(X86_FEATURE_PDCM))
>   		rdmsrl(MSR_IA32_PERF_CAPABILITIES, perf_cap);
>   
> -	perf_cap &= PMU_CAP_LBR_FMT;
> +	if (cpu_has_vmx_lbr())
> +		perf_cap &= PMU_CAP_LBR_FMT;

This is incorrect in the case where cpu_has_vmx_lbr() is false.  You 
would need something like

  	u64 perf_cap = 0;
	u64 host_perf_cap = 0;

  	if (boot_cpu_has(X86_FEATURE_PDCM))
		rdmsrl(MSR_IA32_PERF_CAPABILITIES, host_perf_cap);

	if (cpu_has_vmx_lbr())
		perf_cap |= host_perf_cap & PMU_CAP_LBR_FMT;

However, KVM won't run without VM_ENTRY_LOAD_DEBUG_CONTROLS and 
VM_EXIT_SAVE_DEBUG_CONTROLS (see setup_vmcs_config), so this change is 
not needed either.

Paolo