From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D750C54E68 for ; Wed, 20 Mar 2024 02:43:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C31486B009E; Tue, 19 Mar 2024 22:43:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BE1596B009F; Tue, 19 Mar 2024 22:43:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AA98F6B00A0; Tue, 19 Mar 2024 22:43:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 9BE916B009E for ; Tue, 19 Mar 2024 22:43:19 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 7A9408040A for ; Wed, 20 Mar 2024 02:43:19 +0000 (UTC) X-FDA: 81915870918.28.FFCF942 Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf27.hostedemail.com (Postfix) with ESMTP id 9573940006 for ; Wed, 20 Mar 2024 02:43:15 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.hostedemail.com: domain of xiaojiangfeng@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=xiaojiangfeng@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710902597; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6NgW/2ztyIJhPt8lDC/asFFtwEmDtTYbCB9E29DvhGg=; b=yY9mw3RdlM3P+xzk/FbkvsE8T57AaavWdx6wp4uYGk80O4vQ2V0KKK3xNIg+kfhcHLDNPO DMHeJCvXhoydP/Qt9iIdtoNTy8pF4IQfrg0WnQqxf42YcUIq4w/8ED4rSZqkYB/Zhk95WS y67qoSvgy9b5Yz7/8RjJn3nsC4Q31FQ= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.hostedemail.com: domain of xiaojiangfeng@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=xiaojiangfeng@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710902597; a=rsa-sha256; cv=none; b=VzAQarX38d82jAAi2+ZmmcicG54twvjuhJ23Znuj6H9tufSR4GZSNEZNahrlYVYMQWaoL8 qbjRtNlAFbc0xvUYgztcrQczZfqmd0s6DnoagOgOyLmuo7h6YdSEQOwGo7fmMHQcqXaX31 bEeTlKhJlXzGCNaTYiIgD67XF4NmLj4= Received: from mail.maildlp.com (unknown [172.19.88.234]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4TztDR6fxmz1GCKF; Wed, 20 Mar 2024 10:42:47 +0800 (CST) Received: from canpemm500010.china.huawei.com (unknown [7.192.105.118]) by mail.maildlp.com (Postfix) with ESMTPS id D210B140155; Wed, 20 Mar 2024 10:43:10 +0800 (CST) Received: from huawei.com (10.67.189.167) by canpemm500010.china.huawei.com (7.192.105.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 20 Mar 2024 10:43:10 +0800 From: Jiangfeng Xiao To: , , , , , , , CC: , , , , , , , , , , , , , , , , Subject: [PATCH] ARM: unwind: improve unwinders for noreturn case Date: Wed, 20 Mar 2024 10:19:29 +0800 Message-ID: <1710901169-22763-1-git-send-email-xiaojiangfeng@huawei.com> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1709516385-7778-1-git-send-email-xiaojiangfeng@huawei.com> References: <1709516385-7778-1-git-send-email-xiaojiangfeng@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.189.167] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To canpemm500010.china.huawei.com (7.192.105.118) X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 9573940006 X-Stat-Signature: 8q997uhb998yiecapiw366dpfrqsfbbc X-Rspam-User: X-HE-Tag: 1710902595-887528 X-HE-Meta: U2FsdGVkX1/ODsmtfchshVk8WZARB+ArGZgk3WI/HD0RkNbs2wHiu6SpUXDABWpXh5KWkyR3KcjeoabTCRs7E4a7EUcDwKI1ntn3ELzVSmBU4ndPLMS8+wy4okuMe7MfOy0e/qabIxjl/TlLnxAR2zoesLYjdI48eUwZBodCbCjsVzgYW8BHYMuqKTHKUtx3ngQ1IcJjFj8l1nk2bN7JXTtywZHfNrlWq44MWAEAmGYcHRd6V9Fc/BtSRY4qx9dxyFwZzPQ7FQrT7nG33WaiuSjWb4WAdBdGWbQNRz/HeFtj95AFAkY0fu66VP0uo1KPdxcKWGB6FvxAFKQT/kWwnF1ksINWEhIZUfhcGSmmrPtUuQn3Ja1rn3Z5/nMBE02S4WZUTafqV+hRkU0Yu/T9yafGZDCcCmTKxkdah/7XWEtofF7Cn3Yy+SH0rvA/ArRoTWvmQrV3Mn87lN9PYu6QBU5ilhCiTrtnQi40oEMwvyVns5R8JJI84klUl0oIBzzCdHT7XN8t/lkdYueVHDjlriWg6tTt/+/3k+fRXnhGkVmxF9qV42mTCUn9KmDljhPQ+uRiMv599PxyVmmCTN54oLnRmPMXs6Boc73AaqVOUslTH8sOTZwdYZnVmkUH9Q5aMKW5QsX2ahqrEdxWTG3yBlqni6LhW8HiukmWQD1QSqW6EajwW1BJgKvnHEovf+rGvb8Qu1oChJHQvB43/RjkrDDfESxZS19UY1yYZYc2Swpt83Pp5coYn0uOQwoBBgjSwLElVKWirvcLfmYSmm40btFVY5fwRB99ZJLqN8/cq6wQjOlgK6M5F4rzoa0q/3CwT3f+bIM/ESB4bmIqq5HOkDkMCqZenq0l7mbQjsf8kjZHevy1LV2I93QMzS6KgZWYaKvsgrvYVLUIicVWMOQtqUyFzxBf1snMHIs9ceF2ghGjJF+73YrrJvaK6CFgZJAPswfuc7s8EkxpfntqSYG k9bCN2Y5 nayrx8McJuOIbTT3FZH4LjpTpLv7Q7sD5kXE6OMyCoDsb4hGxDPOtR2yg+6NZkkXD2X8DfZ5cLYyh91nsVpRRVEMpCj7JVrXfVdtjPwEe6fWD4+p88v0/BV/CQvYDp9A6UZoQ0zj8JZUPfpBP/qEhlP6stK59nOuJooF+fKsg7ne2EmRWOUezjzsYEKFINwhonzrgx1Z2KLFPs62SfeOGbIXR4rtOJA5dSxyl89hW3eumJ7fRUrK6G1OCbQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: This is an off-by-one bug which is common in unwinders, due to the fact that the address on the stack points to the return address rather than the call address. So, for example, when the last instruction of a function is a function call (e.g., to a noreturn function), it can cause the unwinder to incorrectly try to unwind from the function after the callee. foo: ... bl bar ... end of function and thus next function ... which results in LR pointing into the next function. Fixed this by subtracting 1 from frmae->pc in the call frame (but not exception frames) like ORC on x86 does. Refer to the unwind_next_frame function in the unwind_orc.c Suggested-by: Josh Poimboeuf Link: https://lkml.kernel.org/lkml/20240305175846.qnyiru7uaa7itqba@treble/ Signed-off-by: Jiangfeng Xiao --- arch/arm/include/asm/stacktrace.h | 4 ---- arch/arm/kernel/stacktrace.c | 2 -- arch/arm/kernel/traps.c | 4 ++-- arch/arm/kernel/unwind.c | 18 +++++++++++++++--- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/arch/arm/include/asm/stacktrace.h b/arch/arm/include/asm/stacktrace.h index 360f0d2..07e4c16 100644 --- a/arch/arm/include/asm/stacktrace.h +++ b/arch/arm/include/asm/stacktrace.h @@ -21,9 +21,7 @@ struct stackframe { struct llist_node *kr_cur; struct task_struct *tsk; #endif -#ifdef CONFIG_UNWINDER_FRAME_POINTER bool ex_frame; -#endif }; static __always_inline @@ -37,9 +35,7 @@ void arm_get_current_stackframe(struct pt_regs *regs, struct stackframe *frame) frame->kr_cur = NULL; frame->tsk = current; #endif -#ifdef CONFIG_UNWINDER_FRAME_POINTER frame->ex_frame = in_entry_text(frame->pc); -#endif } extern int unwind_frame(struct stackframe *frame); diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c index 620aa82..1abd4f9 100644 --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c @@ -154,9 +154,7 @@ static void start_stack_trace(struct stackframe *frame, struct task_struct *task frame->kr_cur = NULL; frame->tsk = task; #endif -#ifdef CONFIG_UNWINDER_FRAME_POINTER frame->ex_frame = in_entry_text(frame->pc); -#endif } void arch_stack_walk(stack_trace_consume_fn consume_entry, void *cookie, diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 3bad79d..b64e442 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -84,10 +84,10 @@ void dump_backtrace_entry(unsigned long where, unsigned long from, printk("%sFunction entered at [<%08lx>] from [<%08lx>]\n", loglvl, where, from); #elif defined CONFIG_BACKTRACE_VERBOSE - printk("%s[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", + pr_warn("%s[<%08lx>] (%ps) from [<%08lx>] (%pB)\n", loglvl, where, (void *)where, from, (void *)from); #else - printk("%s %ps from %pS\n", loglvl, (void *)where, (void *)from); + pr_warn("%s %ps from %pB\n", loglvl, (void *)where, (void *)from); #endif if (in_entry_text(from) && end <= ALIGN(frame, THREAD_SIZE)) diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c index 9d21921..f2baf92 100644 --- a/arch/arm/kernel/unwind.c +++ b/arch/arm/kernel/unwind.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -416,8 +417,14 @@ int unwind_frame(struct stackframe *frame) pr_debug("%s(pc = %08lx lr = %08lx sp = %08lx)\n", __func__, frame->pc, frame->lr, frame->sp); - - idx = unwind_find_idx(frame->pc); + /* + * For a call frame (as opposed to a exception frame), when the last + * instruction of a function is a function call (e.g., to a noreturn + * function), it can cause the unwinder incorrectly try to unwind + * from the function after the callee, fixed this by subtracting 1 + * from frame->pc in the call frame like ORC on x86 does. + */ + idx = unwind_find_idx(frame->ex_frame ? frame->pc : frame->pc - 1); if (!idx) { if (frame->pc && kernel_text_address(frame->pc)) { if (in_module_plt(frame->pc) && frame->pc != frame->lr) { @@ -427,6 +434,7 @@ int unwind_frame(struct stackframe *frame) * the state of the stack or the register file */ frame->pc = frame->lr; + frame->ex_frame = in_entry_text(frame->pc); return URC_OK; } pr_warn("unwind: Index not found %08lx\n", frame->pc); @@ -454,6 +462,7 @@ int unwind_frame(struct stackframe *frame) if (frame->pc == frame->lr) return -URC_FAILURE; frame->pc = frame->lr; + frame->ex_frame = in_entry_text(frame->pc); return URC_OK; } else if ((idx->insn & 0x80000000) == 0) /* prel31 to the unwind table */ @@ -515,6 +524,7 @@ int unwind_frame(struct stackframe *frame) frame->lr = ctrl.vrs[LR]; frame->pc = ctrl.vrs[PC]; frame->lr_addr = ctrl.lr_addr; + frame->ex_frame = in_entry_text(frame->pc); return URC_OK; } @@ -544,6 +554,7 @@ void unwind_backtrace(struct pt_regs *regs, struct task_struct *tsk, */ here: frame.pc = (unsigned long)&&here; + frame.ex_frame = false; } else { /* task blocked in __switch_to */ frame.fp = thread_saved_fp(tsk); @@ -554,11 +565,12 @@ void unwind_backtrace(struct pt_regs *regs, struct task_struct *tsk, */ frame.lr = 0; frame.pc = thread_saved_pc(tsk); + frame.ex_frame = false; } while (1) { int urc; - unsigned long where = frame.pc; + unsigned long where = frame.ex_frame ? frame.pc : frame.pc - 1; urc = unwind_frame(&frame); if (urc < 0) -- 1.8.5.6