Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp100619imm; Tue, 19 Jun 2018 16:52:43 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLYuqesupRP1aJ3+vV7foYpDYFmzHKn1BZhdNqYqEV2oC1Es2uGKC4iEJQJ5AQe0KEJ653b X-Received: by 2002:a17:902:ac97:: with SMTP id h23-v6mr21241814plr.140.1529452362994; Tue, 19 Jun 2018 16:52:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529452362; cv=none; d=google.com; s=arc-20160816; b=jKmfMlFnkcPNUBYVe31hxngIwuTa83FUsFKiE8YuzHjg94cgZq2m54BaVKUmsLTaKV rWWv5Q+BhdciAB6EzcvC8EaZgvn/5sb8oTqe6KTaMBaGKNBGW00TFMqhdJYTM3+hvPvq 5kHwcrOEMhdwYlrr4EJkq2mt5xyF0AHSd4XtQCXB1BqWmLf9xf+GFWBki0NI3CRAqVEz 32e95tZOzD6FLGiuKYuKNVmMz668tUQgPTE9x8Q4GacCW//IIQ0eaGDXUYDaMmLCMbE7 UjJiq9kRp+iMr4PbhHNP4HQFBlaH0kTKkScKMwffqnU84gHyQ6YH4TH6aTRoyRtLdMK0 Monw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :organization:message-id:subject:cc:to:from:date :arc-authentication-results; bh=RXLpvoJZV/zjH9JU4k28NiUd+6syTM/zItjUlU38SUE=; b=op+nYQtkJyll9Qw/cstJsYjcPzevqTKd3l62pV4hdbbjJu9fqLGeheDWF6wwjW5Oh2 PvAEN7HYU8k3e01uozUSG3JoiBmzj9B8hoOGQuT6RZiMhr+CPaYR1Us8BhexI+p+0LAV i40dshphCzASgALe386wBNQSDiZn8UrghsiyzHk8ca6popYu7G/mEQuJqohUGnIeQ9Pt ttRJDTrQnUBHxHyTFfbQskVo4ab2p78Ws5Kk6xlsFcoQWCx2Y6AWRUX2DDhAnpucVKw3 mVYnRRN0OIRYHfoOtvus8nC4Pm2ubV3Owg3jvOax9hceRbldVpAIy6+YGs4dNuFz2dR3 PwWQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9-v6si852151pla.377.2018.06.19.16.52.29; Tue, 19 Jun 2018 16:52:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753739AbeFSXuB convert rfc822-to-8bit (ORCPT + 99 others); Tue, 19 Jun 2018 19:50:01 -0400 Received: from foss.arm.com ([217.140.101.70]:58040 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751092AbeFSXt6 (ORCPT ); Tue, 19 Jun 2018 19:49:58 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3729215AB; Tue, 19 Jun 2018 16:49:58 -0700 (PDT) Received: from dupont (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 953CB3F589; Tue, 19 Jun 2018 16:49:57 -0700 (PDT) Date: Tue, 19 Jun 2018 18:49:52 -0500 From: Kim Phillips To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Ingo Molnar , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Thomas Richter , Michael Petlan , =?ISO-8859-1?Q? "Hendrik_Br=FCckner" ?= , Sandipan Das Subject: [PATCH 2/2] perf test shell: make perf inet_pton test more portable Message-Id: <20180619184952.dac6a3a1e39d3b1d255e7119@arm.com> Organization: Arm X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Debian based systems such as Ubuntu have dash as their default shell. Even if the normal or root user's shell is bash, certain scripts still call /bin/sh, which points to dash, so we fix this perf test by rewriting it in a more portable way. BEFORE: $ sudo ./perf test -v 64 64: probe libc's inet_pton & backtrace it with ping : --- start --- test child forked, pid 31942 ./tests/shell/record+probe_libc_inet_pton.sh: 18: ./tests/shell/record+probe_libc_inet_pton.sh: expected[0]=ping[][0-9 \.:]+probe_libc:inet_pton: \([[:xdigit:]]+\): not found ./tests/shell/record+probe_libc_inet_pton.sh: 19: ./tests/shell/record+probe_libc_inet_pton.sh: expected[1]=.*inet_pton\+0x[[:xdigit:]]+[[:space:]]\(/lib/x86_64-linux-gnu/libc-2.27.so|inlined\)$: not found ./tests/shell/record+probe_libc_inet_pton.sh: 29: ./tests/shell/record+probe_libc_inet_pton.sh: expected[2]=getaddrinfo\+0x[[:xdigit:]]+[[:space:]]\(/lib/x86_64-linux-gnu/libc-2.27.so\)$: not found ./tests/shell/record+probe_libc_inet_pton.sh: 30: ./tests/shell/record+probe_libc_inet_pton.sh: expected[3]=.*\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$: not found ping 31963 [004] 83577.670613: probe_libc:inet_pton: (7fe15f87f4b0) ./tests/shell/record+probe_libc_inet_pton.sh: 39: ./tests/shell/record+probe_libc_inet_pton.sh: Bad substitution ./tests/shell/record+probe_libc_inet_pton.sh: 41: ./tests/shell/record+probe_libc_inet_pton.sh: Bad substitution test child finished with -2 ---- end ---- probe libc's inet_pton & backtrace it with ping: Skip AFTER: 64: probe libc's inet_pton & backtrace it with ping : --- start --- test child forked, pid 32277 ping 32295 [001] 83679.690020: probe_libc:inet_pton: (7ff244f504b0) 7ff244f504b0 __GI___inet_pton+0x0 (/lib/x86_64-linux-gnu/libc-2.27.so) 7ff244f14ce4 getaddrinfo+0x124 (/lib/x86_64-linux-gnu/libc-2.27.so) 556ac036b57d _init+0xb75 (/bin/ping) test child finished with 0 ---- end ---- probe libc's inet_pton & backtrace it with ping: Ok Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Namhyung Kim Cc: Thomas Richter Cc: Michael Petlan Cc: "Hendrik Br?ckner" Cc: Sandipan Das Signed-off-by: Kim Phillips --- Fixed using fake array technique described here: https://www.linuxquestions.org/questions/programming-9/basic-bash-how-to-use-eval-to-evaluate-variable-names-made-of-arbitrary-strings-775622/ Note that bashisms can also be found with 'checkbashisms': $ checkbashisms record+probe_libc_inet_pton.sh script record+probe_libc_inet_pton.sh does not appear to have a #! interpreter line; you may get strange results possible bashism in record+probe_libc_inet_pton.sh line 18 (bash arrays, H[0]): expected[0]="ping[][0-9 \.:]+probe_libc:inet_pton: \([[:xdigit:]]+\)" possible bashism in record+probe_libc_inet_pton.sh line 19 (bash arrays, H[0]): expected[1]=".*inet_pton\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$" possible bashism in record+probe_libc_inet_pton.sh line 23 (bash arrays, H[0]): expected[2]="gaih_inet.*\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$" possible bashism in record+probe_libc_inet_pton.sh line 24 (bash arrays, H[0]): expected[3]="(__GI_)?getaddrinfo\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$" possible bashism in record+probe_libc_inet_pton.sh line 25 (bash arrays, H[0]): expected[4]="main\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$" possible bashism in record+probe_libc_inet_pton.sh line 29 (bash arrays, H[0]): expected[2]="getaddrinfo\+0x[[:xdigit:]]+[[:space:]]\($libc\)$" possible bashism in record+probe_libc_inet_pton.sh line 30 (bash arrays, H[0]): expected[3]=".*\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$" possible bashism in record+probe_libc_inet_pton.sh line 39 (bash arrays, ${name[0|*|@]}): echo "$line" | egrep -q "${expected[$idx]}" possible bashism in record+probe_libc_inet_pton.sh line 41 (bash arrays, ${name[0|*|@]}): printf "FAIL: expected backtrace entry %d \"%s\" got \"%s\"\n" $idx "${expected[$idx]}" "$line" possible bashism in record+probe_libc_inet_pton.sh line 44 (let ...): let idx+=1 possible bashism in record+probe_libc_inet_pton.sh line 45 (bash arrays, ${name[0|*|@]}): [ -z "${expected[$idx]}" ] && break .../shell/record+probe_libc_inet_pton.sh | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tools/perf/tests/shell/record+probe_libc_inet_pton.sh b/tools/perf/tests/shell/record+probe_libc_inet_pton.sh index 263057039693..41124fa12913 100755 --- a/tools/perf/tests/shell/record+probe_libc_inet_pton.sh +++ b/tools/perf/tests/shell/record+probe_libc_inet_pton.sh @@ -15,19 +15,20 @@ nm -Dg $libc 2>/dev/null | fgrep -q inet_pton || exit 254 trace_libc_inet_pton_backtrace() { idx=0 - expected[0]="ping[][0-9 \.:]+probe_libc:inet_pton: \([[:xdigit:]]+\)" - expected[1]=".*inet_pton\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$" + expected='expected' + eval ${expected}0="'ping[][0-9 \.:]+probe_libc:inet_pton: \([[:xdigit:]]+\)'" + eval ${expected}1="'.*inet_pton\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$'" case "$(uname -m)" in s390x) eventattr='call-graph=dwarf,max-stack=4' - expected[2]="gaih_inet.*\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$" - expected[3]="(__GI_)?getaddrinfo\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$" - expected[4]="main\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$" + eval ${expected}2="'gaih_inet.*\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$'" + eval ${expected}3="'(__GI_)?getaddrinfo\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$'" + eval ${expected}4="'main\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$'" ;; *) eventattr='max-stack=3' - expected[2]="getaddrinfo\+0x[[:xdigit:]]+[[:space:]]\($libc\)$" - expected[3]=".*\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$" + eval ${expected}2="'getaddrinfo\+0x[[:xdigit:]]+[[:space:]]\($libc\)$'" + eval ${expected}3="'.*\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$'" ;; esac @@ -36,13 +37,13 @@ trace_libc_inet_pton_backtrace() { perf record -e probe_libc:inet_pton/$eventattr/ -o $file ping -6 -c 1 ::1 > /dev/null 2>&1 perf script -i $file | while read line ; do echo $line - echo "$line" | egrep -q "${expected[$idx]}" + echo "$line" | egrep -q "$(echo $(eval echo \$$expected${idx}))" if [ $? -ne 0 ] ; then - printf "FAIL: expected backtrace entry %d \"%s\" got \"%s\"\n" $idx "${expected[$idx]}" "$line" + printf "FAIL: expected backtrace entry %d \"%s\" got \"%s\"\n" $idx "$(echo $(eval echo \$$expected${idx}))" "$line" exit 1 fi - let idx+=1 - [ -z "${expected[$idx]}" ] && break + idx=$((idx+1)) + [ -z "$(echo $(eval echo \$$expected${idx}))" ] && break done # If any statements are executed from this point onwards, -- 2.17.1