Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp681046pxb; Wed, 24 Feb 2021 12:04:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJznyJMJe53/0KyYouQWcnYvu+ppWIc3ItIUtIT+DTFFT6UJuemBkW26wQ5jOulxQ3gUjOYI X-Received: by 2002:a17:906:a101:: with SMTP id t1mr30502592ejy.182.1614197077710; Wed, 24 Feb 2021 12:04:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614197077; cv=none; d=google.com; s=arc-20160816; b=FcCWvC32Y+FsKV6XnSDQeagy9rjqJoxPtIUZv+UPYaIjPrNFy6jGA+AwYU0+wcdeZT YjUwdgUvu6cDzhMlPWk4ZV5JS/Sl1qVSc0T0IFCOeans1TZrZaD4C6HfCyREnIlfzIzK Cj8KTEnb7jsK6kpONP9YWvCeuAmR3WuaARU6DasETBMdG5v6iM5rqgy/qIE8VcXJCU/q v4G11yaXmkWdgU9IPKzOChayTQqkWsWXMpOZ7ia8uStx1bup2irI7VgVNjVIxqaz9P6a 4Xchp/CeJFhWleZmSPEj7hNcKCKKrVtemJhC/g7JMEN/YZTaNKzqpPb3pUM+E2vo5A1+ /OWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :mime-version:user-agent:date:message-id:subject:from:cc:to :dkim-signature; bh=dmj7KJqhSto9SQSwzoeqjNm2bSTw7/bJr+8g6smLj3c=; b=cuSor2ZtVxZTEywFd1DMc1JqM2PZsNz/r9yXSi9BMXZKAwAQ0WYsE87JIzk3nk80QA t3S/5Mkhe++mFToCzQKBhwUebNcIHmep7AUhdKq+KED5mWyf3ATiD4kPN3KnDROP5PKB RcaefHCns4gw3NQ0ZtDSr09B73H9UVNNdyc3+NdYxnQJd73W1WmWMsYSd75hoMW9k5UC R+I2f2x2A8//R1Cc2TkaOlEp6r24gVZfGuj1gxWvmdD/bd3Nf1O3E02NOjADh7LODTjy CFGwy3qXIzqO5pSayEAt3JrtZh6S9vqWNyYoqxsUjV8zjU0DhqergVRI5QvGaOXdbCZB sqqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@codeweavers.com header.s=6377696661 header.b=L3YsNqvI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=codeweavers.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dj3si1869700edb.206.2021.02.24.12.04.09; Wed, 24 Feb 2021 12:04:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@codeweavers.com header.s=6377696661 header.b=L3YsNqvI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=codeweavers.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231335AbhBXUBY (ORCPT + 99 others); Wed, 24 Feb 2021 15:01:24 -0500 Received: from mail.codeweavers.com ([50.203.203.244]:60764 "EHLO mail.codeweavers.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229598AbhBXUAf (ORCPT ); Wed, 24 Feb 2021 15:00:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=codeweavers.com; s=6377696661; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Date:Message-ID:Subject:From:Cc:To:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dmj7KJqhSto9SQSwzoeqjNm2bSTw7/bJr+8g6smLj3c=; b=L3YsNqvIUEzDpmAd8w1X9nVi+2 kFhttNkg1O65St22No4gsl/JXXtpdT4F5I1P9Yai1pYjBnC1pufNw+iHIfg7r7Icv4VRhnxd+nTsv 03ccLUmYKagJUCWwHBFxtksyPyiPPYh5hOsOH1KQdLg2C0/QVyUHiYANwLoTeJlQsEqk=; Received: from [10.69.141.136] by mail.codeweavers.com with esmtpsa (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1lF0Jw-0007ef-OM; Wed, 24 Feb 2021 13:59:40 -0600 To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org Cc: Ulrich Czekalla , Huw Davies From: Nicholas Fraser Subject: [PATCH] perf buildid-cache: Add test for PE executable Message-ID: <790bfe67-2155-a426-7130-ae7c45cb055b@codeweavers.com> Date: Wed, 24 Feb 2021 14:59:16 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From 9fd0b3889f00ad13662879767d833309d8a035b6 Mon Sep 17 00:00:00 2001 From: Nicholas Fraser Date: Thu, 18 Feb 2021 13:24:03 -0500 Subject: [PATCH] perf buildid-cache: Add test for PE executable This builds on the previous changes to tests/shell/buildid.sh, adding tests for a PE file. It adds it to the build-id cache manually and, if Wine is available, runs it under "perf record" and verifies that it was added automatically. If wine is not installed, only warnings are printed; the test can still exit 0. Signed-off-by: Nicholas Fraser --- tools/perf/tests/shell/buildid.sh | 65 +++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 7 deletions(-) diff --git a/tools/perf/tests/shell/buildid.sh b/tools/perf/tests/shell/buildid.sh index 416af614bbe0..f05670d1e39e 100755 --- a/tools/perf/tests/shell/buildid.sh +++ b/tools/perf/tests/shell/buildid.sh @@ -14,18 +14,56 @@ if ! [ -x "$(command -v cc)" ]; then exit 2 fi +# check what we need to test windows binaries +add_pe=1 +run_pe=1 +if ! perf version --build-options | grep -q 'libbfd: .* on '; then + echo "WARNING: perf not built with libbfd. PE binaries will not be tested." + add_pe=0 + run_pe=0 +fi +if ! which wine > /dev/null; then + echo "WARNING: wine not found. PE binaries will not be run." + run_pe=0 +fi + +# set up wine +if [ ${run_pe} -eq 1 ]; then + wineprefix=$(mktemp -d /tmp/perf.wineprefix.XXX) + export WINEPREFIX=${wineprefix} + # clear display variables to prevent wine from popping up dialogs + unset DISPLAY + unset WAYLAND_DISPLAY +fi + ex_md5=$(mktemp /tmp/perf.ex.MD5.XXX) ex_sha1=$(mktemp /tmp/perf.ex.SHA1.XXX) +ex_pe=$(dirname $0)/../pe-file.exe echo 'int main(void) { return 0; }' | cc -Wl,--build-id=sha1 -o ${ex_sha1} -x c - echo 'int main(void) { return 0; }' | cc -Wl,--build-id=md5 -o ${ex_md5} -x c - -echo "test binaries: ${ex_sha1} ${ex_md5}" +echo "test binaries: ${ex_sha1} ${ex_md5} ${ex_pe}" check() { - id=`readelf -n ${1} 2>/dev/null | grep 'Build ID' | awk '{print $3}'` - + case $1 in + *.exe) + # We don't have a tool that can pull a nicely formatted build-id out of + # a PE file, but we can extract the whole section with objcopy and + # format it ourselves. The .buildid section is a Debug Directory + # containing a CodeView entry: + # https://docs.microsoft.com/en-us/windows/win32/debug/pe-format#debug-directory-image-only + # https://github.com/dotnet/runtime/blob/da94c022576a5c3bbc0e896f006565905eb137f9/docs/design/specs/PE-COFF.md + # The build-id starts at byte 33 and must be rearranged into a GUID. + id=`objcopy -O binary --only-section=.buildid $1 /dev/stdout | \ + cut -c 33-48 | hexdump -ve '/1 "%02x"' | \ + sed 's@^\(..\)\(..\)\(..\)\(..\)\(..\)\(..\)\(..\)\(..\)\(.*\)0a$@\4\3\2\1\6\5\8\7\9@'` + ;; + *) + id=`readelf -n ${1} 2>/dev/null | grep 'Build ID' | awk '{print $3}'` + ;; + esac echo "build id: ${id}" link=${build_id_dir}/.build-id/${id:0:2}/${id:2} @@ -50,7 +88,7 @@ check() exit 1 fi - ${perf} buildid-cache -l | grep $id + ${perf} buildid-cache -l | grep ${id} if [ $? -ne 0 ]; then echo "failed: ${id} is not reported by \"perf buildid-cache -l\"" exit 1 @@ -79,16 +117,20 @@ test_record() { data=$(mktemp /tmp/perf.data.XXX) build_id_dir=$(mktemp -d /tmp/perf.debug.XXX) + log=$(mktemp /tmp/perf.log.XXX) perf="perf --buildid-dir ${build_id_dir}" - ${perf} record --buildid-all -o ${data} ${1} + echo "running: perf record $@" + ${perf} record --buildid-all -o ${data} $@ &> ${log} if [ $? -ne 0 ]; then - echo "failed: record ${1}" + echo "failed: record $@" + echo "see log: ${log}" exit 1 fi - check ${1} + check ${@: -1} + rm -f ${log} rm -rf ${build_id_dir} rm -rf ${data} } @@ -96,12 +138,21 @@ test_record() # add binaries manual via perf buildid-cache -a test_add ${ex_sha1} test_add ${ex_md5} +if [ ${add_pe} -eq 1 ]; then + test_add ${ex_pe} +fi # add binaries via perf record post processing test_record ${ex_sha1} test_record ${ex_md5} +if [ ${run_pe} -eq 1 ]; then + test_record wine ${ex_pe} +fi # cleanup rm ${ex_sha1} ${ex_md5} +if [ ${run_pe} -eq 1 ]; then + rm -r ${wineprefix} +fi exit ${err} -- 2.30.1