perf intel-pt: A few fixes
Adrian Hunter
reviewercover perf intel-pt: A few fixes
Hi
Here are some fixes and a minor improvement for Intel PT. The first 3 patches are cc stable, but the last 2 are not.
Adrian Hunter (5):
perf auxtrace: Define auxtrace record alignment perf intel-pt: Fix overlap calculation for padding perf intel-pt: Fix CYC timestamp calculation after OVF perf intel-pt: Packet splitting can happen only on 32-bit perf auxtrace: Add timestamp to auxtrace errors
tools/perf/util/auxtrace.c | 26 ++++++++++++--- tools/perf/util/auxtrace.h | 5 ++- tools/perf/util/event.h | 3 +- tools/perf/util/intel-bts.c | 4 +-- .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 39 +++++++++++++++++++--- tools/perf/util/intel-pt.c | 23 +++++++++---- tools/perf/util/s390-cpumsf.c | 7 ++-- tools/perf/util/session.c | 3 ++ 8 files changed, 88 insertions(+), 22 deletions(-)
Regards
Adrian
Adrian Hunter
reviewerPATCH 1/5 perf auxtrace: Define auxtrace record alignment
Define auxtrace record alignment so that it can be referenced elsewhere.
Note this is preparation for patch "perf intel-pt: Fix overlap calculation for padding"
--- tools/perf/util/auxtrace.c | 4 ++-- tools/perf/util/auxtrace.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-)
tools/perf/util/auxtrace.c +2 -2
@@ -1279,9 +1279,9 @@ static int __auxtrace_mmap__read(struct perf_mmap *map, }/* padding must be written by fn() e.g. record__process_auxtrace() */ - padding = size &7 ; + padding = size & (PERF_AUXTRACE_RECORD_ALIGNMENT -1 );if (padding) - padding =8 - padding; + padding =PERF_AUXTRACE_RECORD_ALIGNMENT - padding;memset (&ev,0 ,sizeof (ev)); ev.auxtrace.header.type =PERF_RECORD_AUXTRACE ;
tools/perf/util/auxtrace.h +3 -0
@@ -40,6 +40,9 @@ struct record_opts;struct auxtrace_info_event ;struct events_stats ; +/* Auxtrace records must have the same alignment as perf event records */ +#define PERF_AUXTRACE_RECORD_ALIGNMENT 8 +enum auxtrace_type {PERF_AUXTRACE_UNKNOWN ,PERF_AUXTRACE_INTEL_PT ,
Signature · 1 line
2.17.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf auxtrace: Define auxtrace record alignment
perf auxtrace: Define auxtrace record alignment
Commit-ID: c3fcadf0bb765faf45d6d562246e1d08885466df Gitweb: https://git.kernel.org/tip/c3fcadf0bb765faf45d6d562246e1d08885466df Author: Adrian Hunter <[email protected]> AuthorDate: Wed, 6 Feb 2019 12:39:43 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 6 Feb 2019 10:25:39 -0300
perf auxtrace: Define auxtrace record alignment
Define auxtrace record alignment so that it can be referenced elsewhere.
Note this is preparation for patch "perf intel-pt: Fix overlap calculation for padding"
--- tools/perf/util/auxtrace.c | 4 ++-- tools/perf/util/auxtrace.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-)
tools/perf/util/auxtrace.c +2 -2
@@ -1279,9 +1279,9 @@ static int __auxtrace_mmap__read(struct perf_mmap *map, }/* padding must be written by fn() e.g. record__process_auxtrace() */ - padding = size &7 ; + padding = size & (PERF_AUXTRACE_RECORD_ALIGNMENT -1 );if (padding) - padding =8 - padding; + padding =PERF_AUXTRACE_RECORD_ALIGNMENT - padding;memset (&ev,0 ,sizeof (ev)); ev.auxtrace.header.type =PERF_RECORD_AUXTRACE ;
tools/perf/util/auxtrace.h +3 -0
@@ -40,6 +40,9 @@ struct record_opts;struct auxtrace_info_event ;struct events_stats ; +/* Auxtrace records must have the same alignment as perf event records */ +#define PERF_AUXTRACE_RECORD_ALIGNMENT 8 +enum auxtrace_type {PERF_AUXTRACE_UNKNOWN ,PERF_AUXTRACE_INTEL_PT ,
Adrian Hunter
reviewerPATCH 2/5 perf intel-pt: Fix overlap calculation for padding
In reply to Adrian HunterAuxtrace records might have up to 7 bytes of padding appended. Adjust the overlap accordingly.
--- .../util/intel-pt-decoder/intel-pt-decoder.c | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +34 -2
@@ -26,6 +26,7 @@#include "../cache.h" #include "../util.h" +#include "../auxtrace.h" #include "intel-pt-insn-decoder.h" #include "intel-pt-pkt-decoder.h"
@@ -2575,6 +2576,34 @@ static int intel_pt_tsc_cmp(uint64_t tsc1, uint64_t tsc2) } } +#define MAX_PADDING (PERF_AUXTRACE_RECORD_ALIGNMENT - 1) + +/** +* adj_for_padding - adjust overlap to account for padding. +* @buf_b: second buffer +* @buf_a: first buffer +* @len_a: size of first buffer +* +* @buf_a might have up to 7 bytes of padding appended. Adjust the overlap +* accordingly. +* +* Return: A pointer into @buf_b from where non-overlapped data starts +*/ +static unsigned char *adj_for_padding (unsigned char *buf_b, +unsigned char *buf_a,size_t len_a) +{ +unsigned char *p = buf_b -MAX_PADDING ; +unsigned char *q = buf_a + len_a -MAX_PADDING ; +int i; + +for (i =MAX_PADDING ; i; i--, p++, q++) { +if (*p != *q) +break ; + } + +return p; +} +/** * intel_pt_find_overlap_tsc - determine start of non-overlapped trace data * using TSC.
@@ -2625,8 +2654,11 @@ static unsigned char *intel_pt_find_overlap_tsc(unsigned char *buf_a,/* Same TSC, so buffers are consecutive */ if (!cmp && rem_b >= rem_a) { +unsigned char *start; + *consecutive = true; -return buf_b + len_b - (rem_b - rem_a); + start = buf_b + len_b - (rem_b - rem_a); +return adj_for_padding (start, buf_a, len_a); }if (cmp <0 )return buf_b;/* tsc_a < tsc_b => no overlap */
@@ -2689,7 +2721,7 @@ unsigned char *intel_pt_find_overlap(unsigned char *buf_a, size_t len_a, found =memmem (buf_a, len_a, buf_b, len_a);if (found) { *consecutive = true; -return buf_b + len_a; +return adj_for_padding (buf_b + len_a, buf_a, len_a); }/* Try again at next PSB in buffer 'a' */
Signature · 1 line
2.17.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf intel-pt: Fix overlap calculation for padding
perf intel-pt: Fix overlap calculation for padding
Commit-ID: 5a99d99e3310a565b0cf63f785b347be9ee0da45 Gitweb: https://git.kernel.org/tip/5a99d99e3310a565b0cf63f785b347be9ee0da45 Author: Adrian Hunter <[email protected]> AuthorDate: Wed, 6 Feb 2019 12:39:44 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 6 Feb 2019 10:27:00 -0300
perf intel-pt: Fix overlap calculation for padding
Auxtrace records might have up to 7 bytes of padding appended. Adjust the overlap accordingly.
--- .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 36 ++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +34 -2
@@ -26,6 +26,7 @@#include "../cache.h" #include "../util.h" +#include "../auxtrace.h" #include "intel-pt-insn-decoder.h" #include "intel-pt-pkt-decoder.h"
@@ -2575,6 +2576,34 @@ static int intel_pt_tsc_cmp(uint64_t tsc1, uint64_t tsc2) } } +#define MAX_PADDING (PERF_AUXTRACE_RECORD_ALIGNMENT - 1) + +/** +* adj_for_padding - adjust overlap to account for padding. +* @buf_b: second buffer +* @buf_a: first buffer +* @len_a: size of first buffer +* +* @buf_a might have up to 7 bytes of padding appended. Adjust the overlap +* accordingly. +* +* Return: A pointer into @buf_b from where non-overlapped data starts +*/ +static unsigned char *adj_for_padding (unsigned char *buf_b, +unsigned char *buf_a,size_t len_a) +{ +unsigned char *p = buf_b -MAX_PADDING ; +unsigned char *q = buf_a + len_a -MAX_PADDING ; +int i; + +for (i =MAX_PADDING ; i; i--, p++, q++) { +if (*p != *q) +break ; + } + +return p; +} +/** * intel_pt_find_overlap_tsc - determine start of non-overlapped trace data * using TSC.
@@ -2625,8 +2654,11 @@ static unsigned char *intel_pt_find_overlap_tsc(unsigned char *buf_a,/* Same TSC, so buffers are consecutive */ if (!cmp && rem_b >= rem_a) { +unsigned char *start; + *consecutive = true; -return buf_b + len_b - (rem_b - rem_a); + start = buf_b + len_b - (rem_b - rem_a); +return adj_for_padding (start, buf_a, len_a); }if (cmp <0 )return buf_b;/* tsc_a < tsc_b => no overlap */
@@ -2689,7 +2721,7 @@ unsigned char *intel_pt_find_overlap(unsigned char *buf_a, size_t len_a, found =memmem (buf_a, len_a, buf_b, len_a);if (found) { *consecutive = true; -return buf_b + len_a; +return adj_for_padding (buf_b + len_a, buf_a, len_a); }/* Try again at next PSB in buffer 'a' */
Adrian Hunter
reviewerPATCH 3/5 perf intel-pt: Fix CYC timestamp calculation after OVF
In reply to Adrian HunterCYC packet timestamp calculation depends upon CBR which was being cleared upon overflow (OVF). That can cause errors due to failing to synchronize with sideband events. Even if a CBR change has been lost, the old CBR is still a better estimate than zero. So remove the clearing of CBR.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 1 - 1 file changed, 1 deletion(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +0 -1
@@ -1395,7 +1395,6 @@ static int intel_pt_overflow(struct intel_pt_decoder *decoder) {intel_pt_log ("ERROR: Buffer overflow\n" );intel_pt_clear_tx_flags (decoder); - decoder->cbr =0 ; decoder->timestamp_insn_cnt =0 ; decoder->pkt_state =INTEL_PT_STATE_ERR_RESYNC ; decoder->overflow = true;
Signature · 1 line
2.17.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf intel-pt: Fix CYC timestamp calculation after OVF
perf intel-pt: Fix CYC timestamp calculation after OVF
Commit-ID: 03997612904866abe7cdcc992784ef65cb3a4b81 Gitweb: https://git.kernel.org/tip/03997612904866abe7cdcc992784ef65cb3a4b81 Author: Adrian Hunter <[email protected]> AuthorDate: Wed, 6 Feb 2019 12:39:45 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 6 Feb 2019 10:27:27 -0300
perf intel-pt: Fix CYC timestamp calculation after OVF
CYC packet timestamp calculation depends upon CBR which was being cleared upon overflow (OVF). That can cause errors due to failing to synchronize with sideband events. Even if a CBR change has been lost, the old CBR is still a better estimate than zero. So remove the clearing of CBR.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 1 - 1 file changed, 1 deletion(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +0 -1
@@ -1395,7 +1395,6 @@ static int intel_pt_overflow(struct intel_pt_decoder *decoder) {intel_pt_log ("ERROR: Buffer overflow\n" );intel_pt_clear_tx_flags (decoder); - decoder->cbr =0 ; decoder->timestamp_insn_cnt =0 ; decoder->pkt_state =INTEL_PT_STATE_ERR_RESYNC ; decoder->overflow = true;
Adrian Hunter
reviewerPATCH 4/5 perf intel-pt: Packet splitting can happen only on 32-bit
In reply to Adrian HunterData is copied when the trace is stopped, so packets are never split between buffers except when processing if the buffer cannot fit in the address space which can only happen on 32-bit systems. Change the logic to reflect that.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +1 -1
@@ -868,7 +868,7 @@ static int intel_pt_get_next_packet(struct intel_pt_decoder *decoder) ret =intel_pt_get_packet (decoder->buf, decoder->len, &decoder->packet); -if (ret ==INTEL_PT_NEED_MORE_BYTES && +if (ret ==INTEL_PT_NEED_MORE_BYTES &&BITS_PER_LONG ==32 && decoder->len <INTEL_PT_PKT_MAX_SZ && !decoder->next_buf) { ret =intel_pt_get_split_packet (decoder);if (ret <0 )
Signature · 1 line
2.17.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf intel-pt: Packet splitting can happen only on 32-bit
perf intel-pt: Packet splitting can happen only on 32-bit
Commit-ID: 26ee2bcdea33c60aa833cc32a1624ef5d49c9c6f Gitweb: https://git.kernel.org/tip/26ee2bcdea33c60aa833cc32a1624ef5d49c9c6f Author: Adrian Hunter <[email protected]> AuthorDate: Wed, 6 Feb 2019 12:39:46 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 6 Feb 2019 10:27:54 -0300
perf intel-pt: Packet splitting can happen only on 32-bit
Data is copied when the trace is stopped, so packets are never split between buffers except when processing if the buffer cannot fit in the address space which can only happen on 32-bit systems. Change the logic to reflect that.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +1 -1
@@ -868,7 +868,7 @@ static int intel_pt_get_next_packet(struct intel_pt_decoder *decoder) ret =intel_pt_get_packet (decoder->buf, decoder->len, &decoder->packet); -if (ret ==INTEL_PT_NEED_MORE_BYTES && +if (ret ==INTEL_PT_NEED_MORE_BYTES &&BITS_PER_LONG ==32 && decoder->len <INTEL_PT_PKT_MAX_SZ && !decoder->next_buf) { ret =intel_pt_get_split_packet (decoder);if (ret <0 )
Adrian Hunter
reviewerPATCH 5/5 perf auxtrace: Add timestamp to auxtrace errors
In reply to Adrian HunterThe timestamp can use useful to find part of a trace that has an error without outputting all of the trace e.g. using the itrace 's' option to skip initial number of events.
--- tools/perf/util/auxtrace.c | 22 ++++++++++++++++++++-- tools/perf/util/auxtrace.h | 2 +- tools/perf/util/event.h | 3 ++- tools/perf/util/intel-bts.c | 4 ++-- tools/perf/util/intel-pt.c | 23 ++++++++++++++++------- tools/perf/util/s390-cpumsf.c | 7 ++++--- tools/perf/util/session.c | 3 +++ 7 files changed, 48 insertions(+), 16 deletions(-)
tools/perf/util/auxtrace.c +20 -2
@@ -27,6 +27,7 @@#include <linux/bitops.h> #include <linux/log2.h> #include <linux/string.h> +#include <linux/time64.h> #include <sys/param.h> #include <stdlib.h>
@@ -858,7 +859,7 @@ void auxtrace_buffer__free(struct auxtrace_buffer *buffer)void auxtrace_synth_error (struct auxtrace_error_event *auxtrace_error,int type,int code,int cpu,pid_t pid,pid_t tid,u64 ip, -const char *msg) +const char *msg,u64 timestamp) {size_t size;
@@ -870,7 +871,9 @@ void auxtrace_synth_error(struct auxtrace_error_event *auxtrace_error, int type, auxtrace_error->cpu = cpu; auxtrace_error->pid = pid; auxtrace_error->tid = tid; + auxtrace_error->fmt =1 ; auxtrace_error->ip = ip; + auxtrace_error->time = timestamp;strlcpy (auxtrace_error->msg, msg,MAX_AUXTRACE_ERROR_MSG ); size = (void *)auxtrace_error->msg - (void *)auxtrace_error +
@@ -1160,12 +1163,27 @@ static const char *auxtrace_error_name(int type)size_t perf_event__fprintf_auxtrace_error (union perf_event *event,FILE *fp) {struct auxtrace_error_event *e = &event->auxtrace_error; +unsigned long long nsecs = e->time; +const char *msg = e->msg;int ret; ret =fprintf (fp," %s error type %u" ,auxtrace_error_name (e->type), e->type); + +if (e->fmt && nsecs) { +unsigned long secs = nsecs /NSEC_PER_SEC ; + + nsecs -= secs *NSEC_PER_SEC ; + ret +=fprintf (fp," time %lu.%09llu" , secs, nsecs); + }else { + ret +=fprintf (fp," time 0" ); + } + +if (!e->fmt) + msg = (const char *)&e->time; + ret +=fprintf (fp," cpu %d pid %d tid %d ip %#" PRIx64" code %u: %s\n" , - e->cpu, e->pid, e->tid, e->ip, e->code, e->msg); + e->cpu, e->pid, e->tid, e->ip, e->code, msg);return ret; }
tools/perf/util/auxtrace.h +1 -1
@@ -519,7 +519,7 @@ void auxtrace_index__free(struct list_head *head);void auxtrace_synth_error (struct auxtrace_error_event *auxtrace_error,int type,int code,int cpu,pid_t pid,pid_t tid,u64 ip, -const char *msg); +const char *msg,u64 timestamp); int perf_event__synthesize_auxtrace_info(struct auxtrace_record *itr, struct perf_tool *tool,
tools/perf/util/event.h +2 -1
@@ -532,8 +532,9 @@ struct auxtrace_error_event {u32 cpu;u32 pid;u32 tid; -u32 reserved__;/* For alignment */ +u32 fmt;u64 ip; +u64 time;char msg[MAX_AUXTRACE_ERROR_MSG ]; };
tools/perf/util/intel-bts.c +2 -2
@@ -144,7 +144,7 @@ static int intel_bts_lost(struct intel_bts *bts, struct perf_sample *sample)auxtrace_synth_error (&event.auxtrace_error,PERF_AUXTRACE_ERROR_ITRACE ,INTEL_BTS_ERR_LOST , sample->cpu, sample->pid, - sample->tid,0 ,"Lost trace data" ); + sample->tid,0 ,"Lost trace data" , sample->time); err =perf_session__deliver_synth_event (bts->session, &event,NULL );if (err)
@@ -374,7 +374,7 @@ static int intel_bts_synth_error(struct intel_bts *bts, int cpu, pid_t pid,auxtrace_synth_error (&event.auxtrace_error,PERF_AUXTRACE_ERROR_ITRACE ,INTEL_BTS_ERR_NOINSN , cpu, pid, tid, ip, -"Failed to get instruction" ); +"Failed to get instruction" ,0 ); err =perf_session__deliver_synth_event (bts->session, &event,NULL );if (err)
tools/perf/util/intel-pt.c +16 -7
@@ -1411,7 +1411,7 @@ static int intel_pt_synth_pwrx_sample(struct intel_pt_queue *ptq) }static int intel_pt_synth_error (struct intel_pt *pt,int code,int cpu, -pid_t pid,pid_t tid,u64 ip) +pid_t pid,pid_t tid,u64 ip,u64 timestamp) {union perf_event event;char msg[MAX_AUXTRACE_ERROR_MSG ];
@@ -1420,7 +1420,7 @@ static int intel_pt_synth_error(struct intel_pt *pt, int code, int cpu,intel_pt__strerror (code, msg,MAX_AUXTRACE_ERROR_MSG );auxtrace_synth_error (&event.auxtrace_error,PERF_AUXTRACE_ERROR_ITRACE , - code, cpu, pid, tid, ip, msg); + code, cpu, pid, tid, ip, msg, timestamp); err =perf_session__deliver_synth_event (pt->session, &event,NULL );if (err)
@@ -1430,6 +1430,18 @@ static int intel_pt_synth_error(struct intel_pt *pt, int code, int cpu,return err; } +static int intel_ptq_synth_error (struct intel_pt_queue *ptq, +const struct intel_pt_state *state) +{ +struct intel_pt *pt = ptq->pt; +u64 tm = ptq->timestamp; + + tm = pt->timeless_decoding ?0 :tsc_to_perf_time (tm, &pt->tc); + +return intel_pt_synth_error (pt, state->err, ptq->cpu, ptq->pid, + ptq->tid, state->from_ip, tm); +} +static int intel_pt_next_tid (struct intel_pt *pt,struct intel_pt_queue *ptq) {struct auxtrace_queue *queue;
@@ -1676,10 +1688,7 @@ static int intel_pt_run_decoder(struct intel_pt_queue *ptq, u64 *timestamp)intel_pt_next_tid (pt, ptq); }if (pt->synth_opts.errors) { - err =intel_pt_synth_error (pt, state->err, - ptq->cpu, ptq->pid, - ptq->tid, - state->from_ip); + err =intel_ptq_synth_error (ptq, state);if (err)return err; }
@@ -1804,7 +1813,7 @@ static int intel_pt_process_timeless_queues(struct intel_pt *pt, pid_t tid,static int intel_pt_lost (struct intel_pt *pt,struct perf_sample *sample) {return intel_pt_synth_error (pt,INTEL_PT_ERR_LOST , sample->cpu, - sample->pid, sample->tid,0 ); + sample->pid, sample->tid,0 , sample->time); }static struct intel_pt_queue *intel_pt_cpu_to_ptq (struct intel_pt *pt,int cpu)
tools/perf/util/s390-cpumsf.c +4 -3
@@ -819,7 +819,7 @@ static int s390_cpumsf_process_queues(struct s390_cpumsf *sf, u64 timestamp) }static int s390_cpumsf_synth_error (struct s390_cpumsf *sf,int code,int cpu, -pid_t pid,pid_t tid,u64 ip) +pid_t pid,pid_t tid,u64 ip,u64 timestamp) {char msg[MAX_AUXTRACE_ERROR_MSG ];union perf_event event;
@@ -827,7 +827,7 @@ static int s390_cpumsf_synth_error(struct s390_cpumsf *sf, int code, int cpu,strncpy (msg,"Lost Auxiliary Trace Buffer" ,sizeof (msg) -1 );auxtrace_synth_error (&event.auxtrace_error,PERF_AUXTRACE_ERROR_ITRACE , - code, cpu, pid, tid, ip, msg); + code, cpu, pid, tid, ip, msg, timestamp); err =perf_session__deliver_synth_event (sf->session, &event,NULL );if (err)
@@ -839,7 +839,8 @@ static int s390_cpumsf_synth_error(struct s390_cpumsf *sf, int code, int cpu,static int s390_cpumsf_lost (struct s390_cpumsf *sf,struct perf_sample *sample) {return s390_cpumsf_synth_error (sf,1 , sample->cpu, - sample->pid, sample->tid,0 ); + sample->pid, sample->tid,0 , + sample->time); } static int
tools/perf/util/session.c +3 -0
@@ -703,7 +703,10 @@ static void perf_event__auxtrace_error_swap(union perf_event *event, event->auxtrace_error.cpu =bswap_32 (event->auxtrace_error.cpu); event->auxtrace_error.pid =bswap_32 (event->auxtrace_error.pid); event->auxtrace_error.tid =bswap_32 (event->auxtrace_error.tid); + event->auxtrace_error.fmt =bswap_32 (event->auxtrace_error.fmt); event->auxtrace_error.ip =bswap_64 (event->auxtrace_error.ip); +if (event->auxtrace_error.fmt) + event->auxtrace_error.time =bswap_64 (event->auxtrace_error.time); } static void perf_event__thread_map_swap(union perf_event *event,
Signature · 1 line
2.17.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf auxtrace: Add timestamp to auxtrace errors
perf auxtrace: Add timestamp to auxtrace errors
Commit-ID: 16bd4321c2425d37031a902cdbf183e2cd099946 Gitweb: https://git.kernel.org/tip/16bd4321c2425d37031a902cdbf183e2cd099946 Author: Adrian Hunter <[email protected]> AuthorDate: Wed, 6 Feb 2019 12:39:47 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 6 Feb 2019 11:20:32 -0300
perf auxtrace: Add timestamp to auxtrace errors
The timestamp can use useful to find part of a trace that has an error without outputting all of the trace e.g. using the itrace 's' option to skip initial number of events.
--- tools/perf/util/auxtrace.c | 22 ++++++++++++++++++++-- tools/perf/util/auxtrace.h | 2 +- tools/perf/util/event.h | 3 ++- tools/perf/util/intel-bts.c | 4 ++-- tools/perf/util/intel-pt.c | 23 ++++++++++++++++------- tools/perf/util/s390-cpumsf.c | 7 ++++--- tools/perf/util/session.c | 3 +++ 7 files changed, 48 insertions(+), 16 deletions(-)
tools/perf/util/auxtrace.c +20 -2
@@ -27,6 +27,7 @@#include <linux/bitops.h> #include <linux/log2.h> #include <linux/string.h> +#include <linux/time64.h> #include <sys/param.h> #include <stdlib.h>
@@ -858,7 +859,7 @@ void auxtrace_buffer__free(struct auxtrace_buffer *buffer)void auxtrace_synth_error (struct auxtrace_error_event *auxtrace_error,int type,int code,int cpu,pid_t pid,pid_t tid,u64 ip, -const char *msg) +const char *msg,u64 timestamp) {size_t size;
@@ -870,7 +871,9 @@ void auxtrace_synth_error(struct auxtrace_error_event *auxtrace_error, int type, auxtrace_error->cpu = cpu; auxtrace_error->pid = pid; auxtrace_error->tid = tid; + auxtrace_error->fmt =1 ; auxtrace_error->ip = ip; + auxtrace_error->time = timestamp;strlcpy (auxtrace_error->msg, msg,MAX_AUXTRACE_ERROR_MSG ); size = (void *)auxtrace_error->msg - (void *)auxtrace_error +
@@ -1160,12 +1163,27 @@ static const char *auxtrace_error_name(int type)size_t perf_event__fprintf_auxtrace_error (union perf_event *event,FILE *fp) {struct auxtrace_error_event *e = &event->auxtrace_error; +unsigned long long nsecs = e->time; +const char *msg = e->msg;int ret; ret =fprintf (fp," %s error type %u" ,auxtrace_error_name (e->type), e->type); + +if (e->fmt && nsecs) { +unsigned long secs = nsecs /NSEC_PER_SEC ; + + nsecs -= secs *NSEC_PER_SEC ; + ret +=fprintf (fp," time %lu.%09llu" , secs, nsecs); + }else { + ret +=fprintf (fp," time 0" ); + } + +if (!e->fmt) + msg = (const char *)&e->time; + ret +=fprintf (fp," cpu %d pid %d tid %d ip %#" PRIx64" code %u: %s\n" , - e->cpu, e->pid, e->tid, e->ip, e->code, e->msg); + e->cpu, e->pid, e->tid, e->ip, e->code, msg);return ret; }
tools/perf/util/auxtrace.h +1 -1
@@ -519,7 +519,7 @@ void auxtrace_index__free(struct list_head *head);void auxtrace_synth_error (struct auxtrace_error_event *auxtrace_error,int type,int code,int cpu,pid_t pid,pid_t tid,u64 ip, -const char *msg); +const char *msg,u64 timestamp); int perf_event__synthesize_auxtrace_info(struct auxtrace_record *itr, struct perf_tool *tool,
tools/perf/util/event.h +2 -1
@@ -532,8 +532,9 @@ struct auxtrace_error_event {u32 cpu;u32 pid;u32 tid; -u32 reserved__;/* For alignment */ +u32 fmt;u64 ip; +u64 time;char msg[MAX_AUXTRACE_ERROR_MSG ]; };
tools/perf/util/intel-bts.c +2 -2
@@ -144,7 +144,7 @@ static int intel_bts_lost(struct intel_bts *bts, struct perf_sample *sample)auxtrace_synth_error (&event.auxtrace_error,PERF_AUXTRACE_ERROR_ITRACE ,INTEL_BTS_ERR_LOST , sample->cpu, sample->pid, - sample->tid,0 ,"Lost trace data" ); + sample->tid,0 ,"Lost trace data" , sample->time); err =perf_session__deliver_synth_event (bts->session, &event,NULL );if (err)
@@ -374,7 +374,7 @@ static int intel_bts_synth_error(struct intel_bts *bts, int cpu, pid_t pid,auxtrace_synth_error (&event.auxtrace_error,PERF_AUXTRACE_ERROR_ITRACE ,INTEL_BTS_ERR_NOINSN , cpu, pid, tid, ip, -"Failed to get instruction" ); +"Failed to get instruction" ,0 ); err =perf_session__deliver_synth_event (bts->session, &event,NULL );if (err)
tools/perf/util/intel-pt.c +16 -7
@@ -1411,7 +1411,7 @@ static int intel_pt_synth_pwrx_sample(struct intel_pt_queue *ptq) }static int intel_pt_synth_error (struct intel_pt *pt,int code,int cpu, -pid_t pid,pid_t tid,u64 ip) +pid_t pid,pid_t tid,u64 ip,u64 timestamp) {union perf_event event;char msg[MAX_AUXTRACE_ERROR_MSG ];
@@ -1420,7 +1420,7 @@ static int intel_pt_synth_error(struct intel_pt *pt, int code, int cpu,intel_pt__strerror (code, msg,MAX_AUXTRACE_ERROR_MSG );auxtrace_synth_error (&event.auxtrace_error,PERF_AUXTRACE_ERROR_ITRACE , - code, cpu, pid, tid, ip, msg); + code, cpu, pid, tid, ip, msg, timestamp); err =perf_session__deliver_synth_event (pt->session, &event,NULL );if (err)
@@ -1430,6 +1430,18 @@ static int intel_pt_synth_error(struct intel_pt *pt, int code, int cpu,return err; } +static int intel_ptq_synth_error (struct intel_pt_queue *ptq, +const struct intel_pt_state *state) +{ +struct intel_pt *pt = ptq->pt; +u64 tm = ptq->timestamp; + + tm = pt->timeless_decoding ?0 :tsc_to_perf_time (tm, &pt->tc); + +return intel_pt_synth_error (pt, state->err, ptq->cpu, ptq->pid, + ptq->tid, state->from_ip, tm); +} +static int intel_pt_next_tid (struct intel_pt *pt,struct intel_pt_queue *ptq) {struct auxtrace_queue *queue;
@@ -1676,10 +1688,7 @@ static int intel_pt_run_decoder(struct intel_pt_queue *ptq, u64 *timestamp)intel_pt_next_tid (pt, ptq); }if (pt->synth_opts.errors) { - err =intel_pt_synth_error (pt, state->err, - ptq->cpu, ptq->pid, - ptq->tid, - state->from_ip); + err =intel_ptq_synth_error (ptq, state);if (err)return err; }
@@ -1804,7 +1813,7 @@ static int intel_pt_process_timeless_queues(struct intel_pt *pt, pid_t tid,static int intel_pt_lost (struct intel_pt *pt,struct perf_sample *sample) {return intel_pt_synth_error (pt,INTEL_PT_ERR_LOST , sample->cpu, - sample->pid, sample->tid,0 ); + sample->pid, sample->tid,0 , sample->time); }static struct intel_pt_queue *intel_pt_cpu_to_ptq (struct intel_pt *pt,int cpu)
tools/perf/util/s390-cpumsf.c +4 -3
@@ -819,7 +819,7 @@ static int s390_cpumsf_process_queues(struct s390_cpumsf *sf, u64 timestamp) }static int s390_cpumsf_synth_error (struct s390_cpumsf *sf,int code,int cpu, -pid_t pid,pid_t tid,u64 ip) +pid_t pid,pid_t tid,u64 ip,u64 timestamp) {char msg[MAX_AUXTRACE_ERROR_MSG ];union perf_event event;
@@ -827,7 +827,7 @@ static int s390_cpumsf_synth_error(struct s390_cpumsf *sf, int code, int cpu,strncpy (msg,"Lost Auxiliary Trace Buffer" ,sizeof (msg) -1 );auxtrace_synth_error (&event.auxtrace_error,PERF_AUXTRACE_ERROR_ITRACE , - code, cpu, pid, tid, ip, msg); + code, cpu, pid, tid, ip, msg, timestamp); err =perf_session__deliver_synth_event (sf->session, &event,NULL );if (err)
@@ -839,7 +839,8 @@ static int s390_cpumsf_synth_error(struct s390_cpumsf *sf, int code, int cpu,static int s390_cpumsf_lost (struct s390_cpumsf *sf,struct perf_sample *sample) {return s390_cpumsf_synth_error (sf,1 , sample->cpu, - sample->pid, sample->tid,0 ); + sample->pid, sample->tid,0 , + sample->time); } static int
tools/perf/util/session.c +3 -0
@@ -703,7 +703,10 @@ static void perf_event__auxtrace_error_swap(union perf_event *event, event->auxtrace_error.cpu =bswap_32 (event->auxtrace_error.cpu); event->auxtrace_error.pid =bswap_32 (event->auxtrace_error.pid); event->auxtrace_error.tid =bswap_32 (event->auxtrace_error.tid); + event->auxtrace_error.fmt =bswap_32 (event->auxtrace_error.fmt); event->auxtrace_error.ip =bswap_64 (event->auxtrace_error.ip); +if (event->auxtrace_error.fmt) + event->auxtrace_error.time =bswap_64 (event->auxtrace_error.time); } static void perf_event__thread_map_swap(union perf_event *event,