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

Commit c719f560 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf: Fix and clean up initialization of pmu::event_idx 



Andy reported that the current state of event_idx is rather confused.
So remove all but the x86_pmu implementation and change the default to
return 0 (the safe option).

Reported-by: default avatarAndy Lutomirski <luto@amacapital.net>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Christoph Lameter <cl@linux.com>
Cc: Cody P Schafer <cody@linux.vnet.ibm.com>
Cc: Cody P Schafer <dev@codyps.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Himangi Saraogi <himangi774@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: sukadev@linux.vnet.ibm.com <sukadev@linux.vnet.ibm.com>
Cc: Thomas Huth <thuth@linux.vnet.ibm.com>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: linux390@de.ibm.com
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s390@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 65d71fe1

arch/powerpc/perf/hv-24x7.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -417,11 +417,6 @@ static int h_24x7_event_add(struct perf_event *event, int flags) 
	return 0;

	return 0;

}

}





static int h_24x7_event_idx(struct perf_event *event)

{

	return 0;

}



static struct pmu h_24x7_pmu = {

static struct pmu h_24x7_pmu = {

	.task_ctx_nr = perf_invalid_context,

	.task_ctx_nr = perf_invalid_context,
@@ -433,7 +428,6 @@ static struct pmu h_24x7_pmu = { 
	.start       = h_24x7_event_start,

	.start       = h_24x7_event_start,

	.stop        = h_24x7_event_stop,

	.stop        = h_24x7_event_stop,

	.read        = h_24x7_event_update,

	.read        = h_24x7_event_update,

	.event_idx   = h_24x7_event_idx,

};

};





static int hv_24x7_init(void)

static int hv_24x7_init(void)

arch/powerpc/perf/hv-gpci.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -246,11 +246,6 @@ static int h_gpci_event_init(struct perf_event *event) 
	return 0;

	return 0;

}

}





static int h_gpci_event_idx(struct perf_event *event)

{

	return 0;

}



static struct pmu h_gpci_pmu = {

static struct pmu h_gpci_pmu = {

	.task_ctx_nr = perf_invalid_context,

	.task_ctx_nr = perf_invalid_context,
@@ -262,7 +257,6 @@ static struct pmu h_gpci_pmu = { 
	.start       = h_gpci_event_start,

	.start       = h_gpci_event_start,

	.stop        = h_gpci_event_stop,

	.stop        = h_gpci_event_stop,

	.read        = h_gpci_event_update,

	.read        = h_gpci_event_update,

	.event_idx   = h_gpci_event_idx,

};

};





static int hv_gpci_init(void)

static int hv_gpci_init(void)

arch/s390/kernel/perf_cpum_sf.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -1411,11 +1411,6 @@ static void cpumsf_pmu_del(struct perf_event *event, int flags) 
	perf_pmu_enable(event->pmu);

	perf_pmu_enable(event->pmu);

}

}





static int cpumsf_pmu_event_idx(struct perf_event *event)

{

	return event->hw.idx;

}



CPUMF_EVENT_ATTR(SF, SF_CYCLES_BASIC, PERF_EVENT_CPUM_SF);

CPUMF_EVENT_ATTR(SF, SF_CYCLES_BASIC, PERF_EVENT_CPUM_SF);

CPUMF_EVENT_ATTR(SF, SF_CYCLES_BASIC_DIAG, PERF_EVENT_CPUM_SF_DIAG);

CPUMF_EVENT_ATTR(SF, SF_CYCLES_BASIC_DIAG, PERF_EVENT_CPUM_SF_DIAG);
@@ -1458,7 +1453,6 @@ static struct pmu cpumf_sampling = { 
	.stop	      = cpumsf_pmu_stop,

	.stop	      = cpumsf_pmu_stop,

	.read	      = cpumsf_pmu_read,

	.read	      = cpumsf_pmu_read,





	.event_idx    = cpumsf_pmu_event_idx,

	.attr_groups  = cpumsf_pmu_attr_groups,

	.attr_groups  = cpumsf_pmu_attr_groups,

};

};

kernel/events/core.c

+1 −14
Original line number Original line Diff line number Diff line
@@ -6071,11 +6071,6 @@ static int perf_swevent_init(struct perf_event *event) 
	return 0;

	return 0;

}

}





static int perf_swevent_event_idx(struct perf_event *event)

{

	return 0;

}



static struct pmu perf_swevent = {

static struct pmu perf_swevent = {

	.task_ctx_nr	= perf_sw_context,

	.task_ctx_nr	= perf_sw_context,
@@ -6085,8 +6080,6 @@ static struct pmu perf_swevent = { 
	.start		= perf_swevent_start,

	.start		= perf_swevent_start,

	.stop		= perf_swevent_stop,

	.stop		= perf_swevent_stop,

	.read		= perf_swevent_read,

	.read		= perf_swevent_read,



	.event_idx	= perf_swevent_event_idx,

};

};





#ifdef CONFIG_EVENT_TRACING

#ifdef CONFIG_EVENT_TRACING
@@ -6204,8 +6197,6 @@ static struct pmu perf_tracepoint = { 
	.start		= perf_swevent_start,

	.start		= perf_swevent_start,

	.stop		= perf_swevent_stop,

	.stop		= perf_swevent_stop,

	.read		= perf_swevent_read,

	.read		= perf_swevent_read,



	.event_idx	= perf_swevent_event_idx,

};

};





static inline void perf_tp_register(void)

static inline void perf_tp_register(void)
@@ -6431,8 +6422,6 @@ static struct pmu perf_cpu_clock = { 
	.start		= cpu_clock_event_start,

	.start		= cpu_clock_event_start,

	.stop		= cpu_clock_event_stop,

	.stop		= cpu_clock_event_stop,

	.read		= cpu_clock_event_read,

	.read		= cpu_clock_event_read,



	.event_idx	= perf_swevent_event_idx,

};

};





/*

/*
@@ -6511,8 +6500,6 @@ static struct pmu perf_task_clock = { 
	.start		= task_clock_event_start,

	.start		= task_clock_event_start,

	.stop		= task_clock_event_stop,

	.stop		= task_clock_event_stop,

	.read		= task_clock_event_read,

	.read		= task_clock_event_read,



	.event_idx	= perf_swevent_event_idx,

};

};





static void perf_pmu_nop_void(struct pmu *pmu)

static void perf_pmu_nop_void(struct pmu *pmu)
@@ -6542,7 +6529,7 @@ static void perf_pmu_cancel_txn(struct pmu *pmu) 




static int perf_event_idx_default(struct perf_event *event)

static int perf_event_idx_default(struct perf_event *event)

{

{

	return event->hw.idx + 1;

	return 0;

}

}





/*

/*

kernel/events/hw_breakpoint.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -605,11 +605,6 @@ static void hw_breakpoint_stop(struct perf_event *bp, int flags) 
	bp->hw.state = PERF_HES_STOPPED;

	bp->hw.state = PERF_HES_STOPPED;

}

}





static int hw_breakpoint_event_idx(struct perf_event *bp)

{

	return 0;

}



static struct pmu perf_breakpoint = {

static struct pmu perf_breakpoint = {

	.task_ctx_nr	= perf_sw_context, /* could eventually get its own */

	.task_ctx_nr	= perf_sw_context, /* could eventually get its own */
@@ -619,8 +614,6 @@ static struct pmu perf_breakpoint = { 
	.start		= hw_breakpoint_start,

	.start		= hw_breakpoint_start,

	.stop		= hw_breakpoint_stop,

	.stop		= hw_breakpoint_stop,

	.read		= hw_breakpoint_pmu_read,

	.read		= hw_breakpoint_pmu_read,



	.event_idx	= hw_breakpoint_event_idx,

};

};





int __init init_hw_breakpoint(void)

int __init init_hw_breakpoint(void)