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

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

perf_counter, x86: make x86_pmu data a static struct 



Instead of using a pointer to reference to the x86 pmu we now have one
single data structure that is initialized at the beginning. This saves
the pointer access when using this memory.

[ Impact: micro-optimization ]

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1241002046-8832-15-git-send-email-robert.richter@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 72eae04d

arch/x86/kernel/cpu/perf_counter.c

+25 −25
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ struct x86_pmu { 
	int		max_events;

	int		max_events;

};

};





static struct x86_pmu *x86_pmu __read_mostly;

static struct x86_pmu x86_pmu __read_mostly;





static DEFINE_PER_CPU(struct cpu_hw_counters, cpu_hw_counters) = {

static DEFINE_PER_CPU(struct cpu_hw_counters, cpu_hw_counters) = {

	.enabled = 1,

	.enabled = 1,
@@ -184,12 +184,12 @@ static bool reserve_pmc_hardware(void) 
		disable_lapic_nmi_watchdog();

		disable_lapic_nmi_watchdog();





	for (i = 0; i < nr_counters_generic; i++) {

	for (i = 0; i < nr_counters_generic; i++) {

		if (!reserve_perfctr_nmi(x86_pmu->perfctr + i))

		if (!reserve_perfctr_nmi(x86_pmu.perfctr + i))

			goto perfctr_fail;

			goto perfctr_fail;

	}

	}





	for (i = 0; i < nr_counters_generic; i++) {

	for (i = 0; i < nr_counters_generic; i++) {

		if (!reserve_evntsel_nmi(x86_pmu->eventsel + i))

		if (!reserve_evntsel_nmi(x86_pmu.eventsel + i))

			goto eventsel_fail;

			goto eventsel_fail;

	}

	}
@@ -197,13 +197,13 @@ static bool reserve_pmc_hardware(void) 




eventsel_fail:

eventsel_fail:

	for (i--; i >= 0; i--)

	for (i--; i >= 0; i--)

		release_evntsel_nmi(x86_pmu->eventsel + i);

		release_evntsel_nmi(x86_pmu.eventsel + i);





	i = nr_counters_generic;

	i = nr_counters_generic;





perfctr_fail:

perfctr_fail:

	for (i--; i >= 0; i--)

	for (i--; i >= 0; i--)

		release_perfctr_nmi(x86_pmu->perfctr + i);

		release_perfctr_nmi(x86_pmu.perfctr + i);





	if (nmi_watchdog == NMI_LOCAL_APIC)

	if (nmi_watchdog == NMI_LOCAL_APIC)

		enable_lapic_nmi_watchdog();

		enable_lapic_nmi_watchdog();
@@ -216,8 +216,8 @@ static void release_pmc_hardware(void) 
	int i;

	int i;





	for (i = 0; i < nr_counters_generic; i++) {

	for (i = 0; i < nr_counters_generic; i++) {

		release_perfctr_nmi(x86_pmu->perfctr + i);

		release_perfctr_nmi(x86_pmu.perfctr + i);

		release_evntsel_nmi(x86_pmu->eventsel + i);

		release_evntsel_nmi(x86_pmu.eventsel + i);

	}

	}





	if (nmi_watchdog == NMI_LOCAL_APIC)

	if (nmi_watchdog == NMI_LOCAL_APIC)
@@ -297,14 +297,14 @@ static int __hw_perf_counter_init(struct perf_counter *counter) 
	 * Raw event type provide the config in the event structure

	 * Raw event type provide the config in the event structure

	 */

	 */

	if (perf_event_raw(hw_event)) {

	if (perf_event_raw(hw_event)) {

		hwc->config |= x86_pmu->raw_event(perf_event_config(hw_event));

		hwc->config |= x86_pmu.raw_event(perf_event_config(hw_event));

	} else {

	} else {

		if (perf_event_id(hw_event) >= x86_pmu->max_events)

		if (perf_event_id(hw_event) >= x86_pmu.max_events)

			return -EINVAL;

			return -EINVAL;

		/*

		/*

		 * The generic map:

		 * The generic map:

		 */

		 */

		hwc->config |= x86_pmu->event_map(perf_event_id(hw_event));

		hwc->config |= x86_pmu.event_map(perf_event_id(hw_event));

	}

	}





	counter->destroy = hw_perf_counter_destroy;

	counter->destroy = hw_perf_counter_destroy;
@@ -356,7 +356,7 @@ u64 hw_perf_save_disable(void) 
	if (unlikely(!perf_counters_initialized))

	if (unlikely(!perf_counters_initialized))

		return 0;

		return 0;





	return x86_pmu->save_disable_all();

	return x86_pmu.save_disable_all();

}

}

/*

/*

 * Exported because of ACPI idle

 * Exported because of ACPI idle
@@ -396,7 +396,7 @@ void hw_perf_restore(u64 ctrl) 
	if (unlikely(!perf_counters_initialized))

	if (unlikely(!perf_counters_initialized))

		return;

		return;





	x86_pmu->restore_all(ctrl);

	x86_pmu.restore_all(ctrl);

}

}

/*

/*

 * Exported because of ACPI idle

 * Exported because of ACPI idle
@@ -441,7 +441,7 @@ static void hw_perf_enable(int idx, u64 config) 
	if (unlikely(!perf_counters_initialized))

	if (unlikely(!perf_counters_initialized))

		return;

		return;





	x86_pmu->enable(idx, config);

	x86_pmu.enable(idx, config);

}

}





static void intel_pmu_disable_counter(int idx, u64 config)

static void intel_pmu_disable_counter(int idx, u64 config)
@@ -463,7 +463,7 @@ static void hw_perf_disable(int idx, u64 config) 
	if (unlikely(!perf_counters_initialized))

	if (unlikely(!perf_counters_initialized))

		return;

		return;





	x86_pmu->disable(idx, config);

	x86_pmu.disable(idx, config);

}

}





static inline void

static inline void
@@ -580,11 +580,11 @@ fixed_mode_idx(struct perf_counter *counter, struct hw_perf_counter *hwc) 




	event = hwc->config & ARCH_PERFMON_EVENT_MASK;

	event = hwc->config & ARCH_PERFMON_EVENT_MASK;





	if (unlikely(event == x86_pmu->event_map(PERF_COUNT_INSTRUCTIONS)))

	if (unlikely(event == x86_pmu.event_map(PERF_COUNT_INSTRUCTIONS)))

		return X86_PMC_IDX_FIXED_INSTRUCTIONS;

		return X86_PMC_IDX_FIXED_INSTRUCTIONS;

	if (unlikely(event == x86_pmu->event_map(PERF_COUNT_CPU_CYCLES)))

	if (unlikely(event == x86_pmu.event_map(PERF_COUNT_CPU_CYCLES)))

		return X86_PMC_IDX_FIXED_CPU_CYCLES;

		return X86_PMC_IDX_FIXED_CPU_CYCLES;

	if (unlikely(event == x86_pmu->event_map(PERF_COUNT_BUS_CYCLES)))

	if (unlikely(event == x86_pmu.event_map(PERF_COUNT_BUS_CYCLES)))

		return X86_PMC_IDX_FIXED_BUS_CYCLES;

		return X86_PMC_IDX_FIXED_BUS_CYCLES;





	return -1;

	return -1;
@@ -628,8 +628,8 @@ static int x86_pmu_enable(struct perf_counter *counter) 
			set_bit(idx, cpuc->used);

			set_bit(idx, cpuc->used);

			hwc->idx = idx;

			hwc->idx = idx;

		}

		}

		hwc->config_base  = x86_pmu->eventsel;

		hwc->config_base  = x86_pmu.eventsel;

		hwc->counter_base = x86_pmu->perfctr;

		hwc->counter_base = x86_pmu.perfctr;

	}

	}





	perf_counters_lapic_init(hwc->nmi);

	perf_counters_lapic_init(hwc->nmi);
@@ -677,8 +677,8 @@ void perf_counter_print_debug(void) 
	pr_info("CPU#%d: used:       %016llx\n", cpu, *(u64 *)cpuc->used);

	pr_info("CPU#%d: used:       %016llx\n", cpu, *(u64 *)cpuc->used);





	for (idx = 0; idx < nr_counters_generic; idx++) {

	for (idx = 0; idx < nr_counters_generic; idx++) {

		rdmsrl(x86_pmu->eventsel + idx, pmc_ctrl);

		rdmsrl(x86_pmu.eventsel + idx, pmc_ctrl);

		rdmsrl(x86_pmu->perfctr  + idx, pmc_count);

		rdmsrl(x86_pmu.perfctr  + idx, pmc_count);





		prev_left = per_cpu(prev_left[idx], cpu);

		prev_left = per_cpu(prev_left[idx], cpu);
@@ -819,7 +819,7 @@ void smp_perf_counter_interrupt(struct pt_regs *regs) 
	irq_enter();

	irq_enter();

	apic_write(APIC_LVTPC, LOCAL_PERF_VECTOR);

	apic_write(APIC_LVTPC, LOCAL_PERF_VECTOR);

	ack_APIC_irq();

	ack_APIC_irq();

	x86_pmu->handle_irq(regs, 0);

	x86_pmu.handle_irq(regs, 0);

	irq_exit();

	irq_exit();

}

}
@@ -876,7 +876,7 @@ perf_counter_nmi_handler(struct notifier_block *self, 
	regs = args->regs;

	regs = args->regs;





	apic_write(APIC_LVTPC, APIC_DM_NMI);

	apic_write(APIC_LVTPC, APIC_DM_NMI);

	ret = x86_pmu->handle_irq(regs, 1);

	ret = x86_pmu.handle_irq(regs, 1);





	return ret ? NOTIFY_STOP : NOTIFY_OK;

	return ret ? NOTIFY_STOP : NOTIFY_OK;

}

}
@@ -940,7 +940,7 @@ static int intel_pmu_init(void) 
	pr_info("... bit width:       %d\n", eax.split.bit_width);

	pr_info("... bit width:       %d\n", eax.split.bit_width);

	pr_info("... mask length:     %d\n", eax.split.mask_length);

	pr_info("... mask length:     %d\n", eax.split.mask_length);





	x86_pmu = &intel_pmu;

	x86_pmu = intel_pmu;





	nr_counters_generic = eax.split.num_counters;

	nr_counters_generic = eax.split.num_counters;

	nr_counters_fixed = edx.split.num_counters_fixed;

	nr_counters_fixed = edx.split.num_counters_fixed;
@@ -951,7 +951,7 @@ static int intel_pmu_init(void) 




static int amd_pmu_init(void)

static int amd_pmu_init(void)

{

{

	x86_pmu = &amd_pmu;

	x86_pmu = amd_pmu;





	nr_counters_generic = 4;

	nr_counters_generic = 4;

	nr_counters_fixed = 0;

	nr_counters_fixed = 0;