All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@redhat.com>
To: Adrian Hunter <adrian.hunter@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	linux-kernel@vger.kernel.org, David Ahern <dsahern@gmail.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Namhyung Kim <namhyung@gmail.com>,
	Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH V3 08/25] perf tools: Add support for PERF_RECORD_AUX
Date: Tue, 28 Apr 2015 15:09:15 +0200	[thread overview]
Message-ID: <20150428130915.GF22258@krava.redhat.com> (raw)
In-Reply-To: <1429903807-20559-9-git-send-email-adrian.hunter@intel.com>

On Fri, Apr 24, 2015 at 10:29:50PM +0300, Adrian Hunter wrote:
> Add support for the PERF_RECORD_AUX event type.

what is this event for? please update the changelog

jirka

> 
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
>  tools/perf/builtin-inject.c |  1 +
>  tools/perf/util/event.c     | 21 +++++++++++++++++++++
>  tools/perf/util/event.h     | 13 +++++++++++++
>  tools/perf/util/machine.c   | 10 ++++++++++
>  tools/perf/util/machine.h   |  2 ++
>  tools/perf/util/session.c   | 15 +++++++++++++++
>  tools/perf/util/tool.h      |  1 +
>  7 files changed, 63 insertions(+)
> 
> diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
> index 7c7a7ee..3e8f730 100644
> --- a/tools/perf/builtin-inject.c
> +++ b/tools/perf/builtin-inject.c
> @@ -558,6 +558,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
>  			.fork		= perf_event__repipe,
>  			.exit		= perf_event__repipe,
>  			.lost		= perf_event__repipe,
> +			.aux		= perf_event__repipe,
>  			.read		= perf_event__repipe_sample,
>  			.throttle	= perf_event__repipe,
>  			.unthrottle	= perf_event__repipe,
> diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
> index 32323e5..724ffde 100644
> --- a/tools/perf/util/event.c
> +++ b/tools/perf/util/event.c
> @@ -23,6 +23,7 @@ static const char *perf_event__names[] = {
>  	[PERF_RECORD_FORK]			= "FORK",
>  	[PERF_RECORD_READ]			= "READ",
>  	[PERF_RECORD_SAMPLE]			= "SAMPLE",
> +	[PERF_RECORD_AUX]			= "AUX",
>  	[PERF_RECORD_HEADER_ATTR]		= "ATTR",
>  	[PERF_RECORD_HEADER_EVENT_TYPE]		= "EVENT_TYPE",
>  	[PERF_RECORD_HEADER_TRACING_DATA]	= "TRACING_DATA",
> @@ -695,6 +696,14 @@ int perf_event__process_lost(struct perf_tool *tool __maybe_unused,
>  	return machine__process_lost_event(machine, event, sample);
>  }
>  
> +int perf_event__process_aux(struct perf_tool *tool __maybe_unused,
> +			    union perf_event *event,
> +			    struct perf_sample *sample __maybe_unused,
> +			    struct machine *machine)
> +{
> +	return machine__process_aux_event(machine, event);
> +}
> +
>  size_t perf_event__fprintf_mmap(union perf_event *event, FILE *fp)
>  {
>  	return fprintf(fp, " %d/%d: [%#" PRIx64 "(%#" PRIx64 ") @ %#" PRIx64 "]: %c %s\n",
> @@ -758,6 +767,15 @@ int perf_event__process_exit(struct perf_tool *tool __maybe_unused,
>  	return machine__process_exit_event(machine, event, sample);
>  }
>  
> +size_t perf_event__fprintf_aux(union perf_event *event, FILE *fp)
> +{
> +	return fprintf(fp, " offset: %#"PRIx64" size: %#"PRIx64" flags: %#"PRIx64" [%s%s]\n",
> +		       event->aux.aux_offset, event->aux.aux_size,
> +		       event->aux.flags,
> +		       event->aux.flags & PERF_AUX_FLAG_TRUNCATED ? "T" : "",
> +		       event->aux.flags & PERF_AUX_FLAG_OVERWRITE ? "O" : "");
> +}
> +
>  size_t perf_event__fprintf(union perf_event *event, FILE *fp)
>  {
>  	size_t ret = fprintf(fp, "PERF_RECORD_%s",
> @@ -777,6 +795,9 @@ size_t perf_event__fprintf(union perf_event *event, FILE *fp)
>  	case PERF_RECORD_MMAP2:
>  		ret += perf_event__fprintf_mmap2(event, fp);
>  		break;
> +	case PERF_RECORD_AUX:
> +		ret += perf_event__fprintf_aux(event, fp);
> +		break;
>  	default:
>  		ret += fprintf(fp, "\n");
>  	}
> diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
> index 80e9f59..b3c350e 100644
> --- a/tools/perf/util/event.h
> +++ b/tools/perf/util/event.h
> @@ -323,6 +323,13 @@ struct auxtrace_error_event {
>  	char msg[MAX_AUXTRACE_ERROR_MSG];
>  };
>  
> +struct aux_event {
> +	struct perf_event_header header;
> +	u64	aux_offset;
> +	u64	aux_size;
> +	u64	flags;
> +};
> +
>  union perf_event {
>  	struct perf_event_header	header;
>  	struct mmap_event		mmap;
> @@ -341,6 +348,7 @@ union perf_event {
>  	struct auxtrace_info_event	auxtrace_info;
>  	struct auxtrace_event		auxtrace;
>  	struct auxtrace_error_event	auxtrace_error;
> +	struct aux_event		aux;
>  };
>  
>  void perf_event__print_totals(void);
> @@ -376,6 +384,10 @@ int perf_event__process_lost(struct perf_tool *tool,
>  			     union perf_event *event,
>  			     struct perf_sample *sample,
>  			     struct machine *machine);
> +int perf_event__process_aux(struct perf_tool *tool,
> +			    union perf_event *event,
> +			    struct perf_sample *sample,
> +			    struct machine *machine);
>  int perf_event__process_mmap(struct perf_tool *tool,
>  			     union perf_event *event,
>  			     struct perf_sample *sample,
> @@ -433,6 +445,7 @@ size_t perf_event__fprintf_comm(union perf_event *event, FILE *fp);
>  size_t perf_event__fprintf_mmap(union perf_event *event, FILE *fp);
>  size_t perf_event__fprintf_mmap2(union perf_event *event, FILE *fp);
>  size_t perf_event__fprintf_task(union perf_event *event, FILE *fp);
> +size_t perf_event__fprintf_aux(union perf_event *event, FILE *fp);
>  size_t perf_event__fprintf(union perf_event *event, FILE *fp);
>  
>  u64 kallsyms__get_function_start(const char *kallsyms_filename,
> diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
> index 527e032..a7ad511 100644
> --- a/tools/perf/util/machine.c
> +++ b/tools/perf/util/machine.c
> @@ -486,6 +486,14 @@ machine__module_dso(struct machine *machine, struct kmod_path *m,
>  	return dso;
>  }
>  
> +int machine__process_aux_event(struct machine *machine __maybe_unused,
> +			       union perf_event *event)
> +{
> +	if (dump_trace)
> +		perf_event__fprintf_aux(event, stdout);
> +	return 0;
> +}
> +
>  struct map *machine__new_module(struct machine *machine, u64 start,
>  				const char *filename)
>  {
> @@ -1331,6 +1339,8 @@ int machine__process_event(struct machine *machine, union perf_event *event,
>  		ret = machine__process_exit_event(machine, event, sample); break;
>  	case PERF_RECORD_LOST:
>  		ret = machine__process_lost_event(machine, event, sample); break;
> +	case PERF_RECORD_AUX:
> +		ret = machine__process_aux_event(machine, event); break;
>  	default:
>  		ret = -1;
>  		break;
> diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
> index 6d64ced..fc5432a 100644
> --- a/tools/perf/util/machine.h
> +++ b/tools/perf/util/machine.h
> @@ -81,6 +81,8 @@ int machine__process_fork_event(struct machine *machine, union perf_event *event
>  				struct perf_sample *sample);
>  int machine__process_lost_event(struct machine *machine, union perf_event *event,
>  				struct perf_sample *sample);
> +int machine__process_aux_event(struct machine *machine,
> +			       union perf_event *event);
>  int machine__process_mmap_event(struct machine *machine, union perf_event *event,
>  				struct perf_sample *sample);
>  int machine__process_mmap2_event(struct machine *machine, union perf_event *event,
> diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
> index b6972b1..0b4646c 100644
> --- a/tools/perf/util/session.c
> +++ b/tools/perf/util/session.c
> @@ -325,6 +325,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool)
>  		tool->exit = process_event_stub;
>  	if (tool->lost == NULL)
>  		tool->lost = perf_event__process_lost;
> +	if (tool->aux == NULL)
> +		tool->aux = perf_event__process_aux;
>  	if (tool->read == NULL)
>  		tool->read = process_event_sample_stub;
>  	if (tool->throttle == NULL)
> @@ -443,6 +445,16 @@ static void perf_event__read_swap(union perf_event *event, bool sample_id_all)
>  		swap_sample_id_all(event, &event->read + 1);
>  }
>  
> +static void perf_event__aux_swap(union perf_event *event, bool sample_id_all)
> +{
> +	event->aux.aux_offset = bswap_64(event->aux.aux_offset);
> +	event->aux.aux_size   = bswap_64(event->aux.aux_size);
> +	event->aux.flags      = bswap_64(event->aux.flags);
> +
> +	if (sample_id_all)
> +		swap_sample_id_all(event, &event->aux + 1);
> +}
> +
>  static void perf_event__throttle_swap(union perf_event *event,
>  				      bool sample_id_all)
>  {
> @@ -580,6 +592,7 @@ static perf_event__swap_op perf_event__swap_ops[] = {
>  	[PERF_RECORD_THROTTLE]		  = perf_event__throttle_swap,
>  	[PERF_RECORD_UNTHROTTLE]	  = perf_event__throttle_swap,
>  	[PERF_RECORD_SAMPLE]		  = perf_event__all64_swap,
> +	[PERF_RECORD_AUX]		  = perf_event__aux_swap,
>  	[PERF_RECORD_HEADER_ATTR]	  = perf_event__hdr_attr_swap,
>  	[PERF_RECORD_HEADER_EVENT_TYPE]	  = perf_event__event_type_swap,
>  	[PERF_RECORD_HEADER_TRACING_DATA] = perf_event__tracing_data_swap,
> @@ -1029,6 +1042,8 @@ static int machines__deliver_event(struct machines *machines,
>  		return tool->throttle(tool, event, sample, machine);
>  	case PERF_RECORD_UNTHROTTLE:
>  		return tool->unthrottle(tool, event, sample, machine);
> +	case PERF_RECORD_AUX:
> +		return tool->aux(tool, event, sample, machine);
>  	default:
>  		++evlist->stats.nr_unknown_events;
>  		return -1;
> diff --git a/tools/perf/util/tool.h b/tools/perf/util/tool.h
> index 20afe19..8288caf 100644
> --- a/tools/perf/util/tool.h
> +++ b/tools/perf/util/tool.h
> @@ -43,6 +43,7 @@ struct perf_tool {
>  			fork,
>  			exit,
>  			lost,
> +			aux,
>  			throttle,
>  			unthrottle;
>  	event_attr_op	attr;
> -- 
> 1.9.1
> 

  reply	other threads:[~2015-04-28 13:09 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-24 19:29 [PATCH V3 00/25] perf tools: Introduce an abstraction for AUX Area and Instruction Tracing Adrian Hunter
2015-04-24 19:29 ` [PATCH V3 01/25] perf tools: Amend mmap ref counting for the AUX area mmap Adrian Hunter
2015-05-06  3:11   ` [tip:perf/core] perf evlist: " tip-bot for Adrian Hunter
2015-04-24 19:29 ` [PATCH V3 02/25] perf script: Always allow fields 'addr' and 'cpu' for auxtrace Adrian Hunter
2015-05-06  3:12   ` [tip:perf/core] " tip-bot for Adrian Hunter
2015-04-24 19:29 ` [PATCH V3 03/25] perf report: Add Instruction Tracing support Adrian Hunter
2015-05-06  3:12   ` [tip:perf/core] " tip-bot for Adrian Hunter
2015-04-24 19:29 ` [PATCH V3 04/25] perf tools: Add AUX area tracing index Adrian Hunter
2015-04-28 12:07   ` Jiri Olsa
2015-04-29 11:26     ` Adrian Hunter
2015-04-28 12:32   ` Jiri Olsa
2015-04-29 12:11     ` Adrian Hunter
2015-04-24 19:29 ` [PATCH V3 05/25] perf tools: Hit all build ids when AUX area tracing Adrian Hunter
2015-04-28 12:45   ` Jiri Olsa
2015-04-29 12:24     ` Adrian Hunter
2015-04-29 15:26       ` Jiri Olsa
2015-04-24 19:29 ` [PATCH V3 06/25] perf tools: Add build option NO_AUXTRACE to exclude " Adrian Hunter
2015-04-28 12:59   ` Jiri Olsa
2015-04-24 19:29 ` [PATCH V3 07/25] perf auxtrace: Add option to synthesize events for transactions Adrian Hunter
2015-04-28 13:02   ` Jiri Olsa
2015-04-24 19:29 ` [PATCH V3 08/25] perf tools: Add support for PERF_RECORD_AUX Adrian Hunter
2015-04-28 13:09   ` Jiri Olsa [this message]
2015-04-24 19:29 ` [PATCH V3 09/25] perf tools: Add support for PERF_RECORD_ITRACE_START Adrian Hunter
2015-04-24 19:29 ` [PATCH V3 10/25] perf tools: Add AUX area tracing Snapshot Mode Adrian Hunter
2015-04-24 19:29 ` [PATCH V3 11/25] perf record: Add AUX area tracing Snapshot Mode support Adrian Hunter
2015-04-28 13:24   ` Jiri Olsa
2015-04-29 13:14     ` Adrian Hunter
2015-04-29 15:23       ` Jiri Olsa
2015-04-24 19:29 ` [PATCH V3 12/25] perf auxtrace: Add Intel PT as an AUX area tracing type Adrian Hunter
2015-04-24 19:29 ` [PATCH V3 13/25] perf tools: Add Intel PT packet decoder Adrian Hunter
2015-04-24 19:29 ` [PATCH V3 14/25] perf tools: Add Intel PT instruction decoder Adrian Hunter
2015-04-24 19:29 ` [PATCH V3 15/25] perf tools: Add Intel PT log Adrian Hunter
2015-04-24 19:29 ` [PATCH V3 16/25] perf tools: Add Intel PT decoder Adrian Hunter
2015-04-24 19:29 ` [PATCH V3 17/25] perf tools: Add Intel PT support Adrian Hunter
2015-04-24 19:30 ` [PATCH V3 18/25] perf tools: Take Intel PT into use Adrian Hunter
2015-04-24 19:30 ` [PATCH V3 19/25] perf tools: Allow auxtrace data alignment Adrian Hunter
2015-04-24 19:30 ` [PATCH V3 20/25] perf tools: Add Intel BTS support Adrian Hunter
2015-04-24 19:30 ` [PATCH V3 21/25] perf tools: Output sample flags and insn_len from intel_pt Adrian Hunter
2015-04-24 19:30 ` [PATCH V3 22/25] perf tools: Output sample flags and insn_len from intel_bts Adrian Hunter
2015-04-24 19:30 ` [PATCH V3 23/25] perf tools: Intel PT to always update thread stack trace number Adrian Hunter
2015-04-24 19:30 ` [PATCH V3 24/25] perf tools: Intel BTS " Adrian Hunter
2015-04-24 19:30 ` [PATCH V3 25/25] perf tools: Add example call-graph script Adrian Hunter
2015-04-24 20:33 ` [PATCH V3 00/25] perf tools: Introduce an abstraction for AUX Area and Instruction Tracing Arnaldo Carvalho de Melo
2015-04-28 14:33 ` 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=20150428130915.GF22258@krava.redhat.com \
    --to=jolsa@redhat.com \
    --cc=acme@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=dsahern@gmail.com \
    --cc=eranian@google.com \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=namhyung@gmail.com \
    --cc=peterz@infradead.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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.