perf tools: Add read_cgroup_id() function
Namhyung Kim
maintainerPATCH 1/2 perf tools: Add read_cgroup_id() function
The read_cgroup_id() is to read a cgroup id from a file handle using name_to_handle_at(2) for the given cgroup. It'll be used by bperf cgroup stat later.
--- tools/perf/util/cgroup.c | 25 +++++++++++++++++++++++++ tools/perf/util/cgroup.h | 9 +++++++++ 2 files changed, 34 insertions(+)
tools/perf/util/cgroup.c +25 -0
@@ -45,6 +45,31 @@ static int open_cgroup(const char *name)return fd; } +#ifdef HAVE_FILE_HANDLE +int read_cgroup_id (struct cgroup *cgrp) +{ +char path[PATH_MAX +1 ]; +char mnt[PATH_MAX +1 ]; +struct { +struct file_handle fh; +uint64_t cgroup_id; + } handle; +int mount_id; + +if (cgroupfs_find_mountpoint (mnt,PATH_MAX +1 ,"perf_event" )) +return -1 ; + +scnprintf (path,PATH_MAX ,"%s/%s" , mnt, cgrp->name); + + handle.fh.handle_bytes =sizeof (handle.cgroup_id); +if (name_to_handle_at (AT_FDCWD , path, &handle.fh, &mount_id,0 ) <0 ) +return -1 ; + + cgrp->id = handle.cgroup_id; +return 0 ; +} +#endif /* HAVE_FILE_HANDLE */ +static struct cgroup *evlist__find_cgroup (struct evlist *evlist,const char *str) {struct evsel *counter;
tools/perf/util/cgroup.h +9 -0
@@ -38,4 +38,13 @@ struct cgroup *cgroup__find(struct perf_env *env, uint64_t id);void perf_env__purge_cgroups (struct perf_env *env); +#ifdef HAVE_FILE_HANDLE +int read_cgroup_id (struct cgroup *cgrp); +#else +int read_cgroup_id (struct cgroup *cgrp) +{ +return -1 ; +} +#endif /* HAVE_FILE_HANDLE */ +#endif /* __CGROUP_H__ */
Signature · 1 line
2.32.0.272.g935e593368-goog
Namhyung Kim
maintainerPATCH 2/2 perf stat: Enable BPF counter with --for-each-cgroup
Recently bperf was added to use BPF to count perf events for various purposes. This is an extension for the approach and targetting to cgroup usages.
When --for-each-cgroup is used with --bpf-counters, it will open cgroup-switches event per cpu internally and attach the new BPF program to read given perf_events for cgroups.
Unlike the other bperf, it doesn't share the events with other processes but it'd reduce unnecessary events (and the overhead of multiplexing) for each monitored cgroup within the perf session.
Current limitations are:
* bpf_get_cgroup_current_id() works for cgroup v2 only
* it doesn't support cgroup hierarchy
--- tools/perf/Makefile.perf | 1 + tools/perf/util/Build | 1 + tools/perf/util/bpf_counter.c | 5 + tools/perf/util/bpf_counter_cgroup.c | 316 ++++++++++++++++++++ tools/perf/util/bpf_skel/bperf_cgroup.bpf.c | 118 ++++++++ tools/perf/util/cgroup.c | 2 + tools/perf/util/cgroup.h | 1 + 7 files changed, 444 insertions(+) create mode 100644 tools/perf/util/bpf_counter_cgroup.c create mode 100644 tools/perf/util/bpf_skel/bperf_cgroup.bpf.c
tools/perf/Makefile.perf +1 -0
@@ -1015,6 +1015,7 @@ SKEL_OUT := $(abspath $(OUTPUT)util/bpf_skel) SKEL_TMP_OUT := $(abspath $(SKEL_OUT)/.tmp) SKELETONS := $(SKEL_OUT)/bpf_prog_profiler.skel.h SKELETONS += $(SKEL_OUT)/bperf_leader.skel.h $(SKEL_OUT)/bperf_follower.skel.h +SKELETONS += $(SKEL_OUT)/bperf_cgroup.skel.h ifdef BUILD_BPF_SKEL BPFTOOL := $(SKEL_TMP_OUT)/bootstrap/bpftool
tools/perf/util/Build +1 -0
@@ -140,6 +140,7 @@ perf-y += clockid.o perf-$(CONFIG_LIBBPF) += bpf-loader.o perf-$(CONFIG_LIBBPF) += bpf_map.o perf-$(CONFIG_PERF_BPF_SKEL) += bpf_counter.o +perf-$(CONFIG_PERF_BPF_SKEL) += bpf_counter_cgroup.o perf-$(CONFIG_BPF_PROLOGUE) += bpf-prologue.o perf-$(CONFIG_LIBELF) += symbol-elf.o perf-$(CONFIG_LIBELF) += probe-file.o
tools/perf/util/bpf_counter.c +5 -0
@@ -22,6 +22,7 @@#include "evsel.h" #include "evlist.h" #include "target.h" +#include "cgroup.h" #include "cpumap.h" #include "thread_map.h"
@@ -792,6 +793,8 @@ struct bpf_counter_ops bperf_ops = { .destroy = bperf__destroy, }; +extern struct bpf_counter_ops bperf_cgrp_ops; +static inline bool bpf_counter_skip (struct evsel *evsel) { return list_empty(&evsel->bpf_counter_list) &&
@@ -809,6 +812,8 @@ int bpf_counter__load(struct evsel *evsel, struct target *target) {if (target->bpf_str) evsel->bpf_counter_ops = &bpf_program_profiler_ops; +else if (cgrp_event_expanded && target->use_bpf) + evsel->bpf_counter_ops = &bperf_cgrp_ops;else if (target->use_bpf || evsel->bpf_counter ||evsel__match_bpf_counter_events (evsel->name)) evsel->bpf_counter_ops = &bperf_ops;
tools/perf/util/bpf_counter_cgroup.c new file +316 -0
316 lines not on this page · raw message
tools/perf/util/bpf_skel/bperf_cgroup.bpf.c new file +118 -0
118 lines not on this page · raw message
tools/perf/util/cgroup.c +2 -0
@@ -17,6 +17,7 @@#include <regex.h> int nr_cgroups; +bool cgrp_event_expanded;/* used to match cgroup name with patterns */ struct cgroup_name {
@@ -465,6 +466,7 @@ int evlist__expand_cgroup(struct evlist *evlist, const char *str, } ret =0 ; + cgrp_event_expanded = true; out_err:evlist__delete (orig_list);
tools/perf/util/cgroup.h +1 -0
@@ -17,6 +17,7 @@ struct cgroup { };extern int nr_cgroups;/* number of explicit cgroups defined */ +extern bool cgrp_event_expanded;struct cgroup *cgroup__get (struct cgroup *cgroup);void cgroup__put (struct cgroup *cgroup);
Signature · 1 line
2.32.0.272.g935e593368-goog