From patchwork Thu May 18 08:58:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: guo.ziliang@zte.com.cn X-Patchwork-Id: 95718 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp349591vqo; Thu, 18 May 2023 02:14:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5va4u2/YHhJwr6Qp4weXnRSyd+NgqxIg5u/I0pJtTDp2KSjEuzo++99bm1XfErMlrQ46K/ X-Received: by 2002:aa7:88ca:0:b0:63f:120a:1dc3 with SMTP id k10-20020aa788ca000000b0063f120a1dc3mr4861989pff.0.1684401251639; Thu, 18 May 2023 02:14:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684401251; cv=none; d=google.com; s=arc-20160816; b=mVUfl2Gg4r4aEwzsmmQN5VDuNMpVoF+d2YcCNJuZMAWW4H8N9FXv8kXlt+tZyf2010 +U8XICMjH+Fcxbr4vKxDUqFhftRcKeb9Gqrjta2NtOT9Oe7z1uj33BabqnDmfRSlcpAC CDfa4WKWondIgkfbZbHWaWGmaOVJsaHBhoZwdeWma+sclwLYIzFOQYtz7hGUbkDneaQa uxNFP5K404zCbXLVroYxgfdjiJTMglFOW+DRsnIhAe8oGYW0LW0YJHVSiBQIICBsVGFq J64trgRXGU7Sj5JGLdOoV07pwZ1vfqqOcfNfhx+CABeGzLpkSeBmNRUIqq19AEBB1myy jYHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=2pqvK4V+kAwKGq3CLz2nfS4O7QUCrkb3z0z9Eqw+dRg=; b=CgEcldNGsELeRuLqWW6AlAGqVzznLrIwBsVV26NsjauvFmBPo0MHLf8QNKUnAbSfzk PfJkzaf2qjK9AjYdHMN/0R5Ytvio1bFgqdPl/iNHSyz+qPTy2yDBujtBxEMo81UKrPaA cxEl5tT9Q3ZMsNjwJxTfKpj++KrdKRkRMfvmT+Tishk8+/8eK8v0K3b6P+jHuUzWhfuj vP7DOOLtoE7Obs5sRYZ8FU1hlYNMFOVOJ1zaiNlTVJ+kE2Vdbp8PeerzjSfCmDqJzw7U //re6aiQrOzjMKq+qNqFuUi/J+5mEViTjnYzVYvvBQcwxSXnGOHnT8bQtD+c0/MKPoOA BBnA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y26-20020aa79afa000000b006375460490dsi1208907pfp.136.2023.05.18.02.13.57; Thu, 18 May 2023 02:14:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230061AbjERI6Q (ORCPT + 99 others); Thu, 18 May 2023 04:58:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229804AbjERI6P (ORCPT ); Thu, 18 May 2023 04:58:15 -0400 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 558601BE9 for ; Thu, 18 May 2023 01:58:13 -0700 (PDT) Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4QMP5H3blQz5B14p; Thu, 18 May 2023 16:58:11 +0800 (CST) Received: from xaxapp02.zte.com.cn ([10.88.97.241]) by mse-fl2.zte.com.cn with SMTP id 34I8w3fT024754; Thu, 18 May 2023 16:58:04 +0800 (+08) (envelope-from guo.ziliang@zte.com.cn) Received: from mapi (xaxapp03[null]) by mapi (Zmail) with MAPI id mid32; Thu, 18 May 2023 16:58:06 +0800 (CST) Date: Thu, 18 May 2023 16:58:06 +0800 (CST) X-Zmail-TransId: 2afb6465e89e473-3b03c X-Mailer: Zmail v1.0 Message-ID: <202305181658063480018@zte.com.cn> Mime-Version: 1.0 From: To: , Cc: , , , , Subject: =?utf-8?q?=C2=A0=5BPATCH_linux-next=5D_ARM=3A_unwind=3A_use_ex=5Ffr?= =?utf-8?q?ame_with_CONFIG=5FUNWINDER=5FFRAME=5FPOINTER?= X-MAIL: mse-fl2.zte.com.cn 34I8w3fT024754 X-Fangmail-Gw-Spam-Type: 0 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 6465E8A3.000/4QMP5H3blQz5B14p X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766222726788082583?= X-GMAIL-MSGID: =?utf-8?q?1766222726788082583?= From: guo ziliang We define ex_frame with CONFIG_UNWINDER_FRAME_POINTER in struct stackframe, struct stackframe { ...... #ifdef CONFIG_UNWINDER_FRAME_POINTER bool ex_frame; #endif }; but we just use ex_frame without CONFIG_UNWINDER_FRAME_POINTER in return_address() and unwind_frame(). Maybe we should fix it. Signed-off-by: guo ziliang Acked-by: Linus Walleij --- arch/arm/kernel/return_address.c | 2 ++ arch/arm/kernel/stacktrace.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c index ac15db6..dae49e7 100644 --- a/arch/arm/kernel/return_address.c +++ b/arch/arm/kernel/return_address.c @@ -47,7 +47,9 @@ void *return_address(unsigned int level) frame.kr_cur = NULL; frame.tsk = current; #endif +#ifdef CONFIG_UNWINDER_FRAME_POINTER frame.ex_frame = false; +#endif walk_stackframe(&frame, save_return_addr, &data); diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c index 620aa82..338f552 100644 --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c @@ -82,6 +82,7 @@ int notrace unwind_frame(struct stackframe *frame) if (frame_pointer_check(frame)) return -EINVAL; +#ifdef CONFIG_UNWINDER_FRAME_POINTER /* * When we unwind through an exception stack, include the saved PC * value into the stack trace. @@ -102,6 +103,7 @@ int notrace unwind_frame(struct stackframe *frame) frame->ex_frame = false; return 0; } +#endif /* restore the registers from the stack frame */ #ifdef CONFIG_CC_IS_CLANG @@ -119,8 +121,10 @@ int notrace unwind_frame(struct stackframe *frame) (void *)frame->fp, &frame->kr_cur); #endif +#ifdef CONFIG_UNWINDER_FRAME_POINTER if (in_entry_text(frame->pc)) frame->ex_frame = true; +#endif return 0; }