adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

perf_counter: provide major/minor page fault software events

Browse source 
Provide separate sw counters for major and minor page faults.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra 2009-03-13 12:21:34 +01:00 committed by Ingo Molnar
parent 7dd1fcc258
commit ac17dc8e58
4 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/powerpc/mm/fault.c
View file

@ -312,6 +312,7 @@ good_area:
} }
if (ret & VM_FAULT_MAJOR) { if (ret & VM_FAULT_MAJOR) {
current->maj_flt++; current->maj_flt++;
perf_swcounter_event(PERF_COUNT_PAGE_FAULTS_MAJ, 1, 0, regs);
#ifdef CONFIG_PPC_SMLPAR #ifdef CONFIG_PPC_SMLPAR
if (firmware_has_feature(FW_FEATURE_CMO)) { if (firmware_has_feature(FW_FEATURE_CMO)) {
preempt_disable(); preempt_disable();
@ -319,8 +320,10 @@ good_area:
preempt_enable(); preempt_enable();
} }
#endif #endif
} else } else {
current->min_flt++; current->min_flt++;
perf_swcounter_event(PERF_COUNT_PAGE_FAULTS_MIN, 1, 0, regs);
}
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);
return 0; return 0;

7
arch/x86/mm/fault.c
View file

@ -1140,10 +1140,13 @@ good_area:
return; return;
} }
if (fault & VM_FAULT_MAJOR) if (fault & VM_FAULT_MAJOR) {
tsk->maj_flt++; tsk->maj_flt++;
else perf_swcounter_event(PERF_COUNT_PAGE_FAULTS_MAJ, 1, 0, regs);
} else {
tsk->min_flt++; tsk->min_flt++;
perf_swcounter_event(PERF_COUNT_PAGE_FAULTS_MIN, 1, 0, regs);
}
check_v8086_mode(regs, address, tsk); check_v8086_mode(regs, address, tsk);

4
include/linux/perf_counter.h
View file

@ -49,8 +49,10 @@ enum hw_event_types {
PERF_COUNT_PAGE_FAULTS = -3, PERF_COUNT_PAGE_FAULTS = -3,
PERF_COUNT_CONTEXT_SWITCHES = -4, PERF_COUNT_CONTEXT_SWITCHES = -4,
PERF_COUNT_CPU_MIGRATIONS = -5, PERF_COUNT_CPU_MIGRATIONS = -5,
PERF_COUNT_PAGE_FAULTS_MIN = -6,
PERF_COUNT_PAGE_FAULTS_MAJ = -7,
PERF_SW_EVENTS_MIN = -6, PERF_SW_EVENTS_MIN = -8,
}; };
/* /*

22
kernel/perf_counter.c
View file

@ -1503,6 +1503,12 @@ static void perf_swcounter_disable(struct perf_counter *counter)
perf_swcounter_update(counter); perf_swcounter_update(counter);
} }
static const struct hw_perf_counter_ops perf_ops_generic = {
.enable = perf_swcounter_enable,
.disable = perf_swcounter_disable,
.read = perf_swcounter_read,
};
/* /*
* Software counter: cpu wall time clock * Software counter: cpu wall time clock
*/ */
@ -1603,16 +1609,6 @@ static const struct hw_perf_counter_ops perf_ops_task_clock = {
.read = task_clock_perf_counter_read, .read = task_clock_perf_counter_read,
}; };
/*
* Software counter: page faults
*/
static const struct hw_perf_counter_ops perf_ops_page_faults = {
.enable = perf_swcounter_enable,
.disable = perf_swcounter_disable,
.read = perf_swcounter_read,
};
/* /*
* Software counter: context switches * Software counter: context switches
*/ */
@ -1753,9 +1749,9 @@ sw_perf_counter_init(struct perf_counter *counter)
hw_ops = &perf_ops_cpu_clock; hw_ops = &perf_ops_cpu_clock;
break; break;
case PERF_COUNT_PAGE_FAULTS: case PERF_COUNT_PAGE_FAULTS:
if (!(counter->hw_event.exclude_user || case PERF_COUNT_PAGE_FAULTS_MIN:
counter->hw_event.exclude_kernel)) case PERF_COUNT_PAGE_FAULTS_MAJ:
hw_ops = &perf_ops_page_faults; hw_ops = &perf_ops_generic;
break; break;
case PERF_COUNT_CONTEXT_SWITCHES: case PERF_COUNT_CONTEXT_SWITCHES:
if (!counter->hw_event.exclude_kernel) if (!counter->hw_event.exclude_kernel)