From nobody Mon Sep 15 14:43:11 2025 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 963D6C63797 for ; Thu, 12 Jan 2023 00:37:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236068AbjALAhd (ORCPT ); Wed, 11 Jan 2023 19:37:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235845AbjALAhD (ORCPT ); Wed, 11 Jan 2023 19:37:03 -0500 Received: from loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 655D317E1F for ; Wed, 11 Jan 2023 16:36:56 -0800 (PST) Received: from loongson.cn (unknown [111.9.175.10]) by gateway (Coremail) with SMTP id _____8AxHusnVr9j2hIBAA--.3376S3; Thu, 12 Jan 2023 08:36:55 +0800 (CST) Received: from localhost.localdomain (unknown [111.9.175.10]) by localhost.localdomain (Coremail) with SMTP id AQAAf8DxbL4kVr9jLyEYAA--.43573S3; Thu, 12 Jan 2023 08:36:54 +0800 (CST) From: Jinyang He To: Huacai Chen , WANG Xuerui , Qing Zhang Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, Steven Rostedt , Masami Hiramatsu , Mark Rutland Subject: [PATCH v3 1/5] LoongArch: Get frame info in unwind_start when regs is not supported Date: Thu, 12 Jan 2023 08:36:23 +0800 Message-Id: <20230112003627.26111-2-hejinyang@loongson.cn> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230112003627.26111-1-hejinyang@loongson.cn> References: <20230112003627.26111-1-hejinyang@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: AQAAf8DxbL4kVr9jLyEYAA--.43573S3 X-CM-SenderInfo: pkhmx0p1dqwqxorr0wxvrqhubq/ X-Coremail-Antispam: 1Uk129KBjvJXoWxCr1rKFykXr47urWrCrWktFb_yoW5Zw13p3 9xCrs3Wr45uF9Fqr9rtw1kZr95Grn7uw12gF9rJ34rC3W7XFyxuwnYv34DZan0y3yvgw10 qFn5KrW5Ka1UJaUanT9S1TB71UUUUjUqnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj qI5I8CrVACY4xI64kE6c02F40Ex7xfYxn0WfASr-VFAUDa7-sFnT9fnUUIcSsGvfJTRUUU bfkYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I6I8E6xAIw20EY4v20xvaj40_Wr0E3s 1l1IIY67AEw4v_Jrv_JF1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwA2z4 x0Y4vEx4A2jsIE14v26r4j6F4UM28EF7xvwVC2z280aVCY1x0267AKxVW8JVW8Jr1ln4kS 14v26r1Y6r17M2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv 67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAaw2 AFwI0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1l4IxYO2xF xVAFwI0_Jrv_JF1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWw C2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_ Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJV WUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIY CTnIWIevJa73UjIFyTuYvjxUxhiSDUUUU Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" At unwind_start, it is better to try to get its frame info even we not support regs rather than get them outside. So that we can simply use unwind_{start, next_frame, done} outside. Signed-off-by: Jinyang He --- arch/loongarch/kernel/process.c | 12 +++--------- arch/loongarch/kernel/unwind_guess.c | 6 ++++++ arch/loongarch/kernel/unwind_prologue.c | 16 +++++++++++++--- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/arch/loongarch/kernel/process.c b/arch/loongarch/kernel/proces= s.c index 502b8b950057..6ef45174ad35 100644 --- a/arch/loongarch/kernel/process.c +++ b/arch/loongarch/kernel/process.c @@ -197,20 +197,14 @@ int copy_thread(struct task_struct *p, const struct k= ernel_clone_args *args) =20 unsigned long __get_wchan(struct task_struct *task) { - unsigned long pc; + unsigned long pc =3D 0; struct unwind_state state; =20 if (!try_get_task_stack(task)) return 0; =20 - unwind_start(&state, task, NULL); - state.sp =3D thread_saved_fp(task); - get_stack_info(state.sp, state.task, &state.stack_info); - state.pc =3D thread_saved_ra(task); -#ifdef CONFIG_UNWINDER_PROLOGUE - state.type =3D UNWINDER_PROLOGUE; -#endif - for (; !unwind_done(&state); unwind_next_frame(&state)) { + for (unwind_start(&state, task, NULL); !unwind_done(&state); + unwind_next_frame(&state)) { pc =3D unwind_get_return_address(&state); if (!pc) break; diff --git a/arch/loongarch/kernel/unwind_guess.c b/arch/loongarch/kernel/u= nwind_guess.c index e2d2e4f3001f..a1bc7c852000 100644 --- a/arch/loongarch/kernel/unwind_guess.c +++ b/arch/loongarch/kernel/unwind_guess.c @@ -26,6 +26,12 @@ void unwind_start(struct unwind_state *state, struct tas= k_struct *task, if (regs) { state->sp =3D regs->regs[3]; state->pc =3D regs->csr_era; + } else if (task =3D=3D current || task =3D=3D NULL) { + state->sp =3D (unsigned long)__builtin_frame_address(0); + state->pc =3D (unsigned long)__builtin_return_address(0); + } else { + state->sp =3D thread_saved_fp(task); + state->pc =3D thread_saved_ra(task); } =20 state->task =3D task; diff --git a/arch/loongarch/kernel/unwind_prologue.c b/arch/loongarch/kerne= l/unwind_prologue.c index 0f8d1451ebb8..b8b830b69a48 100644 --- a/arch/loongarch/kernel/unwind_prologue.c +++ b/arch/loongarch/kernel/unwind_prologue.c @@ -141,12 +141,22 @@ void unwind_start(struct unwind_state *state, struct = task_struct *task, struct pt_regs *regs) { memset(state, 0, sizeof(*state)); + state->type =3D UNWINDER_PROLOGUE; =20 - if (regs && __kernel_text_address(regs->csr_era)) { - state->pc =3D regs->csr_era; + if (regs) { state->sp =3D regs->regs[3]; + state->pc =3D regs->csr_era; state->ra =3D regs->regs[1]; - state->type =3D UNWINDER_PROLOGUE; + if (!__kernel_text_address(state->pc)) + state->type =3D UNWINDER_GUESS; + } else if (task =3D=3D current || task =3D=3D NULL) { + state->sp =3D (unsigned long)__builtin_frame_address(0); + state->pc =3D (unsigned long)__builtin_return_address(0); + state->ra =3D 0; + } else { + state->sp =3D thread_saved_fp(task); + state->pc =3D thread_saved_ra(task); + state->ra =3D 0; } =20 state->task =3D task; --=20 2.34.3