Re: [PATCH 02/34] selftests: bpf: Fix incorrect kernel headers search path

From: Shuah Khan
Date: Mon Jan 30 2023 - 12:10:07 EST


On 1/30/23 10:00, Mathieu Desnoyers wrote:
On 2023-01-30 11:26, Alexei Starovoitov wrote:
On Mon, Jan 30, 2023 at 8:12 AM Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx> wrote:

On 1/27/23 06:57, Mathieu Desnoyers wrote:
Use $(KHDR_INCLUDES) as lookup path for kernel headers. This prevents
building against kernel headers from the build environment in scenarios
where kernel headers are installed into a specific output directory
(O=...).

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Cc: Shuah Khan <shuah@xxxxxxxxxx>
Cc: linux-kselftest@xxxxxxxxxxxxxxx
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>    [5.18+]
---
   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 c22c43bbee19..6998c816afef 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -327,7 +327,7 @@ endif
   CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG),$(CLANG_TARGET_ARCH))
   BPF_CFLAGS = -g -Werror -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN)               \
            -I$(INCLUDE_DIR) -I$(CURDIR) -I$(APIDIR)                   \
-          -I$(abspath $(OUTPUT)/../usr/include)
+          $(KHDR_INCLUDES)

   CLANG_CFLAGS = $(CLANG_SYS_INCLUDES) \
              -Wno-compare-distinct-pointer-types



Adding bpf maintainers - bpf patches usually go through bpf tree.

Acked-by: Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx>

Please resubmit as separate patch with [PATCH bpf-next] subj
and cc bpf@vger, so that BPF CI can test it on various architectures
and config combinations.

Hi Shuah,

Do you have means to resubmit it on your end, or should I do it ?


Hi Mathieu,

Please go ahead and resubmit.

thanks,
-- Shuah