LKML Archive on lore.kernel.org
 help / color / Atom feed
From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
	Ingo Molnar <mingo@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Michael Petlan <mpetlan@redhat.com>
Subject: [PATCH 08/23] libperf: Add PERF_RECORD_AUXTRACE_INFO 'struct auxtrace_info_event' to perf/event.h
Date: Wed, 28 Aug 2019 15:57:02 +0200
Message-ID: <20190828135717.7245-9-jolsa@kernel.org> (raw)
In-Reply-To: <20190828135717.7245-1-jolsa@kernel.org>

Move the PERF_RECORD_AUXTRACE_INFO event definition to libperf's event.h.

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

Link: http://lkml.kernel.org/n/tip-794xxtrbjexwc0o0p2o79b1y@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/arch/x86/util/intel-pt.c | 2 +-
 tools/perf/lib/include/perf/event.h | 7 +++++++
 tools/perf/util/arm-spe.c           | 2 +-
 tools/perf/util/event.h             | 7 -------
 tools/perf/util/intel-bts.c         | 2 +-
 tools/perf/util/intel-pt.c          | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
index 44cfe72c1a4c..d7125e331dda 100644
--- a/tools/perf/arch/x86/util/intel-pt.c
+++ b/tools/perf/arch/x86/util/intel-pt.c
@@ -327,7 +327,7 @@ static int intel_pt_info_fill(struct auxtrace_record *itr,
 	unsigned long max_non_turbo_ratio;
 	size_t filter_str_len;
 	const char *filter;
-	u64 *info;
+	__u64 *info;
 	int err;
 
 	if (priv_size != ptr->priv_size)
diff --git a/tools/perf/lib/include/perf/event.h b/tools/perf/lib/include/perf/event.h
index c68523c4fa01..02da73491451 100644
--- a/tools/perf/lib/include/perf/event.h
+++ b/tools/perf/lib/include/perf/event.h
@@ -201,4 +201,11 @@ struct id_index_event {
 	struct id_index_entry	 entries[0];
 };
 
+struct auxtrace_info_event {
+	struct perf_event_header header;
+	__u32			 type;
+	__u32			 reserved__; /* For alignment */
+	__u64			 priv[];
+};
+
 #endif /* __LIBPERF_EVENT_H */
diff --git a/tools/perf/util/arm-spe.c b/tools/perf/util/arm-spe.c
index a314e5b26e9d..cd26315bc9aa 100644
--- a/tools/perf/util/arm-spe.c
+++ b/tools/perf/util/arm-spe.c
@@ -181,7 +181,7 @@ static const char * const arm_spe_info_fmts[] = {
 	[ARM_SPE_PMU_TYPE]		= "  PMU Type           %"PRId64"\n",
 };
 
-static void arm_spe_print_info(u64 *arr)
+static void arm_spe_print_info(__u64 *arr)
 {
 	if (!dump_trace)
 		return;
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 82315d2845fe..ca2cae332c43 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -332,13 +332,6 @@ struct events_stats {
 	u32 nr_proc_map_timeout;
 };
 
-struct auxtrace_info_event {
-	struct perf_event_header header;
-	u32 type;
-	u32 reserved__; /* For alignment */
-	u64 priv[];
-};
-
 struct auxtrace_event {
 	struct perf_event_header header;
 	u64 size;
diff --git a/tools/perf/util/intel-bts.c b/tools/perf/util/intel-bts.c
index 8dc6408206b9..03c581a0d5d0 100644
--- a/tools/perf/util/intel-bts.c
+++ b/tools/perf/util/intel-bts.c
@@ -834,7 +834,7 @@ static const char * const intel_bts_info_fmts[] = {
 	[INTEL_BTS_SNAPSHOT_MODE]	= "  Snapshot mode      %"PRId64"\n",
 };
 
-static void intel_bts_print_info(u64 *arr, int start, int finish)
+static void intel_bts_print_info(__u64 *arr, int start, int finish)
 {
 	int i;
 
diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index ea504fa9b623..c83a9a718c03 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -3044,7 +3044,7 @@ static const char * const intel_pt_info_fmts[] = {
 	[INTEL_PT_FILTER_STR_LEN]	= "  Filter string len.  %"PRIu64"\n",
 };
 
-static void intel_pt_print_info(u64 *arr, int start, int finish)
+static void intel_pt_print_info(__u64 *arr, int start, int finish)
 {
 	int i;
 
@@ -3076,7 +3076,7 @@ int intel_pt_process_auxtrace_info(union perf_event *event,
 	size_t min_sz = sizeof(u64) * INTEL_PT_PER_CPU_MMAPS;
 	struct intel_pt *pt;
 	void *info_end;
-	u64 *info;
+	__u64 *info;
 	int err;
 
 	if (auxtrace_info->header.size < sizeof(struct auxtrace_info_event) +
-- 
2.21.0


  parent reply index

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-28 13:56 [PATCH 00/23] libperf: Add rest of events " Jiri Olsa
2019-08-28 13:56 ` [PATCH 01/23] libperf: Add PERF_RECORD_HEADER_ATTR 'struct attr_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:56 ` [PATCH 02/23] libperf: Add PERF_RECORD_CPU_MAP 'struct cpu_map_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:56 ` [PATCH 03/23] libperf: Add PERF_RECORD_EVENT_UPDATE 'struct event_update_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:56 ` [PATCH 04/23] libperf: Add PERF_RECORD_HEADER_EVENT_TYPE 'struct event_type_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:56 ` [PATCH 05/23] libperf: Add PERF_RECORD_HEADER_TRACING_DATA 'struct tracing_data_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 06/23] libperf: Add PERF_RECORD_HEADER_BUILD_ID 'struct build_id_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 07/23] libperf: Add PERF_RECORD_ID_INDEX 'struct id_index_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` Jiri Olsa [this message]
2019-08-29 19:01   ` [tip: perf/core] libperf: Add PERF_RECORD_AUXTRACE_INFO 'struct auxtrace_info_event' " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 09/23] libperf: Add PERF_RECORD_AUXTRACE 'struct auxtrace_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 10/23] libperf: Add PERF_RECORD_AUXTRACE_ERROR 'struct auxtrace_error_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 11/23] libperf: Add PERF_RECORD_AUX 'struct aux_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 12/23] libperf: Add PERF_RECORD_ITRACE_START 'struct itrace_start_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 13/23] libperf: Add PERF_RECORD_SWITCH 'struct context_switch_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 14/23] libperf: Add PERF_RECORD_THREAD_MAP 'struct thread_map_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 15/23] libperf: Add PERF_RECORD_STAT_CONFIG 'struct stat_config_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 16/23] libperf: Add PERF_RECORD_STAT 'struct stat_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 17/23] libperf: Add PERF_RECORD_STAT_ROUND 'struct stat_round_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 18/23] libperf: Add PERF_RECORD_TIME_CONV 'struct time_conv_event' " Jiri Olsa
2019-08-29 19:01   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 19/23] libperf: Add PERF_RECORD_HEADER_FEATURE 'struct feature_event' " Jiri Olsa
2019-08-29 19:02   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 20/23] libperf: Add PERF_RECORD_COMPRESSED 'struct compressed_event' " Jiri Olsa
2019-08-29 19:02   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 21/23] libperf: Add 'union perf_event' " Jiri Olsa
2019-08-29 19:02   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 22/23] libperf: Rename the PERF_RECORD_ structs to have a "perf" prefix Jiri Olsa
2019-08-29 19:02   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 23/23] libperf: Move 'enum perf_user_event_type' to perf/event.h Jiri Olsa
2019-08-29 19:02   ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 18:29 ` [PATCH 00/23] libperf: Add rest of events " Arnaldo Carvalho de Melo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190828135717.7245-9-jolsa@kernel.org \
    --to=jolsa@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@kernel.org \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=mpetlan@redhat.com \
    --cc=namhyung@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git
	git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git
	git clone --mirror https://lore.kernel.org/lkml/8 lkml/git/8.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \
		linux-kernel@vger.kernel.org
	public-inbox-index lkml

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git