perf/x86/intel/lbr: Support XSAVES for arch LBR read

Reading LBR registers in a perf NMI handler for a non-PEBS event
causes a high overhead because the number of LBR registers is huge.
To reduce the overhead, the XSAVES instruction should be used to replace
the LBR registers' reading method.

The XSAVES buffer used for LBR read has to be per-CPU because the NMI
handler invoked the lbr_read(). The existing task_ctx_data buffer
cannot be used which is per-task and only be allocated for the LBR call
stack mode. A new lbr_xsave pointer is introduced in the cpu_hw_events
as an XSAVES buffer for LBR read.

The XSAVES buffer should be allocated only when LBR is used by a
non-PEBS event on the CPU because the total size of the lbr_xsave is
not small (~1.4KB).

The XSAVES buffer is allocated when a non-PEBS event is added, but it
is lazily released in x86_release_hardware() when perf releases the
entire PMU hardware resource, because perf may frequently schedule the
event, e.g. high context switch. The lazy release method reduces the
overhead of frequently allocate/free the buffer.

If the lbr_xsave fails to be allocated, roll back to normal Arch LBR
lbr_read().

Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Dave Hansen <dave.hansen@intel.com>
Link: https://lkml.kernel.org/r/1593780569-62993-24-git-send-email-kan.liang@linux.intel.com

diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 6b1228ae007dcd983e674bde739f136e1c7143cb..1cbf57dc2ac89c19eac7148dc36f88bd60ea0f76 100644 (file)
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -358,6 +358,7 @@ void x86_release_hardware(void)
        if (atomic_dec_and_mutex_lock(&pmc_refcount, &pmc_reserve_mutex)) {
                release_pmc_hardware();
                release_ds_buffers();
+               release_lbr_buffers();
                mutex_unlock(&pmc_reserve_mutex);
        }
 }

diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
index cb1a0495339b826058cdfd56c1d5332b63390c60..63f58bdf556c433f46a215ba70cc12204250313c 100644 (file)
--- a/arch/x86/events/intel/lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -658,6 +658,7 @@ static inline bool branch_user_callstack(unsigned br_sel)
 
 void intel_pmu_lbr_add(struct perf_event *event)
 {
+       struct kmem_cache *kmem_cache = event->pmu->task_ctx_cache;
        struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
 
        if (!x86_pmu.lbr_nr)
@@ -695,6 +696,29 @@ void intel_pmu_lbr_add(struct perf_event *event)
        perf_sched_cb_inc(event->ctx->pmu);
        if (!cpuc->lbr_users++ && !event->total_time_running)
                intel_pmu_lbr_reset();
+
+       if (static_cpu_has(X86_FEATURE_ARCH_LBR) &&
+           kmem_cache && !cpuc->lbr_xsave &&
+           (cpuc->lbr_users != cpuc->lbr_pebs_users))
+               cpuc->lbr_xsave = kmem_cache_alloc(kmem_cache, GFP_KERNEL);
+}
+
+void release_lbr_buffers(void)
+{
+       struct kmem_cache *kmem_cache = x86_get_pmu()->task_ctx_cache;
+       struct cpu_hw_events *cpuc;
+       int cpu;
+
+       if (!static_cpu_has(X86_FEATURE_ARCH_LBR))
+               return;
+
+       for_each_possible_cpu(cpu) {
+               cpuc = per_cpu_ptr(&cpu_hw_events, cpu);
+               if (kmem_cache && cpuc->lbr_xsave) {
+                       kmem_cache_free(kmem_cache, cpuc->lbr_xsave);
+                       cpuc->lbr_xsave = NULL;
+               }
+       }
 }
 
 void intel_pmu_lbr_del(struct perf_event *event)
@@ -945,6 +969,19 @@ static void intel_pmu_arch_lbr_read(struct cpu_hw_events *cpuc)
        intel_pmu_store_lbr(cpuc, NULL);
 }
 
+static void intel_pmu_arch_lbr_read_xsave(struct cpu_hw_events *cpuc)
+{
+       struct x86_perf_task_context_arch_lbr_xsave *xsave = cpuc->lbr_xsave;
+
+       if (!xsave) {
+               intel_pmu_store_lbr(cpuc, NULL);
+               return;
+       }
+       copy_dynamic_supervisor_to_kernel(&xsave->xsave, XFEATURE_MASK_LBR);
+
+       intel_pmu_store_lbr(cpuc, xsave->lbr.entries);
+}
+
 void intel_pmu_lbr_read(void)
 {
        struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
@@ -1767,14 +1804,15 @@ void __init intel_pmu_arch_lbr_init(void)
                x86_pmu.lbr_ctl_map = NULL;
 
        x86_pmu.lbr_reset = intel_pmu_arch_lbr_reset;
-       x86_pmu.lbr_read = intel_pmu_arch_lbr_read;
        if (arch_lbr_xsave) {
                x86_pmu.lbr_save = intel_pmu_arch_lbr_xsaves;
                x86_pmu.lbr_restore = intel_pmu_arch_lbr_xrstors;
+               x86_pmu.lbr_read = intel_pmu_arch_lbr_read_xsave;
                pr_cont("XSAVE ");
        } else {
                x86_pmu.lbr_save = intel_pmu_arch_lbr_save;
                x86_pmu.lbr_restore = intel_pmu_arch_lbr_restore;
+               x86_pmu.lbr_read = intel_pmu_arch_lbr_read;
        }
 
        pr_cont("Architectural LBR, ");

diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h
index d5e351c1f3c12002626918f5d6a7496a5afdd6be..7b68ab5f19e766126bb723893f37384cef1aff89 100644 (file)
--- a/arch/x86/events/perf_event.h
+++ b/arch/x86/events/perf_event.h
@@ -253,6 +253,7 @@ struct cpu_hw_events {
        void                            *last_task_ctx;
        int                             last_log_id;
        int                             lbr_select;
+       void                            *lbr_xsave;
 
        /*
         * Intel host/guest exclude bits
@@ -1066,6 +1067,8 @@ void release_ds_buffers(void);
 
 void reserve_ds_buffers(void);
 
+void release_lbr_buffers(void);
+
 extern struct event_constraint bts_constraint;
 extern struct event_constraint vlbr_constraint;
 
@@ -1207,6 +1210,10 @@ static inline void release_ds_buffers(void)
 {
 }
 
+static inline void release_lbr_buffers(void)
+{
+}
+
 static inline int intel_pmu_init(void)
 {
        return 0;