From: Jiri Olsa <jolsa@redhat.com>
To: Jesper Dangaard Brouer <brouer@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
bpf@vger.kernel.org
Subject: Re: [PATCH] tools build feature: cleanup feature files on make clean
Date: Thu, 27 Aug 2020 14:44:47 +0200 [thread overview]
Message-ID: <20200827124447.GA77089@krava> (raw)
In-Reply-To: <159851841661.1072907.13770213104521805592.stgit@firesoul>
On Thu, Aug 27, 2020 at 10:53:36AM +0200, Jesper Dangaard Brouer wrote:
> The system for "Auto-detecting system features" located under
> tools/build/ are (currently) used by perf, libbpf and bpftool. It can
> contain stalled feature detection files, which are not cleaned up by
> libbpf and bpftool on make clean (side-note: perf tool is correct).
>
> Fix this by making the users invoke the make clean target.
>
> Some details about the changes. The libbpf Makefile already had a
> clean-config target (which seems to be copy-pasted from perf), but this
> target was not "connected" (a make dependency) to clean target. Choose
> not to rename target as someone might be using it. Did change the output
> from "CLEAN config" to "CLEAN feature-detect", to make it more clear
> what happens.
>
> This is related to the complaint and troubleshooting in link:
> Link: https://lore.kernel.org/lkml/20200818122007.2d1cfe2d@carbon/
sry, I forgot about this one.. the change looks good to me
Acked-by: Jiri Olsa <jolsa@redhat.com>
thanks,
jirka
>
> Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
> ---
> tools/build/Makefile | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
> index 8462690a039b..02c99bc95c69 100644
> --- a/tools/bpf/bpftool/Makefile
> +++ b/tools/bpf/bpftool/Makefile
> @@ -176,7 +176,11 @@ $(OUTPUT)bpftool: $(OBJS) $(LIBBPF)
> $(OUTPUT)%.o: %.c
> $(QUIET_CC)$(CC) $(CFLAGS) -c -MMD -o $@ $<
>
> -clean: $(LIBBPF)-clean
> +feature-detect-clean:
> + $(call QUIET_CLEAN, feature-detect)
> + $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
> +
> +clean: $(LIBBPF)-clean feature-detect-clean
> $(call QUIET_CLEAN, bpftool)
> $(Q)$(RM) -- $(OUTPUT)bpftool $(OUTPUT)*.o $(OUTPUT)*.d
> $(Q)$(RM) -- $(BPFTOOL_BOOTSTRAP) $(OUTPUT)*.skel.h $(OUTPUT)vmlinux.h
> diff --git a/tools/build/Makefile b/tools/build/Makefile
> index 727050c40f09..722f1700d96a 100644
> --- a/tools/build/Makefile
> +++ b/tools/build/Makefile
> @@ -38,6 +38,8 @@ clean:
> $(call QUIET_CLEAN, fixdep)
> $(Q)find $(if $(OUTPUT),$(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
> $(Q)rm -f $(OUTPUT)fixdep
> + $(call QUIET_CLEAN, feature-detect)
> + $(Q)$(MAKE) -C feature/ clean >/dev/null
>
> $(OUTPUT)fixdep-in.o: FORCE
> $(Q)$(MAKE) $(build)=fixdep
> diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
> index bf8ed134cb8a..bbb89551468a 100644
> --- a/tools/lib/bpf/Makefile
> +++ b/tools/lib/bpf/Makefile
> @@ -269,10 +269,10 @@ install: install_lib install_pkgconfig install_headers
> ### Cleaning rules
>
> config-clean:
> - $(call QUIET_CLEAN, config)
> + $(call QUIET_CLEAN, feature-detect)
> $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
>
> -clean:
> +clean: config-clean
> $(call QUIET_CLEAN, libbpf) $(RM) -rf $(CMD_TARGETS) \
> *~ .*.d .*.cmd LIBBPF-CFLAGS $(BPF_HELPER_DEFS) \
> $(SHARED_OBJDIR) $(STATIC_OBJDIR) \
>
>
next prev parent reply other threads:[~2020-08-27 12:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-27 8:53 [PATCH] tools build feature: cleanup feature files on make clean Jesper Dangaard Brouer
2020-08-27 12:44 ` Jiri Olsa [this message]
2020-08-28 12:14 ` Daniel Borkmann
2020-09-03 19:03 ` Arnaldo Carvalho de Melo
2020-09-03 19:20 ` Daniel Borkmann
2020-09-03 19:26 ` Arnaldo Carvalho de Melo
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=20200827124447.GA77089@krava \
--to=jolsa@redhat.com \
--cc=acme@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).