perf-counter bits
Subsystems (4)
cover perf-counter bits
pending perf counter bits
PATCH 1/4 perf_counter: remove perf_disable/enable exports
Now that ACPI idle doesn't use it anymore, remove the exports.
--- kernel/perf_counter.c | 2 -- 1 file changed, 2 deletions(-)
kernel/perf_counter.c +0 -2
@@ -90,14 +90,12 @@ void perf_disable(void)__perf_disable ();hw_perf_disable (); } -EXPORT_SYMBOL_GPL (perf_disable);/* ACPI idle */ void perf_enable (void ) {if (__perf_enable ())hw_perf_enable (); } -EXPORT_SYMBOL_GPL (perf_enable);/* ACPI idle */ static void list_add_counter (struct perf_counter *counter,struct perf_counter_context *ctx)
PATCH 4/4 perf_counter: update perf-top to use the new freq interface
In reply to Peter ZijlstraProvide perf top -F as alternative to -c.
--- Documentation/perf_counter/builtin-top.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Documentation/perf_counter/builtin-top.c +5 -1
@@ -98,6 +98,7 @@ static unsigned int page_size;static unsigned int mmap_pages =16 ;static int use_mmap =0 ;static int use_munmap =0 ; +static int freq =0 ;static char *vmlinux;
@@ -846,9 +847,10 @@ static void process_options(int argc, ch {"stat", no_argument, NULL, 'S'}, {"vmlinux", required_argument, NULL, 'x'}, {"zero", no_argument, NULL, 'z'}, + {"freq", required_argument, NULL, 'F'}, {NULL, 0, NULL, 0 } }; -int c =getopt_long (argc, argv,"+:ac:C:d:De:f:g:hln:m:p:r:s:Sx:zMU" , +int c =getopt_long (argc, argv,"+:ac:C:d:De:f:g:hln:m:p:r:s:Sx:zMUF:" , long_options, &option_index);if (c ==-1 )break ;
@@ -889,6 +891,7 @@ static void process_options(int argc, chcase 'm' : mmap_pages =atoi (optarg);break ;case 'M' : use_mmap =1 ;break ;case 'U' : use_munmap =1 ;break ; +case 'F' : freq =1 ; default_interval =atoi (optarg);break ;default : error =1 ;break ; } }
@@ -1075,6 +1078,7 @@ int cmd_top(int argc, char **argv, const hw_event.nmi = nmi; hw_event.mmap = use_mmap; hw_event.munmap = use_munmap; + hw_event.freq = freq; fd[i][counter] =sys_perf_counter_open (&hw_event, tid, cpu, group_fd,0 );if (fd[i][counter] <0 ) {
PATCH 3/4 perf_counter: frequency based adaptive irq_period
In reply to Peter ZijlstraInstead of specifying the irq_period for a counter, provide a target interrupt frequency and dynamically adapt the irq_period to match this frequency.
Paul, please verify ppc64, I only did a very quick pass over that code.
--- arch/powerpc/kernel/perf_counter.c | 13 +++---- arch/x86/kernel/cpu/perf_counter.c | 9 +---- include/linux/perf_counter.h | 10 ++++- kernel/perf_counter.c | 63 +++++++++++++++++++++++++++++-------- 4 files changed, 68 insertions(+), 27 deletions(-)
arch/x86/kernel/cpu/perf_counter.c +3 -6
@@ -286,11 +286,8 @@ static int __hw_perf_counter_init(struct hwc->nmi =1 ; } - hwc->irq_period = hw_event->irq_period; -if ((s64 )hwc->irq_period <=0 || hwc->irq_period > x86_pmu.max_period) - hwc->irq_period = x86_pmu.max_period; - -atomic64_set (&hwc->period_left, hwc->irq_period); +atomic64_set (&hwc->period_left, +min (x86_pmu.max_period, hwc->irq_period));/* * Raw event type provide the config in the event structure
@@ -458,7 +455,7 @@ x86_perf_counter_set_period(struct perf_ struct hw_perf_counter *hwc, int idx) {s64 left =atomic64_read (&hwc->period_left); -s64 period = hwc->irq_period; +s64 period =min (x86_pmu.max_period, hwc->irq_period);int err;/*
include/linux/perf_counter.h +8 -2
@@ -130,7 +130,11 @@ struct perf_counter_hw_event {*/ __u64 config; -__u64 irq_period; +union { +__u64 irq_period; +__u64 irq_freq; + }; +__u32 record_type;__u32 read_format;
@@ -146,8 +150,9 @@ struct perf_counter_hw_event { mmap : 1, /* include mmap data */ munmap : 1, /* include munmap data */ comm : 1, /* include comm data */ + freq : 1, /* use freq, not period */ - __reserved_1 : 52; + __reserved_1 : 51;__u32 extra_config_len;__u32 wakeup_events;/* wakeup every n events */
@@ -337,6 +342,7 @@ struct hw_perf_counter {atomic64_t prev_count;u64 irq_period;atomic64_t period_left; +u64 interrupts;#endif };
kernel/perf_counter.c +51 -12
144 lines not on this page · raw message
arch/powerpc/kernel/perf_counter.c +6 -7
@@ -534,7 +534,7 @@ void hw_perf_enable(void)continue ; } val =0 ; -if (counter->hw_event.irq_period) { +if (counter->hw.irq_period) { left =atomic64_read (&counter->hw.period_left);if (left <0x80000000L ) val =0x80000000L - left;
@@ -829,8 +829,6 @@ const struct pmu *hw_perf_counter_init(sif (!ppmu)return ERR_PTR (-ENXIO ); -if ((s64 )counter->hw_event.irq_period <0 ) -return ERR_PTR (-EINVAL );if (!perf_event_raw (&counter->hw_event)) { ev =perf_event_id (&counter->hw_event);if (ev >= ppmu->n_generic || ppmu->generic_events[ev] ==0 )
@@ -901,7 +899,7 @@ const struct pmu *hw_perf_counter_init(s counter->hw.config = events[n]; counter->hw.counter_base = cflags[n]; -atomic64_set (&counter->hw.period_left, counter->hw_event.irq_period); +atomic64_set (&counter->hw.period_left, counter->hw.irq_period);/* * See if we need to reserve the PMU.
@@ -934,6 +932,7 @@ const struct pmu *hw_perf_counter_init(sstatic void record_and_restart (struct perf_counter *counter,long val,struct pt_regs *regs,int nmi) { +u64 period = counter->hw.irq_period;s64 prev, delta, left;int record =0 ;
@@ -948,11 +947,11 @@ static void record_and_restart(struct pe*/ val =0 ; left =atomic64_read (&counter->hw.period_left) - delta; -if (counter->hw_event.irq_period) { +if (period) {if (left <=0 ) { - left += counter->hw_event.irq_period; + left += period;if (left <=0 ) - left = counter->hw_event.irq_period; + left = period; record =1 ; }if (left <0x80000000L )
PATCH 2/4 perf_counter: per user mlock gift
In reply to Peter ZijlstraInstead of a per-process mlock gift for perf-counters, use a per-user gift so that there is less of a DoS potential.
--- include/linux/sched.h | 4 ++++ kernel/perf_counter.c | 24 ++++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-)
kernel/perf_counter.c +16 -8
@@ -45,7 +45,7 @@ static atomic_t nr_munmap_tracking __reastatic atomic_t nr_comm_tracking__read_mostly ;int sysctl_perf_counter_priv__read_mostly ;/* do we need to be privileged */ -int sysctl_perf_counter_mlock__read_mostly =128 ;/* 'free' kb per counter */ +int sysctl_perf_counter_mlock__read_mostly =512 ;/* 'free' kb per user */ /* * Lock for (sysadmin-configurable) counter reservations:
@@ -1522,6 +1522,9 @@ static void perf_mmap_close(struct vm_arif (atomic_dec_and_mutex_lock (&counter->mmap_count, &counter->mmap_mutex)) { +struct user_struct *user =current_user (); + +atomic_long_sub (counter->data->nr_pages +1 , &user->locked_vm); vma->vm_mm->locked_vm -= counter->data->nr_locked;perf_mmap_data_free (counter);mutex_unlock (&counter->mmap_mutex);
@@ -1537,11 +1540,13 @@ static struct vm_operations_struct perf_static int perf_mmap (struct file *file,struct vm_area_struct *vma) {struct perf_counter *counter = file->private_data; +struct user_struct *user =current_user ();unsigned long vma_size;unsigned long nr_pages; +unsigned long user_locked, user_lock_limit;unsigned long locked, lock_limit; +long user_extra, extra;int ret =0 ; -long extra;if (!(vma->vm_flags &VM_SHARED ) || (vma->vm_flags &VM_WRITE ))return -EINVAL ;
@@ -1569,15 +1574,17 @@ static int perf_mmap(struct file *file, goto unlock; } - extra = nr_pages/* + 1 only account the data pages */ ; - extra -= sysctl_perf_counter_mlock >> (PAGE_SHIFT -10 ); -if (extra <0 ) - extra =0 ; - - locked = vma->vm_mm->locked_vm + extra; + user_extra = nr_pages +1 ; + user_lock_limit = sysctl_perf_counter_mlock >> (PAGE_SHIFT -10 ); + user_locked =atomic_long_read (&user->locked_vm) + user_extra; + + extra =0 ; +if (user_locked > user_lock_limit) + extra = user_locked - user_lock_limit; lock_limit = current->signal->rlim[RLIMIT_MEMLOCK ].rlim_cur; lock_limit >>=PAGE_SHIFT ; + locked = vma->vm_mm->locked_vm + extra;if ((locked > lock_limit) && !capable (CAP_IPC_LOCK )) { ret = -EPERM ;
@@ -1590,6 +1597,7 @@ static int perf_mmap(struct file *file, goto unlock;atomic_set (&counter->mmap_count,1 ); +atomic_long_add (user_extra, &user->locked_vm); vma->vm_mm->locked_vm += extra; counter->data->nr_locked = extra; unlock:
include/linux/sched.h +4 -0
@@ -675,6 +675,10 @@ struct user_struct {struct work_struct work;#endif #endif + +#ifdef CONFIG_PERF_COUNTERS +atomic_long_t locked_vm; +#endif };extern int uids_sysfs_init (void );
Re: [PATCH 4/4] perf_counter: update perf-top to use the new freq interface
In reply to Peter ZijlstraQuoted 42 lines · Peter Zijlstra
Provide perf top -F as alternative to -c.
Signed-off-by Peter Zijlstra <[email protected]>CC Paul Mackerras <[email protected]>CC Corey Ashford <[email protected]>--- Documentation/perf_counter/builtin-top.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)Index:
linux-2.6/Documentation/perf_counter/builtin-top.c
===================================================================Documentation/perf_counter/builtin-top.c +4
-1@@ -98,6 +98,7 @@ static unsigned int page_size;static unsigned int mmap_pages =16 ;static int use_mmap =0 ;static int use_munmap =0 ; +static int freq =0 ;static char *vmlinux;@@ -846,9 +847,10 @@ static void process_options(int argc, ch {"stat", no_argument, NULL, 'S'}, {"vmlinux", required_argument, NULL, 'x'}, {"zero", no_argument, NULL, 'z'}, + {"freq", required_argument, NULL, 'F'}, {NULL, 0, NULL, 0 } }; -int c =getopt_long (argc, argv,"+:ac:C:d:De:f:g:hln:m:p:r:s:Sx:zMU" , +int c =getopt_long (argc, argv,"+:ac:C:d:De:f:g:hln:m:p:r:s:Sx:zMUF:" , long_options, &option_index);if (c ==-1 )break ;@@ -889,6 +891,7 @@ static void process_options(int argc, chcase 'm' : mmap_pages =atoi (optarg);break ;case 'M' : use_mmap =1 ;break ;case 'U' : use_munmap =1 ;break ; +case 'F' : freq =1 ; default_interval =atoi (optarg);break ;default : error =1 ;break ; } }
Documentation/perf_counter/builtin-top.c int cmd_top(int argc, char **argv, const · line 1084
Quoted 7 lines
Documentation/perf_counter/builtin-top.c +1
-0@@ -1075,6 +1078,7 @@ int cmd_top(int argc, char **argv, const hw_event.nmi = nmi; hw_event.mmap = use_mmap; hw_event.munmap = use_munmap; + hw_event.freq = freq; fd[i][counter] =sys_perf_counter_open (&hw_event, tid, cpu, group_fd,0 );if (fd[i][counter] <0 ) {
this frequency-based profiling is nice. It's a lot more untuitive to users than rigid defaults of 'one IRQ per 100,000 cycles'.
So i think perf-top should be changed to have -F enabled by default, with a default 10 KHz frequency for all counters.
But for that we need another fix for this: currently the histogram is 'number of interrupts' based, which gets skewed with frequency based profiling.
A correct sorting key would be a normalized histogram, along 'number of hardware events', which could be measured as deltas between interrupts, like this:
counter_val: 1200000 [ IRQ ] -> { 1200000, RIP-1 }
.
.
.
counter_val: 1250000 [ IRQ ] -> { 1250000, RIP-2 }
.
.
.
counter_val: 1260000 [ IRQ ] -> { 1260000, RIP-3 }look at how the delta between the first and the second IRQ was 50000 cycles, while the delta between the second and third IRQ was just 10000 cycles - because the frequency adjustment code shortened the period.
So in the histogram, RIP-2 should get 50,000 cycles, and RIP-3 should get 10,000 cycles.
With the current scheme both would get +1 event credited - which is wrong.
Agreed?
Ingo
Re: [PATCH 3/4] perf_counter: frequency based adaptive irq_period
In reply to Peter Zijlstrakernel/perf_counter.c perf_counter_alloc(struct perf_counter_h · line 2945
Quoted 7 lines · Peter Zijlstra
kernel/perf_counter.c +3
-0@@ -2907,6 +2940,12 @@ perf_counter_alloc(struct perf_counter_h pmu =NULL ; + hwc = &counter->hw; +if (hw_event->freq && hw_event->irq_freq) + hwc->irq_period =TICK_NSEC / hw_event->irq_freq;
this needs to use a 64-bit do_div method too, otherwise we get this on 32-bit:
kernel/built-in.o: In function `perf_counter_alloc':
perf_counter.c:(.text+0x7ddc7): undefined reference to `__udivdi3'
Ingo
Re: [PATCH 3/4] perf_counter: frequency based adaptive irq_period
In reply to Peter ZijlstraQuoted 12 lines · Peter Zijlstra
plain text document attachment (perf_counter-freq.patch)
Instead of specifying theirq_periodfor a counter, provide a target interrupt frequency and dynamically adapt theirq_periodto match this frequency.Paul, please verify ppc64, I only did a very quick pass over that code.
Signed-off-by Peter Zijlstra <[email protected]>CC Paul Mackerras <[email protected]>CC Corey Ashford <[email protected]>---
Review perf_counter_alloc(struct perf_counter_h · line 2948
Quoted 9 lines
(quoted diff) +6
-0@@ -2907,6 +2940,12 @@ perf_counter_alloc(struct perf_counter_h pmu = NULL; + hwc = &counter->hw; + if (hw_event->freq && hw_event->irq_freq) + hwc->irq_period = TICK_NSEC / hw_event->irq_freq; + else + hwc->irq_period = hw_event->irq_period; +
kernel/built-in.o: In function `perf_counter_alloc':
perf_counter.c:(.text+0x7ddc7): undefined reference to `__udivdi3'
---
kernel/perf_counter.c +1 -1
@@ -2942,7 +2942,7 @@ perf_counter_alloc(struct perf_counter_h hwc = &counter->hw;if (hw_event->freq && hw_event->irq_freq) - hwc->irq_period =TICK_NSEC / hw_event->irq_freq; + hwc->irq_period =div64_u64 (TICK_NSEC , hw_event->irq_freq);else hwc->irq_period = hw_event->irq_period;
[tip:perfcounters/core] perf_counter: remove perf_disable/enable exports
In reply to Peter ZijlstraCommit-ID: 548e1ddf255b4ebfb4ef20c08936fd8d4deb3bd9 Gitweb: http://git.kernel.org/tip/548e1ddf255b4ebfb4ef20c08936fd8d4deb3bd9 Author: Peter Zijlstra <[email protected]> AuthorDate: Fri, 15 May 2009 15:19:26 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 15 May 2009 15:26:55 +0200
perf_counter: remove perf_disable/enable exports
Now that ACPI idle doesn't use it anymore, remove the exports.
[ Impact: remove dead code/data ]
LKML-Reference: <[email protected]>
--- kernel/perf_counter.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
kernel/perf_counter.c +0 -2
@@ -90,14 +90,12 @@ void perf_disable(void)__perf_disable ();hw_perf_disable (); } -EXPORT_SYMBOL_GPL (perf_disable);/* ACPI idle */ void perf_enable (void ) {if (__perf_enable ())hw_perf_enable (); } -EXPORT_SYMBOL_GPL (perf_enable);/* ACPI idle */ static void list_add_counter (struct perf_counter *counter,struct perf_counter_context *ctx)
[tip:perfcounters/core] perf_counter: per user mlock gift
In reply to Peter ZijlstraCommit-ID: 789f90fcf6b0b54e655740e9396c954378542c79 Gitweb: http://git.kernel.org/tip/789f90fcf6b0b54e655740e9396c954378542c79 Author: Peter Zijlstra <[email protected]> AuthorDate: Fri, 15 May 2009 15:19:27 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 15 May 2009 15:26:56 +0200
perf_counter: per user mlock gift
Instead of a per-process mlock gift for perf-counters, use a per-user gift so that there is less of a DoS potential.
[ Impact: allow less worst-case unprivileged memory consumption ]
LKML-Reference: <[email protected]>
--- include/linux/sched.h | 4 ++++ kernel/perf_counter.c | 22 +++++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-)
include/linux/sched.h +4 -0
@@ -674,6 +674,10 @@ struct user_struct {struct work_struct work;#endif #endif + +#ifdef CONFIG_PERF_COUNTERS +atomic_long_t locked_vm; +#endif };extern int uids_sysfs_init (void );
kernel/perf_counter.c +15 -7
@@ -45,7 +45,7 @@ static atomic_t nr_munmap_tracking __read_mostly;static atomic_t nr_comm_tracking__read_mostly ;int sysctl_perf_counter_priv__read_mostly ;/* do we need to be privileged */ -int sysctl_perf_counter_mlock__read_mostly =128 ;/* 'free' kb per counter */ +int sysctl_perf_counter_mlock__read_mostly =512 ;/* 'free' kb per user */ /* * Lock for (sysadmin-configurable) counter reservations:
@@ -1522,6 +1522,9 @@ static void perf_mmap_close(struct vm_area_struct *vma)if (atomic_dec_and_mutex_lock (&counter->mmap_count, &counter->mmap_mutex)) { +struct user_struct *user =current_user (); + +atomic_long_sub (counter->data->nr_pages +1 , &user->locked_vm); vma->vm_mm->locked_vm -= counter->data->nr_locked;perf_mmap_data_free (counter);mutex_unlock (&counter->mmap_mutex);
@@ -1537,11 +1540,13 @@ static struct vm_operations_struct perf_mmap_vmops = {static int perf_mmap (struct file *file,struct vm_area_struct *vma) {struct perf_counter *counter = file->private_data; +struct user_struct *user =current_user ();unsigned long vma_size;unsigned long nr_pages; +unsigned long user_locked, user_lock_limit;unsigned long locked, lock_limit; +long user_extra, extra;int ret =0 ; -long extra;if (!(vma->vm_flags &VM_SHARED ) || (vma->vm_flags &VM_WRITE ))return -EINVAL ;
@@ -1569,15 +1574,17 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma) goto unlock; } - extra = nr_pages/* + 1 only account the data pages */ ; - extra -= sysctl_perf_counter_mlock >> (PAGE_SHIFT -10 ); -if (extra <0 ) - extra =0 ; + user_extra = nr_pages +1 ; + user_lock_limit = sysctl_perf_counter_mlock >> (PAGE_SHIFT -10 ); + user_locked =atomic_long_read (&user->locked_vm) + user_extra; - locked = vma->vm_mm->locked_vm + extra; + extra =0 ; +if (user_locked > user_lock_limit) + extra = user_locked - user_lock_limit; lock_limit = current->signal->rlim[RLIMIT_MEMLOCK ].rlim_cur; lock_limit >>=PAGE_SHIFT ; + locked = vma->vm_mm->locked_vm + extra;if ((locked > lock_limit) && !capable (CAP_IPC_LOCK )) { ret = -EPERM ;
@@ -1590,6 +1597,7 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma) goto unlock;atomic_set (&counter->mmap_count,1 ); +atomic_long_add (user_extra, &user->locked_vm); vma->vm_mm->locked_vm += extra; counter->data->nr_locked = extra; unlock:
[tip:perfcounters/core] perf_counter: frequency based adaptive irq_period
In reply to Peter ZijlstraCommit-ID: 60db5e09c13109b13830cc9dcae688003fd39e79 Gitweb: http://git.kernel.org/tip/60db5e09c13109b13830cc9dcae688003fd39e79 Author: Peter Zijlstra <[email protected]> AuthorDate: Fri, 15 May 2009 15:19:28 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 15 May 2009 15:26:56 +0200
perf_counter: frequency based adaptive irq_period
Instead of specifying the irq_period for a counter, provide a target interrupt frequency and dynamically adapt the irq_period to match this frequency.
[ Impact: new perf-counter attribute/feature ]
LKML-Reference: <[email protected]>
--- arch/powerpc/kernel/perf_counter.c | 13 +++---- arch/x86/kernel/cpu/perf_counter.c | 9 ++--- include/linux/perf_counter.h | 10 ++++- kernel/perf_counter.c | 63 +++++++++++++++++++++++++++++------- 4 files changed, 68 insertions(+), 27 deletions(-)
arch/powerpc/kernel/perf_counter.c +6 -7
@@ -534,7 +534,7 @@ void hw_perf_enable(void)continue ; } val =0 ; -if (counter->hw_event.irq_period) { +if (counter->hw.irq_period) { left =atomic64_read (&counter->hw.period_left);if (left <0x80000000L ) val =0x80000000L - left;
@@ -829,8 +829,6 @@ const struct pmu *hw_perf_counter_init(struct perf_counter *counter)if (!ppmu)return ERR_PTR (-ENXIO ); -if ((s64 )counter->hw_event.irq_period <0 ) -return ERR_PTR (-EINVAL );if (!perf_event_raw (&counter->hw_event)) { ev =perf_event_id (&counter->hw_event);if (ev >= ppmu->n_generic || ppmu->generic_events[ev] ==0 )
@@ -901,7 +899,7 @@ const struct pmu *hw_perf_counter_init(struct perf_counter *counter) counter->hw.config = events[n]; counter->hw.counter_base = cflags[n]; -atomic64_set (&counter->hw.period_left, counter->hw_event.irq_period); +atomic64_set (&counter->hw.period_left, counter->hw.irq_period);/* * See if we need to reserve the PMU.
@@ -934,6 +932,7 @@ const struct pmu *hw_perf_counter_init(struct perf_counter *counter)static void record_and_restart (struct perf_counter *counter,long val,struct pt_regs *regs,int nmi) { +u64 period = counter->hw.irq_period;s64 prev, delta, left;int record =0 ;
@@ -948,11 +947,11 @@ static void record_and_restart(struct perf_counter *counter, long val,*/ val =0 ; left =atomic64_read (&counter->hw.period_left) - delta; -if (counter->hw_event.irq_period) { +if (period) {if (left <=0 ) { - left += counter->hw_event.irq_period; + left += period;if (left <=0 ) - left = counter->hw_event.irq_period; + left = period; record =1 ; }if (left <0x80000000L )
arch/x86/kernel/cpu/perf_counter.c +3 -6
@@ -286,11 +286,8 @@ static int __hw_perf_counter_init(struct perf_counter *counter) hwc->nmi =1 ; } - hwc->irq_period = hw_event->irq_period; -if ((s64 )hwc->irq_period <=0 || hwc->irq_period > x86_pmu.max_period) - hwc->irq_period = x86_pmu.max_period; - -atomic64_set (&hwc->period_left, hwc->irq_period); +atomic64_set (&hwc->period_left, +min (x86_pmu.max_period, hwc->irq_period));/* * Raw event type provide the config in the event structure
@@ -458,7 +455,7 @@ x86_perf_counter_set_period(struct perf_counter *counter, struct hw_perf_counter *hwc, int idx) {s64 left =atomic64_read (&hwc->period_left); -s64 period = hwc->irq_period; +s64 period =min (x86_pmu.max_period, hwc->irq_period);int err;/*
include/linux/perf_counter.h +8 -2
@@ -130,7 +130,11 @@ struct perf_counter_hw_event {*/ __u64 config; -__u64 irq_period; +union { +__u64 irq_period; +__u64 irq_freq; + }; +__u32 record_type;__u32 read_format;
@@ -146,8 +150,9 @@ struct perf_counter_hw_event { mmap : 1, /* include mmap data */ munmap : 1, /* include munmap data */ comm : 1, /* include comm data */ + freq : 1, /* use freq, not period */ - __reserved_1 : 52; + __reserved_1 : 51;__u32 extra_config_len;__u32 wakeup_events;/* wakeup every n events */
@@ -337,6 +342,7 @@ struct hw_perf_counter {atomic64_t prev_count;u64 irq_period;atomic64_t period_left; +u64 interrupts;#endif };
kernel/perf_counter.c +51 -12
144 lines not on this page · raw message
[tip:perfcounters/core] perf top: update to use the new freq interface
In reply to Peter ZijlstraCommit-ID: f5456a6b056b709282e87a68b4c1b81ac2e866fa Gitweb: http://git.kernel.org/tip/f5456a6b056b709282e87a68b4c1b81ac2e866fa Author: Peter Zijlstra <[email protected]> AuthorDate: Fri, 15 May 2009 15:19:29 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 15 May 2009 15:26:57 +0200
perf top: update to use the new freq interface
Provide perf top -F as alternative to -c.
[ Impact: new 'perf top' feature ]
LKML-Reference: <[email protected]>
--- Documentation/perf_counter/builtin-top.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
Documentation/perf_counter/builtin-top.c +5 -1
@@ -98,6 +98,7 @@ static unsigned int page_size;static unsigned int mmap_pages =16 ;static int use_mmap =0 ;static int use_munmap =0 ; +static int freq =0 ;static char *vmlinux;
@@ -846,9 +847,10 @@ static void process_options(int argc, char **argv) {"stat", no_argument, NULL, 'S'}, {"vmlinux", required_argument, NULL, 'x'}, {"zero", no_argument, NULL, 'z'}, + {"freq", required_argument, NULL, 'F'}, {NULL, 0, NULL, 0 } }; -int c =getopt_long (argc, argv,"+:ac:C:d:De:f:g:hln:m:p:r:s:Sx:zMU" , +int c =getopt_long (argc, argv,"+:ac:C:d:De:f:g:hln:m:p:r:s:Sx:zMUF:" , long_options, &option_index);if (c ==-1 )break ;
@@ -889,6 +891,7 @@ static void process_options(int argc, char **argv)case 'm' : mmap_pages =atoi (optarg);break ;case 'M' : use_mmap =1 ;break ;case 'U' : use_munmap =1 ;break ; +case 'F' : freq =1 ; default_interval =atoi (optarg);break ;default : error =1 ;break ; } }
@@ -1075,6 +1078,7 @@ int cmd_top(int argc, char **argv, const char *prefix) hw_event.nmi = nmi; hw_event.mmap = use_mmap; hw_event.munmap = use_munmap; + hw_event.freq = freq; fd[i][counter] =sys_perf_counter_open (&hw_event, tid, cpu, group_fd,0 );if (fd[i][counter] <0 ) {
[tip:perfcounters/core] perf_counter: frequency based adaptive irq_period, 32-bit fix
In reply to Peter ZijlstraCommit-ID: 2e569d36729c8105ae066a9b105068305442cc77 Gitweb: http://git.kernel.org/tip/2e569d36729c8105ae066a9b105068305442cc77 Author: Peter Zijlstra <[email protected]> AuthorDate: Fri, 15 May 2009 15:37:47 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 15 May 2009 15:40:25 +0200
perf_counter: frequency based adaptive irq_period, 32-bit fix
fix:
kernel/built-in.o: In function `perf_counter_alloc':
perf_counter.c:(.text+0x7ddc7): undefined reference to `__udivdi3'
[ Impact: build fix on 32-bit systems ]
LKML-Reference: <1242394667.6642.1887.camel@laptop>
--- kernel/perf_counter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/perf_counter.c +1 -1
@@ -2942,7 +2942,7 @@ perf_counter_alloc(struct perf_counter_hw_event *hw_event, hwc = &counter->hw;if (hw_event->freq && hw_event->irq_freq) - hwc->irq_period =TICK_NSEC / hw_event->irq_freq; + hwc->irq_period =div64_u64 (TICK_NSEC , hw_event->irq_freq);else hwc->irq_period = hw_event->irq_period;