linux-kernel - Re: [PATCH bpf v2 1/2] samples/hid: remove unnecessary -I flags from libbpf EXTRA

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <d2f8f530-2e31-4ddd-a743-35c7f0c48199@illinois.edu>
Date: Mon, 27 Jan 2025 03:37:56 -0600
From: Jinghao Jia <jinghao7@...inois.edu>
To: Nicolas Schier <n.schier@....de>
Cc: Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        Andrii Nakryiko <andrii@...nel.org>,
        Martin KaFai Lau <martin.lau@...ux.dev>,
        Eduard Zingerman
 <eddyz87@...il.com>, Song Liu <song@...nel.org>,
        Yonghong Song <yonghong.song@...ux.dev>,
        John Fastabend <john.fastabend@...il.com>,
        KP Singh <kpsingh@...nel.org>, Stanislav Fomichev <sdf@...ichev.me>,
        Hao Luo <haoluo@...gle.com>, Jiri Olsa <jolsa@...nel.org>,
        Jiri Kosina <jikos@...nel.org>,
        Benjamin Tissoires <bentiss@...nel.org>,
        Masahiro Yamada <masahiroy@...nel.org>, Ruowen Qin <ruqin@...hat.com>,
        bpf@...r.kernel.org, linux-kernel@...r.kernel.org,
        linux-input@...r.kernel.org
Subject: Re: [PATCH bpf v2 1/2] samples/hid: remove unnecessary -I flags from
 libbpf EXTRA_CFLAGS

On 1/27/25 3:29 AM, Nicolas Schier wrote:
> On Thu, Jan 23, 2025 at 02:19:49AM -0600, Jinghao Jia wrote:
>> Commit 5a6ea7022ff4 ("samples/bpf: Remove unnecessary -I flags from
>> libbpf EXTRA_CFLAGS") fixed the build error caused by redundant include
>> path for samples/bpf, but not samples/hid.
>>
>> Apply the same fix on samples/hid as well.
>>
>> Fixes: 13b25489b6f8 ("kbuild: change working directory to external module directory with M=")
> 
> I can't see a relation between this patch and the referenced commit.
> Can you please check whether the 'Fixes' is (still?) valid here?
> 
> Kind regards,
> Nicolas
> 

The 'Fixes' is from commit 5a6ea7022ff4 ("samples/bpf: Remove unnecessary
-I flags from libbpf EXTRA_CFLAGS") that fixes the equivalent issue in
samples/bpf --- according to its commit message, commit 13b25489b6f8
("kbuild: change working directory to external module directory with M=")
is the commit that breaks the libbpf build in the samples.

Best,
Jinghao

> 
>> Tested-by: Ruowen Qin <ruqin@...hat.com>
>> Signed-off-by: Jinghao Jia <jinghao7@...inois.edu>
>> ---
>>  samples/hid/Makefile | 11 ++++++-----
>>  1 file changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/samples/hid/Makefile b/samples/hid/Makefile
>> index 8ea59e9631a3..69159c81d045 100644
>> --- a/samples/hid/Makefile
>> +++ b/samples/hid/Makefile
>> @@ -40,16 +40,17 @@ BPF_EXTRA_CFLAGS += -I$(srctree)/arch/mips/include/asm/mach-generic
>>  endif
>>  endif
>>  
>> -TPROGS_CFLAGS += -Wall -O2
>> -TPROGS_CFLAGS += -Wmissing-prototypes
>> -TPROGS_CFLAGS += -Wstrict-prototypes
>> +COMMON_CFLAGS += -Wall -O2
>> +COMMON_CFLAGS += -Wmissing-prototypes
>> +COMMON_CFLAGS += -Wstrict-prototypes
>>  
>> +TPROGS_CFLAGS += $(COMMON_CFLAGS)
>>  TPROGS_CFLAGS += -I$(objtree)/usr/include
>>  TPROGS_CFLAGS += -I$(LIBBPF_INCLUDE)
>>  TPROGS_CFLAGS += -I$(srctree)/tools/include
>>  
>>  ifdef SYSROOT
>> -TPROGS_CFLAGS += --sysroot=$(SYSROOT)
>> +COMMON_CFLAGS += --sysroot=$(SYSROOT)
>>  TPROGS_LDFLAGS := -L$(SYSROOT)/usr/lib
>>  endif
>>  
>> @@ -112,7 +113,7 @@ clean:
>>  
>>  $(LIBBPF): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(LIBBPF_OUTPUT)
>>  # Fix up variables inherited from Kbuild that tools/ build system won't like
>> -	$(MAKE) -C $(LIBBPF_SRC) RM='rm -rf' EXTRA_CFLAGS="$(TPROGS_CFLAGS)" \
>> +	$(MAKE) -C $(LIBBPF_SRC) RM='rm -rf' EXTRA_CFLAGS="$(COMMON_CFLAGS)" \
>>  		LDFLAGS=$(TPROGS_LDFLAGS) srctree=$(HID_SAMPLES_PATH)/../../ \
>>  		O= OUTPUT=$(LIBBPF_OUTPUT)/ DESTDIR=$(LIBBPF_DESTDIR) prefix= \
>>  		$@ install_headers
>> -- 
>> 2.48.1
>>