1 files changed, 19 insertions, 9 deletions

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 3c7452b39f57..688dea7cb08f 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -52,6 +52,7 @@
 #include "util/evlist.h"
 #include "util/evsel.h"
 #include "util/debug.h"
+#include "util/drv_configs.h"
 #include "util/color.h"
 #include "util/stat.h"
 #include "util/header.h"
@@ -65,6 +66,7 @@
 #include "util/group.h"
 #include "asm/bug.h"
 
+#include <linux/time64.h>
 #include <api/fs/fs.h>
 #include <stdlib.h>
 #include <sys/prctl.h>
@@ -172,7 +174,7 @@ static inline void diff_timespec(struct timespec *r, struct timespec *a,
 {
         r->tv_sec = a->tv_sec - b->tv_sec;
         if (a->tv_nsec < b->tv_nsec) {
-                r->tv_nsec = a->tv_nsec + 1000000000L - b->tv_nsec;
+                r->tv_nsec = a->tv_nsec + NSEC_PER_SEC - b->tv_nsec;
                 r->tv_sec--;
         } else {
                 r->tv_nsec = a->tv_nsec - b->tv_nsec ;
@@ -354,7 +356,7 @@ static void process_interval(void)
         diff_timespec(&rs, &ts, &ref_time);
 
         if (STAT_RECORD) {
-                if (WRITE_STAT_ROUND_EVENT(rs.tv_sec * NSECS_PER_SEC + rs.tv_nsec, INTERVAL))
+                if (WRITE_STAT_ROUND_EVENT(rs.tv_sec * NSEC_PER_SEC + rs.tv_nsec, INTERVAL))
                         pr_err("failed to write stat round event\n");
         }
 
@@ -364,7 +366,7 @@ static void process_interval(void)
 static void enable_counters(void)
 {
         if (initial_delay)
-                usleep(initial_delay * 1000);
+                usleep(initial_delay * USEC_PER_MSEC);
 
         /*
          * We need to enable counters only if:
@@ -539,10 +541,11 @@ static int __run_perf_stat(int argc, const char **argv)
         int status = 0;
         const bool forks = (argc > 0);
         bool is_pipe = STAT_RECORD ? perf_stat.file.is_pipe : false;
+        struct perf_evsel_config_term *err_term;
 
         if (interval) {
-                ts.tv_sec  = interval / 1000;
-                ts.tv_nsec = (interval % 1000) * 1000000;
+                ts.tv_sec  = interval / USEC_PER_MSEC;
+                ts.tv_nsec = (interval % USEC_PER_MSEC) * NSEC_PER_MSEC;
         } else {
                 ts.tv_sec  = 1;
                 ts.tv_nsec = 0;
@@ -610,6 +613,13 @@ try_again:
                 return -1;
         }
 
+        if (perf_evlist__apply_drv_configs(evsel_list, &counter, &err_term)) {
+                error("failed to set config \"%s\" on event %s with %d (%s)\n",
+                      err_term->val.drv_cfg, perf_evsel__name(counter), errno,
+                      str_error_r(errno, msg, sizeof(msg)));
+                return -1;
+        }
+
         if (STAT_RECORD) {
                 int err, fd = perf_data_file__fd(&perf_stat.file);
 
@@ -971,7 +981,7 @@ static void print_metric_header(void *ctx, const char *color __maybe_unused,
 static void nsec_printout(int id, int nr, struct perf_evsel *evsel, double avg)
 {
         FILE *output = stat_config.output;
-        double msecs = avg / 1e6;
+        double msecs = avg / NSEC_PER_MSEC;
         const char *fmt_v, *fmt_n;
         char name[25];
 
@@ -1460,7 +1470,7 @@ static void print_footer(void)
         if (!null_run)
                 fprintf(output, "\n");
         fprintf(output, " %17.9f seconds time elapsed",
-                        avg_stats(&walltime_nsecs_stats)/1e9);
+                        avg_stats(&walltime_nsecs_stats) / NSEC_PER_SEC);
         if (run_count > 1) {
                 fprintf(output, "                                        ");
                 print_noise_pct(stddev_stats(&walltime_nsecs_stats),
@@ -2175,8 +2185,8 @@ static int process_stat_round_event(struct perf_tool *tool __maybe_unused,
                 update_stats(&walltime_nsecs_stats, stat_round->time);
 
         if (stat_config.interval && stat_round->time) {
-                tsh.tv_sec  = stat_round->time / NSECS_PER_SEC;
-                tsh.tv_nsec = stat_round->time % NSECS_PER_SEC;
+                tsh.tv_sec  = stat_round->time / NSEC_PER_SEC;
+                tsh.tv_nsec = stat_round->time % NSEC_PER_SEC;
                 ts = &tsh;
         }