Re: [PATCH 6/7] perf: x86/core: Add interface to query perfmon_event_map[] directly

From: Like Xu
Date: Thu Nov 18 2021 - 08:36:51 EST


On 18/11/2021 4:06 pm, Like Xu wrote:
On 18/11/2021 7:21 am, kernel test robot wrote:
Hi Like,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on kvm/queue]
[also build test ERROR on tip/perf/core mst-vhost/linux-next linus/master v5.16-rc1 next-20211117]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]


...

vim +500 arch/x86/include/asm/perf_event.h

    492
    493    #if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_CPU_SUP_INTEL)
    494    extern struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr);
    495    extern u64 perf_get_hw_event_config(int perf_hw_id);
    496    extern int x86_perf_get_lbr(struct x86_pmu_lbr *lbr);
    497    #else
    498    struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr);
    499    u64 perf_get_hw_event_config(int perf_hw_id);

Thanks to the robot, I should have removed the ";" from this line.


Sorry, my bot is shouting at me again. This part should be:

diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h
index 8fc1b5003713..85fd768d49d7 100644
--- a/arch/x86/include/asm/perf_event.h
+++ b/arch/x86/include/asm/perf_event.h
@@ -492,9 +492,11 @@ static inline void perf_check_microcode(void) { }

#if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_CPU_SUP_INTEL)
extern struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr);
+extern u64 perf_get_hw_event_config(int perf_hw_id);
extern int x86_perf_get_lbr(struct x86_pmu_lbr *lbr);
#else
struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr);
+static u64 perf_get_hw_event_config(int perf_hw_id);
static inline int x86_perf_get_lbr(struct x86_pmu_lbr *lbr)
{
return -1;

Awaiting further review comments.

  > 500    {
    501        return 0;
    502    }
    503    static inline int x86_perf_get_lbr(struct x86_pmu_lbr *lbr)
    504    {
    505        return -1;
    506    }
    507    #endif
    508

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@xxxxxxxxxxxx