selftests/bpf: tcpbpf_kern: use in6_* macros from glibc

Message ID 20180221165116.9754-1-anders.roxell@linaro.org
State Accepted
Commit b52db43a3d2e34b4ef2bb563d95227bb755027df
Headers show
Series
  • selftests/bpf: tcpbpf_kern: use in6_* macros from glibc
Related show

Commit Message

Anders Roxell Feb. 21, 2018, 4:51 p.m.
Both glibc and the kernel have in6_* macros definitions. Build fails
because it picks up wrong in6_* macro from the kernel header and not the
header from glibc.

Fixes build error below:
clang -I. -I./include/uapi -I../../../include/uapi
     -Wno-compare-distinct-pointer-types \
         -O2 -target bpf -emit-llvm -c test_tcpbpf_kern.c -o - |      \
llc -march=bpf -mcpu=generic -filetype=obj
     -o .../tools/testing/selftests/bpf/test_tcpbpf_kern.o
In file included from test_tcpbpf_kern.c:12:
.../netinet/in.h:101:5: error: expected identifier
    IPPROTO_HOPOPTS = 0,   /* IPv6 Hop-by-Hop options.  */
    ^
.../linux/in6.h:131:26: note: expanded from macro 'IPPROTO_HOPOPTS'
                                ^
In file included from test_tcpbpf_kern.c:12:
/usr/include/netinet/in.h:103:5: error: expected identifier
    IPPROTO_ROUTING = 43,  /* IPv6 routing header.  */
    ^
.../linux/in6.h:132:26: note: expanded from macro 'IPPROTO_ROUTING'
                                ^
In file included from test_tcpbpf_kern.c:12:
.../netinet/in.h:105:5: error: expected identifier
    IPPROTO_FRAGMENT = 44, /* IPv6 fragmentation header.  */
    ^

Since both glibc and the kernel have in6_* macros definitions, use the
one from glibc.  Kernel headers will check for previous libc definitions
by including include/linux/libc-compat.h.

Reported-by: Daniel Díaz <daniel.diaz@linaro.org>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

---
 tools/testing/selftests/bpf/test_tcpbpf_kern.c | 1 -
 1 file changed, 1 deletion(-)

-- 
2.11.0

Comments

Daniel Díaz Feb. 21, 2018, 9:38 p.m. | #1
On 02/21/2018 10:51 AM, Anders Roxell wrote:
> Both glibc and the kernel have in6_* macros definitions. Build fails

> because it picks up wrong in6_* macro from the kernel header and not the

> header from glibc.

> 

> Fixes build error below:

> clang -I. -I./include/uapi -I../../../include/uapi

>      -Wno-compare-distinct-pointer-types \

>          -O2 -target bpf -emit-llvm -c test_tcpbpf_kern.c -o - |      \

> llc -march=bpf -mcpu=generic -filetype=obj

>      -o .../tools/testing/selftests/bpf/test_tcpbpf_kern.o

> In file included from test_tcpbpf_kern.c:12:

> .../netinet/in.h:101:5: error: expected identifier

>     IPPROTO_HOPOPTS = 0,   /* IPv6 Hop-by-Hop options.  */

>     ^

> .../linux/in6.h:131:26: note: expanded from macro 'IPPROTO_HOPOPTS'

>                                 ^

> In file included from test_tcpbpf_kern.c:12:

> /usr/include/netinet/in.h:103:5: error: expected identifier

>     IPPROTO_ROUTING = 43,  /* IPv6 routing header.  */

>     ^

> .../linux/in6.h:132:26: note: expanded from macro 'IPPROTO_ROUTING'

>                                 ^

> In file included from test_tcpbpf_kern.c:12:

> .../netinet/in.h:105:5: error: expected identifier

>     IPPROTO_FRAGMENT = 44, /* IPv6 fragmentation header.  */

>     ^

> 

> Since both glibc and the kernel have in6_* macros definitions, use the

> one from glibc.  Kernel headers will check for previous libc definitions

> by including include/linux/libc-compat.h.

> 

> Reported-by: Daniel Díaz <daniel.diaz@linaro.org>

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>


FWIW, this was
Tested-by: Daniel Díaz <daniel.diaz@linaro.org>


> ---

>  tools/testing/selftests/bpf/test_tcpbpf_kern.c | 1 -

>  1 file changed, 1 deletion(-)

> 

> diff --git a/tools/testing/selftests/bpf/test_tcpbpf_kern.c b/tools/testing/selftests/bpf/test_tcpbpf_kern.c

> index 57119ad57a3f..3e645ee41ed5 100644

> --- a/tools/testing/selftests/bpf/test_tcpbpf_kern.c

> +++ b/tools/testing/selftests/bpf/test_tcpbpf_kern.c

> @@ -5,7 +5,6 @@

>  #include <linux/if_ether.h>

>  #include <linux/if_packet.h>

>  #include <linux/ip.h>

> -#include <linux/in6.h>

>  #include <linux/types.h>

>  #include <linux/socket.h>

>  #include <linux/tcp.h>
Daniel Borkmann Feb. 22, 2018, 12:23 a.m. | #2
On 02/21/2018 05:51 PM, Anders Roxell wrote:
> Both glibc and the kernel have in6_* macros definitions. Build fails

> because it picks up wrong in6_* macro from the kernel header and not the

> header from glibc.

> 

> Fixes build error below:

> clang -I. -I./include/uapi -I../../../include/uapi

>      -Wno-compare-distinct-pointer-types \

>          -O2 -target bpf -emit-llvm -c test_tcpbpf_kern.c -o - |      \

> llc -march=bpf -mcpu=generic -filetype=obj

>      -o .../tools/testing/selftests/bpf/test_tcpbpf_kern.o

> In file included from test_tcpbpf_kern.c:12:

> .../netinet/in.h:101:5: error: expected identifier

>     IPPROTO_HOPOPTS = 0,   /* IPv6 Hop-by-Hop options.  */

>     ^

> .../linux/in6.h:131:26: note: expanded from macro 'IPPROTO_HOPOPTS'

>                                 ^

> In file included from test_tcpbpf_kern.c:12:

> /usr/include/netinet/in.h:103:5: error: expected identifier

>     IPPROTO_ROUTING = 43,  /* IPv6 routing header.  */

>     ^

> .../linux/in6.h:132:26: note: expanded from macro 'IPPROTO_ROUTING'

>                                 ^

> In file included from test_tcpbpf_kern.c:12:

> .../netinet/in.h:105:5: error: expected identifier

>     IPPROTO_FRAGMENT = 44, /* IPv6 fragmentation header.  */

>     ^

> 

> Since both glibc and the kernel have in6_* macros definitions, use the

> one from glibc.  Kernel headers will check for previous libc definitions

> by including include/linux/libc-compat.h.

> 

> Reported-by: Daniel Díaz <daniel.diaz@linaro.org>

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>


Applied to bpf tree, thanks Anders!

Patch

diff --git a/tools/testing/selftests/bpf/test_tcpbpf_kern.c b/tools/testing/selftests/bpf/test_tcpbpf_kern.c
index 57119ad57a3f..3e645ee41ed5 100644
--- a/tools/testing/selftests/bpf/test_tcpbpf_kern.c
+++ b/tools/testing/selftests/bpf/test_tcpbpf_kern.c
@@ -5,7 +5,6 @@ 
 #include <linux/if_ether.h>
 #include <linux/if_packet.h>
 #include <linux/ip.h>
-#include <linux/in6.h>
 #include <linux/types.h>
 #include <linux/socket.h>
 #include <linux/tcp.h>