From nobody Sun Feb 8 06:22:08 2026 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 37C97548F6 for ; Tue, 9 Apr 2024 02:32:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712629944; cv=none; b=n40AWzJivyAsy8UhTNXTJfroHu/8AzztfdH4t/DjAvelQ0wVbYtCKBgEj0FrHm/BGqZVr1/leUrisGU3oWnbz1vQG4vGMsSSUSqJ4SIEhraQwKk1sgjAIH7ZUXT4kvchxyg0wqS10DaFGcUmxlgNDiGeU+LSriVipUtr+kWqvNU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712629944; c=relaxed/simple; bh=zHgb1DbnyWnwYo9RlywRWcr9fcdSFqF5Ep8ycDoGlCM=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=g+g7uc7gQQkoPIF81/8auJz580KjIjJl6edDmqXRLK8sftc4nn36dh3C4vBnf4UwvCzwB+pDpd5KtjuJptTIz5Oq3KkY3EcIO4R/2ZDfVaiAd8RnmV6WLhtgQprbzJhayA0M9J6dRtAXedL3+N+K0MRgG3q6mhGROODpD2wAbXo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=xz+/+zvo; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="xz+/+zvo" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dd1395fd1bfso8705018276.0 for ; Mon, 08 Apr 2024 19:32:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712629942; x=1713234742; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=VEEizuBA0YDf+F6hxxsK9XiEMrVCNDKuwIuop/k9nwY=; b=xz+/+zvomO1c/SFI2o2akmfEGMN9KaDo80e9pvyjP++ljBpVNk78bRLjeiiWhwATW5 cJTr1tRccLQGOX3yvmcCOXoRZEs17coeJTfm4fybldzWz30L38ZHVxHq4ubE3/X1zxYe 1gAO+xH02wqZIX3MxDCDqX/pOrQlbEKFPqEB5I5G6QjYriAqtxpCuzStROaMfygLfGzS yQHstCV7tFD941UGdS2qJQL7hWPOeG1tWtUYDsN2o0+18FsN2axMECrCDUABBTCEjc// ZSmE7qOtjhJJTMF6qofIqoyuN7hYiTyGjUANbhQeQTlEbN7nMJ6YRPwzcQk+XV8Mvwuv 5FTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712629942; x=1713234742; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VEEizuBA0YDf+F6hxxsK9XiEMrVCNDKuwIuop/k9nwY=; b=VBgJqObfFxiiO2wwA2j/SO9SQqmNjFLtDDFFUNh/rzpyIgAKBJ6Yhn3KIXZ3ytuBoL vV/lNCIFMg9jPLLXh7SelAN3w5c/sDAIuX2O5u6OwdT27S/zI/pXMHNZNpVii1Ljiiae WiuqlL4oFNgG+A9ef5jBlflAR+dLe2TNgG30mPQSj0aYkl4ZDw0bW86R+N+i5z5tqNYD u66aDQpVK9PKAA3Tqm0CCQRA56rsBrHeiKiUOFL4bTtTm1GW3J4phlMiHmQ2442lW65/ B4l3f4vGjm5eKLZoZxb1bXKo6EP1T8RGkTxpCMz8ojVyOosshBd6eavsQ+GDcrPCtnSP Nkrg== X-Forwarded-Encrypted: i=1; AJvYcCV7maalaC4WOjT37bNHsytpWeV03FZWrLBe3YUkwBMZCj4HDEDPK0tCWuge3/+U716dDjpYZpiBC5bFTV8/kfkWBzU1nlCvCxgjzupC X-Gm-Message-State: AOJu0YyNfUeEGOfMQVJxjm2EM7G2gjGLtJA8RSMNaIrktz8BS9f4yA4z +YhLvvGEtXzwaiErsZ2LWiDhxwFe28UZBt+19dkiFE1ABJ70J5zaqPyl8klltJrKwhMLJH8U/eF aj8qZUA== X-Google-Smtp-Source: AGHT+IE/lTIb1w6m3oLvSH6LqosiDNwlIHfQKtduMtwdgVR0hA+1SlxrCW+9N5nSCHi+rxVOlZa0RIKPVMJJ X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:5520:7788:6b7d:7115]) (user=irogers job=sendgmr) by 2002:a05:6902:100a:b0:dda:ce5f:b4c3 with SMTP id w10-20020a056902100a00b00ddace5fb4c3mr3531327ybt.1.1712629942342; Mon, 08 Apr 2024 19:32:22 -0700 (PDT) Date: Mon, 8 Apr 2024 19:32:13 -0700 In-Reply-To: <20240409023216.2342032-1-irogers@google.com> Message-Id: <20240409023216.2342032-2-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240409023216.2342032-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Subject: [PATCH v1 1/4] perf build: Add shellcheck to tools/perf scripts From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Ravi Bangoria , Kajol Jain , Athira Rajeev , Oliver Upton , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Address shell check errors/warnings in perf-archive.sh and perf-completion.sh. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Build | 14 ++++++++++++++ tools/perf/perf-archive.sh | 2 +- tools/perf/perf-completion.sh | 23 ++++++++++++++++------- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/tools/perf/Build b/tools/perf/Build index aa7623622834..b0cb7ad8e6ac 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -59,3 +59,17 @@ perf-y +=3D ui/ perf-y +=3D scripts/ =20 gtk-y +=3D ui/gtk/ + +ifdef SHELLCHECK + SHELL_TESTS :=3D $(wildcard *.sh) + TEST_LOGS :=3D $(SHELL_TESTS:%=3D%.shellcheck_log) +else + SHELL_TESTS :=3D + TEST_LOGS :=3D +endif + +$(OUTPUT)%.shellcheck_log: % + $(call rule_mkdir) + $(Q)$(call echo-cmd,test)shellcheck -s bash -a -S warning "$<" > $@ || (c= at $@ && rm $@ && false) + +perf-y +=3D $(TEST_LOGS) diff --git a/tools/perf/perf-archive.sh b/tools/perf/perf-archive.sh index f94795794b36..6ed7e52ab881 100755 --- a/tools/perf/perf-archive.sh +++ b/tools/perf/perf-archive.sh @@ -34,7 +34,7 @@ if [ $UNPACK -eq 1 ]; then TARGET=3D`find . -regex "\./perf.*\.tar\.bz2"` TARGET_NUM=3D`echo -n "$TARGET" | grep -c '^'` =20 - if [ -z "$TARGET" -o $TARGET_NUM -gt 1 ]; then + if [ -z "$TARGET" ] || [ $TARGET_NUM -gt 1 ]; then echo -e "Error: $TARGET_NUM files found for unpacking:\n$TARGET" echo "Provide the requested file as an argument" exit 1 diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh index f224d79b89e6..69cba3c170d5 100644 --- a/tools/perf/perf-completion.sh +++ b/tools/perf/perf-completion.sh @@ -108,6 +108,8 @@ __perf__ltrim_colon_completions() =20 __perfcomp () { + # Expansion of spaces to array is deliberate. + # shellcheck disable=3DSC2207 COMPREPLY=3D( $( compgen -W "$1" -- "$2" ) ) } =20 @@ -127,13 +129,13 @@ __perf_prev_skip_opts () =20 let i=3Dcword-1 cmds_=3D$($cmd $1 --list-cmds) - prev_skip_opts=3D() + prev_skip_opts=3D"" while [ $i -ge 0 ]; do - if [[ ${words[i]} =3D=3D $1 ]]; then + if [[ ${words[i]} =3D=3D "$1" ]]; then return fi for cmd_ in $cmds_; do - if [[ ${words[i]} =3D=3D $cmd_ ]]; then + if [[ ${words[i]} =3D=3D "$cmd_" ]]; then prev_skip_opts=3D${words[i]} return fi @@ -164,9 +166,10 @@ __perf_main () $prev_skip_opts =3D=3D @(record|stat|top) ]]; then =20 local cur1=3D${COMP_WORDS[COMP_CWORD]} - local raw_evts=3D$($cmd list --raw-dump hw sw cache tracepoint pmu sdt) + local raw_evts local arr s tmp result cpu_evts =20 + raw_evts=3D$($cmd list --raw-dump hw sw cache tracepoint pmu sdt) # aarch64 doesn't have /sys/bus/event_source/devices/cpu/events if [[ `uname -m` !=3D aarch64 ]]; then cpu_evts=3D$(ls /sys/bus/event_source/devices/cpu/events) @@ -175,10 +178,12 @@ __perf_main () if [[ "$cur1" =3D=3D */* && ${cur1#*/} =3D~ ^[A-Z] ]]; then OLD_IFS=3D"$IFS" IFS=3D" " + # Expansion of spaces to array is deliberate. + # shellcheck disable=3DSC2206 arr=3D($raw_evts) IFS=3D"$OLD_IFS" =20 - for s in ${arr[@]} + for s in "${arr[@]}" do if [[ "$s" =3D=3D *cpu/* ]]; then tmp=3D${s#*cpu/} @@ -200,11 +205,13 @@ __perf_main () fi elif [[ $prev =3D=3D @("--pfm-events") && $prev_skip_opts =3D=3D @(record|stat|top) ]]; then - local evts=3D$($cmd list --raw-dump pfm) + local evts + evts=3D$($cmd list --raw-dump pfm) __perfcomp "$evts" "$cur" elif [[ $prev =3D=3D @("-M"|"--metrics") && $prev_skip_opts =3D=3D @(stat) ]]; then - local metrics=3D$($cmd list --raw-dump metric metricgroup) + local metrics + metrics=3D$($cmd list --raw-dump metric metricgroup) __perfcomp "$metrics" "$cur" else # List subcommands for perf commands @@ -278,6 +285,8 @@ if [[ -n ${ZSH_VERSION-} ]]; then let cword=3DCURRENT-1 emulate ksh -c __perf_main let _ret && _default && _ret=3D0 + # _ret is only assigned 0 or 1, disable inaccurate analysis. + # shellcheck disable=3DSC2152 return _ret } =20 --=20 2.44.0.478.gd926399ef9-goog From nobody Sun Feb 8 06:22:08 2026 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6815454BEF for ; Tue, 9 Apr 2024 02:32:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712629946; cv=none; b=LQHv3QHJHlz3pEmUPLNgfR0YusuU72HaDTi9iALFcN85F30XcqnKrMqTw5b6ijoBXF41ZzmM6dAaZyRsfxgCt5D6A3DFfoIWGlHEBM8Mxhbz5NCPdzdkdPFjOSHLy31I+LdTaoJJ/6LyTTyIJhOlBp2S7C6ewwwYnF7ZKNoObmg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712629946; c=relaxed/simple; bh=g5FISTb0SUz4N5bO73qDIESdt6Zvkkf5ticX23tz8Bc=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=u0UgGpaBnTyPnSnmyno3c/35AvBsvpuM/1+jzFKQwFNbl5h9FYIdLWDvYk2plYqezpJNpD593zLCFF5WZo9SUCOg9dmp+C+JYGJoU+Yol7JaL5yV1n7TQsTnDtsmqs7rOXaYpy4N4eB8wqInsyKWyqmuLmvRqt61/DWvdAqkJu0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=rtHKB4cu; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rtHKB4cu" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-60ff1816749so75605977b3.3 for ; Mon, 08 Apr 2024 19:32:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712629944; x=1713234744; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=LUCLlDEOF+eDEIPKja8ueM/Rrqkxl5/XYQOKdkpQkzo=; b=rtHKB4cu7defFE4KGVpxM94EV2s7SxXiEi5eWRjTaKIJXmgdqcZI8c2QdnkZY586En 62t4x2Y6ISckkcB1H77Jx/IcN6HQUMxNijUJWysA/fLdebJ/kTJxbYi/5fkLroiJ/UAt hqKjiCzJoC6kZ+QyrEAN28Ulv1RKlFUSZe4Xiq/OcvDOi9YHM5Y5EwdySOzQ1H6UfX7i nV7PDdH3Pn0lZ1i+19V4G60gbvQfgZZzpQOYuPv70MLKaYbT/gyjDoQ4gFtxf4tSLfUo RCdXcoIALCPq17t459Q41kCkS2MA2Z6e9QI2yB+ptre0ZhO1UvxCymnG+QUmQ0qYLu9J ZD+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712629944; x=1713234744; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LUCLlDEOF+eDEIPKja8ueM/Rrqkxl5/XYQOKdkpQkzo=; b=KAN3alZBpzdlG+XSASk1NAN2b1nm+gjfKEITq96i75IWxNk86crXIpgmivyeRR7Qpd Vqud2/fenMgxDmoAUhmPrYbKqOdlkqIrqd0yZyxMLyTRzj0sGAjcN3x7NK7PGqCF8FUj J8F+3FHZuX1Q/7Vdg7IdngC9cMveGIcCQTItM0aWKWN7PziptVk2pwZW2/hxUb6VHz3S hRqpRsoJFJCgON7+3vJbdH33/2JBO1weBn9hBIKsX1MgZ3VkcYGxhmoC03/dKZbx/IEY NF/xcIvt/bB6OArJAHHgwwIntfoNAtO0S61GKsTb7eRpe+63ICrohRNCgw/t371DdmUh UIOA== X-Forwarded-Encrypted: i=1; AJvYcCUfQ1GXuoyO1OLEAM1PIJ75z+7Q115pSGyZ25i6+7aPkpvEL8qwObwIGX1FzzNvmxbWqvX0qZIReW/kIjTgWuMEzTVPtoS0ZjHQYh6D X-Gm-Message-State: AOJu0Yylzvz3k1mnuED1r3TGc92rGc+qsEH1wzdaYqO9EKPkUd78F8W/ eGHXUxB/cz482d/RybxVlgooT6f0/niwO4LnLzRDsSC5XYREOaPMU0vNFiMoR/jBbIAJMghjQNa FtM6R4A== X-Google-Smtp-Source: AGHT+IGvQTYCP5+xDoLlENaNXCS0algoYiy4sK2dX6WUL4feZ6IfsnScgDm7nhrevc/FNjddvi6LrIbefbqr X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:5520:7788:6b7d:7115]) (user=irogers job=sendgmr) by 2002:a05:6902:727:b0:dcc:8927:7496 with SMTP id l7-20020a056902072700b00dcc89277496mr873262ybt.5.1712629944477; Mon, 08 Apr 2024 19:32:24 -0700 (PDT) Date: Mon, 8 Apr 2024 19:32:14 -0700 In-Reply-To: <20240409023216.2342032-1-irogers@google.com> Message-Id: <20240409023216.2342032-3-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240409023216.2342032-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Subject: [PATCH v1 2/4] perf arch x86: Add shellcheck to build From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Ravi Bangoria , Kajol Jain , Athira Rajeev , Oliver Upton , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add shellcheck for: tools/perf/arch/x86/tests/gen-insn-x86-dat.sh tools/perf/arch/x86/entry/syscalls/syscalltbl.sh Address a minor quoting issue. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/arch/x86/Build | 14 ++++++++++++++ tools/perf/arch/x86/tests/Build | 14 ++++++++++++++ tools/perf/arch/x86/tests/gen-insn-x86-dat.sh | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/tools/perf/arch/x86/Build b/tools/perf/arch/x86/Build index a7dd46a5b678..ed37013b4289 100644 --- a/tools/perf/arch/x86/Build +++ b/tools/perf/arch/x86/Build @@ -1,2 +1,16 @@ perf-y +=3D util/ perf-y +=3D tests/ + +ifdef SHELLCHECK + SHELL_TESTS :=3D entry/syscalls/syscalltbl.sh + TEST_LOGS :=3D $(SHELL_TESTS:%=3D%.shellcheck_log) +else + SHELL_TESTS :=3D + TEST_LOGS :=3D +endif + +$(OUTPUT)%.shellcheck_log: % + $(call rule_mkdir) + $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ &&= rm $@ && false) + +perf-y +=3D $(TEST_LOGS) diff --git a/tools/perf/arch/x86/tests/Build b/tools/perf/arch/x86/tests/Bu= ild index b87f46e5feea..c1e3b7d39554 100644 --- a/tools/perf/arch/x86/tests/Build +++ b/tools/perf/arch/x86/tests/Build @@ -10,3 +10,17 @@ perf-$(CONFIG_AUXTRACE) +=3D insn-x86.o endif perf-$(CONFIG_X86_64) +=3D bp-modify.o perf-y +=3D amd-ibs-via-core-pmu.o + +ifdef SHELLCHECK + SHELL_TESTS :=3D gen-insn-x86-dat.sh + TEST_LOGS :=3D $(SHELL_TESTS:%=3D%.shellcheck_log) +else + SHELL_TESTS :=3D + TEST_LOGS :=3D +endif + +$(OUTPUT)%.shellcheck_log: % + $(call rule_mkdir) + $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ &&= rm $@ && false) + +perf-y +=3D $(TEST_LOGS) diff --git a/tools/perf/arch/x86/tests/gen-insn-x86-dat.sh b/tools/perf/arc= h/x86/tests/gen-insn-x86-dat.sh index 0d0a003a9c5e..89c46532cd5c 100755 --- a/tools/perf/arch/x86/tests/gen-insn-x86-dat.sh +++ b/tools/perf/arch/x86/tests/gen-insn-x86-dat.sh @@ -11,7 +11,7 @@ if [ "$(uname -m)" !=3D "x86_64" ]; then exit 1 fi =20 -cd $(dirname $0) +cd "$(dirname $0)" =20 trap 'echo "Might need a more recent version of binutils"' EXIT =20 --=20 2.44.0.478.gd926399ef9-goog From nobody Sun Feb 8 06:22:08 2026 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D3E325464A for ; Tue, 9 Apr 2024 02:32:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712629949; cv=none; b=SiE9yNW2UwsPZqHYGH+gyS2pyuEdBEGgIHhOoBGJcRxHDcwGRcOjlVhQLbY2kpu4wayih42n+tPBBg2MRhryoMMEnPlGyZxYT5Cu+W/vIN4O8vP4IAreF+tCLkGOwKRStjbFtlYvZEjt1hWD2UDwO7qrh7aUtWoVuT2fQvXiNHo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712629949; c=relaxed/simple; bh=PL/A3WVadEL63FKjbVqnoa/RshNov2kFBvTQ0RAhX60=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=Ep+q3h+HxNrYRVdAxT04u2tUMlK6b5x+GVkJTCB7n9kvPZKYack30G1qoay89/o49CKomHLgl/BT8VLZGUbH7ipldmMSXQACYEPVUN/fTIlUrg8dVfSsWCFITRqhBiFFkIly4lyEssWFi7hj4t8iBVNoub9NN3U/MnUSsQnNTpE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=1PthwBvX; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="1PthwBvX" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc6b26845cdso7225386276.3 for ; Mon, 08 Apr 2024 19:32:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712629947; x=1713234747; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=4JjU99n3cntJzSuWKEHlCabsCaDKhMo8d9uJcAKSqpE=; b=1PthwBvXPHwvvmq6plmmvmLYVnOlygUuuRIINo98O3rrNKn0jObdQAfTok4aTPei3j XxRd+tcDDPf4pf7l4J6UQw3IJ+cbnFitt79aa+J9EUZYkMn6Fps9YKuaLfWO7s5LFcNS ktU5ez2sUtVi7XH+dNL64ESAS69nA8IAD31AdnzyWMQehJHlJii+LMo9S8TKTA369Pcn xmyRHXTLVYbNx8XknFWtmo9Ee/ifK79tiPt5uOK0fXK5j5hkwjmh1nOtEMbAGBp37aST oumd1fc5uy/1m//A1fepNCDQbGCy1UYYn23Vza9eb3fNf3dydx+udtWIKUGNdj5r5+BD G6TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712629947; x=1713234747; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4JjU99n3cntJzSuWKEHlCabsCaDKhMo8d9uJcAKSqpE=; b=xGDg1ZnWu4de4EvDq4SoXmmRpcLKW/w6h4joRlO9gljVTcpV2TuCRznooQUzFjxp+F KzvMRaDYP5aasanIkbLDjQpIQ90SS3bcKdAqVc9DxF3CeSOTPDwA1S2DY3WPyWDhjaEZ 4P/w5GuSCeKCyIOljYDIpuJFqO0X6VHFqHErTVzKqJEP9URuGXWtJRxVVdizpdtc3grG xY1++iGckgGqbiEiIb2eeYGopHQ8O6gHpvh6KebG3Z9dYZG9HfsIAcJKbkBl9stqRbPg FSM7mYS+eb1V4dTF3u7aP/nopFpwU+wbEHFDiHRA5MbeuK3eIRAYyj2OhNkVpHbpaj+y xctw== X-Forwarded-Encrypted: i=1; AJvYcCXCjJybhqVK2nWsV5xpWWfVBXHbs1yWOpokTlAJTC4/AfIustkPT/kvOTq9yNpTRpkhUOgVrtrcZ0Mvz8u4yevCoFISk6mSL9MwOJDV X-Gm-Message-State: AOJu0YzdrYbldICsTZ4fDbPhmZlS+6ui2qH2snbYADjFjJ0sYD8Cd0q0 XbqyqFMDnHRbenfMJPU+vZJLuUzZq6S10X3y9G6fDQfJ/AWZ05K7oO6rJTG+V9gHzOVnOwvfXTx PDZ44Iw== X-Google-Smtp-Source: AGHT+IHrxNdg3AbPwFqBK+ciQlIUmbNjVBlMy/hHjaGqY4bavIjah0RyNlXtnMe94CNiX51z2K7BxkRbPJfh X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:5520:7788:6b7d:7115]) (user=irogers job=sendgmr) by 2002:a25:a288:0:b0:dc9:5ef8:2b2d with SMTP id c8-20020a25a288000000b00dc95ef82b2dmr3131277ybi.4.1712629947067; Mon, 08 Apr 2024 19:32:27 -0700 (PDT) Date: Mon, 8 Apr 2024 19:32:15 -0700 In-Reply-To: <20240409023216.2342032-1-irogers@google.com> Message-Id: <20240409023216.2342032-4-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240409023216.2342032-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Subject: [PATCH v1 3/4] perf util: Add shellcheck to generate-cmdlist.sh From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Ravi Bangoria , Kajol Jain , Athira Rajeev , Oliver Upton , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add shellcheck to generate-cmdlist.sh to avoid basic shell script mistakes. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/util/Build | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/perf/util/Build b/tools/perf/util/Build index aec5a590e349..292170a99ab6 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -389,3 +389,17 @@ $(OUTPUT)util/vsprintf.o: ../lib/vsprintf.c FORCE $(OUTPUT)util/list_sort.o: ../lib/list_sort.c FORCE $(call rule_mkdir) $(call if_changed_dep,cc_o_c) + +ifdef SHELLCHECK + SHELL_TESTS :=3D generate-cmdlist.sh + TEST_LOGS :=3D $(SHELL_TESTS:%=3D%.shellcheck_log) +else + SHELL_TESTS :=3D + TEST_LOGS :=3D +endif + +$(OUTPUT)%.shellcheck_log: % + $(call rule_mkdir) + $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ &&= rm $@ && false) + +perf-y +=3D $(TEST_LOGS) --=20 2.44.0.478.gd926399ef9-goog From nobody Sun Feb 8 06:22:08 2026 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0545A6A033 for ; Tue, 9 Apr 2024 02:32:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712629951; cv=none; b=GbHCbxryKeXM4+TV4TvSCxEREwAeVnkKP1QWEYn4Hav9Rq+KJ3N5c6LzWcQ+75ace6n2ZZTTiBt2kRPXolTnm0pXWQjm1x8rInVBaDDi4c9YxEvAtz4k+X5jGxmiswP1Jdg8pxz9ZDnK6RgO+d+4gyEylPFaJNkH8yIAFYepg+0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712629951; c=relaxed/simple; bh=xHsqseGo45EFWIp81P0tGMdoFgzohP0SXk8wpRgIZ/M=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=D/5B7EhNGzN+GHblQCfzqJ/H3Q+2paXuSrWTtLsAkHcdHcBccVYdbug3YlJnRESBK3LkZI3bRIQ51NeoInXm51ghVztMIBYlK9wfjz/Z8O0g074fHN/3Ph11xbT/ec3Q8LytXbrnitiBjYNrBmhqUIMDku5l3qRD/nGRCbfjY/U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=KRIQdS6g; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="KRIQdS6g" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc64f63d768so8681860276.2 for ; Mon, 08 Apr 2024 19:32:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712629949; x=1713234749; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=/BAUdVwmPAN+ChmE3q8Tcu1VmgKAoqUPA+AHxJ0JyqY=; b=KRIQdS6gSqM7Cz4ZpXf/TfjU83+ld8PARjdjgsTjZB5jsDSlyJQH1FNp6vtjdUev/V Ha3ouiLTbpzSfQtYQSU+HjLfut72Myxq7xmC7f7awy0FKWZN8SyVH2dXwiAimE1IVrqV KYphCN5vLXaSOuZ2GJs78uKk+QVwz4sBlp+A1nx9ioR8t1Eg5yFUco/cXa1jB3NHsVdq DRdGJMdozmX18lywuA/2Esh7RnGdVXt4mqjPOqGggEQ1T0vh8rL0FOIzTl+PvHU/P7Q8 VYq6Ox0UYyWoC5MN/JKwopRDYGr0SdGU2LqdKscCXo2PQbSF/cCHaXLuRz+p0vHm7BvD yYBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712629949; x=1713234749; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/BAUdVwmPAN+ChmE3q8Tcu1VmgKAoqUPA+AHxJ0JyqY=; b=XHbpsIcVzqSGTlChYWYDRy0ed2G0k0lduLDQQUUyKzHyM/6a3smUQZPIcXQTqN2JOj u2TOqQlC9oOCE2aw7vWdvO9xc4cu1szNhvl7IJmpMrKU02a9fieklUaLOk5GtvqF2IKF 2WlAVEbKPFF2sch0cKEz2ehJqCK94KVIcVAB+OyjqkoyWv4d0juBuqiUHTNhcpFyoaVo NT1BHYz1bCeSCsy/q3ExOgJcW0sd+rNNn3MnSt3uXWqhzcSvHySa31yciMxBhXImSHW7 WfLjtKq29O6I6JSnqsPGvhliM2LasCIY1t3+mbSzs6vox7hCW6Vl0hVkV0O3tVVyWyft Z9OQ== X-Forwarded-Encrypted: i=1; AJvYcCWLi8eZDEJO8v3XfzCXMY/6fGCHMRS1UrtSngqcclNALFFhRFhocT1o/VzVzB/Ib85gAsBqcw6DrlkJLJORV6xl08hwvHIRnNzRXCfO X-Gm-Message-State: AOJu0YxP3TQ/36KwPZhFDqMCxqAQcYdDu2DEnaad9xLGWtb/Jvqpi00d DvOkATCFOr1rWVLPncYzrwRL8wweJ+3GG0ub8JwtgerPukG5tZHchYrI2+lXdqRlzzXqWsqnsnX fNmBvyw== X-Google-Smtp-Source: AGHT+IGF6ZTjnu8dVcNXGrughSGYScPK3AYo0PJxMnN9RAliJjpZ62UnoVFK8B/Xe/xfHylwSeuiBANHAUhu X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:5520:7788:6b7d:7115]) (user=irogers job=sendgmr) by 2002:a05:6902:70d:b0:dc6:dfd9:d431 with SMTP id k13-20020a056902070d00b00dc6dfd9d431mr3087229ybt.1.1712629949240; Mon, 08 Apr 2024 19:32:29 -0700 (PDT) Date: Mon, 8 Apr 2024 19:32:16 -0700 In-Reply-To: <20240409023216.2342032-1-irogers@google.com> Message-Id: <20240409023216.2342032-5-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240409023216.2342032-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Subject: [PATCH v1 4/4] perf trace beauty: Add shellcheck to scripts From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Ravi Bangoria , Kajol Jain , Athira Rajeev , Oliver Upton , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add shell check to scripts generating perf trace lookup tables. Fix quoting issue in arch_errno_names.sh. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/trace/beauty/Build | 14 ++++++++++++++ tools/perf/trace/beauty/arch_errno_names.sh | 8 +++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/perf/trace/beauty/Build b/tools/perf/trace/beauty/Build index d8ce1b698983..cb3c1399ff40 100644 --- a/tools/perf/trace/beauty/Build +++ b/tools/perf/trace/beauty/Build @@ -20,3 +20,17 @@ perf-y +=3D statx.o perf-y +=3D sync_file_range.o perf-y +=3D timespec.o perf-y +=3D tracepoints/ + +ifdef SHELLCHECK + SHELL_TESTS :=3D $(wildcard trace/beauty/*.sh) + TEST_LOGS :=3D $(SHELL_TESTS:trace/beauty/%=3D%.shellcheck_log) +else + SHELL_TESTS :=3D + TEST_LOGS :=3D +endif + +$(OUTPUT)%.shellcheck_log: % + $(call rule_mkdir) + $(Q)$(call echo-cmd,test)shellcheck -s bash -a -S warning "$<" > $@ || (c= at $@ && rm $@ && false) + +perf-y +=3D $(TEST_LOGS) diff --git a/tools/perf/trace/beauty/arch_errno_names.sh b/tools/perf/trace= /beauty/arch_errno_names.sh index 7df4bf5b55a3..30d3889b2957 100755 --- a/tools/perf/trace/beauty/arch_errno_names.sh +++ b/tools/perf/trace/beauty/arch_errno_names.sh @@ -60,10 +60,12 @@ create_arch_errno_table_func() printf 'arch_syscalls__strerrno_t *arch_syscalls__strerrno_function(const= char *arch)\n' printf '{\n' for arch in $archlist; do - printf '\tif (!strcmp(arch, "%s"))\n' $(arch_string "$arch") - printf '\t\treturn errno_to_name__%s;\n' $(arch_string "$arch") + arch_str=3D$(arch_string "$arch") + printf '\tif (!strcmp(arch, "%s"))\n' "$arch_str" + printf '\t\treturn errno_to_name__%s;\n' "$arch_str" done - printf '\treturn errno_to_name__%s;\n' $(arch_string "$default") + arch_str=3D$(arch_string "$default") + printf '\treturn errno_to_name__%s;\n' "$arch_str" printf '}\n' } =20 --=20 2.44.0.478.gd926399ef9-goog