perf tools: pushing driver configuration down to the kernel

Now that PMU specific driver configuration are queued in
evsel::drv_config_terms, all we need to do is re-use the current
ioctl() mechanism to push down the information to the kernel
driver.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 199fc31e3919c5743ca305f9eef5ef8c8fc86a70..1b9decd5fbf120277bee0b8e85f12b7673205071 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -276,6 +276,7 @@ static int record__open(struct record *rec)
        struct perf_evlist *evlist = rec->evlist;
        struct perf_session *session = rec->session;
        struct record_opts *opts = &rec->opts;
+       struct perf_evsel_config_term *err_term;
        int rc = 0;
 
        perf_evlist__config(evlist, opts);
@@ -305,6 +306,14 @@ try_again:
                goto out;
        }
 
+       if (perf_evlist__apply_drv_configs(evlist, &pos, &err_term)) {
+               error("failed to set config \"%s\" on event %s with %d (%s)\n",
+                       err_term->val.drv_cfg, perf_evsel__name(pos), errno,
+                       strerror_r(errno, msg, sizeof(msg)));
+               rc = -1;
+               goto out;
+       }
+
        if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, false,
                                 opts->auxtrace_mmap_pages,
                                 opts->auxtrace_snapshot_mode) < 0) {

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 5da08efda32ffcdd8c0eafd69ce8141d05e15231..b54ee9f1cffdcdea410ffbd9c7233b93d6c007b6 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1247,6 +1247,30 @@ int perf_evlist__apply_filters(struct perf_evlist *evlist, struct perf_evsel **e
        return err;
 }
 
+int perf_evlist__apply_drv_configs(struct perf_evlist *evlist,
+                                  struct perf_evsel **err_evsel,
+                                  struct perf_evsel_config_term **err_term)
+{
+       struct perf_evsel *evsel;
+       int err = 0;
+       const int ncpus = cpu_map__nr(evlist->cpus),
+                 nthreads = thread_map__nr(evlist->threads);
+
+       evlist__for_each(evlist, evsel) {
+               if (list_empty(&evsel->drv_config_terms))
+                       continue;
+
+               err = perf_evsel__apply_drv_configs(evsel, ncpus,
+                                                   nthreads, err_term);
+               if (err) {
+                       *err_evsel = evsel;
+                       break;
+               }
+       }
+
+       return err;
+}
+
 int perf_evlist__set_filter(struct perf_evlist *evlist, const char *filter)
 {
        struct perf_evsel *evsel;

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index a459fe71b452e0b721d798cc73cc6287ae87dc1c..ae5c1eb1d08caa369a78217e27f491749a3ec891 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -163,6 +163,9 @@ void perf_evlist__set_maps(struct perf_evlist *evlist, struct cpu_map *cpus,
                           struct thread_map *threads);
 int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target);
 int perf_evlist__apply_filters(struct perf_evlist *evlist, struct perf_evsel **err_evsel);
+int perf_evlist__apply_drv_configs(struct perf_evlist *evlist,
+                                  struct perf_evsel **err_evsel,
+                                  struct perf_evsel_config_term **term);
 
 void __perf_evlist__set_leader(struct list_head *list);
 void perf_evlist__set_leader(struct perf_evlist *evlist);

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 47f871c3c1c74780354b5b6b62038a397ed0f383..39a8bd842d0df73b216c89e5b15d10e9be667252 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -982,6 +982,27 @@ int perf_evsel__append_filter(struct perf_evsel *evsel,
        return -1;
 }
 
+int perf_evsel__apply_drv_configs(struct perf_evsel *evsel,
+                                 int ncpus, int nthreads,
+                                 struct perf_evsel_config_term **err_term)
+{
+       int err = 0;
+       struct perf_evsel_config_term *term;
+
+       list_for_each_entry(term, &evsel->drv_config_terms, list) {
+               err = perf_evsel__run_ioctl(evsel, ncpus, nthreads,
+                                           PERF_EVENT_IOC_SET_DRV_CONFIGS,
+                                           (void *)term->val.drv_cfg);
+
+               if (err) {
+                       *err_term = term;
+                       break;
+               }
+       }
+
+       return err;
+}
+
 int perf_evsel__enable(struct perf_evsel *evsel, int ncpus, int nthreads)
 {
        return perf_evsel__run_ioctl(evsel, ncpus, nthreads,
@@ -1044,6 +1065,16 @@ static void perf_evsel__free_config_terms(struct perf_evsel *evsel)
        }
 }
 
+static void perf_evsel__free_drv_config_terms(struct perf_evsel *evsel)
+{
+       struct perf_evsel_config_term *term, *h;
+
+       list_for_each_entry_safe(term, h, &evsel->drv_config_terms, list) {
+               list_del(&term->list);
+               free(term);
+       }
+}
+
 void perf_evsel__close_fd(struct perf_evsel *evsel, int ncpus, int nthreads)
 {
        int cpu, thread;
@@ -1065,6 +1096,7 @@ void perf_evsel__exit(struct perf_evsel *evsel)
        perf_evsel__free_fd(evsel);
        perf_evsel__free_id(evsel);
        perf_evsel__free_config_terms(evsel);
+       perf_evsel__free_drv_config_terms(evsel);
        close_cgroup(evsel->cgrp);
        cpu_map__put(evsel->cpus);
        cpu_map__put(evsel->own_cpus);

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index ac94478feaaba28ab3508687798b9af485c122d5..b649143ac16b0fc9e1b0753267cf6dbbbf4ca308 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -231,6 +231,9 @@ int perf_evsel__append_filter(struct perf_evsel *evsel,
                              const char *op, const char *filter);
 int perf_evsel__apply_filter(struct perf_evsel *evsel, int ncpus, int nthreads,
                             const char *filter);
+int perf_evsel__apply_drv_configs(struct perf_evsel *evsel,
+                                 int ncpus, int nthreads,
+                                 struct perf_evsel_config_term **err_term);
 int perf_evsel__enable(struct perf_evsel *evsel, int ncpus, int nthreads);
 int perf_evsel__disable(struct perf_evsel *evsel);