Skip to content

Commit

Permalink
perf_counter, x86: move counter parameters to struct x86_pmu
Browse files Browse the repository at this point in the history 
[ Impact: refactor and generalize code ]

Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1241002046-8832-16-git-send-email-robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Robert Richter authored and Ingo Molnar committed Apr 29, 2009
1 parent 4a06bd8 commit 0933e5c
Showing 1 changed file with 37 additions and 43 deletions.
80 changes: 37 additions & 43 deletions arch/x86/kernel/cpu/perf_counter.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,7 @@
#include <asm/nmi.h>

static bool perf_counters_initialized __read_mostly;

/*
* Number of (generic) HW counters:
*/
static int nr_counters_generic __read_mostly;
static u64 perf_counter_mask __read_mostly;
static u64 counter_value_mask __read_mostly;
static int counter_value_bits __read_mostly;

static int nr_counters_fixed __read_mostly;

struct cpu_hw_counters {
struct perf_counter *counters[X86_PMC_IDX_MAX];
Expand All @@ -58,6 +49,10 @@ struct x86_pmu {
u64 (*event_map)(int);
u64 (*raw_event)(u64);
int max_events;
int num_counters;
int num_counters_fixed;
int counter_bits;
u64 counter_mask;
};

static struct x86_pmu x86_pmu __read_mostly;
Expand Down Expand Up @@ -183,12 +178,12 @@ static bool reserve_pmc_hardware(void)
if (nmi_watchdog == NMI_LOCAL_APIC)
disable_lapic_nmi_watchdog();

for (i = 0; i < nr_counters_generic; i++) {
for (i = 0; i < x86_pmu.num_counters; i++) {
if (!reserve_perfctr_nmi(x86_pmu.perfctr + i))
goto perfctr_fail;
}

for (i = 0; i < nr_counters_generic; i++) {
for (i = 0; i < x86_pmu.num_counters; i++) {
if (!reserve_evntsel_nmi(x86_pmu.eventsel + i))
goto eventsel_fail;
}
Expand All @@ -199,7 +194,7 @@ static bool reserve_pmc_hardware(void)
for (i--; i >= 0; i--)
release_evntsel_nmi(x86_pmu.eventsel + i);

i = nr_counters_generic;
i = x86_pmu.num_counters;

perfctr_fail:
for (i--; i >= 0; i--)
Expand All @@ -215,7 +210,7 @@ static void release_pmc_hardware(void)
{
int i;

for (i = 0; i < nr_counters_generic; i++) {
for (i = 0; i < x86_pmu.num_counters; i++) {
release_perfctr_nmi(x86_pmu.perfctr + i);
release_evntsel_nmi(x86_pmu.eventsel + i);
}
Expand Down Expand Up @@ -336,7 +331,7 @@ static u64 amd_pmu_save_disable_all(void)
*/
barrier();

for (idx = 0; idx < nr_counters_generic; idx++) {
for (idx = 0; idx < x86_pmu.num_counters; idx++) {
u64 val;

if (!test_bit(idx, cpuc->active_mask))
Expand Down Expand Up @@ -378,7 +373,7 @@ static void amd_pmu_restore_all(u64 ctrl)
if (!ctrl)
return;

for (idx = 0; idx < nr_counters_generic; idx++) {
for (idx = 0; idx < x86_pmu.num_counters; idx++) {
u64 val;

if (!test_bit(idx, cpuc->active_mask))
Expand Down Expand Up @@ -527,7 +522,7 @@ x86_perf_counter_set_period(struct perf_counter *counter,
atomic64_set(&hwc->prev_count, (u64)-left);

err = checking_wrmsrl(hwc->counter_base + idx,
(u64)(-left) & counter_value_mask);
(u64)(-left) & x86_pmu.counter_mask);
}

static inline void
Expand Down Expand Up @@ -621,8 +616,9 @@ static int x86_pmu_enable(struct perf_counter *counter)
/* Try to get the previous generic counter again */
if (test_and_set_bit(idx, cpuc->used)) {
try_generic:
idx = find_first_zero_bit(cpuc->used, nr_counters_generic);
if (idx == nr_counters_generic)
idx = find_first_zero_bit(cpuc->used,
x86_pmu.num_counters);
if (idx == x86_pmu.num_counters)
return -EAGAIN;

set_bit(idx, cpuc->used);
Expand Down Expand Up @@ -654,7 +650,7 @@ void perf_counter_print_debug(void)
struct cpu_hw_counters *cpuc;
int cpu, idx;

if (!nr_counters_generic)
if (!x86_pmu.num_counters)
return;

local_irq_disable();
Expand All @@ -676,7 +672,7 @@ void perf_counter_print_debug(void)
}
pr_info("CPU#%d: used: %016llx\n", cpu, *(u64 *)cpuc->used);

for (idx = 0; idx < nr_counters_generic; idx++) {
for (idx = 0; idx < x86_pmu.num_counters; idx++) {
rdmsrl(x86_pmu.eventsel + idx, pmc_ctrl);
rdmsrl(x86_pmu.perfctr + idx, pmc_count);

Expand All @@ -689,7 +685,7 @@ void perf_counter_print_debug(void)
pr_info("CPU#%d: gen-PMC%d left: %016llx\n",
cpu, idx, prev_left);
}
for (idx = 0; idx < nr_counters_fixed; idx++) {
for (idx = 0; idx < x86_pmu.num_counters_fixed; idx++) {
rdmsrl(MSR_ARCH_PERFMON_FIXED_CTR0 + idx, pmc_count);

pr_info("CPU#%d: fixed-PMC%d count: %016llx\n",
Expand Down Expand Up @@ -911,6 +907,9 @@ static struct x86_pmu amd_pmu = {
.event_map = amd_pmu_event_map,
.raw_event = amd_pmu_raw_event,
.max_events = ARRAY_SIZE(amd_perfmon_event_map),
.num_counters = 4,
.counter_bits = 48,
.counter_mask = (1ULL << 48) - 1,
};

static int intel_pmu_init(void)
Expand Down Expand Up @@ -941,23 +940,17 @@ static int intel_pmu_init(void)
pr_info("... mask length: %d\n", eax.split.mask_length);

x86_pmu = intel_pmu;

nr_counters_generic = eax.split.num_counters;
nr_counters_fixed = edx.split.num_counters_fixed;
counter_value_mask = (1ULL << eax.split.bit_width) - 1;
x86_pmu.num_counters = eax.split.num_counters;
x86_pmu.num_counters_fixed = edx.split.num_counters_fixed;
x86_pmu.counter_bits = eax.split.bit_width;
x86_pmu.counter_mask = (1ULL << eax.split.bit_width) - 1;

return 0;
}

static int amd_pmu_init(void)
{
x86_pmu = amd_pmu;

nr_counters_generic = 4;
nr_counters_fixed = 0;
counter_value_mask = 0x0000FFFFFFFFFFFFULL;
counter_value_bits = 48;

pr_info("AMD Performance Monitoring support detected.\n");
return 0;
}
Expand All @@ -979,25 +972,26 @@ void __init init_hw_perf_counters(void)
if (err != 0)
return;

pr_info("... num counters: %d\n", nr_counters_generic);
if (nr_counters_generic > X86_PMC_MAX_GENERIC) {
nr_counters_generic = X86_PMC_MAX_GENERIC;
pr_info("... num counters: %d\n", x86_pmu.num_counters);
if (x86_pmu.num_counters > X86_PMC_MAX_GENERIC) {
x86_pmu.num_counters = X86_PMC_MAX_GENERIC;
WARN(1, KERN_ERR "hw perf counters %d > max(%d), clipping!",
nr_counters_generic, X86_PMC_MAX_GENERIC);
x86_pmu.num_counters, X86_PMC_MAX_GENERIC);
}
perf_counter_mask = (1 << nr_counters_generic) - 1;
perf_max_counters = nr_counters_generic;
perf_counter_mask = (1 << x86_pmu.num_counters) - 1;
perf_max_counters = x86_pmu.num_counters;

pr_info("... value mask: %016Lx\n", counter_value_mask);
pr_info("... value mask: %016Lx\n", x86_pmu.counter_mask);

if (nr_counters_fixed > X86_PMC_MAX_FIXED) {
nr_counters_fixed = X86_PMC_MAX_FIXED;
if (x86_pmu.num_counters_fixed > X86_PMC_MAX_FIXED) {
x86_pmu.num_counters_fixed = X86_PMC_MAX_FIXED;
WARN(1, KERN_ERR "hw perf counters fixed %d > max(%d), clipping!",
nr_counters_fixed, X86_PMC_MAX_FIXED);
x86_pmu.num_counters_fixed, X86_PMC_MAX_FIXED);
}
pr_info("... fixed counters: %d\n", nr_counters_fixed);
pr_info("... fixed counters: %d\n", x86_pmu.num_counters_fixed);

perf_counter_mask |= ((1LL << nr_counters_fixed)-1) << X86_PMC_IDX_FIXED;
perf_counter_mask |=
((1LL << x86_pmu.num_counters_fixed)-1) << X86_PMC_IDX_FIXED;

pr_info("... counter mask: %016Lx\n", perf_counter_mask);
perf_counters_initialized = true;
Expand Down

0 comments on commit 0933e5c

Please sign in to comment.