raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

tools lib traceevent: Fix string handling in heterogeneous arch environments

Browse Source 
commit c2e4b24ff8 upstream.

When a trace recorded on a 32-bit device is processed with a 64-bit
binary, the higher 32-bits of the address need to ignored.

The lack of this results in the output of the 64-bit pointer
value to the trace as the 32-bit address lookup fails in find_printk().

Before:

  burn-1778  [003]   548.600305: bputs:   0xc0046db2s: 2cec5c058d98c

After:

  burn-1778  [003]   548.600305: bputs:   0xc0046db2s: RT throttling activated

The problem occurs in PRINT_FIELD when the field is recognized as a
pointer to a string (of the type const char *)

Heterogeneous architectures cases below can arise and should be handled:

* Traces recorded using 32-bit addresses processed on a 64-bit machine
* Traces recorded using 64-bit addresses processed on a 32-bit machine

Reported-by: Juri Lelli <juri.lelli@arm.com>
Signed-off-by: Kapileshwar Singh <kapileshwar.singh@arm.com>
Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Javi Merino <javi.merino@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1442928123-13824-1-git-send-email-kapileshwar.singh@arm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kapileshwar Singh
2015-09-22 14:22:03 +01:00
committed by Greg Kroah-Hartman
parent 42719676db
commit 41f3fa1732
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/lib/traceevent/event-parse.c
View File

@@ -3721,7 +3721,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,
struct format_field *field; struct format_field *field;
struct printk_map *printk; struct printk_map *printk;
long long val, fval; long long val, fval;
unsigned long addr; unsigned long long addr;
char *str; char *str;
unsigned char *hex; unsigned char *hex;
int print; int print;
@@ -3754,13 +3754,30 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,
*/ */
if (!(field->flags & FIELD_IS_ARRAY) && if (!(field->flags & FIELD_IS_ARRAY) &&
field->size == pevent->long_size) { 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 */ /* Check if it matches a print format */
printk = find_printk(pevent, addr); printk = find_printk(pevent, addr);
if (printk) if (printk)
trace_seq_puts(s, printk->printk); trace_seq_puts(s, printk->printk);
else else
trace_seq_printf(s, "%lx", addr); trace_seq_printf(s, "%llx", addr);
break; break;
} }
str = malloc(len + 1); str = malloc(len + 1);