* [PATCH] tools/bpf/runqslower: Rebuild libbpf.a on libbpf source change
@ 2020-02-04 17:53 Song Liu
2020-02-04 18:43 ` Andrii Nakryiko
0 siblings, 1 reply; 4+ messages in thread
From: Song Liu @ 2020-02-04 17:53 UTC (permalink / raw)
To: bpf; +Cc: Song Liu, Andrii Nakryiko
Add missing dependency of $(BPFOBJ) to $(LIBBPF_SRC), so that running make
in runqslower/ will rebuild libbpf.a when there is change in libbpf/.
Fixes: 9c01546d26d2 ("tools/bpf: Add runqslower tool to tools/bpf")
Cc: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Song Liu <songliubraving@fb.com>
---
tools/bpf/runqslower/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/bpf/runqslower/Makefile b/tools/bpf/runqslower/Makefile
index 87eae5be9bcd..ea89fcb6d68f 100644
--- a/tools/bpf/runqslower/Makefile
+++ b/tools/bpf/runqslower/Makefile
@@ -75,7 +75,7 @@ $(OUTPUT)/vmlinux.h: $(VMLINUX_BTF_PATH) | $(OUTPUT) $(BPFTOOL)
fi
$(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF_PATH) format c > $@
-$(BPFOBJ): | $(OUTPUT)
+$(BPFOBJ): $(LIBBPF_SRC) | $(OUTPUT)
$(Q)$(MAKE) $(submake_extras) -C $(LIBBPF_SRC) \
OUTPUT=$(abspath $(dir $@))/ $(abspath $@)
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] tools/bpf/runqslower: Rebuild libbpf.a on libbpf source change
2020-02-04 17:53 [PATCH] tools/bpf/runqslower: Rebuild libbpf.a on libbpf source change Song Liu
@ 2020-02-04 18:43 ` Andrii Nakryiko
2020-02-04 21:35 ` Song Liu
0 siblings, 1 reply; 4+ messages in thread
From: Andrii Nakryiko @ 2020-02-04 18:43 UTC (permalink / raw)
To: Song Liu; +Cc: bpf, Andrii Nakryiko
On Tue, Feb 4, 2020 at 9:54 AM Song Liu <songliubraving@fb.com> wrote:
>
> Add missing dependency of $(BPFOBJ) to $(LIBBPF_SRC), so that running make
> in runqslower/ will rebuild libbpf.a when there is change in libbpf/.
>
> Fixes: 9c01546d26d2 ("tools/bpf: Add runqslower tool to tools/bpf")
> Cc: Andrii Nakryiko <andriin@fb.com>
> Signed-off-by: Song Liu <songliubraving@fb.com>
> ---
> tools/bpf/runqslower/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/bpf/runqslower/Makefile b/tools/bpf/runqslower/Makefile
> index 87eae5be9bcd..ea89fcb6d68f 100644
> --- a/tools/bpf/runqslower/Makefile
> +++ b/tools/bpf/runqslower/Makefile
> @@ -75,7 +75,7 @@ $(OUTPUT)/vmlinux.h: $(VMLINUX_BTF_PATH) | $(OUTPUT) $(BPFTOOL)
> fi
> $(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF_PATH) format c > $@
>
> -$(BPFOBJ): | $(OUTPUT)
> +$(BPFOBJ): $(LIBBPF_SRC) | $(OUTPUT)
Let's instead update this rule to do what selftests/bpf do (watch *.c,
*.h and Makefile, and use all + install_headers to build libbpf and
generate bpf_helper_defs.h?
Please also specify (in subject) which tree (bpf or bpf-next) you are targeting.
> $(Q)$(MAKE) $(submake_extras) -C $(LIBBPF_SRC) \
> OUTPUT=$(abspath $(dir $@))/ $(abspath $@)
>
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] tools/bpf/runqslower: Rebuild libbpf.a on libbpf source change
2020-02-04 18:43 ` Andrii Nakryiko
@ 2020-02-04 21:35 ` Song Liu
2020-02-04 21:47 ` Andrii Nakryiko
0 siblings, 1 reply; 4+ messages in thread
From: Song Liu @ 2020-02-04 21:35 UTC (permalink / raw)
To: Andrii Nakryiko; +Cc: bpf, Andrii Nakryiko
> On Feb 4, 2020, at 10:43 AM, Andrii Nakryiko <andrii.nakryiko@gmail.com> wrote:
>
> On Tue, Feb 4, 2020 at 9:54 AM Song Liu <songliubraving@fb.com> wrote:
>>
>> Add missing dependency of $(BPFOBJ) to $(LIBBPF_SRC), so that running make
>> in runqslower/ will rebuild libbpf.a when there is change in libbpf/.
>>
>> Fixes: 9c01546d26d2 ("tools/bpf: Add runqslower tool to tools/bpf")
>> Cc: Andrii Nakryiko <andriin@fb.com>
>> Signed-off-by: Song Liu <songliubraving@fb.com>
>> ---
>> tools/bpf/runqslower/Makefile | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/bpf/runqslower/Makefile b/tools/bpf/runqslower/Makefile
>> index 87eae5be9bcd..ea89fcb6d68f 100644
>> --- a/tools/bpf/runqslower/Makefile
>> +++ b/tools/bpf/runqslower/Makefile
>> @@ -75,7 +75,7 @@ $(OUTPUT)/vmlinux.h: $(VMLINUX_BTF_PATH) | $(OUTPUT) $(BPFTOOL)
>> fi
>> $(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF_PATH) format c > $@
>>
>> -$(BPFOBJ): | $(OUTPUT)
>> +$(BPFOBJ): $(LIBBPF_SRC) | $(OUTPUT)
>
> Let's instead update this rule to do what selftests/bpf do (watch *.c,
> *.h and Makefile, and use all + install_headers to build libbpf and
> generate bpf_helper_defs.h?
Do you mean:
diff --git c/tools/bpf/runqslower/Makefile w/tools/bpf/runqslower/Makefile
index 87eae5be9bcd..39edd68afa8e 100644
--- c/tools/bpf/runqslower/Makefile
+++ w/tools/bpf/runqslower/Makefile
@@ -75,7 +75,7 @@ $(OUTPUT)/vmlinux.h: $(VMLINUX_BTF_PATH) | $(OUTPUT) $(BPFTOOL)
fi
$(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF_PATH) format c > $@
-$(BPFOBJ): | $(OUTPUT)
+$(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(OUTPUT)
$(Q)$(MAKE) $(submake_extras) -C $(LIBBPF_SRC) \
OUTPUT=$(abspath $(dir $@))/ $(abspath $@)
>
> Please also specify (in subject) which tree (bpf or bpf-next) you are targeting.
Aha, I started with "bpf: runqslower:". Then I some how changed it to
tools/bpf/runquslower. Will fix.
Thanks,
Song
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] tools/bpf/runqslower: Rebuild libbpf.a on libbpf source change
2020-02-04 21:35 ` Song Liu
@ 2020-02-04 21:47 ` Andrii Nakryiko
0 siblings, 0 replies; 4+ messages in thread
From: Andrii Nakryiko @ 2020-02-04 21:47 UTC (permalink / raw)
To: Song Liu; +Cc: bpf, Andrii Nakryiko
On Tue, Feb 4, 2020 at 1:35 PM Song Liu <songliubraving@fb.com> wrote:
>
>
>
> > On Feb 4, 2020, at 10:43 AM, Andrii Nakryiko <andrii.nakryiko@gmail.com> wrote:
> >
> > On Tue, Feb 4, 2020 at 9:54 AM Song Liu <songliubraving@fb.com> wrote:
> >>
> >> Add missing dependency of $(BPFOBJ) to $(LIBBPF_SRC), so that running make
> >> in runqslower/ will rebuild libbpf.a when there is change in libbpf/.
> >>
> >> Fixes: 9c01546d26d2 ("tools/bpf: Add runqslower tool to tools/bpf")
> >> Cc: Andrii Nakryiko <andriin@fb.com>
> >> Signed-off-by: Song Liu <songliubraving@fb.com>
> >> ---
> >> tools/bpf/runqslower/Makefile | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/tools/bpf/runqslower/Makefile b/tools/bpf/runqslower/Makefile
> >> index 87eae5be9bcd..ea89fcb6d68f 100644
> >> --- a/tools/bpf/runqslower/Makefile
> >> +++ b/tools/bpf/runqslower/Makefile
> >> @@ -75,7 +75,7 @@ $(OUTPUT)/vmlinux.h: $(VMLINUX_BTF_PATH) | $(OUTPUT) $(BPFTOOL)
> >> fi
> >> $(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF_PATH) format c > $@
> >>
> >> -$(BPFOBJ): | $(OUTPUT)
> >> +$(BPFOBJ): $(LIBBPF_SRC) | $(OUTPUT)
> >
> > Let's instead update this rule to do what selftests/bpf do (watch *.c,
> > *.h and Makefile, and use all + install_headers to build libbpf and
> > generate bpf_helper_defs.h?
>
> Do you mean:
>
> diff --git c/tools/bpf/runqslower/Makefile w/tools/bpf/runqslower/Makefile
> index 87eae5be9bcd..39edd68afa8e 100644
> --- c/tools/bpf/runqslower/Makefile
> +++ w/tools/bpf/runqslower/Makefile
> @@ -75,7 +75,7 @@ $(OUTPUT)/vmlinux.h: $(VMLINUX_BTF_PATH) | $(OUTPUT) $(BPFTOOL)
> fi
> $(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF_PATH) format c > $@
>
> -$(BPFOBJ): | $(OUTPUT)
> +$(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(OUTPUT)
> $(Q)$(MAKE) $(submake_extras) -C $(LIBBPF_SRC) \
> OUTPUT=$(abspath $(dir $@))/ $(abspath $@)
this works
Acked-by: Andrii Nakryiko <andriin@fb.com>
>
> >
> > Please also specify (in subject) which tree (bpf or bpf-next) you are targeting.
>
> Aha, I started with "bpf: runqslower:". Then I some how changed it to
> tools/bpf/runquslower. Will fix.
>
> Thanks,
> Song
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-04 21:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-04 17:53 [PATCH] tools/bpf/runqslower: Rebuild libbpf.a on libbpf source change Song Liu
2020-02-04 18:43 ` Andrii Nakryiko
2020-02-04 21:35 ` Song Liu
2020-02-04 21:47 ` Andrii Nakryiko
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).