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

Commit fd0d000b authored by Robert Richter's avatar Robert Richter Committed by Ingo Molnar
Browse files

perf: Pass last sampling period to perf_sample_data_init() 



We always need to pass the last sample period to
perf_sample_data_init(), otherwise the event distribution will be
wrong. Thus, modifiyng the function interface with the required period
as argument. So basically a pattern like this:

        perf_sample_data_init(&data, ~0ULL);
        data.period = event->hw.last_period;

will now be like that:

        perf_sample_data_init(&data, ~0ULL, event->hw.last_period);

Avoids unininitialized data.period and simplifies code.

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1333390758-10893-3-git-send-email-robert.richter@amd.com


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

arch/alpha/kernel/perf_event.c

+1 −2
Original line number Diff line number Diff line
@@ -824,7 +824,6 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr, 


	idx = la_ptr;



	perf_sample_data_init(&data, 0);

	for (j = 0; j < cpuc->n_events; j++) {

		if (cpuc->current_idx[j] == idx)

			break;
@@ -848,7 +847,7 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr, 


	hwc = &event->hw;

	alpha_perf_event_update(event, hwc, idx, alpha_pmu->pmc_max_period[idx]+1);

	data.period = event->hw.last_period;

	perf_sample_data_init(&data, 0, hwc->last_period);



	if (alpha_perf_event_set_period(event, hwc, idx)) {

		if (perf_event_overflow(event, &data, regs)) {

arch/arm/kernel/perf_event_v6.c

+1 −3
Original line number Diff line number Diff line
@@ -489,8 +489,6 @@ armv6pmu_handle_irq(int irq_num, 
	 */

	armv6_pmcr_write(pmcr);



	perf_sample_data_init(&data, 0);



	cpuc = &__get_cpu_var(cpu_hw_events);

	for (idx = 0; idx < cpu_pmu->num_events; ++idx) {

		struct perf_event *event = cpuc->events[idx];
@@ -509,7 +507,7 @@ armv6pmu_handle_irq(int irq_num, 


		hwc = &event->hw;

		armpmu_event_update(event, hwc, idx);

		data.period = event->hw.last_period;

		perf_sample_data_init(&data, 0, hwc->last_period);

		if (!armpmu_event_set_period(event, hwc, idx))

			continue;

arch/arm/kernel/perf_event_v7.c

+1 −3
Original line number Diff line number Diff line
@@ -1077,8 +1077,6 @@ static irqreturn_t armv7pmu_handle_irq(int irq_num, void *dev) 
	 */

	regs = get_irq_regs();



	perf_sample_data_init(&data, 0);



	cpuc = &__get_cpu_var(cpu_hw_events);

	for (idx = 0; idx < cpu_pmu->num_events; ++idx) {

		struct perf_event *event = cpuc->events[idx];
@@ -1097,7 +1095,7 @@ static irqreturn_t armv7pmu_handle_irq(int irq_num, void *dev) 


		hwc = &event->hw;

		armpmu_event_update(event, hwc, idx);

		data.period = event->hw.last_period;

		perf_sample_data_init(&data, 0, hwc->last_period);

		if (!armpmu_event_set_period(event, hwc, idx))

			continue;

arch/arm/kernel/perf_event_xscale.c

+2 −6
Original line number Diff line number Diff line
@@ -248,8 +248,6 @@ xscale1pmu_handle_irq(int irq_num, void *dev) 


	regs = get_irq_regs();



	perf_sample_data_init(&data, 0);



	cpuc = &__get_cpu_var(cpu_hw_events);

	for (idx = 0; idx < cpu_pmu->num_events; ++idx) {

		struct perf_event *event = cpuc->events[idx];
@@ -263,7 +261,7 @@ xscale1pmu_handle_irq(int irq_num, void *dev) 


		hwc = &event->hw;

		armpmu_event_update(event, hwc, idx);

		data.period = event->hw.last_period;

		perf_sample_data_init(&data, 0, hwc->last_period);

		if (!armpmu_event_set_period(event, hwc, idx))

			continue;
@@ -588,8 +586,6 @@ xscale2pmu_handle_irq(int irq_num, void *dev) 


	regs = get_irq_regs();



	perf_sample_data_init(&data, 0);



	cpuc = &__get_cpu_var(cpu_hw_events);

	for (idx = 0; idx < cpu_pmu->num_events; ++idx) {

		struct perf_event *event = cpuc->events[idx];
@@ -603,7 +599,7 @@ xscale2pmu_handle_irq(int irq_num, void *dev) 


		hwc = &event->hw;

		armpmu_event_update(event, hwc, idx);

		data.period = event->hw.last_period;

		perf_sample_data_init(&data, 0, hwc->last_period);

		if (!armpmu_event_set_period(event, hwc, idx))

			continue;

arch/mips/kernel/perf_event_mipsxx.c

+1 −1
Original line number Diff line number Diff line
@@ -1325,7 +1325,7 @@ static int mipsxx_pmu_handle_shared_irq(void) 


	regs = get_irq_regs();



	perf_sample_data_init(&data, 0);

	perf_sample_data_init(&data, 0, 0);



	switch (counters) {

#define HANDLE_COUNTER(n)						\