LinuxLists.cc - [PATCH] perf tools: Change FEATURE-DUMP to FEATURE-DUMP.libbpf for lib bpf

2015-11-05 06:51:51

Subject: [PATCH] perf tools: Change FEATURE-DUMP to FEATURE-DUMP.libbpf for lib bpf

Commit ed63f34c026e9a60d17fa750ecdfe3f600d49393 ("perf tools: Make perf
depend on libbpf") dynamically creates FEATURE-DUMP.libbpf during the
perf building, but the .gitignore under tools/lib/bpf/ mistakes
FEATURE-DUMP.libbpf for FEATURE-DUMP. Besides, the Makefile under
tools/lib/bpf/ also mistakes FEATURE-DUMP.libbpf for FEATURE-DUMP, which
causes that "make clean" will leave (or say create) FEATURE-DUMP.libbpf
rather than remove FEATURE-DUMP.libbpf file.

Signed-off-by: Yunlong Song <[email protected]>
---
tools/lib/bpf/.gitignore | 2 +-
tools/lib/bpf/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/lib/bpf/.gitignore b/tools/lib/bpf/.gitignore
index 812aeed..f81e549 100644
--- a/tools/lib/bpf/.gitignore
+++ b/tools/lib/bpf/.gitignore
@@ -1,2 +1,2 @@
libbpf_version.h
-FEATURE-DUMP
+FEATURE-DUMP.libbpf
diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
index fc9af57..a3caaf3 100644
--- a/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@ -180,7 +180,7 @@ config-clean:
clean:
$(call QUIET_CLEAN, libbpf) $(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d \
$(RM) LIBBPF-CFLAGS
- $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP
+ $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf

--
1.8.5.2

2015-11-05 13:23:59

by Arnaldo Carvalho de Melo

[permalink] [raw]

Subject: Re: [PATCH] perf tools: Change FEATURE-DUMP to FEATURE-DUMP.libbpf for lib bpf

Em Thu, Nov 05, 2015 at 02:56:34PM +0800, Yunlong Song escreveu:
> Commit ed63f34c026e9a60d17fa750ecdfe3f600d49393 ("perf tools: Make perf
> depend on libbpf") dynamically creates FEATURE-DUMP.libbpf during the
> perf building, but the .gitignore under tools/lib/bpf/ mistakes
> FEATURE-DUMP.libbpf for FEATURE-DUMP. Besides, the Makefile under
> tools/lib/bpf/ also mistakes FEATURE-DUMP.libbpf for FEATURE-DUMP, which
> causes that "make clean" will leave (or say create) FEATURE-DUMP.libbpf
> rather than remove FEATURE-DUMP.libbpf file.

Ok, so the cset that created files with a .libbpf suffix was this one:

commit 65f041bee783
Author: Arnaldo Carvalho de Melo <[email protected]>
Date: Mon Sep 21 17:25:27 2015 -0300

tools lib bpf: Use FEATURE_USER to allow building in the same dir as perf

-------

That has this tag:

Fixes: 1b76c13e4b36 ("bpf tools: Introduce 'bpf' library and add bpf feature check")

---

The cset you mention, ed63f34c026e9a60d17fa750ecdfe3f600d49393, just
makes perf call the code introduced by 1b76c13e4b36 and fixed by
65f041bee783, i.e. you start noticing, when building perf, that those
files are created.

Anyway, fixing it up, thanks for the patch!

- Arnaldo

> Signed-off-by: Yunlong Song <[email protected]>
> ---
> tools/lib/bpf/.gitignore | 2 +-
> tools/lib/bpf/Makefile | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/lib/bpf/.gitignore b/tools/lib/bpf/.gitignore
> index 812aeed..f81e549 100644
> --- a/tools/lib/bpf/.gitignore
> +++ b/tools/lib/bpf/.gitignore
> @@ -1,2 +1,2 @@
> libbpf_version.h
> -FEATURE-DUMP
> +FEATURE-DUMP.libbpf
> diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
> index fc9af57..a3caaf3 100644
> --- a/tools/lib/bpf/Makefile
> +++ b/tools/lib/bpf/Makefile
> @@ -180,7 +180,7 @@ config-clean:
> clean:
> $(call QUIET_CLEAN, libbpf) $(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d \
> $(RM) LIBBPF-CFLAGS
> - $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP
> + $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf
>
>
>
> --
> 1.8.5.2

2015-11-06 02:09:28

by Yunlong Song

[permalink] [raw]

Subject: Re: [PATCH] perf tools: Change FEATURE-DUMP to FEATURE-DUMP.libbpf for lib bpf

On 2015/11/5 21:23, Arnaldo Carvalho de Melo wrote:
> The cset you mention, ed63f34c026e9a60d17fa750ecdfe3f600d49393, just
> makes perf call the code introduced by 1b76c13e4b36 and fixed by
> 65f041bee783, i.e. you start noticing, when building perf, that those
> files are created.
>
> Anyway, fixing it up, thanks for the patch!
>
> - Arnaldo

Yes, right. Thanks for your detailed explanation.

--
Thanks,
Yunlong Song

2015-11-08 07:31:04

by tip-bot for Vasyl Gomonovych

[permalink] [raw]

Subject: [tip:perf/urgent] tools lib bpf: Change FEATURE-DUMP to FEATURE-DUMP.libbpf

Commit-ID: 0c77c04aa9c2b3a154f5cb0559feaee3fb7a6935
Gitweb: http://git.kernel.org/tip/0c77c04aa9c2b3a154f5cb0559feaee3fb7a6935
Author: Yunlong Song <[email protected]>
AuthorDate: Thu, 5 Nov 2015 14:56:34 +0800
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 5 Nov 2015 12:47:51 -0300

tools lib bpf: Change FEATURE-DUMP to FEATURE-DUMP.libbpf

Commit ed63f34c026e9a60d17fa750ecdfe3f600d49393 ("perf tools: Make perf
depend on libbpf") triggers the build of libbpf when building the perf
tools, dynamically creating FEATURE-DUMP.libbpf.

It failed to update the tools/lib/bpf/.gitignore file to have that
prefix, fix it.

Signed-off-by: Yunlong Song <[email protected]>
Cc: Adrian Hunter <[email protected]>
Cc: Alexei Starovoitov <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Kan Liang <[email protected]>
Cc: Masami Hiramatsu <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Wang Nan <[email protected]>
Fixes: 65f041bee783 ("tools lib bpf: Use FEATURE_USER to allow building in the same dir as perf")
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/lib/bpf/.gitignore | 2 +-
tools/lib/bpf/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/lib/bpf/.gitignore b/tools/lib/bpf/.gitignore
index 812aeed..f81e549 100644
--- a/tools/lib/bpf/.gitignore
+++ b/tools/lib/bpf/.gitignore
@@ -1,2 +1,2 @@
libbpf_version.h
-FEATURE-DUMP
+FEATURE-DUMP.libbpf
diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
index fc9af57..a3caaf3 100644
--- a/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@ -180,7 +180,7 @@ config-clean:
clean:
$(call QUIET_CLEAN, libbpf) $(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d \
$(RM) LIBBPF-CFLAGS
- $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP
+ $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf