Unlike the other headers in tools/include/uapi/linux, types.h has
never been synced from the exported headers, instead it's been hand
written over time. This means it doesn't match the exported headers
which can cause build errors on some architectures.
For example on powerpc, tools/bpf doesn't build:
$ make O=/build -C tools/bpf/
make: Entering directory '/linux/tools/bpf'
Auto-detecting system features:
... libbfd: [ on ]
... disassembler-four-args: [ on ]
CC /build/bpf_jit_disasm.o
LINK /build/bpf_jit_disasm
CC /build/bpf_dbg.o
In file included from /usr/include/powerpc64le-linux-gnu/asm/sigcontext.h:14,
from /usr/include/powerpc64le-linux-gnu/bits/sigcontext.h:30,
from /usr/include/signal.h:288,
from /linux/tools/bpf/bpf_dbg.c:51:
/usr/include/powerpc64le-linux-gnu/asm/elf.h:160:9: error: unknown type name
'__vector128'
160 | typedef __vector128 elf_vrreg_t;
| ^~~~~~~~~~~
make: *** [Makefile:67: /build/bpf_dbg.o] Error 1
This is because tools/include/uapi/linux/types.h doesn't include
asm/types.h, where __vector128 is defined in the powerpc headers.
We can fix it by syncing the tools header with the exported kernel
header, as is done for the other headers in tools/include/uapi/linux.
Reported-by: Vitaly Chikunov <v...@altlinux.org>
Signed-off-by: Michael Ellerman <m...@ellerman.id.au>
---
Earlier discussion:
https://lore.kernel.org/netdev/20201024203040.4cjxnxrdy6qx5...@altlinux.org/
Build tested on powerpc and x86.
---
tools/include/uapi/linux/types.h | 41 ++++++++++++++++++++++++++------
1 file changed, 34 insertions(+), 7 deletions(-)
diff --git a/tools/include/uapi/linux/types.h b/tools/include/uapi/linux/types.h
index 91fa51a9c31d..999cb0fa88eb 100644
--- a/tools/include/uapi/linux/types.h
+++ b/tools/include/uapi/linux/types.h
@@ -1,11 +1,26 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _UAPI_LINUX_TYPES_H
-#define _UAPI_LINUX_TYPES_H
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef _LINUX_TYPES_H
+#define _LINUX_TYPES_H
-#include <asm-generic/int-ll64.h>
+#include <asm/types.h>
+
+#ifndef __ASSEMBLY__
+
+#include <linux/posix_types.h>
+
+
+/*
+ * Below are truly Linux-specific types that should never collide with
+ * any application/library that wants linux/types.h.
+ */
+
+#ifdef __CHECKER__
+#define __bitwise__ __attribute__((bitwise))
+#else
+#define __bitwise__
+#endif
+#define __bitwise __bitwise__
-/* copied from linux:include/uapi/linux/types.h */
-#define __bitwise
typedef __u16 __bitwise __le16;
typedef __u16 __bitwise __be16;
typedef __u32 __bitwise __le32;
@@ -16,8 +31,20 @@ typedef __u64 __bitwise __be64;
typedef __u16 __bitwise __sum16;
typedef __u32 __bitwise __wsum;
+/*
+ * aligned_u64 should be used in defining kernel<->userspace ABIs to avoid
+ * common 32/64-bit compat problems.
+ * 64-bit values align to 4-byte boundaries on x86_32 (and possibly other
+ * architectures) and to 8-byte boundaries on 64-bit architectures. The new
+ * aligned_64 type enforces 8-byte alignment so that structs containing
+ * aligned_64 values have the same alignment on 32-bit and 64-bit
architectures.
+ * No conversions are necessary between 32-bit user-space and a 64-bit kernel.
+ */
#define __aligned_u64 __u64 __attribute__((aligned(8)))
#define __aligned_be64 __be64 __attribute__((aligned(8)))
#define __aligned_le64 __le64 __attribute__((aligned(8)))
-#endif /* _UAPI_LINUX_TYPES_H */
+typedef unsigned __bitwise __poll_t;
+
+#endif /* __ASSEMBLY__ */
+#endif /* _LINUX_TYPES_H */
--
2.25.1
