From: Jiri Olsa <jolsa@redhat.com>
To: "Toke Høiland-Jørgensen" <toke@redhat.com>
Cc: daniel@iogearbox.net, ast@fb.com, bpf@vger.kernel.org,
netdev@vger.kernel.org, jolsa@kernel.org
Subject: Re: [PATCH bpf] tools/bpf: build: make sure resolve_btfids cleans up after itself
Date: Tue, 1 Sep 2020 17:20:48 +0200 [thread overview]
Message-ID: <20200901152048.GA470123@krava> (raw)
In-Reply-To: <20200901144343.179552-1-toke@redhat.com>
On Tue, Sep 01, 2020 at 04:43:43PM +0200, Toke Høiland-Jørgensen wrote:
> The new resolve_btfids tool did not clean up the feature detection folder
> on 'make clean', and also was not called properly from the clean rule in
> tools/make/ folder on its 'make clean'. This lead to stale objects being
> left around, which could cause feature detection to fail on subsequent
> builds.
>
> Fixes: fbbb68de80a4 ("bpf: Add resolve_btfids tool to resolve BTF IDs in ELF object")
> Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
> ---
> tools/bpf/Makefile | 4 ++--
> tools/bpf/resolve_btfids/Makefile | 1 +
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/tools/bpf/Makefile b/tools/bpf/Makefile
> index 0a6d09a3e91f..39bb322707b4 100644
> --- a/tools/bpf/Makefile
> +++ b/tools/bpf/Makefile
> @@ -38,7 +38,7 @@ FEATURE_TESTS = libbfd disassembler-four-args
> FEATURE_DISPLAY = libbfd disassembler-four-args
>
> check_feat := 1
> -NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean
> +NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean resolve_btfids_clean
> ifdef MAKECMDGOALS
> ifeq ($(filter-out $(NON_CHECK_FEAT_TARGETS),$(MAKECMDGOALS)),)
> check_feat := 0
> @@ -89,7 +89,7 @@ $(OUTPUT)bpf_exp.lex.c: $(OUTPUT)bpf_exp.yacc.c
> $(OUTPUT)bpf_exp.yacc.o: $(OUTPUT)bpf_exp.yacc.c
> $(OUTPUT)bpf_exp.lex.o: $(OUTPUT)bpf_exp.lex.c
>
> -clean: bpftool_clean runqslower_clean
> +clean: bpftool_clean runqslower_clean resolve_btfids_clean
> $(call QUIET_CLEAN, bpf-progs)
> $(Q)$(RM) -r -- $(OUTPUT)*.o $(OUTPUT)bpf_jit_disasm $(OUTPUT)bpf_dbg \
> $(OUTPUT)bpf_asm $(OUTPUT)bpf_exp.yacc.* $(OUTPUT)bpf_exp.lex.*
> diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/Makefile
> index a88cd4426398..fe8eb537688b 100644
> --- a/tools/bpf/resolve_btfids/Makefile
> +++ b/tools/bpf/resolve_btfids/Makefile
> @@ -80,6 +80,7 @@ libbpf-clean:
> clean: libsubcmd-clean libbpf-clean fixdep-clean
> $(call msg,CLEAN,$(BINARY))
> $(Q)$(RM) -f $(BINARY); \
> + $(RM) -rf $(if $(OUTPUT),$(OUTPUT),.)/feature; \
I forgot this one.. thanks for fixing this
Acked-by: Jiri Olsa <jolsa@redhat.com>
jirka
next prev parent reply other threads:[~2020-09-01 17:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-01 14:43 [PATCH bpf] tools/bpf: build: make sure resolve_btfids cleans up after itself Toke Høiland-Jørgensen
2020-09-01 15:20 ` Jiri Olsa [this message]
2020-09-01 16:08 ` Toke Høiland-Jørgensen
2020-09-01 16:13 ` Daniel Borkmann
2020-09-01 19:28 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200901152048.GA470123@krava \
--to=jolsa@redhat.com \
--cc=ast@fb.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=jolsa@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=toke@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox