[PATCH bpf-next] bpftool: Remove unnecessary source files from bootstrap version

[PATCH bpf-next] bpftool: Remove unnecessary source files from bootstrap version

[Quentin Monnet]

Commit d510296d331a ("bpftool: Use syscall/loader program in "prog load"
and "gen skeleton" command.") added new files to the list of objects to
compile in order to build the bootstrap version of bpftool. As far as I
can tell, these objects are unnecessary and were added by mistake; maybe
a draft version intended to add support for loading loader programs from
the bootstrap version. Anyway, we can remove these object files from the
list to make the bootstrap bpftool binary a tad smaller and faster to
build.

Fixes: d510296d331a ("bpftool: Use syscall/loader program in "prog load" and "gen skeleton" command.")
Signed-off-by: Quentin Monnet <qmo@kernel.org>
---
 tools/bpf/bpftool/Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
index e9154ace80ff..00c704423539 100644
--- a/tools/bpf/bpftool/Makefile
+++ b/tools/bpf/bpftool/Makefile
@@ -183,7 +183,7 @@ HOST_CFLAGS = $(subst -I$(LIBBPF_INCLUDE),-I$(LIBBPF_BOOTSTRAP_INCLUDE),\
 
 BPFTOOL_BOOTSTRAP := $(BOOTSTRAP_OUTPUT)bpftool
 
-BOOTSTRAP_OBJS = $(addprefix $(BOOTSTRAP_OUTPUT),main.o common.o json_writer.o gen.o btf.o xlated_dumper.o btf_dumper.o disasm.o)
+BOOTSTRAP_OBJS = $(addprefix $(BOOTSTRAP_OUTPUT),main.o common.o json_writer.o gen.o btf.o)
 $(BOOTSTRAP_OBJS): $(LIBBPF_BOOTSTRAP)
 
 OBJS = $(patsubst %.c,$(OUTPUT)%.o,$(SRCS)) $(OUTPUT)disasm.o
@@ -231,9 +231,6 @@ endif
 
 CFLAGS += $(if $(BUILD_BPF_SKELS),,-DBPFTOOL_WITHOUT_SKELETONS)
 
-$(BOOTSTRAP_OUTPUT)disasm.o: $(srctree)/kernel/bpf/disasm.c
-	$(QUIET_CC)$(HOSTCC) $(HOST_CFLAGS) -c -MMD $< -o $@
-
 $(OUTPUT)disasm.o: $(srctree)/kernel/bpf/disasm.c
 	$(QUIET_CC)$(CC) $(CFLAGS) -c -MMD $< -o $@
 
-- 
2.34.1

Re: [PATCH bpf-next] bpftool: Remove unnecessary source files from bootstrap version

[Alexei Starovoitov]

On Tue, Mar 19, 2024 at 6:35 PM Quentin Monnet <qmo@kernel.org> wrote:
>
> Commit d510296d331a ("bpftool: Use syscall/loader program in "prog load"
> and "gen skeleton" command.") added new files to the list of objects to
> compile in order to build the bootstrap version of bpftool. As far as I
> can tell, these objects are unnecessary and were added by mistake; maybe
> a draft version intended to add support for loading loader programs from
> the bootstrap version. Anyway, we can remove these object files from the
> list to make the bootstrap bpftool binary a tad smaller and faster to
> build.
>
> Fixes: d510296d331a ("bpftool: Use syscall/loader program in "prog load" and "gen skeleton" command.")

I don't remember why I needed them back then.
Probably to debug lskel.
Applied.

Re: [PATCH bpf-next] bpftool: Remove unnecessary source files from bootstrap version

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Alexei Starovoitov <ast@kernel.org>:

On Wed, 20 Mar 2024 01:34:57 +0000 you wrote:
> Commit d510296d331a ("bpftool: Use syscall/loader program in "prog load"
> and "gen skeleton" command.") added new files to the list of objects to
> compile in order to build the bootstrap version of bpftool. As far as I
> can tell, these objects are unnecessary and were added by mistake; maybe
> a draft version intended to add support for loading loader programs from
> the bootstrap version. Anyway, we can remove these object files from the
> list to make the bootstrap bpftool binary a tad smaller and faster to
> build.
> 
> [...]

Here is the summary with links:
  - [bpf-next] bpftool: Remove unnecessary source files from bootstrap version
    https://git.kernel.org/bpf/bpf-next/c/e9a826dd145b

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html