* [PATCH bpf-next] bpf: missing trailing slash in tools/testing/selftests/bpf/Makefile
@ 2024-05-02 14:08 Jose E. Marchesi
2024-05-02 16:40 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Jose E. Marchesi @ 2024-05-02 14:08 UTC (permalink / raw
To: bpf; +Cc: Jose E . Marchesi, david.faust, cupertino.miranda,
Andrii Nakryiko
tools/lib/bpf/Makefile assumes that the patch in OUTPUT is a directory
and that it includes a trailing slash. This seems to be a common
expectation for OUTPUT among all the Makefiles.
In the rule for runqslower in tools/testing/selftests/bpf/Makefile the
variable BPFTOOL_OUTPUT is set to a directory name that lacks a
trailing slash. This results in a malformed BPF_HELPER_DEFS being
defined in lib/bpf/Makefile.
This problem becomes evident when a file like
tools/lib/bpf/bpf_tracing.h gets updated.
This patch fixes the problem by adding the missing slash in the value
for BPFTOOL_OUTPUT in the $(OUTPUT)/runqslower rule.
Regtested by running selftests in bpf-next master and building
samples/bpf programs.
Signed-off-by: Jose E. Marchesi <jose.marchesi@oracle.com>
Cc: david.faust@oracle.com
Cc: cupertino.miranda@oracle.com
Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com>
---
tools/testing/selftests/bpf/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index 82247aeef857..ba28d42b74db 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -262,7 +262,7 @@ $(OUTPUT)/runqslower: $(BPFOBJ) | $(DEFAULT_BPFTOOL) $(RUNQSLOWER_OUTPUT)
$(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/runqslower \
OUTPUT=$(RUNQSLOWER_OUTPUT) VMLINUX_BTF=$(VMLINUX_BTF) \
BPFTOOL_OUTPUT=$(HOST_BUILD_DIR)/bpftool/ \
- BPFOBJ_OUTPUT=$(BUILD_DIR)/libbpf \
+ BPFOBJ_OUTPUT=$(BUILD_DIR)/libbpf/ \
BPFOBJ=$(BPFOBJ) BPF_INCLUDE=$(INCLUDE_DIR) \
EXTRA_CFLAGS='-g $(OPT_FLAGS) $(SAN_CFLAGS)' \
EXTRA_LDFLAGS='$(SAN_LDFLAGS)' && \
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH bpf-next] bpf: missing trailing slash in tools/testing/selftests/bpf/Makefile
2024-05-02 14:08 [PATCH bpf-next] bpf: missing trailing slash in tools/testing/selftests/bpf/Makefile Jose E. Marchesi
@ 2024-05-02 16:40 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-05-02 16:40 UTC (permalink / raw
To: Jose E. Marchesi; +Cc: bpf, david.faust, cupertino.miranda, andrii.nakryiko
Hello:
This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <andrii@kernel.org>:
On Thu, 2 May 2024 16:08:31 +0200 you wrote:
> tools/lib/bpf/Makefile assumes that the patch in OUTPUT is a directory
> and that it includes a trailing slash. This seems to be a common
> expectation for OUTPUT among all the Makefiles.
>
> In the rule for runqslower in tools/testing/selftests/bpf/Makefile the
> variable BPFTOOL_OUTPUT is set to a directory name that lacks a
> trailing slash. This results in a malformed BPF_HELPER_DEFS being
> defined in lib/bpf/Makefile.
>
> [...]
Here is the summary with links:
- [bpf-next] bpf: missing trailing slash in tools/testing/selftests/bpf/Makefile
https://git.kernel.org/bpf/bpf-next/c/08e90da6872a
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-05-02 16:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-02 14:08 [PATCH bpf-next] bpf: missing trailing slash in tools/testing/selftests/bpf/Makefile Jose E. Marchesi
2024-05-02 16:40 ` patchwork-bot+netdevbpf
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 read-only IMAP folder(s) and NNTP newsgroup(s).