From patchwork Wed Jul 12 07:56:58 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: 118910 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp989960vqm; Wed, 12 Jul 2023 01:14:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlGuoQUpQxY4bt9dVEBvZPUT+4GmOtNIl/3V/1gTg1ET7SER9TRDblAtt48COWEPwr1J5GcI X-Received: by 2002:a05:6a20:8f0c:b0:131:47f7:e80d with SMTP id b12-20020a056a208f0c00b0013147f7e80dmr12311129pzk.23.1689149683769; Wed, 12 Jul 2023 01:14:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689149683; cv=none; d=google.com; s=arc-20160816; b=pcP0ss7oQyZTya1sdKyTJJUS5SSoMWQnRQQeG63+V8d63M7y1UoHigM8oZAiJ5rfsW C+mcq/jpT4T4tnC+bCamObRK7Ep3izMlSwdPAuP87r3mzCtN+1IoH66mhWLzyU4QB6BU ScMJC/tkVDEZKUuBGyhT35YTKuXUhk9rroBpJAA5QLY2KuRPEOmLSF4+oDjDmg26aaUs iboQPshaVMMW3t6ZRv5rHGwDNvSUPbgrIGskf/bO3OksDxHiASsRX9opQ492LJ3IJfz1 2pe+w88nsoRyF2ijU75yQfHPirL2TGN2EIe5zsiDYG2maoItWOtOy5ftYw0TxutkYF6e cHkQ== 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=pAgaV08b6OrTCSWcVor7UcUK0uSfnBz1bmNvRVb6iZ8=; fh=o7frVIJjX7RztSrwO8IJZ+nfsM7eX5XJlpSlHf1R85w=; b=OwBNP/sIzwFttG+d8p1Glwvdz8rOTog7ZP2Dhz2vZaW/Ra4OqnJnCRfQe/QnmVZG01 bFZkAH6sU+3mEJ0I5iC9kIp8glG6BTir0TlepEyD7cf2ZWQdOeSdUNFq12hdFwE4x6mT zHDjWPky2t1TwqmbN8rxXVvuqIKALgJRF0Nb3namhVRW2Z90Ucr6VpPKC1X0ItPLh0PL xCx1QkVnE6K+NlhUHWpQ9/kjoxgTIemvLG16DATrwzwCOKSO3H15AConKF46mYMnvWlX uwfW6EnMDfOFLgAXcBv8own6GMQO5W4vubYrr/FZ5BKLfZrrchl+J9HEjWr8SDUnN+3f uVAw== 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 u2-20020a631402000000b00553d7157e83si2730382pgl.134.2023.07.12.01.14.30; Wed, 12 Jul 2023 01:14:43 -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 S231359AbjGLH5f (ORCPT + 99 others); Wed, 12 Jul 2023 03:57:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232048AbjGLH50 (ORCPT ); Wed, 12 Jul 2023 03:57:26 -0400 Received: from mxct.zte.com.cn (mxct.zte.com.cn [58.251.27.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA3C61992 for ; Wed, 12 Jul 2023 00:57:22 -0700 (PDT) Received: from mxde.zte.com.cn (unknown [10.35.20.165]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mxct.zte.com.cn (FangMail) with ESMTPS id 4R197c6YGRzbhY8 for ; Wed, 12 Jul 2023 15:57:16 +0800 (CST) Received: from mxhk.zte.com.cn (unknown [192.168.250.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mxde.zte.com.cn (FangMail) with ESMTPS id 4R197P6mhYz6Jqrv for ; Wed, 12 Jul 2023 15:57:05 +0800 (CST) Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (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 4R197L5Y8zz5R9jt; Wed, 12 Jul 2023 15:57:02 +0800 (CST) Received: from xaxapp02.zte.com.cn ([10.88.97.241]) by mse-fl1.zte.com.cn with SMTP id 36C7utTv023239; Wed, 12 Jul 2023 15:56:55 +0800 (+08) (envelope-from guo.ziliang@zte.com.cn) Received: from mapi (xaxapp01[null]) by mapi (Zmail) with MAPI id mid32; Wed, 12 Jul 2023 15:56:58 +0800 (CST) Date: Wed, 12 Jul 2023 15:56:58 +0800 (CST) X-Zmail-TransId: 2af964ae5cca56f-ed69e X-Mailer: Zmail v1.0 Message-ID: <202307121556582695428@zte.com.cn> Mime-Version: 1.0 From: To: , , Cc: , , , Subject: =?utf-8?q?=5BPATCH_linux-next=5D_ARM=3A_unwind=3A_use_ex=5Fframe_wi?= =?utf-8?q?th_CONFIG=5FUNWINDER=5FFRAME=5FPOINTER?= X-MAIL: mse-fl1.zte.com.cn 36C7utTv023239 X-Fangmail-Gw-Spam-Type: 0 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 64AE5CDB.000/4R197c6YGRzbhY8 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,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: INBOX X-GMAIL-THRID: 1771201819090531367 X-GMAIL-MSGID: 1771201819090531367 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(). so when we config CONFIG_FRAME_POINTER=y and CONFIG_ARM_UNWIND=n, compile failed: arch/arm/kernel/stacktrace.c: In function 'unwind_frame': arch/arm/kernel/stacktrace.c:44:11: error: 'struct stackframe' has no member named 'ex_frame' if (frame->ex_frame) { ^~ arch/arm/kernel/stacktrace.c:57:8: error: 'struct stackframe' has no member named 'ex_frame' frame->ex_frame = false; ^~ arch/arm/kernel/stacktrace.c:67:8: error: 'struct stackframe' has no member named 'ex_frame' frame->ex_frame = true; ^~ Maybe we should fix it. Signed-off-by: guo ziliang --- 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; }