From patchwork Fri Dec 15 18:26:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliot Berman X-Patchwork-Id: 179511 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp9487749dys; Fri, 15 Dec 2023 10:27:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IEWwHKB5B2UtFRx9NE4WSk3mAyyle5F2sN9Tl2qv90+rYw31tk59uQ6kaLHtn5lQ5HHWM67 X-Received: by 2002:a0c:eb43:0:b0:67f:1ec:5189 with SMTP id c3-20020a0ceb43000000b0067f01ec5189mr4638092qvq.64.1702664844975; Fri, 15 Dec 2023 10:27:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702664844; cv=none; d=google.com; s=arc-20160816; b=YN3/vSp+QnBL7//qikrbpbdZ5vbOENsj4G2b7Yf/IYVWZ5hgdj88jVyjRuPcf7LumA bEeU43NBn7ttz8ADaL74hM5u8Tsn+WMmNPbNdhrSylxWM+UliyAPF/VfK3/zULrhGzm+ P3ff+aVsDtINZTQat0/zAQj8qDbF1xQrPw4qBADz2avXFnMJQ8ypqEROUo+2x96o4iDY lxDrZb8wT9vyI9nKdTMyz/8u3xLLsK/iyq1LHp8A0E5CcAS2OOSCS08uBoH6+j4rxCCo uowalZdEgMvaNdqieeA8BkiquhEQJKmP1q23PGTm4tjCakFUz2tUf4l0LfOpyr/EAqR1 pemQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:message-id:content-transfer-encoding:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:subject:date :from:dkim-signature; bh=t6sjwTTEMurBtYFGKNA1rJneCPYBdA2fvAB/fMn1cDk=; fh=9wB+g52STLklkKR6UOYj78YLurD2rrEJEMN9cM/2Ax8=; b=ZyKwArgBGVcaZGah/A/1coTxrFJhWmb/jpn73nP5jx2nTusA9/VFUA10ikFK6lHRX4 I1BNuYJgVxVq7yIjjc5D3Gs1opIO9WXO0AT42qk5wpH5Y8PEliKwRsxokquT+urtmGIF COiyykJdSpFDwioPyBp307fqvBZx9Wc8s5S1PahsjwbERwFJgwUGj58SyelJYWwsP2d/ n4Oq56snG7z7H0OnxJgL+X0Q5hDeso1Ny2/8Rf0aevi9XAWT7EuFbyR6QuVZsLMpL6cz ZmUDEHK/HfNArAbYUPOo0Qa+W+z84Ri4igd06UqXjE3fi4ckIwpcGIHzUAMlrG9WlZUY ZK0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=WDql3P5U; spf=pass (google.com: domain of linux-kernel+bounces-1526-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1526-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id j8-20020a0ce008000000b0067f19650cbcsi1733771qvk.316.2023.12.15.10.27.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 10:27:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-1526-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=WDql3P5U; spf=pass (google.com: domain of linux-kernel+bounces-1526-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1526-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id BDDFE1C23371 for ; Fri, 15 Dec 2023 18:27:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 23DB041864; Fri, 15 Dec 2023 18:27:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="WDql3P5U" X-Original-To: linux-kernel@vger.kernel.org Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 180403FE40; Fri, 15 Dec 2023 18:27:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3BFIDXRU018255; Fri, 15 Dec 2023 18:26:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:date:subject:mime-version:content-type :content-transfer-encoding:message-id:to:cc; s=qcppdkim1; bh=t6s jwTTEMurBtYFGKNA1rJneCPYBdA2fvAB/fMn1cDk=; b=WDql3P5Uu4yoQSjEmkp jvL2HXRLgC0lbOC0inGuRz0rKgUYswXgtJWhEmSv5NwRllAyFlN0tAt0TlUC1qw/ 2J4J9qEMN439hpHYG+RYY608nTR5GgJyUHEIwQPHG6y3WBoAh4OAMbu2zpxpD2Z0 ALCVo9bYrjnEAWQlGb7rqgKQOoodMVKP77T/A8LK3Uz67p5HGNqosVeH8XkpCzUT vf1CNfiJBgiKj8EmFHtQBvdZqOWtq76Dzq9GJurkJhF67upf9twp9HnudegCDVZk Y085iGCaVahUFmy7snP/XS22dUjK2F7DwQXT8WVUQXT2AFZw/Bsx65IFugh7FvVU usQ== Received: from nasanppmta01.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3v0up201sm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 15 Dec 2023 18:26:55 +0000 (GMT) Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3BFIQtrd001897 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 15 Dec 2023 18:26:55 GMT Received: from [169.254.0.1] (10.49.16.6) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Fri, 15 Dec 2023 10:26:54 -0800 From: Elliot Berman Date: Fri, 15 Dec 2023 10:26:40 -0800 Subject: [PATCH] scripts/decode_stacktrace.sh: Use LLVM environment variable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <20231215-llvm-decode-stacktrace-v1-1-201cb86f4879@quicinc.com> X-B4-Tracking: v=1; b=H4sIAF+afGUC/4WNTQ6CMBBGr0JmbU1/VKgr72FY4HSUidBqi42Gc HcrF3D5XvK9b4ZEkSnBsZohUubEwRdQmwqw7/yNBLvCoKU2SqudGIY8CkcYHIk0dXifYockpN2 bxtZWyoODMn5EuvJ7DZ/bwj2nKcTP+pPVz/5NZiWUaKy+1Abrxhp9er4Y2eMWwwjtsixfUfICO L4AAAA= To: Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Manuel Traut CC: , , , Elliot Berman X-Mailer: b4 0.13-dev X-ClientProxiedBy: nalasex01b.na.qualcomm.com (10.47.209.197) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: 63bvn7dcg4qWbRItjJ2-hdFyotm5vUcs X-Proofpoint-ORIG-GUID: 63bvn7dcg4qWbRItjJ2-hdFyotm5vUcs X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-09_01,2023-12-07_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 bulkscore=0 mlxscore=0 phishscore=0 adultscore=0 suspectscore=0 mlxlogscore=427 impostorscore=0 priorityscore=1501 clxscore=1011 malwarescore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2312150129 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785373492829678927 X-GMAIL-MSGID: 1785373492829678927 When using LLVM as the compiler, decode_stacktrace should also use llvm-addr2line. Check if LLVM is set and add the appropriate suffix/prefix. Signed-off-by: Elliot Berman Tested-by: Justin Stitt --- scripts/decode_stacktrace.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) --- base-commit: 3f7168591ebf7bbdb91797d02b1afaf00a4289b1 change-id: 20231214-llvm-decode-stacktrace-09538979006d Best regards, diff --git a/scripts/decode_stacktrace.sh b/scripts/decode_stacktrace.sh index 564c5632e1a2..189b00f4e120 100755 --- a/scripts/decode_stacktrace.sh +++ b/scripts/decode_stacktrace.sh @@ -16,6 +16,16 @@ elif type c++filt >/dev/null 2>&1 ; then cppfilt_opts=-i fi +if [[ "${LLVM}" == "1" ]] ; then + addr2line="llvm-addr2line" +elif [[ "${LLVM}" == */ ]] ; then + addr2line="${LLVM}llvm-addr2line" +elif [[ "${LLVM}" == -* ]] ; then + addr2line="llvm-addr2line${LLVM}" +else + addr2line="${CROSS_COMPILE}addr2line" +fi + if [[ $1 == "-r" ]] ; then vmlinux="" basepath="auto" @@ -169,7 +179,7 @@ parse_symbol() { if [[ $aarray_support == true && "${cache[$module,$address]+isset}" == "isset" ]]; then local code=${cache[$module,$address]} else - local code=$(${CROSS_COMPILE}addr2line -i -e "$objfile" "$address" 2>/dev/null) + local code=$(${addr2line} -i -e "$objfile" "$address" 2>/dev/null) if [[ $aarray_support == true ]]; then cache[$module,$address]=$code fi