evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf, x86: P4 PMU -- do a real check for ESCR address being in hash

Browse source 
To prevent from clashes in future code modifications
do a real check for ESCR address being in hash. At
moment the callers are known to pass sane values but
better to be on a safe side.

And comment fix.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
CC: Lin Ming <ming.m.lin@intel.com>
CC: Peter Zijlstra <a.p.zijlstra@chello.nl>
CC: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20100518212439.004503600@openvz.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Cyrill Gorcunov 2010-05-19 01:19:17 +04:00 • committed by Ingo Molnar
parent 151f85a471
commit 623aab896e
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/x86/kernel/cpu/perf_event_p4.c
View file

@ -670,7 +670,7 @@ static void p4_pmu_swap_config_ts(struct hw_perf_event *hwc, int cpu)
/* /*
* ESCR address hashing is tricky, ESCRs are not sequential * ESCR address hashing is tricky, ESCRs are not sequential
* in memory but all starts from MSR_P4_BSU_ESCR0 (0x03e0) and * in memory but all starts from MSR_P4_BSU_ESCR0 (0x03a0) and
* the metric between any ESCRs is laid in range [0xa0,0xe1] * the metric between any ESCRs is laid in range [0xa0,0xe1]
* *
* so we make ~70% filled hashtable * so we make ~70% filled hashtable
@ -735,8 +735,9 @@ static int p4_get_escr_idx(unsigned int addr)
{ {
unsigned int idx = P4_ESCR_MSR_IDX(addr); unsigned int idx = P4_ESCR_MSR_IDX(addr);
if (unlikely(idx >= P4_ESCR_MSR_TABLE_SIZE || if (unlikely(idx >= P4_ESCR_MSR_TABLE_SIZE ||
!p4_escr_table[idx])) { !p4_escr_table[idx] ||
p4_escr_table[idx] != addr)) {
WARN_ONCE(1, "P4 PMU: Wrong address passed: %x\n", addr); WARN_ONCE(1, "P4 PMU: Wrong address passed: %x\n", addr);
return -1; return -1;
} }