From patchwork Thu Jul 30 20:51:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 11693671 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 32BCA14E3 for ; Thu, 30 Jul 2020 20:52:13 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 09AB420829 for ; Thu, 30 Jul 2020 20:52:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jRq+sDkF"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="h7wTTnVr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 09AB420829 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=jMte9CnjSdZqsg/X0UkjOlAvnlSeYNgeh/ALjkn8FEw=; b=jRq+sDkFORlOJZKBP1eQ/LNpP UousNX3SCWh98ZoQrcQzZ4wGkfQ8/A6i3EulwLgq83gvNpxmjDLuaZoMNrPcUqYXGQfO2E4lzAwYF e6W1VahOnRpC4TbevNorWyLSYO6/mAWsIaIC12DYhu+Qw+juFMgZajYIUhkluysDuecw/fFxNHBrq G1WP7OmEEK0oxsSl012CoMhr+XU5HioiW/MLz2KNvsw/bz1dtrPi/6DaRpxi8OKKe89JyJqPdSeZ6 9uf9gpNUylyVJxeq/92LHEB3Kue0GV+bO/gzqadCj33SY6VZ2BqlOsXGWdmFfo5fQkMPlO8rgr76f 2TtVcoqZg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k1FWu-0004o4-DG; Thu, 30 Jul 2020 20:51:56 +0000 Received: from mail-qt1-x84a.google.com ([2607:f8b0:4864:20::84a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k1FWc-0004gs-B8 for linux-arm-kernel@lists.infradead.org; Thu, 30 Jul 2020 20:51:39 +0000 Received: by mail-qt1-x84a.google.com with SMTP id d24so12030518qtg.23 for ; Thu, 30 Jul 2020 13:51:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=ydEFx7nL1QHetJ3IzZOqahIDDjnqGsyqZ8n++t96BPs=; b=h7wTTnVreiKdJy+S3fm1G5Q+3oIaI3sFumAyVhgRi/n9ezm7wRwkGq12SeApvBf77Z yX7kGgMRDPif/nTYK3URgcmC1Hxjt9vaylvzFShL86Y577Y6AIKwncRD7f+EY3NuLIgC p7gZGl2vcGUf1bULilSS8BokmMppT1Dk6tDPMc2loxDlz/Sj0BwExazMghpSO2ttTSYm QZT41EGqN8BUowWyiJBATS4vAbv+FJCk9y9IxDLnYkcJddcQ3rn2W7WaH/CaXUGuKrou Q/E6wrfVPA3s3Q8HvtnjIGhotWF6O53G/C61bFtcN5o/TijH9HAU744EsMUgY5wpo+GY jLwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ydEFx7nL1QHetJ3IzZOqahIDDjnqGsyqZ8n++t96BPs=; b=YJTBowEnUK5NPtKnDQuzuK7JgneFrVbcXMrZDVrENwq0qAO865qc6BVHV7a0qRRT+G yvX6QXK0Jr71H5AwAEZPysiVDCGkRc+CLC9dm3538ZATgormr4rNZunl6jj0vyXZtOpV BXlsMs4ftRM0R7VTXmj6pVh7dvdchsnNxEvXBsB7Pj8oW9D6stuUR5ddI6zvKgjXhE00 Wu6m9J55sLCCZB3R5NBUSy/AyS0kb0yIkAc5LFMBhCdxPBuzrd9LJGX64K2E5xrqgC3t xTu2IgsaVC2nfAdwaGDbHHl+/8Si9xW7MikAPu4BZL9vr9C8rdCi+3ek/4cRUK7SexhF ZDvw== X-Gm-Message-State: AOAM531woZYxn/F6ftIXTAnDaVt56xlw5BvWN2fHnN+Pl37os4EfDPfm 3a0yqubur/7AYjhBSNnYGQv3AQaTpQAIaIuACpk= X-Google-Smtp-Source: ABdhPJypnfQMkIkUmhttCt6JJcEy5+kESjzSY6DmkgV227v2mbIs9Wfta5Fz6VMfPMaMbwf8XRvCb9EMykZZanPJTgU= X-Received: by 2002:a0c:b891:: with SMTP id y17mr1039225qvf.2.1596142294513; Thu, 30 Jul 2020 13:51:34 -0700 (PDT) Date: Thu, 30 Jul 2020 13:51:11 -0700 In-Reply-To: <20200730205112.2099429-1-ndesaulniers@google.com> Message-Id: <20200730205112.2099429-4-ndesaulniers@google.com> Mime-Version: 1.0 References: <20200730205112.2099429-1-ndesaulniers@google.com> X-Mailer: git-send-email 2.28.0.163.g6104cc2f0b6-goog Subject: [PATCH 3/4] ARM: backtrace-clang: give labels more descriptive names From: Nick Desaulniers To: Nathan Huckleberry , Russell King X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200730_165138_466799_CF8F3EAD X-CRM114-Status: GOOD ( 13.09 ) X-Spam-Score: -7.7 (-------) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-7.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:84a listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 DKIMWL_WL_MED DKIMwl.org - Medium sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nick Desaulniers , Chunyan Zhang , Dmitry Safonov <0x7f454c46@gmail.com>, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Miles Chen , linux-mediatek@lists.infradead.org, Matthias Brugger , Andrew Morton , Lvqiang Huang , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Removes the 1004 label; it was neither a control flow target, nor an instruction we expect to produce a fault. Gives the labels slightly more readable names. The `b` suffixes are handy to disambiguate between labels of the same identifier when there's more than one. Since these labels are unique, let's just give them names. Signed-off-by: Nick Desaulniers --- arch/arm/lib/backtrace-clang.S | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/arch/arm/lib/backtrace-clang.S b/arch/arm/lib/backtrace-clang.S index 40eb2215eaf4..7dad2a6843a5 100644 --- a/arch/arm/lib/backtrace-clang.S +++ b/arch/arm/lib/backtrace-clang.S @@ -121,8 +121,8 @@ for_each_frame: tst frame, mask @ Check for address exceptions * start. This value gets updated to be the function start later if it is * possible. */ -1001: ldr sv_pc, [frame, #4] @ get saved 'pc' -1002: ldr sv_fp, [frame, #0] @ get saved fp +load_pc: ldr sv_pc, [frame, #4] @ get saved 'pc' +load_fp: ldr sv_fp, [frame, #0] @ get saved fp teq sv_fp, mask @ make sure next frame exists beq no_frame @@ -142,7 +142,7 @@ for_each_frame: tst frame, mask @ Check for address exceptions * registers for the current function, but the stacktrace is still printed * properly. */ -1003: ldr sv_lr, [sv_fp, #4] @ get saved lr from next frame +load_lr: ldr sv_lr, [sv_fp, #4] @ get saved lr from next frame tst sv_lr, #0 @ If there's no previous lr, beq finished_setup @ we're done. @@ -166,8 +166,7 @@ finished_setup: /* * Print the function (sv_pc) and where it was called from (sv_lr). */ -1004: mov r0, sv_pc - + mov r0, sv_pc mov r1, sv_lr mov r2, frame bic r1, r1, mask @ mask PC/LR for the mode @@ -182,7 +181,7 @@ finished_setup: * pointer the comparison will fail and no registers will print. Unwinding will * continue as if there had been no registers stored in this frame. */ -1005: ldr r1, [sv_pc, #0] @ if stmfd sp!, {..., fp, lr} +load_stmfd: ldr r1, [sv_pc, #0] @ if stmfd sp!, {..., fp, lr} ldr r3, .Lopcode @ instruction exists, teq r3, r1, lsr #11 ldr r0, [frame] @ locals are stored in @@ -201,7 +200,7 @@ finished_setup: mov frame, sv_fp @ above the current frame bhi for_each_frame -1006: adr r0, .Lbad +bad_frame: adr r0, .Lbad mov r1, loglvl mov r2, frame bl printk @@ -216,11 +215,10 @@ bad_lr: mov sv_fp, #0 ENDPROC(c_backtrace) .pushsection __ex_table,"a" .align 3 - .long 1001b, 1006b - .long 1002b, 1006b - .long 1003b, 1006b - .long 1004b, 1006b - .long 1005b, 1006b + .long load_pc, bad_frame + .long load_fp, bad_frame + .long load_lr, bad_frame + .long load_stmfd, bad_frame .long prev_call, bad_lr .popsection