lkml.org 
[lkml]   [2019]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/36] libperf: Add perf_mmap__mmap() function
    Date
    Move perf_mmap__mmap() from tools/perf to libperf, it will be used in
    the following patches. And rename the existing perf's function to
    mmap__mmap().

    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 <a.p.zijlstra@chello.nl>
    Link: http://lore.kernel.org/lkml/20190913132355.21634-43-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/lib/include/internal/mmap.h | 2 ++
    tools/perf/lib/mmap.c | 18 ++++++++++++++++++
    tools/perf/util/evlist.c | 2 +-
    tools/perf/util/mmap.c | 12 +++---------
    tools/perf/util/mmap.h | 2 +-
    5 files changed, 25 insertions(+), 11 deletions(-)

    diff --git a/tools/perf/lib/include/internal/mmap.h b/tools/perf/lib/include/internal/mmap.h
    index e7a67260940c..7067b70c6f61 100644
    --- a/tools/perf/lib/include/internal/mmap.h
    +++ b/tools/perf/lib/include/internal/mmap.h
    @@ -37,5 +37,7 @@ struct perf_mmap_param {
    size_t perf_mmap__mmap_len(struct perf_mmap *map);

    void perf_mmap__init(struct perf_mmap *map, bool overwrite);
    +int perf_mmap__mmap(struct perf_mmap *map, struct perf_mmap_param *mp,
    + int fd, int cpu);

    #endif /* __LIBPERF_INTERNAL_MMAP_H */
    diff --git a/tools/perf/lib/mmap.c b/tools/perf/lib/mmap.c
    index cc4284da4d99..b216a7db857f 100644
    --- a/tools/perf/lib/mmap.c
    +++ b/tools/perf/lib/mmap.c
    @@ -1,4 +1,5 @@
    // SPDX-License-Identifier: GPL-2.0
    +#include <sys/mman.h>
    #include <internal/mmap.h>
    #include <internal/lib.h>

    @@ -13,3 +14,20 @@ size_t perf_mmap__mmap_len(struct perf_mmap *map)
    {
    return map->mask + 1 + page_size;
    }
    +
    +int perf_mmap__mmap(struct perf_mmap *map, struct perf_mmap_param *mp,
    + int fd, int cpu)
    +{
    + map->prev = 0;
    + map->mask = mp->mask;
    + map->base = mmap(NULL, perf_mmap__mmap_len(map), mp->prot,
    + MAP_SHARED, fd, 0);
    + if (map->base == MAP_FAILED) {
    + map->base = NULL;
    + return -1;
    + }
    +
    + map->fd = fd;
    + map->cpu = cpu;
    + return 0;
    +}
    diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
    index 666339d4d1cd..055f625dc630 100644
    --- a/tools/perf/util/evlist.c
    +++ b/tools/perf/util/evlist.c
    @@ -671,7 +671,7 @@ static int evlist__mmap_per_evsel(struct evlist *evlist, int idx,
    if (*output == -1) {
    *output = fd;

    - if (perf_mmap__mmap(&maps[idx], mp, *output, evlist_cpu) < 0)
    + if (mmap__mmap(&maps[idx], mp, *output, evlist_cpu) < 0)
    return -1;
    } else {
    if (ioctl(fd, PERF_EVENT_IOC_SET_OUTPUT, *output) != 0)
    diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
    index a8e81c4cbae8..acef6e3f6b80 100644
    --- a/tools/perf/util/mmap.c
    +++ b/tools/perf/util/mmap.c
    @@ -353,7 +353,7 @@ static void perf_mmap__setup_affinity_mask(struct mmap *map, struct mmap_params
    CPU_SET(map->core.cpu, &map->affinity_mask);
    }

    -int perf_mmap__mmap(struct mmap *map, struct mmap_params *mp, int fd, int cpu)
    +int mmap__mmap(struct mmap *map, struct mmap_params *mp, int fd, int cpu)
    {
    /*
    * The last one will be done at perf_mmap__consume(), so that we
    @@ -369,18 +369,12 @@ int perf_mmap__mmap(struct mmap *map, struct mmap_params *mp, int fd, int cpu)
    * perf_evlist__filter_pollfd().
    */
    refcount_set(&map->core.refcnt, 2);
    - map->core.prev = 0;
    - map->core.mask = mp->core.mask;
    - map->core.base = mmap(NULL, mmap__mmap_len(map), mp->core.prot,
    - MAP_SHARED, fd, 0);
    - if (map->core.base == MAP_FAILED) {
    +
    + if (perf_mmap__mmap(&map->core, &mp->core, fd, cpu)) {
    pr_debug2("failed to mmap perf event ring buffer, error %d\n",
    errno);
    - map->core.base = NULL;
    return -1;
    }
    - map->core.fd = fd;
    - map->core.cpu = cpu;

    perf_mmap__setup_affinity_mask(map, mp);

    diff --git a/tools/perf/util/mmap.h b/tools/perf/util/mmap.h
    index 2b97dc6d9ee2..a60e6ead7255 100644
    --- a/tools/perf/util/mmap.h
    +++ b/tools/perf/util/mmap.h
    @@ -42,7 +42,7 @@ struct mmap_params {
    struct auxtrace_mmap_params auxtrace_mp;
    };

    -int perf_mmap__mmap(struct mmap *map, struct mmap_params *mp, int fd, int cpu);
    +int mmap__mmap(struct mmap *map, struct mmap_params *mp, int fd, int cpu);
    void perf_mmap__munmap(struct mmap *map);

    void perf_mmap__get(struct mmap *map);
    --
    2.21.0
    \
     
     \ /
      Last update: 2019-10-07 14:57    [W:4.273 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site