Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ceb90d9e authored by Kan Liang's avatar Kan Liang Committed by Ingo Molnar
Browse files

perf/x86/intel: Fix PMU read for auto-reload 



Auto-reload events needs to be specially handled in event count read.

Auto-reload is only available for intel_pmu.

Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: acme@kernel.org
Fixes: b8241d20699e ("perf/x86/intel: Implement batched PEBS interrupt handling (large PEBS interrupt threshold)")
Link: http://lkml.kernel.org/r/1518474035-21006-5-git-send-email-kan.liang@linux.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 5bee2cc6

arch/x86/events/intel/core.c

+9 −0
Original line number Diff line number Diff line
@@ -2060,6 +2060,14 @@ static void intel_pmu_del_event(struct perf_event *event) 
		intel_pmu_pebs_del(event);

}



static void intel_pmu_read_event(struct perf_event *event)

{

	if (event->hw.flags & PERF_X86_EVENT_AUTO_RELOAD)

		intel_pmu_auto_reload_read(event);

	else

		x86_perf_event_update(event);

}



static void intel_pmu_enable_fixed(struct hw_perf_event *hwc)

{

	int idx = hwc->idx - INTEL_PMC_IDX_FIXED;
@@ -3503,6 +3511,7 @@ static __initconst const struct x86_pmu intel_pmu = { 
	.disable		= intel_pmu_disable_event,

	.add			= intel_pmu_add_event,

	.del			= intel_pmu_del_event,

	.read			= intel_pmu_read_event,

	.hw_config		= intel_pmu_hw_config,

	.schedule_events	= x86_schedule_events,

	.eventsel		= MSR_ARCH_PERFMON_EVENTSEL0,