Commit 5b554ce5 authored by Toke Høiland-Jørgensen's avatar Toke Høiland-Jørgensen Committed by Alexei Starovoitov
Browse files

tools/runqslower: Use consistent include paths for libbpf 



Fix the runqslower tool to include libbpf header files with the bpf/
prefix, to be consistent with external users of the library. Also ensure
that all includes of exported libbpf header files (those that are exported
on 'make install' of the library) use bracketed includes instead of quoted.

To not break the build, keep the old include path until everything has been
changed to the new one; a subsequent patch will remove that.

Fixes: 6910d7d3 ("selftests/bpf: Ensure bpf_helper_defs.h are taken from selftests dir")
Signed-off-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/157952560457.1683545.9913736511685743625.stgit@toke.dk
parent bfe42797

tools/bpf/runqslower/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ LLVM_STRIP := llvm-strip 
DEFAULT_BPFTOOL := $(OUTPUT)/sbin/bpftool

BPFTOOL ?= $(DEFAULT_BPFTOOL)

LIBBPF_SRC := $(abspath ../../lib/bpf)

INCLUDES := -I$(OUTPUT) -I$(abspath ../../lib) -I$(abspath ../../lib/bpf)

CFLAGS := -g -Wall



# Try to detect best kernel BTF source
@@ -51,13 +52,13 @@ $(OUTPUT)/%.skel.h: $(OUTPUT)/%.bpf.o | $(BPFTOOL) 


$(OUTPUT)/%.bpf.o: %.bpf.c $(OUTPUT)/libbpf.a | $(OUTPUT)

	$(call msg,BPF,$@)

	$(Q)$(CLANG) -g -O2 -target bpf -I$(OUTPUT) -I$(LIBBPF_SRC)	      \

	$(Q)$(CLANG) -g -O2 -target bpf $(INCLUDES)			      \

		 -c $(filter %.c,$^) -o $@ &&				      \

	$(LLVM_STRIP) -g $@



$(OUTPUT)/%.o: %.c | $(OUTPUT)

	$(call msg,CC,$@)

	$(Q)$(CC) $(CFLAGS) -I$(LIBBPF_SRC) -I$(OUTPUT) -c $(filter %.c,$^) -o $@

	$(Q)$(CC) $(CFLAGS) $(INCLUDES) -c $(filter %.c,$^) -o $@



$(OUTPUT):

	$(call msg,MKDIR,$@)

tools/bpf/runqslower/runqslower.bpf.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// Copyright (c) 2019 Facebook

#include "vmlinux.h"

#include <bpf_helpers.h>

#include <bpf/bpf_helpers.h>

#include "runqslower.h"



#define TASK_RUNNING 0

tools/bpf/runqslower/runqslower.c

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
#include <string.h>

#include <sys/resource.h>

#include <time.h>

#include <libbpf.h>

#include <bpf.h>

#include <bpf/libbpf.h>

#include <bpf/bpf.h>

#include "runqslower.h"

#include "runqslower.skel.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE