1 files changed, 19 insertions, 6 deletions

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 8ca40deaa728..2e70610649a1 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -168,11 +168,18 @@ static int create_perf_stat_counter(struct perf_evsel *evsel)
         attr->sample_period = 0;
         attr->sample_type   = 0;
 
+        /*
+         * Disabling all counters initially, they will be enabled
+         * either manually by us or by kernel via enable_on_exec
+         * set later.
+         */
+        if (perf_evsel__is_group_leader(evsel))
+                attr->disabled = 1;
+
         if (target__has_cpu(&target))
                 return perf_evsel__open_per_cpu(evsel, perf_evsel__cpus(evsel));
 
         if (!target__has_task(&target) && perf_evsel__is_group_leader(evsel)) {
-                attr->disabled = 1;
                 if (!initial_delay)
                         attr->enable_on_exec = 1;
         }
@@ -251,12 +258,18 @@ static void process_interval(void)
         print_counters(&rs, 0, NULL);
 }
 
-static void handle_initial_delay(void)
+static void enable_counters(void)
 {
-        if (initial_delay) {
+        if (initial_delay)
                 usleep(initial_delay * 1000);
+
+        /*
+         * We need to enable counters only if:
+         * - we don't have tracee (attaching to task or cpu)
+         * - we have initial delay configured
+         */
+        if (!target__none(&target) || initial_delay)
                 perf_evlist__enable(evsel_list);
-        }
 }
 
 static volatile int workload_exec_errno;
@@ -353,7 +366,7 @@ static int __run_perf_stat(int argc, const char **argv)
 
         if (forks) {
                 perf_evlist__start_workload(evsel_list);
-                handle_initial_delay();
+                enable_counters();
 
                 if (interval) {
                         while (!waitpid(child_pid, &status, WNOHANG)) {
@@ -372,7 +385,7 @@ static int __run_perf_stat(int argc, const char **argv)
                 if (WIFSIGNALED(status))
                         psignal(WTERMSIG(status), argv[0]);
         } else {
-                handle_initial_delay();
+                enable_counters();
                 while (!done) {
                         nanosleep(&ts, NULL);
                         if (interval)