| Message ID | 20200201185218.24473-55-sean.j.christopherson@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: x86: Introduce KVM cpu caps | expand |
Sean Christopherson <sean.j.christopherson@intel.com> writes: > Use kvm_cpu_cap_has() to check for Intel PT when processing the list of > virtualized MSRs to pave the way toward removing ->pt_supported(). > > No functional change intended. > > Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> > --- > arch/x86/kvm/x86.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index e4353c03269c..9d38dcdbb613 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -5251,23 +5251,23 @@ static void kvm_init_msr_list(void) > break; > case MSR_IA32_RTIT_CTL: > case MSR_IA32_RTIT_STATUS: > - if (!kvm_x86_ops->pt_supported()) > + if (!kvm_cpu_cap_has(X86_FEATURE_INTEL_PT)) > continue; > break; > case MSR_IA32_RTIT_CR3_MATCH: > - if (!kvm_x86_ops->pt_supported() || > + if (!kvm_cpu_cap_has(X86_FEATURE_INTEL_PT) || > !intel_pt_validate_hw_cap(PT_CAP_cr3_filtering)) > continue; > break; > case MSR_IA32_RTIT_OUTPUT_BASE: > case MSR_IA32_RTIT_OUTPUT_MASK: > - if (!kvm_x86_ops->pt_supported() || > + if (!kvm_cpu_cap_has(X86_FEATURE_INTEL_PT) || > (!intel_pt_validate_hw_cap(PT_CAP_topa_output) && > !intel_pt_validate_hw_cap(PT_CAP_single_range_output))) > continue; > break; > case MSR_IA32_RTIT_ADDR0_A ... MSR_IA32_RTIT_ADDR3_B: { > - if (!kvm_x86_ops->pt_supported() || > + if (!kvm_cpu_cap_has(X86_FEATURE_INTEL_PT) || > msrs_to_save_all[i] - MSR_IA32_RTIT_ADDR0_A >= > intel_pt_validate_hw_cap(PT_CAP_num_address_ranges) * 2) > continue; Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index e4353c03269c..9d38dcdbb613 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5251,23 +5251,23 @@ static void kvm_init_msr_list(void) break; case MSR_IA32_RTIT_CTL: case MSR_IA32_RTIT_STATUS: - if (!kvm_x86_ops->pt_supported()) + if (!kvm_cpu_cap_has(X86_FEATURE_INTEL_PT)) continue; break; case MSR_IA32_RTIT_CR3_MATCH: - if (!kvm_x86_ops->pt_supported() || + if (!kvm_cpu_cap_has(X86_FEATURE_INTEL_PT) || !intel_pt_validate_hw_cap(PT_CAP_cr3_filtering)) continue; break; case MSR_IA32_RTIT_OUTPUT_BASE: case MSR_IA32_RTIT_OUTPUT_MASK: - if (!kvm_x86_ops->pt_supported() || + if (!kvm_cpu_cap_has(X86_FEATURE_INTEL_PT) || (!intel_pt_validate_hw_cap(PT_CAP_topa_output) && !intel_pt_validate_hw_cap(PT_CAP_single_range_output))) continue; break; case MSR_IA32_RTIT_ADDR0_A ... MSR_IA32_RTIT_ADDR3_B: { - if (!kvm_x86_ops->pt_supported() || + if (!kvm_cpu_cap_has(X86_FEATURE_INTEL_PT) || msrs_to_save_all[i] - MSR_IA32_RTIT_ADDR0_A >= intel_pt_validate_hw_cap(PT_CAP_num_address_ranges) * 2) continue;
Use kvm_cpu_cap_has() to check for Intel PT when processing the list of virtualized MSRs to pave the way toward removing ->pt_supported(). No functional change intended. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> --- arch/x86/kvm/x86.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)