lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 1102/1157] KVM: x86/pmu: Introduce the ctrl_mask value for fixed counter
    Date
    From: Like Xu <like.xu@linux.intel.com>

    [ Upstream commit 2c985527dd8d283e786ad7a67e532ef7f6f00fac ]

    The mask value of fixed counter control register should be dynamic
    adjusted with the number of fixed counters. This patch introduces a
    variable that includes the reserved bits of fixed counter control
    registers. This is a generic code refactoring.

    Co-developed-by: Luwei Kang <luwei.kang@intel.com>
    Signed-off-by: Luwei Kang <luwei.kang@intel.com>
    Signed-off-by: Like Xu <like.xu@linux.intel.com>
    Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Message-Id: <20220411101946.20262-6-likexu@tencent.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/include/asm/kvm_host.h | 1 +
    arch/x86/kvm/vmx/pmu_intel.c | 6 +++++-
    2 files changed, 6 insertions(+), 1 deletion(-)

    diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
    index 9217bd6cf0d1..4b41ab003a1c 100644
    --- a/arch/x86/include/asm/kvm_host.h
    +++ b/arch/x86/include/asm/kvm_host.h
    @@ -505,6 +505,7 @@ struct kvm_pmu {
    unsigned nr_arch_fixed_counters;
    unsigned available_event_types;
    u64 fixed_ctr_ctrl;
    + u64 fixed_ctr_ctrl_mask;
    u64 global_ctrl;
    u64 global_status;
    u64 counter_bitmask[2];
    diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c
    index 37e9eb32e3d9..7e72022a00aa 100644
    --- a/arch/x86/kvm/vmx/pmu_intel.c
    +++ b/arch/x86/kvm/vmx/pmu_intel.c
    @@ -395,7 +395,7 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
    case MSR_CORE_PERF_FIXED_CTR_CTRL:
    if (pmu->fixed_ctr_ctrl == data)
    return 0;
    - if (!(data & 0xfffffffffffff444ull)) {
    + if (!(data & pmu->fixed_ctr_ctrl_mask)) {
    reprogram_fixed_counters(pmu, data);
    return 0;
    }
    @@ -479,6 +479,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
    struct kvm_cpuid_entry2 *entry;
    union cpuid10_eax eax;
    union cpuid10_edx edx;
    + int i;

    pmu->nr_arch_gp_counters = 0;
    pmu->nr_arch_fixed_counters = 0;
    @@ -487,6 +488,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
    pmu->version = 0;
    pmu->reserved_bits = 0xffffffff00200000ull;
    pmu->raw_event_mask = X86_RAW_EVENT_MASK;
    + pmu->fixed_ctr_ctrl_mask = ~0ull;

    entry = kvm_find_cpuid_entry(vcpu, 0xa, 0);
    if (!entry || !vcpu->kvm->arch.enable_pmu)
    @@ -522,6 +524,8 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
    setup_fixed_pmc_eventsel(pmu);
    }

    + for (i = 0; i < pmu->nr_arch_fixed_counters; i++)
    + pmu->fixed_ctr_ctrl_mask &= ~(0xbull << (i * 4));
    pmu->global_ctrl = ((1ull << pmu->nr_arch_gp_counters) - 1) |
    (((1ull << pmu->nr_arch_fixed_counters) - 1) << INTEL_PMC_IDX_FIXED);
    pmu->global_ctrl_mask = ~pmu->global_ctrl;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 03:04    [W:3.323 / U:0.596 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site