From 53d576b324b38774515889faff8940a478f7251e Mon Sep 17 00:00:00 2001 From: Huibin Hong Date: Thu, 23 Dec 2021 08:01:25 +0000 Subject: [PATCH] arm64: process: move show_extra_register_data after dump_backtrace In show_regs, move show_extra_register_data after dump_backtrace [ 6.071359][ T7] pc : _regulator_put+0x10c/0x11c [ 6.071370][ T7] lr : regulator_put+0x30/0x4c [ 6.071379][ T7] sp : ffffffc01223bb20 [ 6.071389][ T7] pmr_save: 000000e0 [ 6.071398][ T7] x29: ffffffc01223bb20 x28: ffffffc01094adb8 [ 6.071414][ T7] x27: ffffffc01094adac x26: ffffff8402bd7f20 [ 6.071429][ T7] x25: ffffff8403a05900 x24: ffffff8402bd7f20 [ 6.071444][ T7] x23: ffffff8403a05900 x22: ffffffc01223bb78 [ 6.071458][ T7] x21: ffffff8403a05800 x20: ffffffc011e250a8 [ 6.071472][ T7] x19: ffffff8403a05600 x18: ffffffc0120f1070 [ 6.071487][ T7] x17: 0000000000000000 x16: 00000000000000d8 [ 6.071502][ T7] x15: 0000000000000004 x14: 0000000000003fff [ 6.071517][ T7] x13: ffffffc011c0cf28 x12: 0000000000000003 [ 6.071531][ T7] x11: 00000000ffffbfff x10: dead000000000100 [ 6.071546][ T7] x9 : 0000000000000000 x8 : 0000000000000001 [ 6.071560][ T7] x7 : 5b5d313831313730 x6 : ffffffc011e13f50 [ 6.071575][ T7] x5 : ffffffffffffffff x4 : 0000000000000000 [ 6.071589][ T7] x3 : 00000000000000e0 x2 : ffffff8400348000 [ 6.071604][ T7] x1 : 0000000000000000 x0 : ffffff8403a05600 [ 6.071620][ T7] Call trace: [ 6.071632][ T7] _regulator_put+0x10c/0x11c [ 6.071644][ T7] regulator_put+0x30/0x4c [ 6.071659][ T7] devm_regulator_release+0x18/0x28 [ 6.071674][ T7] release_nodes+0x228/0x288 [ 6.071686][ T7] devres_release_all+0x40/0x60 [ 6.071702][ T7] really_probe+0x310/0x510 [ 6.071716][ T7] driver_probe_device+0x80/0xc0 [ 6.071728][ T7] __device_attach_driver+0x118/0x140 [ 6.071741][ T7] bus_for_each_drv+0x84/0xd4 [ 6.071753][ T7] __device_attach_async_helper+0x80/0xdc [ 6.071765][ T7] async_run_entry_fn+0x48/0x130 [ 6.071778][ T7] process_one_work+0x1f4/0x490 [ 6.071789][ T7] worker_thread+0x278/0x4dc [ 6.071803][ T7] kthread+0x13c/0x344 [ 6.071816][ T7] ret_from_fork+0x10/0x30 [ 6.071826][ T7] [ 6.071826][ T7] PC: 0xffffffc01073a8a4: [ 6.071835][ T7] a8a4 a9014ff4 910003fd b4000720 aa0003f3 b140041f 540006c8 b9402268 35000728 Fixes: 80018840e074 ("ANDROID: arm64: process: dump memory around registers when displaying regs") Signed-off-by: Huibin Hong Change-Id: I79e7964a9278de6013fe2213d79b95dcd4f28a86 --- arch/arm64/kernel/process.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index e01233ac92d9..641d0ae6d6fc 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -365,15 +365,15 @@ void __show_regs(struct pt_regs *regs) pr_cont("\n"); } - if (!user_mode(regs)) - show_extra_register_data(regs, 256); - printk("\n"); } void show_regs(struct pt_regs * regs) { __show_regs(regs); dump_backtrace(regs, NULL, KERN_DEFAULT); + + if (!user_mode(regs)) + show_extra_register_data(regs, 256); } EXPORT_SYMBOL_GPL(show_regs);