---
 tools/perf/Documentation/perf-top.txt | 12 ++++++++++++
 tools/perf/builtin-top.c              |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/tools/perf/Documentation/perf-top.txt b/tools/perf/Documentation/perf-top.txt
index bba5ffb05463..9898a32b8d9c 100644
--- a/tools/perf/Documentation/perf-top.txt
+++ b/tools/perf/Documentation/perf-top.txt

@@ -277,6 +277,18 @@ Default is to monitor all CPUS.
        Record events of type PERF_RECORD_NAMESPACES and display it with the
        'cgroup_id' sort key.

+-G name::
+--cgroup name::
+monitor only in the container (cgroup) 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. Multiple cgroups
+can be provided. Each cgroup is applied to the corresponding event, i.e., first cgroup
+to first event, second cgroup to second event and so on. It is possible to provide
+an empty cgroup (monitor all the time) using, e.g., -G foo,,bar. Cgroups must have
+corresponding events, i.e., they always refer to events defined earlier on the command
+line. If the user wants to track multiple events for a specific cgroup, the user can
+use '-e e1 -e e2 -G foo,foo' or just use '-e e1 -e e2 -G foo'.
+
 --all-cgroups::
        Record events of type PERF_RECORD_CGROUP and display it with the
        'cgroup' sort key.

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 69cb3635f5ef..2d570bfe7a56 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c

@@ -22,6 +22,7 @@

 #include "util/annotate.h"
 #include "util/bpf-event.h"
+#include "util/cgroup.h"
 #include "util/config.h"
 #include "util/color.h"
 #include "util/dso.h"

@@ -1558,6 +1559,8 @@ int cmd_top(int argc, const char **argv)
        OPT_BOOLEAN(0, "force", &symbol_conf.force, "don't complain, do it"),
        OPT_UINTEGER(0, "num-thread-synthesize", &top.nr_threads_synthesize,
                        "number of thread to run event synthesize"),
+       OPT_CALLBACK('G', "cgroup", &top.evlist, "name",
+                    "monitor event in cgroup name only", parse_cgroups),
        OPT_BOOLEAN(0, "namespaces", &opts->record_namespaces,
                    "Record namespaces events"),
        OPT_BOOLEAN(0, "all-cgroups", &opts->record_cgroup,

@@ -1646,6 +1649,11 @@ int cmd_top(int argc, const char **argv)
                goto out_delete_evlist;
        }

+       if (nr_cgroups > 0 && opts->record_cgroup) {
+               pr_err("--cgroup and --all-cgroups cannot be used together\n");
+               goto out_delete_evlist;
+       }
+
        if (opts->branch_stack && callchain_param.enabled)
                symbol_conf.show_branchflag_count = true;

--

2.32.0.272.g935e593368-goog