From patchwork Tue Jul 7 04:33:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maninder Singh X-Patchwork-Id: 6730011 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 26617C05AC for ; Tue, 7 Jul 2015 04:37:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E7AC2077B for ; Tue, 7 Jul 2015 04:37:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 038B92077A for ; Tue, 7 Jul 2015 04:37:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZCKaY-0001Ud-Qp; Tue, 07 Jul 2015 04:34:34 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZCKaV-0001St-L6 for linux-arm-kernel@lists.infradead.org; Tue, 07 Jul 2015 04:34:32 +0000 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NR3033Z5OOUYO50@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 07 Jul 2015 13:34:06 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.125]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id E9.C6.17770.EB65B955; Tue, 7 Jul 2015 13:34:06 +0900 (KST) X-AuditID: cbfee691-f79ca6d00000456a-82-559b56be4654 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 89.29.25346.DB65B955; Tue, 7 Jul 2015 13:34:05 +0900 (KST) Received: from localhost.localdomain ([107.108.92.210]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NR30068QONWY290@mmp2.samsung.com>; Tue, 07 Jul 2015 13:34:05 +0900 (KST) From: Maninder Singh To: catalin.marinas@arm.com, will.deacon@arm.com, sungjinn.chung@samsung.com, jays.lee@samsung.com, kgene.kim@samsung.com, vladimir.murzin@arm.com, behanw@converseincode.com, punit.agrawal@arm.com, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] arm64: Modify the dump mem for 64 bit addresses Date: Tue, 07 Jul 2015 10:03:15 +0530 Message-id: <1436243596-5263-1-git-send-email-maninder1.s@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOLMWRmVeSWpSXmKPExsWyRsSkVndf2OxQg01dHBanzuRYvF/Ww2hx /+p3RovXLwwtehdcZbPY9Pgaq8XlXXPYLA7Pb2OxWHr9IpPFvTdbmSyevz/NZLHxXrbFhxkr GS3WztjFYvHy4wkWB36PNfPWMHrsbJvP6rF5Sb1H35ZVjB6fN8kFsEZx2aSk5mSWpRbp2yVw ZZzcblBwzrCi99F8lgbG2RpdjJwcEgImEhcetDFB2GISF+6tZ+ti5OIQEljKKNFz8j0jTNHz V++YIBLTGSWuXvwGVfWTUaL98nx2kCo2AT2JVbv2sIAkRASWMEmsXQThMAt0MUqc2XuRFaRK WMBZ4sHCnUCzODhYBFQlHvXbg4R5Bdwkzq95zQYSlhBQkJgzyQakVUJgF7vEzgNbwc5gERCQ +Db5EAtEjazEpgPMENdJShxccYNlAqPgAkaGVYyiqQXJBcVJ6UWmesWJucWleel6yfm5mxiB 4X/637OJOxjvH7A+xCjAwajEw3tDYnaoEGtiWXFl7iFGU6ANE5mlRJPzgVGWVxJvaGxmZGFq YmpsZG5ppiTOqyP9M1hIID2xJDU7NbUgtSi+qDQntfgQIxMHp1QD4w7Gv6dMlofPXzPZSlmA lVnhpEDdeaEq33wxs+27TXdkrtcrqLh+62l2wdVNLyZ/ebxz2Urds6YxX1v2ZLfZ1tu6n2WO svpu0LY4h/XwxAmbq5SKzlXXntlvsYY34/FyxuzbO+6nmIhzpSZUWL4I2Lkv6PSbKcdzhKp7 vt8/qndhS+POigfeN5RYijMSDbWYi4oTAVWXOo96AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsVy+t9jQd29YbNDDW7strI4dSbH4v2yHkaL +1e/M1q8fmFo0bvgKpvFpsfXWC0u75rDZnF4fhuLxdLrF5ks7r3ZymTx/P1pJouN97ItPsxY yWixdsYuFouXH0+wOPB7rJm3htFjZ9t8Vo/NS+o9+rasYvT4vEkugDWqgdEmIzUxJbVIITUv OT8lMy/dVsk7ON453tTMwFDX0NLCXEkhLzE31VbJxSdA1y0zB+hWJYWyxJxSoFBAYnGxkr4d pgmhIW66FjCNEbq+IUFwPUYGaCBhDWPGye0GBecMK3ofzWdpYJyt0cXIySEhYCLx/NU7Jghb TOLCvfVsXYxcHEIC0xklrl78BuX8ZJRovzyfHaSKTUBPYtWuPSwgCRGBJUwSaxdBOMwCXYwS Z/ZeZAWpEhZwlniwcCfQXA4OFgFViUf99iBhXgE3ifNrXrOBhCUEFCTmTLKZwMi9gJFhFaNo akFyQXFSeq6hXnFibnFpXrpecn7uJkZwdD2T2sG4ssHiEKMAB6MSD+8NidmhQqyJZcWVuYcY JTiYlUR4K/SAQrwpiZVVqUX58UWlOanFhxhNgXZPZJYSTc4HRn5eSbyhsYm5qbGppYmFiZml kjjvyXyfUCGB9MSS1OzU1ILUIpg+Jg5OqQbG/r9fXiWflpE5tVZUtuRBoN3n7UsPW8eefbWs zfPey4SYnjtTw+NinFkST6dO336ft2u3vuU+hqW6t1mE7x+/v2/Nl1mhzAzOByZZrq495Te1 XXGFiCln6kWXw/uKLn8+tfv+TI6mp4tNyheo5V1WORL4hO3F4fhPa39ELD4WX/Cr7P+3gLtb TimxFGckGmoxFxUnAgBLmqmyxAIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150706_213431_843035_BF9142FF X-CRM114-Status: GOOD ( 17.83 ) X-Spam-Score: -7.5 (-------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maninder Singh , k.kozlowski@samsung.com, Rohit Thapliyal , pankaj.m@samsung.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rohit Thapliyal On 64bit kernel, the dump_mem gives 32 bit addresses on the stack dump. This gives unorganized information regarding the 64bit values on the stack. Hence, modified to get a complete 64bit memory dump. With patch: [ 93.534801] Process insmod (pid: 1587, stack limit = 0xffffffc976be4058) [ 93.541441] Stack: (0xffffffc976be7cf0 to 0xffffffc976be8000) [ 93.547136] 7ce0: ffffffc976be7d00 ffffffc00008163c [ 93.554898] 7d00: ffffffc976be7d40 ffffffc0000f8a44 ffffffc00098ef38 ffffffbffc000088 [ 93.562659] 7d20: ffffffc00098ef50 ffffffbffc0000c0 0000000000000001 ffffffbffc000070 [ 93.570419] 7d40: ffffffc976be7e40 ffffffc0000f935c 0000000000000000 000000002b424090 [ 93.578179] 7d60: 000000002b424010 0000007facc555f4 0000000080000000 0000000000000015 [ 93.585937] 7d80: 0000000000000116 0000000000000069 ffffffc00097b000 ffffffc976be4000 [ 93.593694] 7da0: 0000000000000064 0000000000000072 000000000000006e 000000000000003f [ 93.601453] 7dc0: 000000000000feff 000000000000fff1 ffffffbffc002028 0000000000000124 [ 93.609211] 7de0: ffffffc976be7e10 0000000000000001 ffffff8000000000 ffffffbbffff0000 [ 93.616969] 7e00: ffffffc976be7e60 0000000000000000 0000000000000000 0000000000000000 [ 93.624726] 7e20: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 [ 93.632484] 7e40: 0000007fcc474550 ffffffc0000841ec 000000002b424010 0000007facda0710 [ 93.640241] 7e60: ffffffffffffffff ffffffc0000be6dc ffffff80007d2000 000000000001c010 [ 93.647999] 7e80: ffffff80007e0ae0 ffffff80007e09d0 ffffff80007edf70 0000000000000288 [ 93.655757] 7ea0: 00000000000002e8 0000000000000000 0000000000000000 0000001c0000001b [ 93.663514] 7ec0: 0000000000000009 0000000000000007 000000002b424090 000000000001c010 [ 93.671272] 7ee0: 000000002b424010 0000007faccd3a48 0000000000000000 0000000000000000 [ 93.679030] 7f00: 0000007fcc4743f8 0000007fcc4743f8 0000000000000069 0000000000000003 [ 93.686787] 7f20: 0101010101010101 0000000000000004 0000000000000020 00000000000003f3 [ 93.694544] 7f40: 0000007facb95664 0000007facda7030 0000007facc555d0 0000000000498378 [ 93.702301] 7f60: 0000000000000000 000000002b424010 0000007facda0710 000000002b424090 [ 93.710058] 7f80: 0000007fcc474698 0000000000498000 0000007fcc474ebb 0000000000474f58 [ 93.717815] 7fa0: 0000000000498000 0000000000000000 0000000000000000 0000007fcc474550 [ 93.725573] 7fc0: 00000000004104bc 0000007fcc474430 0000007facc555f4 0000000080000000 [ 93.733330] 7fe0: 000000002b424090 0000000000000069 0950020128000244 4104000008000004 [ 93.741084] Call trace: The above output makes a debugger life a lot more easier. Signed-off-by: Rohit Thapliyal Signed-off-by: Maninder Singh --- v1: added new function dump_mem64 v2: Removed the separate function dump_mem64 and accommodated a field width based on which the dump shall be created of width either 4 or 8 as suggested by Catalin. v3: Changelog modified arch/arm64/kernel/traps.c | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 1ef2940..53d57db 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -51,8 +51,9 @@ int show_unhandled_signals = 1; /* * Dump out the contents of some memory nicely... */ + static void dump_mem(const char *lvl, const char *str, unsigned long bottom, - unsigned long top) + unsigned long top, unsigned int width) { unsigned long first; mm_segment_t fs; @@ -70,18 +71,27 @@ static void dump_mem(const char *lvl, const char *str, unsigned long bottom, for (first = bottom & ~31; first < top; first += 32) { unsigned long p; - char str[sizeof(" 12345678") * 8 + 1]; + char str[sizeof(" 1234567812345678") * 8 + 1]; memset(str, ' ', sizeof(str)); str[sizeof(str) - 1] = '\0'; - for (p = first, i = 0; i < 8 && p < top; i++, p += 4) { + for (p = first, i = 0; i < (width > 4 ? width-4 : width+4) + && p < top; i++, p += width) { if (p >= bottom && p < top) { - unsigned int val; - if (__get_user(val, (unsigned int *)p) == 0) - sprintf(str + i * 9, " %08x", val); - else - sprintf(str + i * 9, " ????????"); + unsigned long val; + + if (width == 8) { + if (__get_user(val, (unsigned long *)p) == 0) + sprintf(str + i * 17, " %016lx", val); + else + sprintf(str + i * 17, " ????????????????"); + } else { + if (__get_user(val, (unsigned int *)p) == 0) + sprintf(str + i * 9, " %08x", (unsigned int)val); + else + sprintf(str + i * 9, " ????????"); + } } } printk("%s%04lx:%s\n", lvl, first & 0xffff, str); @@ -95,7 +105,7 @@ static void dump_backtrace_entry(unsigned long where, unsigned long stack) print_ip_sym(where); if (in_exception_text(where)) dump_mem("", "Exception stack", stack, - stack + sizeof(struct pt_regs)); + stack + sizeof(struct pt_regs), 8); } static void dump_instr(const char *lvl, struct pt_regs *regs) @@ -191,6 +201,7 @@ static int __die(const char *str, int err, struct thread_info *thread, struct task_struct *tsk = thread->task; static int die_counter; int ret; + unsigned int width = 8; pr_emerg("Internal error: %s: %x [#%d]" S_PREEMPT S_SMP "\n", str, err, ++die_counter); @@ -206,8 +217,19 @@ static int __die(const char *str, int err, struct thread_info *thread, TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), thread + 1); if (!user_mode(regs) || in_interrupt()) { - dump_mem(KERN_EMERG, "Stack: ", regs->sp, - THREAD_SIZE + (unsigned long)task_stack_page(tsk)); + + if (regs->sp > (unsigned long)task_stack_page(tsk)) { + dump_mem(KERN_EMERG, "Stack: ", regs->sp, + THREAD_SIZE + + (unsigned long)task_stack_page(tsk), width); + } else { + if (compat_user_mode(regs)) + width = 4; + dump_mem(KERN_EMERG, "Stack: ", + (unsigned long)task_stack_page(tsk), + THREAD_SIZE + + (unsigned long)task_stack_page(tsk), width); + } dump_backtrace(regs, tsk); dump_instr(KERN_EMERG, regs); }