Re: [GIT PULL] perf/core improvements and fixes
From: Daniel DÃaz
Date: Tue May 05 2020 - 12:57:33 EST
Hello!
On Tue, 5 May 2020 at 11:37, Arnaldo Carvalho de Melo
<arnaldo.melo@xxxxxxxxx> wrote:
>
> Em Mon, May 04, 2020 at 02:07:56PM -0500, Daniel DÃaz escreveu:
> > Hello!
> >
> > On Fri, 24 Apr 2020 at 09:10, Andreas Gerstmayr <agerstmayr@xxxxxxxxxx> wrote:
> > >
> > > On 24.04.20 15:07, Arnaldo Carvalho de Melo wrote:
> > > > Em Thu, Apr 23, 2020 at 04:28:46PM -0500, Daniel DÃaz escreveu:
> > > >> On Wed, 22 Apr 2020 at 07:09, Ingo Molnar <mingo@xxxxxxxxxx> wrote:
> > > >>>> 85 files changed, 1851 insertions(+), 513 deletions(-)
> > > >
> > > >>> Pulled, thanks a lot Arnaldo!
> > > >
> > > >> Our OpenEmbedded builds detected an issue with 5287f9269206 ("perf
> > > >> script: Add flamegraph.py script"):
> > > >> ERROR: perf-1.0-r9 do_package_qa: QA Issue:
> > > >> /usr/libexec/perf-core/scripts/python/bin/flamegraph-report contained
> > > >> in package perf-python requires /usr/bin/sh, but no providers found in
> > > >> RDEPENDS_perf-python? [file-rdeps]
> > > >
> > > >
> > > > yeah, the flamegraph scripts are the outliers, there, everything else is
> > > > using /bin/bash, so I'll switch to that, ok Andreas?
> > >
> > > Sure, no problem. Thanks!
> >
> > Just a gentle reminder that this can still be fixed in today's
> > linux-next tree (next-20200504).
>
> Thanks for the reminder, I've just added this to my tree:
>
> commit c74ab13a30d3bec443c116e25b611255c58f32c0
> Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> Date: Tue May 5 13:33:12 2020 -0300
>
> perf flamegraph: Use /bin/bash for report script
>
> As all the other tools/perf/scripts/python/bin/*-report scripts, fixing
> the this problem reported by Daniel Diaz:
>
> Our OpenEmbedded builds detected an issue with 5287f9269206 ("perf
> script: Add flamegraph.py script"):
> ERROR: perf-1.0-r9 do_package_qa: QA Issue:
> /usr/libexec/perf-core/scripts/python/bin/flamegraph-report contained
> in package perf-python requires /usr/bin/sh, but no providers found in
> RDEPENDS_perf-python? [file-rdeps]
>
> This means that there is a new binary pulled in in the shebang line
> which was unaccounted for: `/usr/bin/sh`. I don't see any other usage
> of /usr/bin/sh in the kernel tree (does not even exist on my Ubuntu
> dev machine) but plenty of /bin/sh. This patch is needed:
> -----8<----------8<----------8<-----
> diff --git a/tools/perf/scripts/python/bin/flamegraph-record
> b/tools/perf/scripts/python/bin/flamegraph-record
> index 725d66e71570..a2f3fa25ef81 100755
> --- a/tools/perf/scripts/python/bin/flamegraph-record
> +++ b/tools/perf/scripts/python/bin/flamegraph-record
> @@ -1,2 +1,2 @@
> -#!/usr/bin/sh
> +#!/bin/sh
> perf record -g "$@"
> diff --git a/tools/perf/scripts/python/bin/flamegraph-report
> b/tools/perf/scripts/python/bin/flamegraph-report
> index b1a79afd903b..b0177355619b 100755
> --- a/tools/perf/scripts/python/bin/flamegraph-report
> +++ b/tools/perf/scripts/python/bin/flamegraph-report
> @@ -1,3 +1,3 @@
> -#!/usr/bin/sh
> +#!/bin/sh
> # description: create flame graphs
> perf script -s "$PERF_EXEC_PATH"/scripts/python/flamegraph.py -- "$@"
> ----->8---------->8---------->8-----
>
> Fixes: 5287f9269206 ("perf script: Add flamegraph.py script")
> Reported-by: Daniel DÃaz <daniel.diaz@xxxxxxxxxx>
> Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> Cc: Andreas Gerstmayr <agerstmayr@xxxxxxxxxx>
> Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
> Cc: lkft-triage@xxxxxxxxxxxxxxxx
> Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
> Link: http://lore.kernel.org/lkml/CAEUSe7_wmKS361mKLTB1eYbzYXcKkXdU26BX5BojdKRz8MfPCw@xxxxxxxxxxxxxx
> Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
>
> diff --git a/tools/perf/scripts/python/bin/flamegraph-report b/tools/perf/scripts/python/bin/flamegraph-report
> index b1a79afd903b..53c5dc90c87e 100755
> --- a/tools/perf/scripts/python/bin/flamegraph-report
> +++ b/tools/perf/scripts/python/bin/flamegraph-report
> @@ -1,3 +1,3 @@
> -#!/usr/bin/sh
> +#!/bin/bash
> # description: create flame graphs
> perf script -s "$PERF_EXEC_PATH"/scripts/python/flamegraph.py -- "$@"
What about flamegraph-record?
Thanks and greetings!
Daniel DÃaz
daniel.diaz@xxxxxxxxxx