From nobody Sat Apr 25 11:55:10 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BD4CC43334 for ; Tue, 12 Jul 2022 02:18:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230148AbiGLCSC (ORCPT ); Mon, 11 Jul 2022 22:18:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229872AbiGLCR7 (ORCPT ); Mon, 11 Jul 2022 22:17:59 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC6BB220FB; Mon, 11 Jul 2022 19:17:57 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4LhkqZ2qmvzhYyN; Tue, 12 Jul 2022 10:15:22 +0800 (CST) Received: from kwepemm600010.china.huawei.com (7.193.23.86) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 12 Jul 2022 10:17:55 +0800 Received: from ubuntu1804.huawei.com (10.67.174.174) by kwepemm600010.china.huawei.com (7.193.23.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 12 Jul 2022 10:17:54 +0800 From: Li Huafei To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH 1/5] ARM: stacktrace: Skip frame pointer boundary check for call_with_stack() Date: Tue, 12 Jul 2022 10:15:23 +0800 Message-ID: <20220712021527.109921-2-lihuafei1@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220712021527.109921-1-lihuafei1@huawei.com> References: <20220712021527.109921-1-lihuafei1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.174] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600010.china.huawei.com (7.193.23.86) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When using the frame pointer unwinder, it was found that the stack trace output of stack_trace_save() is incomplete if the stack contains call_with_stack(): [0x7f00002c] dump_stack_task+0x2c/0x90 [hrtimer] [0x7f0000a0] hrtimer_hander+0x10/0x18 [hrtimer] [0x801a67f0] __hrtimer_run_queues+0x1b0/0x3b4 [0x801a7350] hrtimer_run_queues+0xc4/0xd8 [0x801a597c] update_process_times+0x3c/0x88 [0x801b5a98] tick_periodic+0x50/0xd8 [0x801b5bf4] tick_handle_periodic+0x24/0x84 [0x8010ffc4] twd_handler+0x38/0x48 [0x8017d220] handle_percpu_devid_irq+0xa8/0x244 [0x80176e9c] generic_handle_domain_irq+0x2c/0x3c [0x8052e3a8] gic_handle_irq+0x7c/0x90 [0x808ab15c] generic_handle_arch_irq+0x60/0x80 [0x8051191c] call_with_stack+0x1c/0x20 For the frame pointer unwinder, unwind_frame() checks stackframe::fp by stackframe::sp. Since call_with_stack() switches the SP from one stack to another, stackframe::fp and stackframe: :sp will point to different stacks, so we can no longer check stackframe::fp by stackframe::sp. Skip checking stackframe::fp at this point to avoid this problem. Signed-off-by: Li Huafei Reviewed-by: Linus Walleij --- arch/arm/kernel/stacktrace.c | 40 ++++++++++++++++++++++++++++------ arch/arm/lib/call_with_stack.S | 2 ++ 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c index d0fa2037460a..af87040b0353 100644 --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c @@ -9,6 +9,8 @@ #include #include =20 +#include "reboot.h" + #if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) /* * Unwind the current stack frame and store the new register values in the @@ -39,29 +41,53 @@ * Note that with framepointer enabled, even the leaf functions have the s= ame * prologue and epilogue, therefore we can ignore the LR value in this cas= e. */ -int notrace unwind_frame(struct stackframe *frame) + +extern unsigned long call_with_stack_end; + +static int frame_pointer_check(struct stackframe *frame) { unsigned long high, low; unsigned long fp =3D frame->fp; + unsigned long pc =3D frame->pc; + + /* + * call_with_stack() is the only place we allow SP to jump from one + * stack to another, with FP and SP pointing to different stacks, + * skipping the FP boundary check at this point. + */ + if (pc >=3D (unsigned long)&call_with_stack && + pc < (unsigned long)&call_with_stack_end) + return 0; =20 /* only go to a higher address on the stack */ low =3D frame->sp; high =3D ALIGN(low, THREAD_SIZE); =20 -#ifdef CONFIG_CC_IS_CLANG /* check current frame pointer is within bounds */ +#ifdef CONFIG_CC_IS_CLANG if (fp < low + 4 || fp > high - 4) return -EINVAL; - - frame->sp =3D frame->fp; - frame->fp =3D READ_ONCE_NOCHECK(*(unsigned long *)(fp)); - frame->pc =3D READ_ONCE_NOCHECK(*(unsigned long *)(fp + 4)); #else - /* check current frame pointer is within bounds */ if (fp < low + 12 || fp > high - 4) return -EINVAL; +#endif + + return 0; +} + +int notrace unwind_frame(struct stackframe *frame) +{ + unsigned long fp =3D frame->fp; + + if (frame_pointer_check(frame)) + return -EINVAL; =20 /* restore the registers from the stack frame */ +#ifdef CONFIG_CC_IS_CLANG + frame->sp =3D frame->fp; + frame->fp =3D READ_ONCE_NOCHECK(*(unsigned long *)(fp)); + frame->pc =3D READ_ONCE_NOCHECK(*(unsigned long *)(fp + 4)); +#else frame->fp =3D READ_ONCE_NOCHECK(*(unsigned long *)(fp - 12)); frame->sp =3D READ_ONCE_NOCHECK(*(unsigned long *)(fp - 8)); frame->pc =3D READ_ONCE_NOCHECK(*(unsigned long *)(fp - 4)); diff --git a/arch/arm/lib/call_with_stack.S b/arch/arm/lib/call_with_stack.S index 0a268a6c513c..5030d4e8d126 100644 --- a/arch/arm/lib/call_with_stack.S +++ b/arch/arm/lib/call_with_stack.S @@ -46,4 +46,6 @@ UNWIND( .setfp fpreg, sp ) pop {fpreg, pc} UNWIND( .fnend ) #endif + .globl call_with_stack_end +call_with_stack_end: ENDPROC(call_with_stack) --=20 2.17.1 From nobody Sat Apr 25 11:55:10 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AA06C43334 for ; Tue, 12 Jul 2022 02:18:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231246AbiGLCSU (ORCPT ); Mon, 11 Jul 2022 22:18:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230460AbiGLCSM (ORCPT ); Mon, 11 Jul 2022 22:18:12 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 169FD2F02B; Mon, 11 Jul 2022 19:18:11 -0700 (PDT) Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LhkpW56YhzVfgC; Tue, 12 Jul 2022 10:14:27 +0800 (CST) Received: from kwepemm600010.china.huawei.com (7.193.23.86) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 12 Jul 2022 10:17:55 +0800 Received: from ubuntu1804.huawei.com (10.67.174.174) by kwepemm600010.china.huawei.com (7.193.23.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 12 Jul 2022 10:17:54 +0800 From: Li Huafei To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH 2/5] ARM: stacktrace: Avoid duplicate saving of exception PC value Date: Tue, 12 Jul 2022 10:15:24 +0800 Message-ID: <20220712021527.109921-3-lihuafei1@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220712021527.109921-1-lihuafei1@huawei.com> References: <20220712021527.109921-1-lihuafei1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.174] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600010.china.huawei.com (7.193.23.86) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Because an exception stack frame is not created in the exception entry, save_trace() does special handling for the exception PC, but this is only needed when CONFIG_FRAME_POINTER_UNWIND=3Dy. When CONFIG_ARM_UNWIND=3Dy, unwind annotations have been added to the exception entry and save_trace() will repeatedly save the exception PC: [0x7f000090] hrtimer_hander+0x8/0x10 [hrtimer] [0x8019ec50] __hrtimer_run_queues+0x18c/0x394 [0x8019f760] hrtimer_run_queues+0xbc/0xd0 [0x8019def0] update_process_times+0x34/0x80 [0x801ad2a4] tick_periodic+0x48/0xd0 [0x801ad3dc] tick_handle_periodic+0x1c/0x7c [0x8010f2e0] twd_handler+0x30/0x40 [0x80177620] handle_percpu_devid_irq+0xa0/0x23c [0x801718d0] generic_handle_domain_irq+0x24/0x34 [0x80502d28] gic_handle_irq+0x74/0x88 [0x8085817c] generic_handle_arch_irq+0x58/0x78 [0x80100ba8] __irq_svc+0x88/0xc8 [0x80108114] arch_cpu_idle+0x38/0x3c [0x80108114] arch_cpu_idle+0x38/0x3c <=3D=3D=3D=3D duplicate saved e= xception PC [0x80861bf8] default_idle_call+0x38/0x130 [0x8015d5cc] do_idle+0x150/0x214 [0x8015d978] cpu_startup_entry+0x18/0x1c [0x808589c0] rest_init+0xd8/0xdc [0x80c00a44] arch_post_acpi_subsys_init+0x0/0x8 We can move the special handling of the exception PC in save_trace() to the unwind_frame() of the frame pointer unwinder. Signed-off-by: Li Huafei Reviewed-by: Linus Waleij --- arch/arm/include/asm/stacktrace.h | 6 +++++ arch/arm/kernel/return_address.c | 1 + arch/arm/kernel/stacktrace.c | 38 +++++++++++++++++++------------ 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/arch/arm/include/asm/stacktrace.h b/arch/arm/include/asm/stack= trace.h index 3e78f921b8b2..25282ff645fb 100644 --- a/arch/arm/include/asm/stacktrace.h +++ b/arch/arm/include/asm/stacktrace.h @@ -21,6 +21,9 @@ struct stackframe { struct llist_node *kr_cur; struct task_struct *tsk; #endif +#ifdef CONFIG_UNWINDER_FRAME_POINTER + bool ex_frame; +#endif }; =20 static __always_inline @@ -34,6 +37,9 @@ void arm_get_current_stackframe(struct pt_regs *regs, str= uct stackframe *frame) frame->kr_cur =3D NULL; frame->tsk =3D current; #endif +#ifdef CONFIG_UNWINDER_FRAME_POINTER + frame->ex_frame =3D in_entry_text(frame->pc) ? true : false; +#endif } =20 extern int unwind_frame(struct stackframe *frame); diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_addr= ess.c index 8aac1e10b117..38f1ea9c724d 100644 --- a/arch/arm/kernel/return_address.c +++ b/arch/arm/kernel/return_address.c @@ -47,6 +47,7 @@ void *return_address(unsigned int level) frame.kr_cur =3D NULL; frame.tsk =3D current; #endif + frame.ex_frame =3D false; =20 walk_stackframe(&frame, save_return_addr, &data); =20 diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c index af87040b0353..3acf51ee46bb 100644 --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c @@ -82,6 +82,21 @@ int notrace unwind_frame(struct stackframe *frame) if (frame_pointer_check(frame)) return -EINVAL; =20 + /* + * When we unwind through an exception stack, include the saved PC + * value into the stack trace. + */ + if (frame->ex_frame) { + struct pt_regs *regs =3D (struct pt_regs *)frame->sp; + + if ((unsigned long)®s[1] > ALIGN(frame->sp, THREAD_SIZE)) + return -EINVAL; + + frame->pc =3D regs->ARM_pc; + frame->ex_frame =3D false; + return 0; + } + /* restore the registers from the stack frame */ #ifdef CONFIG_CC_IS_CLANG frame->sp =3D frame->fp; @@ -98,6 +113,9 @@ int notrace unwind_frame(struct stackframe *frame) (void *)frame->fp, &frame->kr_cur); #endif =20 + if (in_entry_text(frame->pc)) + frame->ex_frame =3D true; + return 0; } #endif @@ -128,7 +146,6 @@ static int save_trace(struct stackframe *frame, void *d) { struct stack_trace_data *data =3D d; struct stack_trace *trace =3D data->trace; - struct pt_regs *regs; unsigned long addr =3D frame->pc; =20 if (data->no_sched_functions && in_sched_functions(addr)) @@ -139,19 +156,6 @@ static int save_trace(struct stackframe *frame, void *= d) } =20 trace->entries[trace->nr_entries++] =3D addr; - - if (trace->nr_entries >=3D trace->max_entries) - return 1; - - if (!in_entry_text(frame->pc)) - return 0; - - regs =3D (struct pt_regs *)frame->sp; - if ((unsigned long)®s[1] > ALIGN(frame->sp, THREAD_SIZE)) - return 0; - - trace->entries[trace->nr_entries++] =3D regs->ARM_pc; - return trace->nr_entries >=3D trace->max_entries; } =20 @@ -193,6 +197,9 @@ static noinline void __save_stack_trace(struct task_str= uct *tsk, frame.kr_cur =3D NULL; frame.tsk =3D tsk; #endif +#ifdef CONFIG_UNWINDER_FRAME_POINTER + frame.ex_frame =3D false; +#endif =20 walk_stackframe(&frame, save_trace, &data); } @@ -214,6 +221,9 @@ void save_stack_trace_regs(struct pt_regs *regs, struct= stack_trace *trace) frame.kr_cur =3D NULL; frame.tsk =3D current; #endif +#ifdef CONFIG_UNWINDER_FRAME_POINTER + frame.ex_frame =3D in_entry_text(frame.pc) ? true : false; +#endif =20 walk_stackframe(&frame, save_trace, &data); } --=20 2.17.1 From nobody Sat Apr 25 11:55:10 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05A30C433EF for ; Tue, 12 Jul 2022 02:18:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229645AbiGLCSN (ORCPT ); Mon, 11 Jul 2022 22:18:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229984AbiGLCSA (ORCPT ); Mon, 11 Jul 2022 22:18:00 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 110B72409A; Mon, 11 Jul 2022 19:17:59 -0700 (PDT) Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Lhkqb40zgzhZD8; Tue, 12 Jul 2022 10:15:23 +0800 (CST) Received: from kwepemm600010.china.huawei.com (7.193.23.86) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 12 Jul 2022 10:17:56 +0800 Received: from ubuntu1804.huawei.com (10.67.174.174) by kwepemm600010.china.huawei.com (7.193.23.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 12 Jul 2022 10:17:55 +0800 From: Li Huafei To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH 3/5] ARM: stacktrace: Allow stack trace saving for non-current tasks Date: Tue, 12 Jul 2022 10:15:25 +0800 Message-ID: <20220712021527.109921-4-lihuafei1@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220712021527.109921-1-lihuafei1@huawei.com> References: <20220712021527.109921-1-lihuafei1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.174] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600010.china.huawei.com (7.193.23.86) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The current ARM implementation of save_stack_trace_tsk() does not allow saving stack trace for non-current tasks, which may limit the scenarios in which stack_trace_save_tsk() can be used. Like other architectures, or like ARM's unwind_backtrace(), we can leave it up to the caller to ensure that the task that needs to be unwound is not running. Signed-off-by: Li Huafei --- arch/arm/kernel/stacktrace.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c index 3acf51ee46bb..836420c00938 100644 --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c @@ -171,19 +171,11 @@ static noinline void __save_stack_trace(struct task_s= truct *tsk, data.no_sched_functions =3D nosched; =20 if (tsk !=3D current) { -#ifdef CONFIG_SMP - /* - * What guarantees do we have here that 'tsk' is not - * running on another CPU? For now, ignore it as we - * can't guarantee we won't explode. - */ - return; -#else + /* task blocked in __switch_to */ frame.fp =3D thread_saved_fp(tsk); frame.sp =3D thread_saved_sp(tsk); frame.lr =3D 0; /* recovered from the stack */ frame.pc =3D thread_saved_pc(tsk); -#endif } else { /* We don't want this function nor the caller */ data.skip +=3D 2; --=20 2.17.1 From nobody Sat Apr 25 11:55:10 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51398C43334 for ; Tue, 12 Jul 2022 02:18:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231131AbiGLCSQ (ORCPT ); Mon, 11 Jul 2022 22:18:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230378AbiGLCSK (ORCPT ); Mon, 11 Jul 2022 22:18:10 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34A5F3A487; Mon, 11 Jul 2022 19:18:09 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Lhkqp1X1gzhZ3d; Tue, 12 Jul 2022 10:15:34 +0800 (CST) Received: from kwepemm600010.china.huawei.com (7.193.23.86) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 12 Jul 2022 10:17:57 +0800 Received: from ubuntu1804.huawei.com (10.67.174.174) by kwepemm600010.china.huawei.com (7.193.23.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 12 Jul 2022 10:17:56 +0800 From: Li Huafei To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH 4/5] ARM: stacktrace: Make stack walk callback consistent with generic code Date: Tue, 12 Jul 2022 10:15:26 +0800 Message-ID: <20220712021527.109921-5-lihuafei1@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220712021527.109921-1-lihuafei1@huawei.com> References: <20220712021527.109921-1-lihuafei1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.174] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600010.china.huawei.com (7.193.23.86) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In order to use generic arch_stack_walk() code, make stack walk callback consistent with it. Signed-off-by: Li Huafei Reviewed-by: Linus Walleij Reviewed-by: Mark Brown --- arch/arm/include/asm/stacktrace.h | 2 +- arch/arm/kernel/perf_callchain.c | 9 ++++----- arch/arm/kernel/return_address.c | 8 ++++---- arch/arm/kernel/stacktrace.c | 13 ++++++------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/arch/arm/include/asm/stacktrace.h b/arch/arm/include/asm/stack= trace.h index 25282ff645fb..ce85d3ad5d05 100644 --- a/arch/arm/include/asm/stacktrace.h +++ b/arch/arm/include/asm/stacktrace.h @@ -44,7 +44,7 @@ void arm_get_current_stackframe(struct pt_regs *regs, str= uct stackframe *frame) =20 extern int unwind_frame(struct stackframe *frame); extern void walk_stackframe(struct stackframe *frame, - int (*fn)(struct stackframe *, void *), void *data); + bool (*fn)(void *, unsigned long), void *data); extern void dump_mem(const char *lvl, const char *str, unsigned long botto= m, unsigned long top); =20 diff --git a/arch/arm/kernel/perf_callchain.c b/arch/arm/kernel/perf_callch= ain.c index bc6b246ab55e..7147edbe56c6 100644 --- a/arch/arm/kernel/perf_callchain.c +++ b/arch/arm/kernel/perf_callchain.c @@ -81,13 +81,12 @@ perf_callchain_user(struct perf_callchain_entry_ctx *en= try, struct pt_regs *regs * whist unwinding the stackframe and is like a subroutine return so we use * the PC. */ -static int -callchain_trace(struct stackframe *fr, - void *data) +static bool +callchain_trace(void *data, unsigned long pc) { struct perf_callchain_entry_ctx *entry =3D data; - perf_callchain_store(entry, fr->pc); - return 0; + perf_callchain_store(entry, pc); + return true; } =20 void diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_addr= ess.c index 38f1ea9c724d..ac15db66df4c 100644 --- a/arch/arm/kernel/return_address.c +++ b/arch/arm/kernel/return_address.c @@ -16,17 +16,17 @@ struct return_address_data { void *addr; }; =20 -static int save_return_addr(struct stackframe *frame, void *d) +static bool save_return_addr(void *d, unsigned long pc) { struct return_address_data *data =3D d; =20 if (!data->level) { - data->addr =3D (void *)frame->pc; + data->addr =3D (void *)pc; =20 - return 1; + return false; } else { --data->level; - return 0; + return true; } } =20 diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c index 836420c00938..ec0ca3192775 100644 --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c @@ -121,12 +121,12 @@ int notrace unwind_frame(struct stackframe *frame) #endif =20 void notrace walk_stackframe(struct stackframe *frame, - int (*fn)(struct stackframe *, void *), void *data) + bool (*fn)(void *, unsigned long), void *data) { while (1) { int ret; =20 - if (fn(frame, data)) + if (!fn(data, frame->pc)) break; ret =3D unwind_frame(frame); if (ret < 0) @@ -142,21 +142,20 @@ struct stack_trace_data { unsigned int skip; }; =20 -static int save_trace(struct stackframe *frame, void *d) +static bool save_trace(void *d, unsigned long addr) { struct stack_trace_data *data =3D d; struct stack_trace *trace =3D data->trace; - unsigned long addr =3D frame->pc; =20 if (data->no_sched_functions && in_sched_functions(addr)) - return 0; + return true; if (data->skip) { data->skip--; - return 0; + return true; } =20 trace->entries[trace->nr_entries++] =3D addr; - return trace->nr_entries >=3D trace->max_entries; + return trace->nr_entries < trace->max_entries; } =20 /* This must be noinline to so that our skip calculation works correctly */ --=20 2.17.1 From nobody Sat Apr 25 11:55:10 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2A14C43334 for ; Tue, 12 Jul 2022 02:19:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229796AbiGLCTC (ORCPT ); Mon, 11 Jul 2022 22:19:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229608AbiGLCS7 (ORCPT ); Mon, 11 Jul 2022 22:18:59 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD9C4A5; Mon, 11 Jul 2022 19:18:57 -0700 (PDT) Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LhkqR10WyzVffN; Tue, 12 Jul 2022 10:15:15 +0800 (CST) Received: from kwepemm600010.china.huawei.com (7.193.23.86) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 12 Jul 2022 10:17:58 +0800 Received: from ubuntu1804.huawei.com (10.67.174.174) by kwepemm600010.china.huawei.com (7.193.23.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 12 Jul 2022 10:17:57 +0800 From: Li Huafei To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH 5/5] ARM: stacktrace: Convert stacktrace to generic ARCH_STACKWALK Date: Tue, 12 Jul 2022 10:15:27 +0800 Message-ID: <20220712021527.109921-6-lihuafei1@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220712021527.109921-1-lihuafei1@huawei.com> References: <20220712021527.109921-1-lihuafei1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.174] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600010.china.huawei.com (7.193.23.86) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch converts ARM stacktrace to the generic ARCH_STACKWALK implemented by commit 214d8ca6ee85 ("stacktrace: Provide common infrastructure"). Signed-off-by: Li Huafei Reviewed-by: Linus Walleij --- arch/arm/Kconfig | 1 + arch/arm/kernel/stacktrace.c | 114 ++++++++++------------------------- 2 files changed, 33 insertions(+), 82 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7630ba9cb6cc..8da192853562 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -18,6 +18,7 @@ config ARM select ARCH_HAS_PHYS_TO_DMA select ARCH_HAS_SETUP_DMA_OPS select ARCH_HAS_SET_MEMORY + select ARCH_STACKWALK select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL select ARCH_HAS_STRICT_MODULE_RWX if MMU select ARCH_HAS_SYNC_DMA_FOR_DEVICE if SWIOTLB || !MMU diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c index ec0ca3192775..1b9c91e14d2e 100644 --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c @@ -136,98 +136,48 @@ void notrace walk_stackframe(struct stackframe *frame, EXPORT_SYMBOL(walk_stackframe); =20 #ifdef CONFIG_STACKTRACE -struct stack_trace_data { - struct stack_trace *trace; - unsigned int no_sched_functions; - unsigned int skip; -}; - -static bool save_trace(void *d, unsigned long addr) -{ - struct stack_trace_data *data =3D d; - struct stack_trace *trace =3D data->trace; - - if (data->no_sched_functions && in_sched_functions(addr)) - return true; - if (data->skip) { - data->skip--; - return true; - } - - trace->entries[trace->nr_entries++] =3D addr; - return trace->nr_entries < trace->max_entries; -} - -/* This must be noinline to so that our skip calculation works correctly */ -static noinline void __save_stack_trace(struct task_struct *tsk, - struct stack_trace *trace, unsigned int nosched) +static void start_stack_trace(struct stackframe *frame, struct task_struct= *task, + unsigned long fp, unsigned long sp, + unsigned long lr, unsigned long pc) { - struct stack_trace_data data; - struct stackframe frame; - - data.trace =3D trace; - data.skip =3D trace->skip; - data.no_sched_functions =3D nosched; - - if (tsk !=3D current) { - /* task blocked in __switch_to */ - frame.fp =3D thread_saved_fp(tsk); - frame.sp =3D thread_saved_sp(tsk); - frame.lr =3D 0; /* recovered from the stack */ - frame.pc =3D thread_saved_pc(tsk); - } else { - /* We don't want this function nor the caller */ - data.skip +=3D 2; - frame.fp =3D (unsigned long)__builtin_frame_address(0); - frame.sp =3D current_stack_pointer; - frame.lr =3D (unsigned long)__builtin_return_address(0); -here: - frame.pc =3D (unsigned long)&&here; - } + frame->fp =3D fp; + frame->sp =3D sp; + frame->lr =3D lr; + frame->pc =3D pc; #ifdef CONFIG_KRETPROBES - frame.kr_cur =3D NULL; - frame.tsk =3D tsk; + frame->kr_cur =3D NULL; + frame->tsk =3D task; #endif #ifdef CONFIG_UNWINDER_FRAME_POINTER - frame.ex_frame =3D false; + frame->ex_frame =3D in_entry_text(frame->pc) ? true : false; #endif - - walk_stackframe(&frame, save_trace, &data); } =20 -void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace) +void arch_stack_walk(stack_trace_consume_fn consume_entry, void *cookie, + struct task_struct *task, struct pt_regs *regs) { - struct stack_trace_data data; struct stackframe frame; =20 - data.trace =3D trace; - data.skip =3D trace->skip; - data.no_sched_functions =3D 0; - - frame.fp =3D regs->ARM_fp; - frame.sp =3D regs->ARM_sp; - frame.lr =3D regs->ARM_lr; - frame.pc =3D regs->ARM_pc; -#ifdef CONFIG_KRETPROBES - frame.kr_cur =3D NULL; - frame.tsk =3D current; -#endif -#ifdef CONFIG_UNWINDER_FRAME_POINTER - frame.ex_frame =3D in_entry_text(frame.pc) ? true : false; -#endif - - walk_stackframe(&frame, save_trace, &data); -} - -void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *tra= ce) -{ - __save_stack_trace(tsk, trace, 1); -} -EXPORT_SYMBOL(save_stack_trace_tsk); + if (regs) { + start_stack_trace(&frame, NULL, regs->ARM_fp, regs->ARM_sp, + regs->ARM_lr, regs->ARM_pc); + } else if (task !=3D current) { + /* task blocked in __switch_to */ + start_stack_trace(&frame, task, thread_saved_fp(task), + thread_saved_sp(task), 0, + thread_saved_pc(task)); + } else { +here: + start_stack_trace(&frame, task, + (unsigned long)__builtin_frame_address(0), + current_stack_pointer, + (unsigned long)__builtin_return_address(0), + (unsigned long)&&here); + /* skip this function */ + if (unwind_frame(&frame)) + return; + } =20 -void save_stack_trace(struct stack_trace *trace) -{ - __save_stack_trace(current, trace, 0); + walk_stackframe(&frame, consume_entry, cookie); } -EXPORT_SYMBOL_GPL(save_stack_trace); #endif --=20 2.17.1