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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B93DC282C8 for ; Mon, 28 Jan 2019 17:32:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2FD322148E for ; Mon, 28 Jan 2019 17:32:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548696738; bh=ha13/+c1hI0UVFahTPcIqef+Yu7NvF8dQGclnD8mjb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2EleCKQG9j9L6O+k70dU66mIWOkDpbvwgrB2zUoaR4dKq/VrTH14eIX6XIw2/Rcp/ DRMRU3APJibP6Ie4Hldip8IR6/yCzF9Yor7TJl/U9uUTCwJ1gvBpA2WAMDjLaPdVqI kmcR9ZNuqoiTHODxlKlUmW5uCSWSAyXtXQegEO1U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729956AbfA1P5k (ORCPT ); Mon, 28 Jan 2019 10:57:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:43112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730260AbfA1P5k (ORCPT ); Mon, 28 Jan 2019 10:57:40 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CC72421783; Mon, 28 Jan 2019 15:57:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548691059; bh=ha13/+c1hI0UVFahTPcIqef+Yu7NvF8dQGclnD8mjb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w6g5q67R37jju9CzuGqlPnMCuAxnYqJfTX5bOIVt6ali3bvLC/VqcllLGHuTghkZE d/2utTKykzAhNTynCnxV4PAl8dc+YhPkLrXwK610bbmIgice5wcTO7gis3lng09C1i qZ8Ac27B1DZHansvYpuT68TCLmDKoxr4aSA0/9Qo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marc Zyngier , Will Deacon , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL 4.20 276/304] scripts/decode_stacktrace: only strip base path when a prefix of the path Date: Mon, 28 Jan 2019 10:43:13 -0500 Message-Id: <20190128154341.47195-276-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marc Zyngier [ Upstream commit 67a28de47faa83585dd644bd4c31e5a1d9346c50 ] Running something like: decodecode vmlinux . leads to interested results where not only the leading "." gets stripped from the displayed paths, but also anywhere in the string, displaying something like: kvm_vcpu_check_block (arch/arm64/kvm/virt/kvm/kvm_mainc:2141) which doesn't help further processing. Fix it by only stripping the base path if it is a prefix of the path. Link: http://lkml.kernel.org/r/20181210174659.31054-3-marc.zyngier@arm.com Signed-off-by: Marc Zyngier Cc: Will Deacon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- scripts/decode_stacktrace.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/decode_stacktrace.sh b/scripts/decode_stacktrace.sh index 64220e36ce3b..98a7d63a723e 100755 --- a/scripts/decode_stacktrace.sh +++ b/scripts/decode_stacktrace.sh @@ -78,7 +78,7 @@ parse_symbol() { fi # Strip out the base of the path - code=${code//$basepath/""} + code=${code//^$basepath/""} # In the case of inlines, move everything to same line code=${code//$'\n'/' '} -- 2.19.1