| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 2 Oct 2020 10:34:51 -0700
From: Ian Rogers <irogers@...gle.com>
To: Namhyung Kim <namhyung@...nel.org>
Cc: Jiri Olsa <jolsa@...hat.com>, Jiri Olsa <jolsa@...nel.org>,
Arnaldo Carvalho de Melo <acme@...nel.org>,
lkml <linux-kernel@...r.kernel.org>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Ingo Molnar <mingo@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Michael Petlan <mpetlan@...hat.com>,
Stephane Eranian <eranian@...gle.com>
Subject: Re: [PATCHv2 1/9] perf tools: Add build id shell test
On Fri, Oct 2, 2020 at 6:07 AM Namhyung Kim <namhyung@...nel.org> wrote:
>
> Hi Jiri,
>
> On Fri, Oct 2, 2020 at 4:05 AM Jiri Olsa <jolsa@...hat.com> wrote:
> >
> > Adding test for build id cache that adds binary
> > with sha1 and md5 build ids and verifies it's
> > added properly.
> >
> > The test updates build id cache with perf record
> > and perf buildid-cache -a.
> >
> > Signed-off-by: Jiri Olsa <jolsa@...nel.org>
> > ---
> > v2 changes:
> > - detect perf build directory when checking for build-ex* binaries
> >
> > tools/perf/Makefile.perf | 14 +++++
> > tools/perf/tests/shell/buildid.sh | 101 ++++++++++++++++++++++++++++++
> > 2 files changed, 115 insertions(+)
> > create mode 100755 tools/perf/tests/shell/buildid.sh
> >
> > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> > index 920d8afb9238..b2aeefa64e92 100644
> > --- a/tools/perf/Makefile.perf
> > +++ b/tools/perf/Makefile.perf
> > @@ -126,6 +126,8 @@ include ../scripts/utilities.mak
> > #
> > # Define NO_LIBDEBUGINFOD if you do not want support debuginfod
> > #
> > +# Define NO_BUILDID_EX if you do not want buildid-ex-* binaries
> > +#
> >
> > # As per kernel Makefile, avoid funny character set dependencies
> > unexport LC_ALL
> > @@ -349,6 +351,11 @@ ifndef NO_PERF_READ_VDSOX32
> > PROGRAMS += $(OUTPUT)perf-read-vdsox32
> > endif
> >
> > +ifndef NO_BUILDID_EX
> > +PROGRAMS += $(OUTPUT)buildid-ex-sha1
> > +PROGRAMS += $(OUTPUT)buildid-ex-md5
> > +endif
> > +
> > LIBJVMTI = libperf-jvmti.so
> >
> > ifndef NO_JVMTI
> > @@ -756,6 +763,13 @@ $(OUTPUT)perf-read-vdsox32: perf-read-vdso.c util/find-map.c
> > $(QUIET_CC)$(CC) -mx32 $(filter -static,$(LDFLAGS)) -Wall -Werror -o $@ perf-read-vdso.c
> > endif
> >
> > +ifndef NO_BUILDID_EX
> > +$(OUTPUT)buildid-ex-sha1:
> > + $(QUIET_LINK)echo 'int main(void) { return 0; }' | $(CC) -Wl,--build-id=sha1 -o $@ -x c -
> > +$(OUTPUT)buildid-ex-md5:
> > + $(QUIET_LINK)echo 'int main(void) { return 0; }' | $(CC) -Wl,--build-id=md5 -o $@ -x c -
> > +endif
>
> Can we just build them in the test shell script instead?
>
> Thanks
> Namhyung
That'd mean perf test having a dependency on a compiler :-/ That said
there are some existing dependencies for BPF compilers.
Thanks,
Ian
>
> > +
> > ifndef NO_JVMTI
> > LIBJVMTI_IN := $(OUTPUT)jvmti/jvmti-in.o
> >
> > diff --git a/tools/perf/tests/shell/buildid.sh b/tools/perf/tests/shell/buildid.sh
> > new file mode 100755
> > index 000000000000..dd9f9c306c34
> > --- /dev/null
> > +++ b/tools/perf/tests/shell/buildid.sh
> > @@ -0,0 +1,101 @@
> > +#!/bin/sh
> > +# build id cache operations
> > +# SPDX-License-Identifier: GPL-2.0
> > +
> > +ex_md5=buildid-ex-md5
> > +ex_sha1=buildid-ex-sha1
> > +
> > +# skip if there are no test binaries
> > +if [ ! -x buildid-ex-sha1 -a ! -x buildid-ex-md5 ]; then
> > + ex_dir=$(dirname `which perf`)
> > + ex_md5=${ex_dir}/buildid-ex-md5
> > + ex_sha1=${ex_dir}/buildid-ex-sha1
> > +
> > + if [ ! -x ${ex_sha1} -a ! -x ${ex_md5} ]; then
> > + echo "failed: no test binaries"
> > + exit 2
> > + fi
> > +fi
> > +
> > +echo "test binaries: ${ex_sha1} ${ex_md5}"
> > +
> > +# skip if there's no readelf
> > +if [ ! -x `which readelf` ]; then
> > + echo "failed: no readelf, install binutils"
> > + exit 2
> > +fi
> > +
> > +check()
> > +{
> > + id=`readelf -n $1 2>/dev/null | grep 'Build ID' | awk '{print $3}'`
> > +
> > + echo "build id: ${id}"
> > +
> > + link=${build_id_dir}/.build-id/${id:0:2}/${id:2}
> > + echo "link: ${link}"
> > +
> > + if [ ! -h $link ]; then
> > + echo "failed: link ${link} does not exist"
> > + exit 1
> > + fi
> > +
> > + file=${build_id_dir}/.build-id/${id:0:2}/`readlink ${link}`/elf
> > + echo "file: ${file}"
> > +
> > + if [ ! -x $file ]; then
> > + echo "failed: file ${file} does not exist"
> > + exit 1
> > + fi
> > +
> > + diff ${file} ${1}
> > + if [ $? -ne 0 ]; then
> > + echo "failed: ${file} do not match"
> > + exit 1
> > + fi
> > +
> > + echo "OK for ${1}"
> > +}
> > +
> > +test_add()
> > +{
> > + build_id_dir=$(mktemp -d /tmp/perf.debug.XXX)
> > + perf="perf --buildid-dir ${build_id_dir}"
> > +
> > + ${perf} buildid-cache -v -a ${1}
> > + if [ $? -ne 0 ]; then
> > + echo "failed: add ${1} to build id cache"
> > + exit 1
> > + fi
> > +
> > + check ${1}
> > +
> > + rm -rf ${build_id_dir}
> > +}
> > +
> > +test_record()
> > +{
> > + data=$(mktemp /tmp/perf.data.XXX)
> > + build_id_dir=$(mktemp -d /tmp/perf.debug.XXX)
> > + perf="perf --buildid-dir ${build_id_dir}"
> > +
> > + ${perf} record --buildid-all -o ${data} ${1}
> > + if [ $? -ne 0 ]; then
> > + echo "failed: record ${1}"
> > + exit 1
> > + fi
> > +
> > + check ${1}
> > +
> > + rm -rf ${build_id_dir}
> > + rm -rf ${data}
> > +}
> > +
> > +# add binaries manual via perf buildid-cache -a
> > +test_add ${ex_sha1}
> > +test_add ${ex_md5}
> > +
> > +# add binaries via perf record post processing
> > +test_record ${ex_sha1}
> > +test_record ${ex_md5}
> > +
> > +exit ${err}
> > --
> > 2.26.2
> >
Powered by blists - more mailing lists