lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, perf_counter, bts: Correct pointer-to-u64 casts

Browse Source 
On 32bit, pointers in the DS AREA configuration are cast to
u64. The current (long) cast to avoid compiler warnings results
in a signed 64bit address.

Signed-off-by: Markus Metzger <markus.t.metzger@intel.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20090902140615.305889000@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
markus.t.metzger@intel.com
2009-09-02 16:04:47 +02:00
committed by Ingo Molnar
parent 747b50aaf7
commit 596da17f94
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
arch/x86/kernel/cpu/perf_counter.c
View File

@@ -726,7 +726,8 @@ static inline void init_debug_store_on_cpu(int cpu)
return; return;
wrmsr_on_cpu(cpu, MSR_IA32_DS_AREA, wrmsr_on_cpu(cpu, MSR_IA32_DS_AREA,
(u32)((u64)(long)ds), (u32)((u64)(long)ds >> 32)); (u32)((u64)(unsigned long)ds),
(u32)((u64)(unsigned long)ds >> 32));
} }
static inline void fini_debug_store_on_cpu(int cpu) static inline void fini_debug_store_on_cpu(int cpu)
@@ -757,7 +758,7 @@ static void release_bts_hardware(void)
per_cpu(cpu_hw_counters, cpu).ds = NULL; per_cpu(cpu_hw_counters, cpu).ds = NULL;
kfree((void *)(long)ds->bts_buffer_base); kfree((void *)(unsigned long)ds->bts_buffer_base);
kfree(ds); kfree(ds);
} }
@@ -788,7 +789,7 @@ static int reserve_bts_hardware(void)
break; break;
} }
ds->bts_buffer_base = (u64)(long)buffer; ds->bts_buffer_base = (u64)(unsigned long)buffer;
ds->bts_index = ds->bts_buffer_base; ds->bts_index = ds->bts_buffer_base;
ds->bts_absolute_maximum = ds->bts_absolute_maximum =
ds->bts_buffer_base + BTS_BUFFER_SIZE; ds->bts_buffer_base + BTS_BUFFER_SIZE;
@@ -1491,7 +1492,7 @@ static void intel_pmu_drain_bts_buffer(struct cpu_hw_counters *cpuc,
}; };
struct perf_counter *counter = cpuc->counters[X86_PMC_IDX_FIXED_BTS]; struct perf_counter *counter = cpuc->counters[X86_PMC_IDX_FIXED_BTS];
unsigned long orig_ip = data->regs->ip; unsigned long orig_ip = data->regs->ip;
u64 at; struct bts_record *at, *top;
if (!counter) if (!counter)
return; return;
@@ -1499,19 +1500,18 @@ static void intel_pmu_drain_bts_buffer(struct cpu_hw_counters *cpuc,
if (!ds) if (!ds)
return; return;
for (at = ds->bts_buffer_base; at = (struct bts_record *)(unsigned long)ds->bts_buffer_base;
at < ds->bts_index; top = (struct bts_record *)(unsigned long)ds->bts_index;
at += sizeof(struct bts_record)) {
struct bts_record *rec = (struct bts_record *)(long)at;
data->regs->ip = rec->from; ds->bts_index = ds->bts_buffer_base;
data->addr = rec->to;
for (; at < top; at++) {
data->regs->ip = at->from;
data->addr = at->to;
perf_counter_output(counter, 1, data); perf_counter_output(counter, 1, data);
} }
ds->bts_index = ds->bts_buffer_base;
data->regs->ip = orig_ip; data->regs->ip = orig_ip;
data->addr = 0; data->addr = 0;