perf: add support for per-cpu per-cgroup monitoring (v5)
PATCH 2/2 perf: add support for per-cpu per-cgroup monitoring (v5)
This patch adds the ability to filter monitoring based on container groups (cgroups) for both perf stat and perf record. It is possible to monitor multiple cgroup in parallel. There is one cgroup per event. The cgroups to monitor are passed via a new -G option followed by a comma separated list of cgroup names.
The cgroup filesystem has to be mounted. Given a cgroup name, the perf tool finds the corresponding directory in the cgroup filesystem and opens it. It then passes that file descriptor to the kernel.
Example:
$ perf stat -B -a -e cycles:u,cycles:u,cycles:u -G test1,,test2 -- sleep 1 Performance counter stats for 'sleep 1':
2,368,667,414 cycles test1
2,369,661,459 cycles
<not counted> cycles test21.001856890 seconds time elapsed
Signed-off-by Stephane Eranian <[email protected]>
---
tools/perf/Documentation/perf-record.txt +6 -0
@@ -120,6 +120,12 @@ Do not update the builid cache. This saves some overhead in situations where the information in the perf.data file (which includes buildids) is sufficient. +-G name:: +--cgroup name:: +monitor only in the container called "name". This option is available only in per-cpu +mode. The cgroup filesystem must be mounted. All threads belonging to container "name" +are monitored when they run on the monitored CPUs. + SEE ALSO -------- linkperf:perf-stat[1], linkperf:perf-list[1]
tools/perf/Documentation/perf-stat.txt +5 -0
@@ -53,6 +53,11 @@ comma-sperated list with no space: 0,1. Ranges of CPUs are specified with -: 0-2 In per-thread mode, this option is ignored. The -a option is still necessary to activate system-wide monitoring. Default is to count on all CPUs. +-G name:: +--cgroup name:: +monitor only in the container called "name". This option is available only in per-cpu +mode. The cgroup filesystem must be mounted. All threads belonging to container "name" +are monitored when they run on the monitored CPUs. EXAMPLES --------
tools/perf/Makefile +2 -0
@@ -417,6 +417,7 @@ LIB_H += util/probe-finder.h LIB_H += util/probe-event.h LIB_H += util/pstack.h LIB_H += util/cpumap.h +LIB_H += util/cgroup.h LIB_OBJS += $(OUTPUT)util/abspath.o LIB_OBJS += $(OUTPUT)util/alias.o
@@ -464,6 +465,7 @@ LIB_OBJS += $(OUTPUT)util/hist.o LIB_OBJS += $(OUTPUT)util/probe-event.o LIB_OBJS += $(OUTPUT)util/util.o LIB_OBJS += $(OUTPUT)util/cpumap.o +LIB_OBJS += $(OUTPUT)util/cgroup.o BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o
tools/perf/builtin-record.c +23 -1
@@ -23,6 +23,7 @@#include "util/session.h" #include "util/symbol.h" #include "util/cpumap.h" +#include "util/cgroup.h" #include <unistd.h> #include <sched.h>
@@ -230,6 +231,8 @@ static void create_counter(int counter, int cpu)char *filter = filters[counter];struct perf_event_attr *attr = attrs + counter;struct perf_header_attr *h_attr; +unsigned long flags =0 ; +int pid;int track = !counter;/* only the first counter needs these */ int thread_index;int ret;
@@ -287,6 +290,9 @@ static void create_counter(int counter, int cpu) attr->sample_type |=PERF_SAMPLE_CPU ; } +if (cgroups[counter]) + flags =PERF_FLAG_PID_CGROUP ; + attr->mmap = track; attr->comm = track; attr->inherit = !no_inherit;
@@ -297,8 +303,13 @@ static void create_counter(int counter, int cpu)for (thread_index =0 ; thread_index < thread_num; thread_index++) { try_again: +if (cgroups[counter]) + pid = cgroups_fd[counter]; +else + pid = all_tids[thread_index]; + fd[nr_cpu][counter][thread_index] =sys_perf_event_open (attr, - all_tids[thread_index], cpu, group_fd,0 ); + pid, cpu, group_fd, flags);if (fd[nr_cpu][counter][thread_index] <0 ) {int err = errno;
@@ -885,6 +896,9 @@ const struct option record_options[] = { "don't sample"),OPT_BOOLEAN ('N' ,"no-buildid-cache" , &no_buildid,"do not update the buildid cache" ), +OPT_CALLBACK ('G' ,"cgroup" ,NULL ,"name" , +"monitor in cgroup name only" , + parse_cgroups), OPT_END() };
@@ -908,6 +922,9 @@ int cmd_record(int argc, const char **argv, const char *prefix __used) write_mode =WRITE_FORCE ; } +if (nr_cgroups && !system_wide) +usage_with_options (record_usage, record_options); +symbol__init ();if (no_buildid)disable_buildid_cache ();
@@ -918,6 +935,9 @@ int cmd_record(int argc, const char **argv, const char *prefix __used) attrs[0 ].config =PERF_COUNT_HW_CPU_CYCLES ; } +if (open_cgroups ()) +usage_with_options (record_usage, record_options); +if (target_pid !=-1 ) { target_tid = target_pid; thread_num =find_all_tid (target_pid, &all_tids);
@@ -927,6 +947,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)usage_with_options (record_usage, record_options); } }else { + err = -ENOMEM ; all_tids=malloc (sizeof (pid_t));if (!all_tids) goto out_symbol_exit;
@@ -978,5 +999,6 @@ out_free_fd: all_tids =NULL ; out_symbol_exit:symbol__exit (); +close_cgroups ();return err; }
tools/perf/builtin-stat.c +38 -3
107 lines not on this page · raw message
tools/perf/util/cgroup.c new file +123 -0
123 lines not on this page · raw message
tools/perf/util/cgroup.h new file +14 -0
@@ -0,0 +1,14 @@ +#ifndef __CGROUP_H__ +#define __CGROUP_H__ + +struct option ; + +extern char *cgroups[MAX_COUNTERS ]; +extern int cgroups_fd[MAX_COUNTERS ]; +extern int nr_cgroups;/* number of explicit cgroups defined */ + +extern int open_cgroups (void ); +extern void close_cgroups (void ); +extern int parse_cgroups (const struct option *opt,const char *str,int unset); + +#endif /* __CGROUP_H__ */