mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

libperf: Add perf_mmap struct 

Add the perf_mmap struct to libperf.

The definition is added into:

  include/internal/mmap.h

which is not to be included by users, but shared within perf and
libperf.

Committer notes:

Remove unnecessary includes from tools/perf/lib/include/internal/mmap.h,
those will be readded as they become necessary, later in the series.

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-11-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2019-07-27 22:07:44 +02:00 committed by Arnaldo Carvalho de Melo
parent e0fcfb086f
commit 547740f7b3
7 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/arch/x86/tests/perf-time-to-tsc.c
View File

@ -93,7 +93,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe
CHECK__(evlist__mmap(evlist, UINT_MAX)); CHECK__(evlist__mmap(evlist, UINT_MAX));
pc = evlist->mmap[0].base; pc = evlist->mmap[0].core.base;
ret = perf_read_tsc_conversion(pc, &tc); ret = perf_read_tsc_conversion(pc, &tc);
if (ret) { if (ret) {
if (ret == -EOPNOTSUPP) { if (ret == -EOPNOTSUPP) {

2
tools/perf/arch/x86/util/intel-bts.c
View File

@ -78,7 +78,7 @@ static int intel_bts_info_fill(struct auxtrace_record *itr,
if (!session->evlist->nr_mmaps) if (!session->evlist->nr_mmaps)
return -EINVAL; return -EINVAL;
pc = session->evlist->mmap[0].base; pc = session->evlist->mmap[0].core.base;
if (pc) { if (pc) {
err = perf_read_tsc_conversion(pc, &tc); err = perf_read_tsc_conversion(pc, &tc);
if (err) { if (err) {

2
tools/perf/arch/x86/util/intel-pt.c
View File

@ -355,7 +355,7 @@ static int intel_pt_info_fill(struct auxtrace_record *itr,
if (!session->evlist->nr_mmaps) if (!session->evlist->nr_mmaps)
return -EINVAL; return -EINVAL;
pc = session->evlist->mmap[0].base; pc = session->evlist->mmap[0].core.base;
if (pc) { if (pc) {
err = perf_read_tsc_conversion(pc, &tc); err = perf_read_tsc_conversion(pc, &tc);
if (err) { if (err) {

14
tools/perf/builtin-record.c
View File

@ -261,7 +261,7 @@ static int record__aio_pushfn(struct mmap *map, void *to, void *buf, size_t size
struct record_aio *aio = to; struct record_aio *aio = to;
/* /*
* map->base data pointed by buf is copied into free map->aio.data[] buffer * map->core.base data pointed by buf is copied into free map->aio.data[] buffer
* to release space in the kernel buffer as fast as possible, calling * to release space in the kernel buffer as fast as possible, calling
* perf_mmap__consume() from perf_mmap__push() function. * perf_mmap__consume() from perf_mmap__push() function.
* *
@ -360,7 +360,7 @@ static void record__aio_mmap_read_sync(struct record *rec)
for (i = 0; i < evlist->nr_mmaps; i++) { for (i = 0; i < evlist->nr_mmaps; i++) {
struct mmap *map = &maps[i]; struct mmap *map = &maps[i];
if (map->base) if (map->core.base)
record__aio_sync(map, true); record__aio_sync(map, true);
} }
} }
@ -970,7 +970,7 @@ static int record__mmap_read_evlist(struct record *rec, struct evlist *evlist,
u64 flush = 0; u64 flush = 0;
struct mmap *map = &maps[i]; struct mmap *map = &maps[i];
if (map->base) { if (map->core.base) {
record__adjust_affinity(rec, map); record__adjust_affinity(rec, map);
if (synch) { if (synch) {
flush = map->flush; flush = map->flush;
@ -1198,10 +1198,10 @@ static const struct perf_event_mmap_page *
perf_evlist__pick_pc(struct evlist *evlist) perf_evlist__pick_pc(struct evlist *evlist)
{ {
if (evlist) { if (evlist) {
if (evlist->mmap && evlist->mmap[0].base) if (evlist->mmap && evlist->mmap[0].core.base)
return evlist->mmap[0].base; return evlist->mmap[0].core.base;
if (evlist->overwrite_mmap && evlist->overwrite_mmap[0].base) if (evlist->overwrite_mmap && evlist->overwrite_mmap[0].core.base)
return evlist->overwrite_mmap[0].base; return evlist->overwrite_mmap[0].core.base;
} }
return NULL; return NULL;
} }

14
tools/perf/lib/include/internal/mmap.h Normal file
View File

@ -0,0 +1,14 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __LIBPERF_INTERNAL_MMAP_H
#define __LIBPERF_INTERNAL_MMAP_H
/**
* struct perf_mmap - perf's ring buffer mmap details
*
* @refcnt - e.g. code using PERF_EVENT_IOC_SET_OUTPUT to share this
*/
struct perf_mmap {
void *base;
};
#endif /* __LIBPERF_INTERNAL_MMAP_H */

22
tools/perf/util/mmap.c
View File

@ -31,7 +31,7 @@ size_t perf_mmap__mmap_len(struct mmap *map)
static union perf_event *perf_mmap__read(struct mmap *map, static union perf_event *perf_mmap__read(struct mmap *map,
u64 *startp, u64 end) u64 *startp, u64 end)
{ {
unsigned char *data = map->base + page_size; unsigned char *data = map->core.base + page_size;
union perf_event *event = NULL; union perf_event *event = NULL;
int diff = end - *startp; int diff = end - *startp;
@ -116,7 +116,7 @@ void perf_mmap__get(struct mmap *map)
void perf_mmap__put(struct mmap *map) void perf_mmap__put(struct mmap *map)
{ {
BUG_ON(map->base && refcount_read(&map->refcnt) == 0); BUG_ON(map->core.base && refcount_read(&map->refcnt) == 0);
if (refcount_dec_and_test(&map->refcnt)) if (refcount_dec_and_test(&map->refcnt))
perf_mmap__munmap(map); perf_mmap__munmap(map);
@ -317,9 +317,9 @@ void perf_mmap__munmap(struct mmap *map)
munmap(map->data, perf_mmap__mmap_len(map)); munmap(map->data, perf_mmap__mmap_len(map));
map->data = NULL; map->data = NULL;
} }
if (map->base != NULL) { if (map->core.base != NULL) {
munmap(map->base, perf_mmap__mmap_len(map)); munmap(map->core.base, perf_mmap__mmap_len(map));
map->base = NULL; map->core.base = NULL;
map->fd = -1; map->fd = -1;
refcount_set(&map->refcnt, 0); refcount_set(&map->refcnt, 0);
} }
@ -370,12 +370,12 @@ int perf_mmap__mmap(struct mmap *map, struct mmap_params *mp, int fd, int cpu)
refcount_set(&map->refcnt, 2); refcount_set(&map->refcnt, 2);
map->prev = 0; map->prev = 0;
map->mask = mp->mask; map->mask = mp->mask;
map->base = mmap(NULL, perf_mmap__mmap_len(map), mp->prot, map->core.base = mmap(NULL, perf_mmap__mmap_len(map), mp->prot,
MAP_SHARED, fd, 0); MAP_SHARED, fd, 0);
if (map->base == MAP_FAILED) { if (map->core.base == MAP_FAILED) {
pr_debug2("failed to mmap perf event ring buffer, error %d\n", pr_debug2("failed to mmap perf event ring buffer, error %d\n",
errno); errno);
map->base = NULL; map->core.base = NULL;
return -1; return -1;
} }
map->fd = fd; map->fd = fd;
@ -399,7 +399,7 @@ int perf_mmap__mmap(struct mmap *map, struct mmap_params *mp, int fd, int cpu)
} }
if (auxtrace_mmap__mmap(&map->auxtrace_mmap, if (auxtrace_mmap__mmap(&map->auxtrace_mmap,
&mp->auxtrace_mp, map->base, fd)) &mp->auxtrace_mp, map->core.base, fd))
return -1; return -1;
return perf_mmap__aio_mmap(map, mp); return perf_mmap__aio_mmap(map, mp);
@ -444,7 +444,7 @@ static int __perf_mmap__read_init(struct mmap *md)
{ {
u64 head = perf_mmap__read_head(md); u64 head = perf_mmap__read_head(md);
u64 old = md->prev; u64 old = md->prev;
unsigned char *data = md->base + page_size; unsigned char *data = md->core.base + page_size;
unsigned long size; unsigned long size;
md->start = md->overwrite ? head : old; md->start = md->overwrite ? head : old;
@ -489,7 +489,7 @@ int perf_mmap__push(struct mmap *md, void *to,
int push(struct mmap *map, void *to, void *buf, size_t size)) int push(struct mmap *map, void *to, void *buf, size_t size))
{ {
u64 head = perf_mmap__read_head(md); u64 head = perf_mmap__read_head(md);
unsigned char *data = md->base + page_size; unsigned char *data = md->core.base + page_size;
unsigned long size; unsigned long size;
void *buf; void *buf;
int rc = 0; int rc = 0;

7
tools/perf/util/mmap.h
View File

@ -1,6 +1,7 @@
#ifndef __PERF_MMAP_H #ifndef __PERF_MMAP_H
#define __PERF_MMAP_H 1 #define __PERF_MMAP_H 1
#include <internal/mmap.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/refcount.h> #include <linux/refcount.h>
#include <linux/types.h> #include <linux/types.h>
@ -20,7 +21,7 @@ struct aiocb;
* @refcnt - e.g. code using PERF_EVENT_IOC_SET_OUTPUT to share this * @refcnt - e.g. code using PERF_EVENT_IOC_SET_OUTPUT to share this
*/ */
struct mmap { struct mmap {
void *base; struct perf_mmap core;
int mask; int mask;
int fd; int fd;
int cpu; int cpu;
@ -60,12 +61,12 @@ void perf_mmap__consume(struct mmap *map);
static inline u64 perf_mmap__read_head(struct mmap *mm) static inline u64 perf_mmap__read_head(struct mmap *mm)
{ {
return ring_buffer_read_head(mm->base); return ring_buffer_read_head(mm->core.base);
} }
static inline void perf_mmap__write_tail(struct mmap *md, u64 tail) static inline void perf_mmap__write_tail(struct mmap *md, u64 tail)
{ {
ring_buffer_write_tail(md->base, tail); ring_buffer_write_tail(md->core.base, tail);
} }
union perf_event *perf_mmap__read_forward(struct mmap *map); union perf_event *perf_mmap__read_forward(struct mmap *map);