Messages in this thread Patch in this message | | | From | Andrey Konovalov <> | Subject | [PATCH 1/2] stacktrace: fix print_stack_trace printing timestamp twice | Date | Tue, 8 Nov 2016 20:37:49 +0100 |
| |
Right now print_stack_trace prints timestamp twice, the first time it's done by printk when printing spaces, the second - by print_ip_sym. As a result, stack traces in KASAN reports have double timestamps: [ 18.822232] Allocated by task 3838: [ 18.822232] [ 18.822232] [<ffffffff8107e236>] save_stack_trace+0x16/0x20 [ 18.822232] [ 18.822232] [<ffffffff81509bd6>] save_stack+0x46/0xd0 [ 18.822232] [ 18.822232] [<ffffffff81509e4b>] kasan_kmalloc+0xab/0xe0 ....
Fix by calling printk only once.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- kernel/stacktrace.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/kernel/stacktrace.c b/kernel/stacktrace.c index b6e4c16..56f510f 100644 --- a/kernel/stacktrace.c +++ b/kernel/stacktrace.c @@ -14,13 +14,15 @@ void print_stack_trace(struct stack_trace *trace, int spaces) { int i; + unsigned long ip; if (WARN_ON(!trace->entries)) return; for (i = 0; i < trace->nr_entries; i++) { - printk("%*c", 1 + spaces, ' '); - print_ip_sym(trace->entries[i]); + ip = trace->entries[i]; + printk("%*c[<%p>] %pS\n", 1 + spaces, ' ', + (void *) ip, (void *) ip); } } EXPORT_SYMBOL_GPL(print_stack_trace); -- 2.8.0.rc3.226.g39d4020
| |