libperf: Add 'struct perf_mmap_param'

Add libperf's version of mmap params 'struct perf_mmap_param' object
with the basics: 'prot' and 'mask'.  Encapsulate it in the current
'struct mmap_params' object.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20191007125344.14268-3-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/lib/include/internal/mmap.h b/tools/perf/lib/include/internal/mmap.h
index e25890de6a55d6ba81aa7974e66ac828e0c49718..b26806b36bb6e3d0b941af2fe747a6e9587090c6 100644 (file)
--- a/tools/perf/lib/include/internal/mmap.h
+++ b/tools/perf/lib/include/internal/mmap.h
@@ -29,6 +29,11 @@ struct perf_mmap {
        char             event_copy[PERF_SAMPLE_MAX_SIZE] __aligned(8);
 };
 
+struct perf_mmap_param {
+       int     prot;
+       int     mask;
+};
+
 void perf_mmap__init(struct perf_mmap *map, bool overwrite);
 
 #endif /* __LIBPERF_INTERNAL_MMAP_H */

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 6c8de08656708f73cce6cc28fe3687d346bf5492..3a19a7cb95b14264fc6653ee6a080045ef65ff19 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -667,7 +667,7 @@ static int evlist__mmap_per_evsel(struct evlist *evlist, int idx,
                int fd;
                int cpu;
 
-               mp->prot = PROT_READ | PROT_WRITE;
+               mp->core.prot = PROT_READ | PROT_WRITE;
                if (evsel->core.attr.write_backward) {
                        output = _output_overwrite;
                        maps = evlist->overwrite_mmap;
@@ -680,7 +680,7 @@ static int evlist__mmap_per_evsel(struct evlist *evlist, int idx,
                                if (evlist->bkw_mmap_state == BKW_MMAP_NOTREADY)
                                        perf_evlist__toggle_bkw_mmap(evlist, BKW_MMAP_RUNNING);
                        }
-                       mp->prot &= ~PROT_WRITE;
+                       mp->core.prot &= ~PROT_WRITE;
                }
 
                if (evsel->core.system_wide && thread)
@@ -921,8 +921,12 @@ int evlist__mmap_ex(struct evlist *evlist, unsigned int pages,
         * Its value is decided by evsel's write_backward.
         * So &mp should not be passed through const pointer.
         */
-       struct mmap_params mp = { .nr_cblocks = nr_cblocks, .affinity = affinity, .flush = flush,
-                                 .comp_level = comp_level };
+       struct mmap_params mp = {
+               .nr_cblocks     = nr_cblocks,
+               .affinity       = affinity,
+               .flush          = flush,
+               .comp_level     = comp_level
+       };
 
        if (!evlist->mmap)
                evlist->mmap = evlist__alloc_mmap(evlist, false);
@@ -934,7 +938,7 @@ int evlist__mmap_ex(struct evlist *evlist, unsigned int pages,
 
        evlist->core.mmap_len = evlist__mmap_size(pages);
        pr_debug("mmap size %zuB\n", evlist->core.mmap_len);
-       mp.mask = evlist->core.mmap_len - page_size - 1;
+       mp.core.mask = evlist->core.mmap_len - page_size - 1;
 
        auxtrace_mmap_params__init(&mp.auxtrace_mp, evlist->core.mmap_len,
                                   auxtrace_pages, auxtrace_overwrite);

diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
index a35dc57d59950a64b3e0a53cf99bca969c16d374..a496ced5ed2a8824c991e01697ec80df0d2a181b 100644 (file)
--- a/tools/perf/util/mmap.c
+++ b/tools/perf/util/mmap.c
@@ -370,8 +370,8 @@ int perf_mmap__mmap(struct mmap *map, struct mmap_params *mp, int fd, int cpu)
         */
        refcount_set(&map->core.refcnt, 2);
        map->core.prev = 0;
-       map->core.mask = mp->mask;
-       map->core.base = mmap(NULL, perf_mmap__mmap_len(map), mp->prot,
+       map->core.mask = mp->core.mask;
+       map->core.base = mmap(NULL, perf_mmap__mmap_len(map), mp->core.prot,
                         MAP_SHARED, fd, 0);
        if (map->core.base == MAP_FAILED) {
                pr_debug2("failed to mmap perf event ring buffer, error %d\n",

diff --git a/tools/perf/util/mmap.h b/tools/perf/util/mmap.h
index e567c1c875bdb8f65d1d82b8b3a8a47fff538191..4ff75d8aeb05042ffac5ff19637baf3573594c24 100644 (file)
--- a/tools/perf/util/mmap.h
+++ b/tools/perf/util/mmap.h
@@ -37,7 +37,8 @@ struct mmap {
 };
 
 struct mmap_params {
-       int prot, mask, nr_cblocks, affinity, flush, comp_level;
+       struct perf_mmap_param core;
+       int nr_cblocks, affinity, flush, comp_level;
        struct auxtrace_mmap_params auxtrace_mp;
 };