linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] perf libdw: Fix off-by 1 relative directory includes
@ 2020-05-29 22:52 Ian Rogers
  2020-05-31 14:29 ` Namhyung Kim
  0 siblings, 1 reply; 4+ messages in thread
From: Ian Rogers @ 2020-05-29 22:52 UTC (permalink / raw)
  To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
	Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
	linux-kernel
  Cc: Stephane Eranian, Ian Rogers

This is currently working due to extra include paths in the build.

Before:
$ cd tools/perf/arch/arm64/util
$ ls -la ../../util/unwind-libdw.h
ls: cannot access '../../util/unwind-libdw.h': No such file or directory

After:
$ ls -la ../../../util/unwind-libdw.h
-rw-r----- 1 irogers irogers 553 Apr 17 14:31 ../../../util/unwind-libdw.h
---
 tools/perf/arch/arm64/util/unwind-libdw.c   | 6 +++---
 tools/perf/arch/powerpc/util/unwind-libdw.c | 6 +++---
 tools/perf/arch/x86/util/unwind-libdw.c     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tools/perf/arch/arm64/util/unwind-libdw.c b/tools/perf/arch/arm64/util/unwind-libdw.c
index 7623d85e77f3..a50941629649 100644
--- a/tools/perf/arch/arm64/util/unwind-libdw.c
+++ b/tools/perf/arch/arm64/util/unwind-libdw.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <elfutils/libdwfl.h>
-#include "../../util/unwind-libdw.h"
-#include "../../util/perf_regs.h"
-#include "../../util/event.h"
+#include "../../../util/unwind-libdw.h"
+#include "../../../util/perf_regs.h"
+#include "../../../util/event.h"
 
 bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
 {
diff --git a/tools/perf/arch/powerpc/util/unwind-libdw.c b/tools/perf/arch/powerpc/util/unwind-libdw.c
index abf2dbc7f829..7b2d96ec28e3 100644
--- a/tools/perf/arch/powerpc/util/unwind-libdw.c
+++ b/tools/perf/arch/powerpc/util/unwind-libdw.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <elfutils/libdwfl.h>
 #include <linux/kernel.h>
-#include "../../util/unwind-libdw.h"
-#include "../../util/perf_regs.h"
-#include "../../util/event.h"
+#include "../../../util/unwind-libdw.h"
+#include "../../../util/perf_regs.h"
+#include "../../../util/event.h"
 
 /* See backends/ppc_initreg.c and backends/ppc_regs.c in elfutils.  */
 static const int special_regs[3][2] = {
diff --git a/tools/perf/arch/x86/util/unwind-libdw.c b/tools/perf/arch/x86/util/unwind-libdw.c
index fda8f4206ee4..eea2bf87232b 100644
--- a/tools/perf/arch/x86/util/unwind-libdw.c
+++ b/tools/perf/arch/x86/util/unwind-libdw.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <elfutils/libdwfl.h>
-#include "../../util/unwind-libdw.h"
-#include "../../util/perf_regs.h"
-#include "../../util/event.h"
+#include "../../../util/unwind-libdw.h"
+#include "../../../util/perf_regs.h"
+#include "../../../util/event.h"
 
 bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
 {
-- 
2.27.0.rc2.251.g90737beb825-goog


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] perf libdw: Fix off-by 1 relative directory includes
  2020-05-29 22:52 [PATCH] perf libdw: Fix off-by 1 relative directory includes Ian Rogers
@ 2020-05-31 14:29 ` Namhyung Kim
  2020-06-01  0:06   ` Ian Rogers
  0 siblings, 1 reply; 4+ messages in thread
From: Namhyung Kim @ 2020-05-31 14:29 UTC (permalink / raw)
  To: Ian Rogers
  Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
	Mark Rutland, Alexander Shishkin, Jiri Olsa, linux-kernel,
	Stephane Eranian

Hi Ian,

On Sat, May 30, 2020 at 7:53 AM Ian Rogers <irogers@google.com> wrote:
>
> This is currently working due to extra include paths in the build.
>
> Before:
> $ cd tools/perf/arch/arm64/util
> $ ls -la ../../util/unwind-libdw.h
> ls: cannot access '../../util/unwind-libdw.h': No such file or directory
>
> After:
> $ ls -la ../../../util/unwind-libdw.h
> -rw-r----- 1 irogers irogers 553 Apr 17 14:31 ../../../util/unwind-libdw.h

Missing sign-off, but otherwise looks good to me

Acked-by: Namhyung Kim <namhyung@kernel.org>

Thanks
Namhyung


> ---
>  tools/perf/arch/arm64/util/unwind-libdw.c   | 6 +++---
>  tools/perf/arch/powerpc/util/unwind-libdw.c | 6 +++---
>  tools/perf/arch/x86/util/unwind-libdw.c     | 6 +++---
>  3 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/tools/perf/arch/arm64/util/unwind-libdw.c b/tools/perf/arch/arm64/util/unwind-libdw.c
> index 7623d85e77f3..a50941629649 100644
> --- a/tools/perf/arch/arm64/util/unwind-libdw.c
> +++ b/tools/perf/arch/arm64/util/unwind-libdw.c
> @@ -1,8 +1,8 @@
>  // SPDX-License-Identifier: GPL-2.0
>  #include <elfutils/libdwfl.h>
> -#include "../../util/unwind-libdw.h"
> -#include "../../util/perf_regs.h"
> -#include "../../util/event.h"
> +#include "../../../util/unwind-libdw.h"
> +#include "../../../util/perf_regs.h"
> +#include "../../../util/event.h"
>
>  bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
>  {
> diff --git a/tools/perf/arch/powerpc/util/unwind-libdw.c b/tools/perf/arch/powerpc/util/unwind-libdw.c
> index abf2dbc7f829..7b2d96ec28e3 100644
> --- a/tools/perf/arch/powerpc/util/unwind-libdw.c
> +++ b/tools/perf/arch/powerpc/util/unwind-libdw.c
> @@ -1,9 +1,9 @@
>  // SPDX-License-Identifier: GPL-2.0
>  #include <elfutils/libdwfl.h>
>  #include <linux/kernel.h>
> -#include "../../util/unwind-libdw.h"
> -#include "../../util/perf_regs.h"
> -#include "../../util/event.h"
> +#include "../../../util/unwind-libdw.h"
> +#include "../../../util/perf_regs.h"
> +#include "../../../util/event.h"
>
>  /* See backends/ppc_initreg.c and backends/ppc_regs.c in elfutils.  */
>  static const int special_regs[3][2] = {
> diff --git a/tools/perf/arch/x86/util/unwind-libdw.c b/tools/perf/arch/x86/util/unwind-libdw.c
> index fda8f4206ee4..eea2bf87232b 100644
> --- a/tools/perf/arch/x86/util/unwind-libdw.c
> +++ b/tools/perf/arch/x86/util/unwind-libdw.c
> @@ -1,8 +1,8 @@
>  // SPDX-License-Identifier: GPL-2.0
>  #include <elfutils/libdwfl.h>
> -#include "../../util/unwind-libdw.h"
> -#include "../../util/perf_regs.h"
> -#include "../../util/event.h"
> +#include "../../../util/unwind-libdw.h"
> +#include "../../../util/perf_regs.h"
> +#include "../../../util/event.h"
>
>  bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
>  {
> --
> 2.27.0.rc2.251.g90737beb825-goog
>

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] perf libdw: Fix off-by 1 relative directory includes
  2020-05-31 14:29 ` Namhyung Kim
@ 2020-06-01  0:06   ` Ian Rogers
  2020-06-01 14:21     ` Arnaldo Carvalho de Melo
  0 siblings, 1 reply; 4+ messages in thread
From: Ian Rogers @ 2020-06-01  0:06 UTC (permalink / raw)
  To: Namhyung Kim
  Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
	Mark Rutland, Alexander Shishkin, Jiri Olsa, linux-kernel,
	Stephane Eranian

On Sun, May 31, 2020 at 7:29 AM Namhyung Kim <namhyung@kernel.org> wrote:
>
> Hi Ian,
>
> On Sat, May 30, 2020 at 7:53 AM Ian Rogers <irogers@google.com> wrote:
> >
> > This is currently working due to extra include paths in the build.
> >
> > Before:
> > $ cd tools/perf/arch/arm64/util
> > $ ls -la ../../util/unwind-libdw.h
> > ls: cannot access '../../util/unwind-libdw.h': No such file or directory
> >
> > After:
> > $ ls -la ../../../util/unwind-libdw.h
> > -rw-r----- 1 irogers irogers 553 Apr 17 14:31 ../../../util/unwind-libdw.h
>
> Missing sign-off, but otherwise looks good to me

Doh! Thanks Namhyung.

Signed-off-by: Ian Rogers <irogers@google.com>

Ian

> Acked-by: Namhyung Kim <namhyung@kernel.org>
>
> Thanks
> Namhyung
>
>
> > ---
> >  tools/perf/arch/arm64/util/unwind-libdw.c   | 6 +++---
> >  tools/perf/arch/powerpc/util/unwind-libdw.c | 6 +++---
> >  tools/perf/arch/x86/util/unwind-libdw.c     | 6 +++---
> >  3 files changed, 9 insertions(+), 9 deletions(-)
> >
> > diff --git a/tools/perf/arch/arm64/util/unwind-libdw.c b/tools/perf/arch/arm64/util/unwind-libdw.c
> > index 7623d85e77f3..a50941629649 100644
> > --- a/tools/perf/arch/arm64/util/unwind-libdw.c
> > +++ b/tools/perf/arch/arm64/util/unwind-libdw.c
> > @@ -1,8 +1,8 @@
> >  // SPDX-License-Identifier: GPL-2.0
> >  #include <elfutils/libdwfl.h>
> > -#include "../../util/unwind-libdw.h"
> > -#include "../../util/perf_regs.h"
> > -#include "../../util/event.h"
> > +#include "../../../util/unwind-libdw.h"
> > +#include "../../../util/perf_regs.h"
> > +#include "../../../util/event.h"
> >
> >  bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
> >  {
> > diff --git a/tools/perf/arch/powerpc/util/unwind-libdw.c b/tools/perf/arch/powerpc/util/unwind-libdw.c
> > index abf2dbc7f829..7b2d96ec28e3 100644
> > --- a/tools/perf/arch/powerpc/util/unwind-libdw.c
> > +++ b/tools/perf/arch/powerpc/util/unwind-libdw.c
> > @@ -1,9 +1,9 @@
> >  // SPDX-License-Identifier: GPL-2.0
> >  #include <elfutils/libdwfl.h>
> >  #include <linux/kernel.h>
> > -#include "../../util/unwind-libdw.h"
> > -#include "../../util/perf_regs.h"
> > -#include "../../util/event.h"
> > +#include "../../../util/unwind-libdw.h"
> > +#include "../../../util/perf_regs.h"
> > +#include "../../../util/event.h"
> >
> >  /* See backends/ppc_initreg.c and backends/ppc_regs.c in elfutils.  */
> >  static const int special_regs[3][2] = {
> > diff --git a/tools/perf/arch/x86/util/unwind-libdw.c b/tools/perf/arch/x86/util/unwind-libdw.c
> > index fda8f4206ee4..eea2bf87232b 100644
> > --- a/tools/perf/arch/x86/util/unwind-libdw.c
> > +++ b/tools/perf/arch/x86/util/unwind-libdw.c
> > @@ -1,8 +1,8 @@
> >  // SPDX-License-Identifier: GPL-2.0
> >  #include <elfutils/libdwfl.h>
> > -#include "../../util/unwind-libdw.h"
> > -#include "../../util/perf_regs.h"
> > -#include "../../util/event.h"
> > +#include "../../../util/unwind-libdw.h"
> > +#include "../../../util/perf_regs.h"
> > +#include "../../../util/event.h"
> >
> >  bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
> >  {
> > --
> > 2.27.0.rc2.251.g90737beb825-goog
> >

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] perf libdw: Fix off-by 1 relative directory includes
  2020-06-01  0:06   ` Ian Rogers
@ 2020-06-01 14:21     ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 4+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-06-01 14:21 UTC (permalink / raw)
  To: Ian Rogers
  Cc: Namhyung Kim, Peter Zijlstra, Ingo Molnar, Mark Rutland,
	Alexander Shishkin, Jiri Olsa, linux-kernel, Stephane Eranian

Em Sun, May 31, 2020 at 05:06:08PM -0700, Ian Rogers escreveu:
> On Sun, May 31, 2020 at 7:29 AM Namhyung Kim <namhyung@kernel.org> wrote:
> >
> > Hi Ian,
> >
> > On Sat, May 30, 2020 at 7:53 AM Ian Rogers <irogers@google.com> wrote:
> > >
> > > This is currently working due to extra include paths in the build.
> > >
> > > Before:
> > > $ cd tools/perf/arch/arm64/util
> > > $ ls -la ../../util/unwind-libdw.h
> > > ls: cannot access '../../util/unwind-libdw.h': No such file or directory
> > >
> > > After:
> > > $ ls -la ../../../util/unwind-libdw.h
> > > -rw-r----- 1 irogers irogers 553 Apr 17 14:31 ../../../util/unwind-libdw.h
> >
> > Missing sign-off, but otherwise looks good to me
> 
> Doh! Thanks Namhyung.
> 
> Signed-off-by: Ian Rogers <irogers@google.com>

Thanks, applied.

- Arnaldo
 
> Ian
> 
> > Acked-by: Namhyung Kim <namhyung@kernel.org>
> >
> > Thanks
> > Namhyung
> >
> >
> > > ---
> > >  tools/perf/arch/arm64/util/unwind-libdw.c   | 6 +++---
> > >  tools/perf/arch/powerpc/util/unwind-libdw.c | 6 +++---
> > >  tools/perf/arch/x86/util/unwind-libdw.c     | 6 +++---
> > >  3 files changed, 9 insertions(+), 9 deletions(-)
> > >
> > > diff --git a/tools/perf/arch/arm64/util/unwind-libdw.c b/tools/perf/arch/arm64/util/unwind-libdw.c
> > > index 7623d85e77f3..a50941629649 100644
> > > --- a/tools/perf/arch/arm64/util/unwind-libdw.c
> > > +++ b/tools/perf/arch/arm64/util/unwind-libdw.c
> > > @@ -1,8 +1,8 @@
> > >  // SPDX-License-Identifier: GPL-2.0
> > >  #include <elfutils/libdwfl.h>
> > > -#include "../../util/unwind-libdw.h"
> > > -#include "../../util/perf_regs.h"
> > > -#include "../../util/event.h"
> > > +#include "../../../util/unwind-libdw.h"
> > > +#include "../../../util/perf_regs.h"
> > > +#include "../../../util/event.h"
> > >
> > >  bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
> > >  {
> > > diff --git a/tools/perf/arch/powerpc/util/unwind-libdw.c b/tools/perf/arch/powerpc/util/unwind-libdw.c
> > > index abf2dbc7f829..7b2d96ec28e3 100644
> > > --- a/tools/perf/arch/powerpc/util/unwind-libdw.c
> > > +++ b/tools/perf/arch/powerpc/util/unwind-libdw.c
> > > @@ -1,9 +1,9 @@
> > >  // SPDX-License-Identifier: GPL-2.0
> > >  #include <elfutils/libdwfl.h>
> > >  #include <linux/kernel.h>
> > > -#include "../../util/unwind-libdw.h"
> > > -#include "../../util/perf_regs.h"
> > > -#include "../../util/event.h"
> > > +#include "../../../util/unwind-libdw.h"
> > > +#include "../../../util/perf_regs.h"
> > > +#include "../../../util/event.h"
> > >
> > >  /* See backends/ppc_initreg.c and backends/ppc_regs.c in elfutils.  */
> > >  static const int special_regs[3][2] = {
> > > diff --git a/tools/perf/arch/x86/util/unwind-libdw.c b/tools/perf/arch/x86/util/unwind-libdw.c
> > > index fda8f4206ee4..eea2bf87232b 100644
> > > --- a/tools/perf/arch/x86/util/unwind-libdw.c
> > > +++ b/tools/perf/arch/x86/util/unwind-libdw.c
> > > @@ -1,8 +1,8 @@
> > >  // SPDX-License-Identifier: GPL-2.0
> > >  #include <elfutils/libdwfl.h>
> > > -#include "../../util/unwind-libdw.h"
> > > -#include "../../util/perf_regs.h"
> > > -#include "../../util/event.h"
> > > +#include "../../../util/unwind-libdw.h"
> > > +#include "../../../util/perf_regs.h"
> > > +#include "../../../util/event.h"
> > >
> > >  bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
> > >  {
> > > --
> > > 2.27.0.rc2.251.g90737beb825-goog
> > >

-- 

- Arnaldo

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-01 14:21 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-29 22:52 [PATCH] perf libdw: Fix off-by 1 relative directory includes Ian Rogers
2020-05-31 14:29 ` Namhyung Kim
2020-06-01  0:06   ` Ian Rogers
2020-06-01 14:21     ` Arnaldo Carvalho de Melo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).