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

perf/x86/intel: Rename confusing 'freerunning PEBS' API and implementation to 'large PEBS' 



The 'freerunning PEBS' and 'large PEBS' are the same thing. Both of these
names appear in the code and in the API, which causes confusion.

Rename 'freerunning PEBS' to 'large PEBS' to unify the code,
which eliminates the confusion.

No functional change.

Reported-by: default avatarVince Weaver <vincent.weaver@maine.edu>
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>
Link: http://lkml.kernel.org/r/1520865937-22910-1-git-send-email-kan.liang@linux.intel.com


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

arch/x86/events/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2119,7 +2119,7 @@ static int x86_pmu_event_init(struct perf_event *event) 
	}



	if (READ_ONCE(x86_pmu.attr_rdpmc) &&

	    !(event->hw.flags & PERF_X86_EVENT_FREERUNNING))

	    !(event->hw.flags & PERF_X86_EVENT_LARGE_PEBS))

		event->hw.flags |= PERF_X86_EVENT_RDPMC_ALLOWED;



	return err;

arch/x86/events/intel/core.c

+6 −6
Original line number Diff line number Diff line
@@ -2952,9 +2952,9 @@ static void intel_pebs_aliases_skl(struct perf_event *event) 
	return intel_pebs_aliases_precdist(event);

}



static unsigned long intel_pmu_free_running_flags(struct perf_event *event)

static unsigned long intel_pmu_large_pebs_flags(struct perf_event *event)

{

	unsigned long flags = x86_pmu.free_running_flags;

	unsigned long flags = x86_pmu.large_pebs_flags;



	if (event->attr.use_clockid)

		flags &= ~PERF_SAMPLE_TIME;
@@ -2976,8 +2976,8 @@ static int intel_pmu_hw_config(struct perf_event *event) 
		if (!event->attr.freq) {

			event->hw.flags |= PERF_X86_EVENT_AUTO_RELOAD;

			if (!(event->attr.sample_type &

			      ~intel_pmu_free_running_flags(event)))

				event->hw.flags |= PERF_X86_EVENT_FREERUNNING;

			      ~intel_pmu_large_pebs_flags(event)))

				event->hw.flags |= PERF_X86_EVENT_LARGE_PEBS;

		}

		if (x86_pmu.pebs_aliases)

			x86_pmu.pebs_aliases(event);
@@ -3460,7 +3460,7 @@ static __initconst const struct x86_pmu core_pmu = { 
	.event_map		= intel_pmu_event_map,

	.max_events		= ARRAY_SIZE(intel_perfmon_event_map),

	.apic			= 1,

	.free_running_flags	= PEBS_FREERUNNING_FLAGS,

	.large_pebs_flags	= LARGE_PEBS_FLAGS,



	/*

	 * Intel PMCs cannot be accessed sanely above 32-bit width,
@@ -3502,7 +3502,7 @@ static __initconst const struct x86_pmu intel_pmu = { 
	.event_map		= intel_pmu_event_map,

	.max_events		= ARRAY_SIZE(intel_perfmon_event_map),

	.apic			= 1,

	.free_running_flags	= PEBS_FREERUNNING_FLAGS,

	.large_pebs_flags	= LARGE_PEBS_FLAGS,

	/*

	 * Intel PMCs cannot be accessed sanely above 32 bit width,

	 * so we install an artificial 1<<31 period regardless of

arch/x86/events/intel/ds.c

+3 −3
Original line number Diff line number Diff line
@@ -935,7 +935,7 @@ void intel_pmu_pebs_add(struct perf_event *event) 
	bool needed_cb = pebs_needs_sched_cb(cpuc);



	cpuc->n_pebs++;

	if (hwc->flags & PERF_X86_EVENT_FREERUNNING)

	if (hwc->flags & PERF_X86_EVENT_LARGE_PEBS)

		cpuc->n_large_pebs++;



	pebs_update_state(needed_cb, cpuc, event->ctx->pmu);
@@ -975,7 +975,7 @@ void intel_pmu_pebs_del(struct perf_event *event) 
	bool needed_cb = pebs_needs_sched_cb(cpuc);



	cpuc->n_pebs--;

	if (hwc->flags & PERF_X86_EVENT_FREERUNNING)

	if (hwc->flags & PERF_X86_EVENT_LARGE_PEBS)

		cpuc->n_large_pebs--;



	pebs_update_state(needed_cb, cpuc, event->ctx->pmu);
@@ -1530,7 +1530,7 @@ void __init intel_ds_init(void) 
			x86_pmu.pebs_record_size =

						sizeof(struct pebs_record_skl);

			x86_pmu.drain_pebs = intel_pmu_drain_pebs_nhm;

			x86_pmu.free_running_flags |= PERF_SAMPLE_TIME;

			x86_pmu.large_pebs_flags |= PERF_SAMPLE_TIME;

			break;



		default:

arch/x86/events/perf_event.h

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ struct event_constraint { 
#define PERF_X86_EVENT_RDPMC_ALLOWED	0x0100 /* grant rdpmc permission */

#define PERF_X86_EVENT_EXCL_ACCT	0x0200 /* accounted EXCL event */

#define PERF_X86_EVENT_AUTO_RELOAD	0x0400 /* use PEBS auto-reload */

#define PERF_X86_EVENT_FREERUNNING	0x0800 /* use freerunning PEBS */

#define PERF_X86_EVENT_LARGE_PEBS	0x0800 /* use large PEBS */





struct amd_nb {
@@ -88,7 +88,7 @@ struct amd_nb { 
 * REGS_USER can be handled for events limited to ring 3.

 *

 */

#define PEBS_FREERUNNING_FLAGS \

#define LARGE_PEBS_FLAGS \

	(PERF_SAMPLE_IP | PERF_SAMPLE_TID | PERF_SAMPLE_ADDR | \

	PERF_SAMPLE_ID | PERF_SAMPLE_CPU | PERF_SAMPLE_STREAM_ID | \

	PERF_SAMPLE_DATA_SRC | PERF_SAMPLE_IDENTIFIER | \
@@ -608,7 +608,7 @@ struct x86_pmu { 
	struct event_constraint *pebs_constraints;

	void		(*pebs_aliases)(struct perf_event *event);

	int 		max_pebs_events;

	unsigned long	free_running_flags;

	unsigned long	large_pebs_flags;



	/*

	 * Intel LBR

CRA Git | Maintained and supported by SUSTech CRA and CCSE