leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libperf: Add PERF_RECORD_MMAP 'struct mmap_event' to perf/event.h

Browse Source 
Move the mmap_event event definition to libperf's event.h header
include.

In order to keep libperf simple, we switch 'u64/u32/u16/u8' types used
events to their generic '__u*' versions.

Perf added 'u*' types mainly to ease up printing __u64 values as stated
in the linux/types.h comment:

  /*
   * We define u64 as uint64_t for every architecture
   * so that we can print it with "%"PRIx64 without getting warnings.
   *
   * typedef __u64 u64;
   * typedef __s64 s64;
   */

Add  and use new PRI_lu64 and PRI_lx64 macros for that.  Use extra '_'
to ease up reading and differentiate them from standard PRI*64 macros.

Committer notes:

Fixup the PRI_l[ux]64 macros on 32-bit arches, conditionally defining it
with that extra 'l' modifier only on arches where __u64 is long long,
leaving it aside on 32-bit arches.

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://lkml.kernel.org/r/20190825181752.722-2-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa
2019-08-25 20:17:41 +02:00
committed by Arnaldo Carvalho de Melo
parent 3b4acbb92d
commit 1345e2ee87
4 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/perf/lib/include/perf/event.h Normal file
View File

@@ -0,0 +1,18 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __LIBPERF_EVENT_H
#define __LIBPERF_EVENT_H
#include <linux/perf_event.h>
#include <linux/types.h>
#include <linux/limits.h>
struct mmap_event {
struct perf_event_header header;
__u32 pid, tid;
__u64 start;
__u64 len;
__u64 pgoff;
char filename[PATH_MAX];
};
#endif /* __LIBPERF_EVENT_H */

2
tools/perf/util/event.c
View File

@@ -1353,7 +1353,7 @@ int perf_event__process_bpf_event(struct perf_tool *tool __maybe_unused,
size_t perf_event__fprintf_mmap(union perf_event *event, FILE *fp) size_t perf_event__fprintf_mmap(union perf_event *event, FILE *fp)
{ {
return fprintf(fp, " %d/%d: [%#" PRIx64 "(%#" PRIx64 ") @ %#" PRIx64 "]: %c %s\n", return fprintf(fp, " %d/%d: [%#" PRI_lx64 "(%#" PRI_lx64 ") @ %#" PRI_lx64 "]: %c %s\n",
event->mmap.pid, event->mmap.tid, event->mmap.start, event->mmap.pid, event->mmap.tid, event->mmap.start,
event->mmap.len, event->mmap.pgoff, event->mmap.len, event->mmap.pgoff,
(event->header.misc & PERF_RECORD_MISC_MMAP_DATA) ? 'r' : 'x', (event->header.misc & PERF_RECORD_MISC_MMAP_DATA) ? 'r' : 'x',

22
tools/perf/util/event.h
View File

@@ -7,19 +7,25 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/bpf.h> #include <linux/bpf.h>
#include <linux/perf_event.h> #include <linux/perf_event.h>
#include <perf/event.h>
#include "../perf.h" #include "../perf.h"
#include "build-id.h" #include "build-id.h"
#include "perf_regs.h" #include "perf_regs.h"
struct mmap_event { #ifdef __LP64__
struct perf_event_header header; /*
u32 pid, tid; * /usr/include/inttypes.h uses just 'lu' for PRIu64, but we end up defining
u64 start; * __u64 as long long unsigned int, and then -Werror=format= kicks in and
u64 len; * complains of the mismatched types, so use these two special extra PRI
u64 pgoff; * macros to overcome that.
char filename[PATH_MAX]; */
}; #define PRI_lu64 "l" PRIu64
#define PRI_lx64 "l" PRIx64
#else
#define PRI_lu64 PRIu64
#define PRI_lx64 PRIx64
#endif
struct mmap2_event { struct mmap2_event {
struct perf_event_header header; struct perf_event_header header;

4
tools/perf/util/python.c
View File

@@ -130,8 +130,8 @@ static PyObject *pyrf_mmap_event__repr(struct pyrf_event *pevent)
PyObject *ret; PyObject *ret;
char *s; char *s;
if (asprintf(&s, "{ type: mmap, pid: %u, tid: %u, start: %#" PRIx64 ", " if (asprintf(&s, "{ type: mmap, pid: %u, tid: %u, start: %#" PRI_lx64 ", "
"length: %#" PRIx64 ", offset: %#" PRIx64 ", " "length: %#" PRI_lx64 ", offset: %#" PRI_lx64 ", "
"filename: %s }", "filename: %s }",
pevent->event.mmap.pid, pevent->event.mmap.tid, pevent->event.mmap.pid, pevent->event.mmap.tid,
pevent->event.mmap.start, pevent->event.mmap.len, pevent->event.mmap.start, pevent->event.mmap.len,