From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932577AbcKHTiU (ORCPT ); Tue, 8 Nov 2016 14:38:20 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:35172 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752248AbcKHTiQ (ORCPT ); Tue, 8 Nov 2016 14:38:16 -0500 From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, mingo@redhat.com Cc: kcc@google.com, Andrey Konovalov Subject: [PATCH 1/2] stacktrace: fix print_stack_trace printing timestamp twice Date: Tue, 8 Nov 2016 20:37:49 +0100 Message-Id: <9df5bd889e1b980d84aa41e7010e622005fd0665.1478632698.git.andreyknvl@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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] [] save_stack_trace+0x16/0x20 [ 18.822232] [ 18.822232] [] save_stack+0x46/0xd0 [ 18.822232] [ 18.822232] [] kasan_kmalloc+0xab/0xe0 .... Fix by calling printk only once. Signed-off-by: Andrey Konovalov --- 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