fix compile errors due to unsync linux/in6.h and netinet/in.h

PATCH In review Wang YanQing 3 participants 3 messages Apr 18, 2019

Subsystems (3)

Kselftest BPF BPF selftests

lore

Share & tools

lore

Wang YanQing

author

2019-04-18 18:23 UTC #0 lore raw

PATCH v2 1/1 fix compile errors due to unsync linux/in6.h and netinet/in.h

I meet below compile errors:
"
In file included from test_tcpnotify_kern.c:12:
/usr/include/netinet/in.h:101:5: error: expected identifier
IPPROTO_HOPOPTS = 0, /* IPv6 Hop-by-Hop options. */
^
/usr/include/linux/in6.h:131:26: note: expanded from macro 'IPPROTO_HOPOPTS'

In file included from test_tcpnotify_kern.c:12:
/usr/include/netinet/in.h:103:5: error: expected identifier
IPPROTO_ROUTING = 43, /* IPv6 routing header. */
^
/usr/include/linux/in6.h:132:26: note: expanded from macro 'IPPROTO_ROUTING'

In file included from test_tcpnotify_kern.c:12:
/usr/include/netinet/in.h:105:5: error: expected identifier
IPPROTO_FRAGMENT = 44, /* IPv6 fragmentation header. */
^
/usr/include/linux/in6.h:133:26: note: expanded from macro 'IPPROTO_FRAGMENT' "
The same compile errors are reported for test_tcpbpf_kern.c too.

My environment:
lsb_release -a:
No LSB modules are available.

Distributor ID: Ubuntu
Description:    Ubuntu 16.04.6 LTS
Release:        16.04
Codename:       xenial

dpkg -l | grep libc-dev:

ii  libc-dev-bin              2.23-0ubuntu11           amd64        GNU C Library: Development binaries
ii  linux-libc-dev:amd64      4.4.0-145.171            amd64        Linux Kernel Headers for development.

The reason is linux/in6.h and netinet/in.h aren't synchronous about how to handle the same definitions, IPPROTO_HOPOPTS, etc.

This patch fixes the compile errors by moving <netinet/in.h> to before the <linux/*.h>.

Signed-off-by Wang YanQing <[email protected]>

---
Changes
v1-v2:
1:Rewrite the changelog.

 tools/testing/selftests/bpf/progs/test_tcpbpf_kern.c    | 2 +-
 tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

tools/testing/selftests/bpf/progs/test_tcpbpf_kern.c +1 -1

index 74f73b3..c7c3240 100644
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <stddef.h>
 #include <string.h>
+#include <netinet/in.h>
 #include <linux/bpf.h>
 #include <linux/if_ether.h>
 #include <linux/if_packet.h>

@@ -9,7 +10,6 @@
 #include <linux/types.h>
 #include <linux/socket.h>
 #include <linux/tcp.h>
-#include <netinet/in.h>
 #include "bpf_helpers.h"
 #include "bpf_endian.h"
 #include "test_tcpbpf.h"

tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c +1 -1

index edbca20..ec6db6e 100644
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <stddef.h>
 #include <string.h>
+#include <netinet/in.h>
 #include <linux/bpf.h>
 #include <linux/if_ether.h>
 #include <linux/if_packet.h>

@@ -9,7 +10,6 @@
 #include <linux/types.h>
 #include <linux/socket.h>
 #include <linux/tcp.h>
-#include <netinet/in.h>
 #include "bpf_helpers.h"
 #include "bpf_endian.h"
 #include "test_tcpnotify.h"

Signature · 1 line

1.8.5.6.2.g3d8a54e.dirty

Yonghong Song

Acked-by on v2 1/1

2019-04-18 20:41 UTC #1 lore raw

Quoted 34 lines · Wang YanQing

I meet below compile errors:
"
In file included from test_tcpnotify_kern.c:12:
/usr/include/netinet/in.h:101:5: error: expected identifier
IPPROTO_HOPOPTS = 0, /* IPv6 Hop-by-Hop options. */
^
/usr/include/linux/in6.h:131:26: note: expanded from macro 'IPPROTO_HOPOPTS'
                                 ^
In file included from test_tcpnotify_kern.c:12:
/usr/include/netinet/in.h:103:5: error: expected identifier
IPPROTO_ROUTING = 43, /* IPv6 routing header. */
^
/usr/include/linux/in6.h:132:26: note: expanded from macro 'IPPROTO_ROUTING'
                                 ^
In file included from test_tcpnotify_kern.c:12:
/usr/include/netinet/in.h:105:5: error: expected identifier
IPPROTO_FRAGMENT = 44, /* IPv6 fragmentation header. */
^
/usr/include/linux/in6.h:133:26: note: expanded from macro 'IPPROTO_FRAGMENT' "
The same compile errors are reported for test_tcpbpf_kern.c too.
My environment:
lsb_release -a:
No LSB modules are available.
Distributor ID: Ubuntu
Description:    Ubuntu 16.04.6 LTS
Release:        16.04
Codename:       xenial
dpkg -l | grep libc-dev:
ii  libc-dev-bin              2.23-0ubuntu11           amd64        GNU C Library: Development binaries
ii  linux-libc-dev:amd64      4.4.0-145.171            amd64        Linux Kernel Headers for development.

Quoted 7 lines

The reason is linux/in6.h and netinet/in.h aren't synchronous about how to handle the same definitions, IPPROTO_HOPOPTS, etc.
This patch fixes the compile errors by moving <netinet/in.h> to before the <linux/*.h>.
Signed-off-by Wang YanQing <[email protected]>

Tested and the change makes sense. By changing the include order, now we have linux checks the existence of macro _NETINET_IN_H instead of certain versions of glibc checks _UAPI_LINUX_IN6_H which does not exist for all recent kernels (at least 4.4 and onwards).

Acked-by Yonghong Song <[email protected]>

Quoted 50 lines

---
Changes
v1-v2:
1:Rewrite the changelog.

  tools/testing/selftests/bpf/progs/test_tcpbpf_kern.c    | 2 +-
  tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

tools/testing/selftests/bpf/progs/test_tcpbpf_kern.c +1 -1

index 74f73b3..c7c3240 100644
@@ -1,6 +1,7 @@
  // SPDX-License-Identifier: GPL-2.0
  #include <stddef.h>
  #include <string.h>
+#include <netinet/in.h>
  #include <linux/bpf.h>
  #include <linux/if_ether.h>
  #include <linux/if_packet.h>

@@ -9,7 +10,6 @@
  #include <linux/types.h>
  #include <linux/socket.h>
  #include <linux/tcp.h>
-#include <netinet/in.h>
  #include "bpf_helpers.h"
  #include "bpf_endian.h"
  #include "test_tcpbpf.h"

tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c +1 -1

index edbca20..ec6db6e 100644
@@ -1,6 +1,7 @@
  // SPDX-License-Identifier: GPL-2.0
  #include <stddef.h>
  #include <string.h>
+#include <netinet/in.h>
  #include <linux/bpf.h>
  #include <linux/if_ether.h>
  #include <linux/if_packet.h>

@@ -9,7 +10,6 @@
  #include <linux/types.h>
  #include <linux/socket.h>
  #include <linux/tcp.h>
-#include <netinet/in.h>
  #include "bpf_helpers.h"
  #include "bpf_endian.h"
  #include "test_tcpnotify.h"

Alexei Starovoitov

2019-04-18 23:10 UTC #2 lore raw

In reply to Wang YanQing

Quoted 35 lines · Wang YanQing

I meet below compile errors:
"
In file included from test_tcpnotify_kern.c:12:
/usr/include/netinet/in.h:101:5: error: expected identifier
IPPROTO_HOPOPTS = 0, /* IPv6 Hop-by-Hop options. */
^
/usr/include/linux/in6.h:131:26: note: expanded from macro 'IPPROTO_HOPOPTS'
                                ^
In file included from test_tcpnotify_kern.c:12:
/usr/include/netinet/in.h:103:5: error: expected identifier
IPPROTO_ROUTING = 43, /* IPv6 routing header. */
^
/usr/include/linux/in6.h:132:26: note: expanded from macro 'IPPROTO_ROUTING'
                                ^
In file included from test_tcpnotify_kern.c:12:
/usr/include/netinet/in.h:105:5: error: expected identifier
IPPROTO_FRAGMENT = 44, /* IPv6 fragmentation header. */
^
/usr/include/linux/in6.h:133:26: note: expanded from macro 'IPPROTO_FRAGMENT' "
The same compile errors are reported for test_tcpbpf_kern.c too.
My environment:
lsb_release -a:
No LSB modules are available.
Distributor ID: Ubuntu
Description:    Ubuntu 16.04.6 LTS
Release:        16.04
Codename:       xenial
dpkg -l | grep libc-dev:
ii  libc-dev-bin              2.23-0ubuntu11           amd64        GNU C Library: Development binaries
ii  linux-libc-dev:amd64      4.4.0-145.171            amd64        Linux Kernel Headers for development.

Quoted 7 lines

The reason is linux/in6.h and netinet/in.h aren't synchronous about how to handle the same definitions, IPPROTO_HOPOPTS, etc.
This patch fixes the compile errors by moving <netinet/in.h> to before the <linux/*.h>.
Signed-off-by Wang YanQing <[email protected]>

Added 'selftests/bpf' to commit log and pushed.