perf_counter: Separate out attr->type from attr->config
Subsystems (3)
Commit-ID: a21ca2cac582886a3e95c8bb84ff7c52d4d15e54 Gitweb: http://git.kernel.org/tip/a21ca2cac582886a3e95c8bb84ff7c52d4d15e54 Author: Ingo Molnar <[email protected]> AuthorDate: Sat, 6 Jun 2009 09:58:57 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Sat, 6 Jun 2009 11:37:22 +0200
perf_counter: Separate out attr->type from attr->config
Counter type is a frequently used value and we do a lot of bit juggling by encoding and decoding it from attr->config.
Clean this up by creating a separate attr->type field.
Also clean up the various similarly complex user-space bits all around counter attribute management.
The net improvement is significant, and it will be easier to add a new major type (which is what triggered this cleanup).
(This changes the ABI, all tools are adapted.)
(PowerPC build-tested.)
Cc: Peter Zijlstra <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Corey Ashford <[email protected]>
Cc: Marcelo Tosatti <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
LKML-Reference: <new-submission>
--- Documentation/perf_counter/builtin-record.c | 105 +++++++++------------ Documentation/perf_counter/builtin-stat.c | 76 ++++++--------- Documentation/perf_counter/builtin-top.c | 67 +++++--------- Documentation/perf_counter/perf.h | 2 - Documentation/perf_counter/util/parse-events.c | 120 +++++++++++++----------- Documentation/perf_counter/util/parse-events.h | 7 +- arch/powerpc/kernel/perf_counter.c | 6 +- arch/x86/kernel/cpu/perf_counter.c | 8 +- include/linux/perf_counter.h | 65 +++---------- kernel/perf_counter.c | 14 +-- 10 files changed, 196 insertions(+), 274 deletions(-)
Documentation/perf_counter/builtin-record.c +47 -58
@@ -20,10 +20,10 @@#define ALIGN (x, a) __ALIGN_MASK(x, (typeof(x))(a)-1)#define __ALIGN_MASK (x, mask) (((x)+(mask))&~(mask)) -static long default_interval =100000 ; -static long event_count[MAX_COUNTERS ]; -static int fd[MAX_NR_CPUS ][MAX_COUNTERS ]; + +static long default_interval =100000 ; +static int nr_cpus =0 ;static unsigned int page_size;static unsigned int mmap_pages =128 ;
@@ -38,22 +38,44 @@ static int inherit = 1;static int force =0 ;static int append_file =0 ; -const unsigned int default_count[] = { -1000000 , -1000000 , -10000 , -10000 , -1000000 , -10000 , +static long samples; +static struct timeval last_read; +static struct timeval this_read; + +static __u64 bytes_written; + +static struct pollfd event_array[MAX_NR_CPUS *MAX_COUNTERS ]; + +static int nr_poll; +static int nr_cpu; + +struct mmap_event { +struct perf_event_header header; +__u32 pid; +__u32 tid; +__u64 start; +__u64 len; +__u64 pgoff; +char filename[PATH_MAX ]; +}; + +struct comm_event { +struct perf_event_header header; +__u32 pid; +__u32 tid; +char comm[16 ]; }; +struct mmap_data { -int counter; -void *base; -unsigned int mask; -unsigned int prev; +int counter; +void *base; +unsigned int mask; +unsigned int prev; }; +static struct mmap_data mmap_array[MAX_NR_CPUS ][MAX_COUNTERS ]; +static unsigned int mmap_read_head (struct mmap_data *md) {struct perf_counter_mmap_page *pc = md->base;
@@ -65,11 +87,6 @@ static unsigned int mmap_read_head(struct mmap_data *md)return head; } -static long samples; -static struct timeval last_read, this_read; - -static __u64 bytes_written; -static void mmap_read (struct mmap_data *md) {unsigned int head =mmap_read_head (md);
@@ -157,29 +174,6 @@ static void sig_handler(int sig) done =1 ; } -static struct pollfd event_array[MAX_NR_CPUS *MAX_COUNTERS ]; -static struct mmap_data mmap_array[MAX_NR_CPUS ][MAX_COUNTERS ]; - -static int nr_poll; -static int nr_cpu; - -struct mmap_event { -struct perf_event_header header; -__u32 pid; -__u32 tid; -__u64 start; -__u64 len; -__u64 pgoff; -char filename[PATH_MAX ]; -}; - -struct comm_event { -struct perf_event_header header; -__u32 pid; -__u32 tid; -char comm[16 ]; -}; -static void pid_synthesize_comm_event (pid_t pid,int full) {struct comm_event comm_ev;
@@ -341,24 +335,21 @@ static int group_fd;static void create_counter (int counter,int cpu,pid_t pid) { -struct perf_counter_attr attr; +struct perf_counter_attr *attr = attrs + counter;int track =1 ; -memset (&attr,0 ,sizeof (attr)); - attr.config = event_id[counter]; - attr.sample_period = event_count[counter]; - attr.sample_type =PERF_SAMPLE_IP |PERF_SAMPLE_TID |PERF_SAMPLE_PERIOD ; + attr->sample_type =PERF_SAMPLE_IP |PERF_SAMPLE_TID |PERF_SAMPLE_PERIOD ;if (freq) { - attr.freq =1 ; - attr.sample_freq = freq; + attr->freq =1 ; + attr->sample_freq = freq; } - attr.mmap = track; - attr.comm = track; - attr.inherit = (cpu <0 ) && inherit; + attr->mmap = track; + attr->comm = track; + attr->inherit = (cpu <0 ) && inherit; track =0 ;/* only the first counter needs these */ - fd[nr_cpu][counter] =sys_perf_counter_open (&attr, pid, cpu, group_fd,0 ); + fd[nr_cpu][counter] =sys_perf_counter_open (attr, pid, cpu, group_fd,0 );if (fd[nr_cpu][counter] <0 ) {int err = errno;
@@ -542,16 +533,14 @@ int cmd_record(int argc, const char **argv, const char *prefix)if (!argc && target_pid ==-1 && !system_wide)usage_with_options (record_usage, options); -if (!nr_counters) { +if (!nr_counters) nr_counters =1 ; - event_id[0 ] =0 ; - }for (counter =0 ; counter < nr_counters; counter++) { -if (event_count[counter]) +if (attrs[counter].sample_period)continue ; - event_count[counter] = default_interval; + attrs[counter].sample_period = default_interval; }return __cmd_record (argc, argv);
Documentation/perf_counter/builtin-stat.c +32 -44
146 lines not on this page · raw message
Documentation/perf_counter/builtin-top.c +23 -44
137 lines not on this page · raw message
Documentation/perf_counter/perf.h +0 -2
@@ -64,6 +64,4 @@ sys_perf_counter_open(struct perf_counter_attr *attr_uptr,#define MAX_COUNTERS 256#define MAX_NR_CPUS 256 -#define EID (type, id) (((__u64)(type) << PERF_COUNTER_TYPE_SHIFT) | (id)) -#endif
Documentation/perf_counter/util/parse-events.c +66 -54
200 lines not on this page · raw message
Documentation/perf_counter/util/parse-events.h +2 -5
@@ -3,12 +3,9 @@* Parse symbolic events/counts passed in as options: */ -extern int nr_counters; -extern __u64 event_id[MAX_COUNTERS ]; -extern int event_mask[MAX_COUNTERS ]; +extern int nr_counters; -#define EVENT_MASK_KERNEL 1 -#define EVENT_MASK_USER 2 +extern struct perf_counter_attr attrs[MAX_COUNTERS ];extern char *event_name (int ctr);
arch/powerpc/kernel/perf_counter.c +3 -3
@@ -867,13 +867,13 @@ const struct pmu *hw_perf_counter_init(struct perf_counter *counter)if (!ppmu)return ERR_PTR (-ENXIO ); -if (!perf_event_raw (&counter->attr)) { - ev =perf_event_id (&counter->attr); +if (counter->attr.type !=PERF_TYPE_RAW ) { + ev = counter->attr.config;if (ev >= ppmu->n_generic || ppmu->generic_events[ev] ==0 )return ERR_PTR (-EOPNOTSUPP ); ev = ppmu->generic_events[ev]; }else { - ev =perf_event_config (&counter->attr); + ev = counter->attr.config; } counter->hw.config_base = ev; counter->hw.idx =0 ;
arch/x86/kernel/cpu/perf_counter.c +4 -4
@@ -292,15 +292,15 @@ static int __hw_perf_counter_init(struct perf_counter *counter)/* * Raw event type provide the config in the event structure */ -if (perf_event_raw (attr)) { - hwc->config |= x86_pmu.raw_event (perf_event_config (attr)); +if (attr->type ==PERF_TYPE_RAW ) { + hwc->config |= x86_pmu.raw_event (attr->config); }else { -if (perf_event_id (attr) >= x86_pmu.max_events) +if (attr->config >= x86_pmu.max_events)return -EINVAL ;/* * The generic map: */ - hwc->config |= x86_pmu.event_map (perf_event_id (attr)); + hwc->config |= x86_pmu.event_map (attr->config); } counter->destroy = hw_perf_counter_destroy;
include/linux/perf_counter.h +13 -52
104 lines not on this page · raw message
kernel/perf_counter.c +6 -8
@@ -3091,14 +3091,12 @@ static int perf_swcounter_match(struct perf_counter *counter, enum perf_event_types type, u32 event, struct pt_regs *regs) { - u64 event_config; - - event_config = ((u64 ) type <<PERF_COUNTER_TYPE_SHIFT ) | event; - if (!perf_swcounter_is_counting(counter)) return 0; -if (counter->attr.config != event_config) + if (counter->attr.type != type) + return 0; + if (counter->attr.config != event) return 0; if (regs) {
@@ -3403,7 +3401,7 @@ static const struct pmu *sw_perf_counter_init(struct perf_counter *counter)* to be kernel events, and page faults are never hypervisor * events. */ -switch (perf_event_id (&counter->attr)) { +switch (counter->attr.config) {case PERF_COUNT_CPU_CLOCK : pmu = &perf_ops_cpu_clock;
@@ -3496,12 +3494,12 @@ perf_counter_alloc(struct perf_counter_attr *attr,if (attr->inherit && (attr->sample_type &PERF_SAMPLE_GROUP )) goto done; -if (perf_event_raw (attr)) { +if (attr->type ==PERF_TYPE_RAW ) { pmu =hw_perf_counter_init (counter); goto done; } -switch (perf_event_type (attr)) { +switch (attr->type) {case PERF_TYPE_HARDWARE : pmu =hw_perf_counter_init (counter);break ;