diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-09-23 09:42:11 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-09-23 09:42:11 +0200 |
commit | b5727270ecd807f75a8d5d1450cec39495fc794a (patch) | |
tree | b40753b713a39f41179bd0b48668f363814664fd | |
parent | 96f3eda67fcf2598e9d2794398e0e7ab35138ea6 (diff) | |
parent | d0d0313c2ae4bc220c4ed96ce340860a4e74a2e9 (diff) | |
download | linux-b5727270ecd807f75a8d5d1450cec39495fc794a.tar.bz2 |
Merge branch 'perf/urgent' into perf/core to pick up fixes before pulling new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | tools/lib/traceevent/event-parse.c | 23 | ||||
-rw-r--r-- | tools/perf/util/session.c | 5 |
2 files changed, 24 insertions, 4 deletions
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index 12447978a921..9aa107a0ce8c 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -3847,7 +3847,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, struct format_field *field; struct printk_map *printk; long long val, fval; - unsigned long addr; + unsigned long long addr; char *str; unsigned char *hex; int print; @@ -3880,13 +3880,30 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, */ if (!(field->flags & FIELD_IS_ARRAY) && field->size == pevent->long_size) { - addr = *(unsigned long *)(data + field->offset); + + /* Handle heterogeneous recording and processing + * architectures + * + * CASE I: + * Traces recorded on 32-bit devices (32-bit + * addressing) and processed on 64-bit devices: + * In this case, only 32 bits should be read. + * + * CASE II: + * Traces recorded on 64 bit devices and processed + * on 32-bit devices: + * In this case, 64 bits must be read. + */ + addr = (pevent->long_size == 8) ? + *(unsigned long long *)(data + field->offset) : + (unsigned long long)*(unsigned int *)(data + field->offset); + /* Check if it matches a print format */ printk = find_printk(pevent, addr); if (printk) trace_seq_puts(s, printk->printk); else - trace_seq_printf(s, "%lx", addr); + trace_seq_printf(s, "%llx", addr); break; } str = malloc(len + 1); diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index d1a43a322f96..f5e000030a5e 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1565,7 +1565,10 @@ static int __perf_session__process_events(struct perf_session *session, file_offset = page_offset; head = data_offset - page_offset; - if (data_size && (data_offset + data_size < file_size)) + if (data_size == 0) + goto out; + + if (data_offset + data_size < file_size) file_size = data_offset + data_size; ui_progress__init(&prog, file_size, "Processing events..."); |