lkml.org 
[lkml]   [2021]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V7 04/18] perf/x86/core: Pass "struct kvm_pmu *" to determine the guest values
    Date
    From: Like Xu <like.xu@linux.intel.com>

    Splitting the logic for determining the guest values is unnecessarily
    confusing, and potentially fragile. Perf should have full knowledge and
    control of what values are loaded for the guest.

    If we change .guest_get_msrs() to take a struct kvm_pmu pointer, then it
    can generate the full set of guest values by grabbing guest ds_area and
    pebs_data_cfg. Alternatively, .guest_get_msrs() could take the desired
    guest MSR values directly (ds_area and pebs_data_cfg), but kvm_pmu is
    vendor agnostic, so we don't see any reason to not just pass the pointer.

    Suggested-by: Sean Christopherson <seanjc@google.com>
    Signed-off-by: Like Xu <like.xu@linux.intel.com>
    Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com>
    ---
    arch/x86/events/core.c | 4 ++--
    arch/x86/events/intel/core.c | 4 ++--
    arch/x86/events/perf_event.h | 2 +-
    arch/x86/include/asm/perf_event.h | 4 ++--
    arch/x86/kvm/vmx/vmx.c | 3 ++-
    5 files changed, 9 insertions(+), 8 deletions(-)

    diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
    index 67eb5983bf80..6409f5fdd2b0 100644
    --- a/arch/x86/events/core.c
    +++ b/arch/x86/events/core.c
    @@ -712,9 +712,9 @@ void x86_pmu_disable_all(void)
    }
    }

    -struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr)
    +struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr, void *data)
    {
    - return static_call(x86_pmu_guest_get_msrs)(nr);
    + return static_call(x86_pmu_guest_get_msrs)(nr, data);
    }
    EXPORT_SYMBOL_GPL(perf_guest_get_msrs);

    diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
    index b187cb6b72fa..1d187b6d941a 100644
    --- a/arch/x86/events/intel/core.c
    +++ b/arch/x86/events/intel/core.c
    @@ -3897,7 +3897,7 @@ static int intel_pmu_hw_config(struct perf_event *event)
    return 0;
    }

    -static struct perf_guest_switch_msr *intel_guest_get_msrs(int *nr)
    +static struct perf_guest_switch_msr *intel_guest_get_msrs(int *nr, void *data)
    {
    struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
    struct perf_guest_switch_msr *arr = cpuc->guest_switch_msrs;
    @@ -3930,7 +3930,7 @@ static struct perf_guest_switch_msr *intel_guest_get_msrs(int *nr)
    return arr;
    }

    -static struct perf_guest_switch_msr *core_guest_get_msrs(int *nr)
    +static struct perf_guest_switch_msr *core_guest_get_msrs(int *nr, void *data)
    {
    struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
    struct perf_guest_switch_msr *arr = cpuc->guest_switch_msrs;
    diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h
    index d0634b142376..09c20373ae09 100644
    --- a/arch/x86/events/perf_event.h
    +++ b/arch/x86/events/perf_event.h
    @@ -876,7 +876,7 @@ struct x86_pmu {
    /*
    * Intel host/guest support (KVM)
    */
    - struct perf_guest_switch_msr *(*guest_get_msrs)(int *nr);
    + struct perf_guest_switch_msr *(*guest_get_msrs)(int *nr, void *data);

    /*
    * Check period value for PERF_EVENT_IOC_PERIOD ioctl.
    diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h
    index 6a6e707905be..d5957b68906b 100644
    --- a/arch/x86/include/asm/perf_event.h
    +++ b/arch/x86/include/asm/perf_event.h
    @@ -491,10 +491,10 @@ static inline void perf_check_microcode(void) { }
    #endif

    #if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_CPU_SUP_INTEL)
    -extern struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr);
    +extern struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr, void *data);
    extern int x86_perf_get_lbr(struct x86_pmu_lbr *lbr);
    #else
    -struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr);
    +struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr, void *data);
    static inline int x86_perf_get_lbr(struct x86_pmu_lbr *lbr)
    {
    return -1;
    diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
    index 50b42d7a8a11..3930e89679fc 100644
    --- a/arch/x86/kvm/vmx/vmx.c
    +++ b/arch/x86/kvm/vmx/vmx.c
    @@ -6595,9 +6595,10 @@ static void atomic_switch_perf_msrs(struct vcpu_vmx *vmx)
    {
    int i, nr_msrs;
    struct perf_guest_switch_msr *msrs;
    + struct kvm_pmu *pmu = vcpu_to_pmu(&vmx->vcpu);

    /* Note, nr_msrs may be garbage if perf_guest_get_msrs() returns NULL. */
    - msrs = perf_guest_get_msrs(&nr_msrs);
    + msrs = perf_guest_get_msrs(&nr_msrs, (void *)pmu);
    if (!msrs)
    return;

    --
    2.27.0
    \
     
     \ /
      Last update: 2021-06-22 11:44    [W:4.112 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site