diff mbox series

[v2] selftests net: fix bpf build error

Message ID 20220601084840.11024-1-lina.wang@mediatek.com (mailing list archive)
State New
Headers show
Series [v2] selftests net: fix bpf build error | expand

Commit Message

Lina Wang June 1, 2022, 8:48 a.m. UTC
bpf_helpers.h has been moved to tools/lib/bpf since 5.10, so add more
including path.

Fixes: edae34a3ed92 ("selftests net: add UDP GRO fraglist + bpf self-tests")
Reported-by: kernel test robot <oliver.sang@intel.com>
Signed-off-by: Lina Wang <lina.wang@mediatek.com>
---
 tools/testing/selftests/net/bpf/Makefile | 1 +
 1 file changed, 1 insertion(+)

Comments

Song Liu June 1, 2022, 3:54 p.m. UTC | #1
On Wed, Jun 1, 2022 at 1:55 AM Lina Wang <lina.wang@mediatek.com> wrote:
>
> bpf_helpers.h has been moved to tools/lib/bpf since 5.10, so add more
> including path.
>
> Fixes: edae34a3ed92 ("selftests net: add UDP GRO fraglist + bpf self-tests")
> Reported-by: kernel test robot <oliver.sang@intel.com>
> Signed-off-by: Lina Wang <lina.wang@mediatek.com>

Acked-by: Song Liu <songliubraving@fb.com>

PS: When sending v2, you can include Acked-by/Reviewed-by received for v1.

[...]
Paolo Abeni June 2, 2022, 10:29 a.m. UTC | #2
On Wed, 2022-06-01 at 16:48 +0800, Lina Wang wrote:
> bpf_helpers.h has been moved to tools/lib/bpf since 5.10, so add more
> including path.
> 
> Fixes: edae34a3ed92 ("selftests net: add UDP GRO fraglist + bpf self-tests")
> Reported-by: kernel test robot <oliver.sang@intel.com>
> Signed-off-by: Lina Wang <lina.wang@mediatek.com>
> ---
>  tools/testing/selftests/net/bpf/Makefile | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tools/testing/selftests/net/bpf/Makefile b/tools/testing/selftests/net/bpf/Makefile
> index f91bf14bbee7..070251986dbe 100644
> --- a/tools/testing/selftests/net/bpf/Makefile
> +++ b/tools/testing/selftests/net/bpf/Makefile
> @@ -2,6 +2,7 @@
>  
>  CLANG ?= clang
>  CCINCLUDE += -I../../bpf
> +CCINCLUDE += -I../../../../lib
>  CCINCLUDE += -I../../../../../usr/include/
>  
>  TEST_CUSTOM_PROGS = $(OUTPUT)/bpf/nat6to4.o

With this patch applied, I still get an error while building the self-
tests:

---
cd tools/testing/selftests/
make 
#...
make[1]: Entering directory '/home/pabeni/net/tools/testing/selftests/net'
bpf/Makefile:15: warning: overriding recipe for target 'clean'
../lib.mk:136: warning: ignoring old recipe for target 'clean'
clang -O2 -target bpf -c bpf/nat6to4.c -I../../bpf -I../../../../lib -I../../../../../usr/include/ -o /home/pabeni/net/tools/testing/selftests/net/bpf/nat6to4.o
bpf/nat6to4.c:43:10: fatal error: 'bpf/bpf_helpers.h' file not found
#include <bpf/bpf_helpers.h>
         ^~~~~~~~~~~~~~~~~~~
1 error generated.
make[1]: *** [bpf/Makefile:12: /home/pabeni/net/tools/testing/selftests/net/bpf/nat6to4.o] Error 1
---

the following fix the issue here:

---
diff --git a/tools/testing/selftests/net/bpf/Makefile b/tools/testing/selftests/net/bpf/Makefile
index 070251986dbe..cff99d571408 100644
--- a/tools/testing/selftests/net/bpf/Makefile
+++ b/tools/testing/selftests/net/bpf/Makefile
@@ -2,7 +2,7 @@
 
 CLANG ?= clang
 CCINCLUDE += -I../../bpf
-CCINCLUDE += -I../../../../lib
+CCINCLUDE += -I../../../lib
 CCINCLUDE += -I../../../../../usr/include/
---

(But I still hit the "overriding recipe for target 'clean'" warnings)

Cheers,

Paolo
Lina Wang June 6, 2022, 7:32 a.m. UTC | #3
On Thu, 2022-06-02 at 12:29 +0200, Paolo Abeni wrote:
> On Wed, 2022-06-01 at 16:48 +0800, Lina Wang wrote:
> > bpf_helpers.h has been moved to tools/lib/bpf since 5.10, so add
> > more
> > including path.
> > 
> > Fixes: edae34a3ed92 ("selftests net: add UDP GRO fraglist + bpf
>  CLANG ?= clang
>  CCINCLUDE += -I../../bpf
> -CCINCLUDE += -I../../../../lib
> +CCINCLUDE += -I../../../lib
>  CCINCLUDE += -I../../../../../usr/include/
> ---

Your solution is right,

> (But I still hit the "overriding recipe for target 'clean'" warnings)

I have fixed in v3, the warning is that tools/testing/selftests/net/bpf/Makefile has redefined "clean"

Thanks!
diff mbox series

Patch

diff --git a/tools/testing/selftests/net/bpf/Makefile b/tools/testing/selftests/net/bpf/Makefile
index f91bf14bbee7..070251986dbe 100644
--- a/tools/testing/selftests/net/bpf/Makefile
+++ b/tools/testing/selftests/net/bpf/Makefile
@@ -2,6 +2,7 @@ 
 
 CLANG ?= clang
 CCINCLUDE += -I../../bpf
+CCINCLUDE += -I../../../../lib
 CCINCLUDE += -I../../../../../usr/include/
 
 TEST_CUSTOM_PROGS = $(OUTPUT)/bpf/nat6to4.o