Userspace compile test and fixes for exported uapi header files
Subsystems (41)
v3 cover Userspace compile test and fixes for exported uapi header files
v3:
tried to fix all v2 review findings
tried to guess how to fix a few more issue
with a few hacks, 0 files fail and 760 files pass the compile test on 32bit x86
v2:
https://lkml.org/lkml/2015/2/16/521
added cross compiler support with CROSS_COMPILE,
detecting libc and GCC headers from compiler,
more header file fixes
v1:
https://lkml.org/lkml/2014/8/21/665
Users of kernel header files would be happier if they did not contain kernel specific parts and would contain #include statements for all other header files that they depend on, and in general would compile.
This patch set introduces a compile test for headers exported to userspace and then fixes many of the userspace header compilation failures.
Changes are also available in headers_test_v03 branch at github:
https://github.com/mcfrisk/linux/tree/headers_test_v03
The patch set includes some obvious hacks for which I'd like to get some feedback and suggestions how to properly fix them.
Here's how to run the userspace compile tests:
$ make headers_install && cd usr/include && \ ../../scripts/headers_compile_test.sh
Additionally tested an allyesconfig compilation on 32bit x86.
Mikko Rapeli (98):
headers_install.sh: enhance error handling scripts/headers_compile_test.sh: compile test script for exported
headers
drm.h: use __kernel_size_t instead of size_t
drm_mode.h: use __u32 and __u64 from linux/types.h exynos_drm.h: use __u64 from linux/types.h
nouveau_drm.h: use __u32 and __u64 from linux/types.h radeon_drm.h: use __u32 and __u64 from linux/types.h r128_drm.h: include drm/drm.h
via_drm.h: include linux/types.h instead of non-existing
via_drmclient.h
via_drm.h: hide struct via_file_private in userspace savage_drm.h: include <drm/drm.h>
sis_drm.h: hide sis_file_private in userspace drm/i810_drm.h: include drm/drm.h include/uapi/drm/vmwgfx_drm.h: use __s32, __u32 and __u64 from
linux/types.h
include/uapi/drm/qxl_drm.h: use __s32, __u32 and __u64 from
linux/types.h
include/uapi/drm/msm_drm.h: use __s32, __s64, __u32 and __u64 from
linux/types.h
include/uapi/linux/agpgart.h: include stdlib.h in userspace include/uapi/sound/emu10k1.h: added EMU10K1 version of DECLARE_BITMAP
etc macros
dm-log-userspace.h: use __u32, __s32 and __u64 from linux/types.h hsi_char.h: use __u32 from linux/types.h include/uapi/linux/hsi/cs-protocol.h: include linux/time.h ebtables.h: use __u64 from linux/types.h
cld.h: use __u8, __u16, __s16, __u32 and __s64 from linux/types.h rds.h: use __u8, __u16, __s16, __u32 and __s64 from linux/types.h sctp.h: use __u8 and __u32 from linux/types.h scsi_bsg_fc.h: use __u8, __u32 and __u64 from linux/types.h scsi_netlink.h: use __u8, __u16 and __u64 from linux/types.h scsi_netlink_fc.h: use __u16, __u32 and __u64 from linux/types.h scsi_netlink_fc.h: include stdint.h in userspace
hdspm.h: use __u8, __u32 and __u64 from linux/types.h gntalloc.h: use __u16, __u32 and __u64 from linux/types.h gntdev.h: use __u32 and __u64 from linux/types.h include/uapi/linux/sysctl.h: use __kernel_size_t instead of size_t include/uapi/asm-generic/ipcbuf.h: include linux/posix_types.h include/uapi/asm-generic/msgbuf.h: include asm/ipcbuf.h include/uapi/asm-generic/shmbuf.h: include fixes asm-generic/sembuf.h: include asm/posix_types.h and asm/ipcbuf.h include/uapi/asm-generic/signal.h: use __kernel_size_t instead of
size_t
include/uapi/linux/socket.h: include sys/socket.h in userspace include/uapi/linux/rds.h: include linux/socket.h and linux/types.h include/uapi/linux/if_pppox.h: include linux/if.h include/uapi/linux/if_tunnel.h: include linux/if.h, linux/ip.h and
linux/in6.h
include/uapi/linux/hdlc/ioctl.h: include linux/if.h
nf_conntrack_tuple_common.h: include linux/types.h and
linux/netfilter.h
include/uapi/linux/ipv6_route.h: include linux/in6.h
include/uapi/linux/ipv6_route.h: include linux/in6.h
include/uapi/linux/if_pppol2tp.h: include linux/in.h and linux/in6.h
include/uapi/linux/if_pppox.h: include linux/in.h and linux/in6.h
Break dependency loop between linux/if.h and linux/hdlc/ioctl.h
include/uapi/linux/packet_diag.h: include linux/netdevice.h
include/uapi/linux/llc.h: include linux/if.h
include/uapi/linux/mqueue.h: include linux/types.h
include/uapi/linux/mroute.h: include linux/in.h
include/uapi/linux/dlm_netlink.h: include linux/dlmconstants.h
include/uapi/linux/ip6_tunnel.h: include linux/if.h and linux/in6.h
include/uapi/linux/netfilter.h: include in.h and in6.h
include/uapi/linux/netfilter_bridge.h: include in.h
include/uapi/linux/netfilter_ipv4/ip_tables.h: include linux/if.h
include/uapi/linux/netfilter: include linux/if.h in several headers
include/uapi/linux/netfilter/xt_osf.h: include linux/ip.h and
linux/tcp.h
include/uapi/linux/netfilter_ipv6/ip6t_rt.h: include linux/in6.h
include/uapi/linux/netfilter_bridge/ebt_ip6.h: include linux/in6.h
include/uapi/linux/netfilter/xt_policy.h: include linux/in.h and
linux/in6.h
include/uapi/linux/netfilter_bridge/ebt_arp.h: include
linux/if_ether.h
include/uapi/linux/netfilter_bridge/ebt_arpreply.h: include
linux/if_ether.h
include/uapi/linux/netfilter_bridge/ebt_nat.h: include
linux/if_ether.h
include/uapi/linux/netfilter/ipset/ip_set_bitmap.h: include
linux/netfilter/ipset/ip_set.h
include/uapi/linux/netfilter/ipset/ip_set_hash.h: include
linux/netfilter/ipset/ip_set.h
include/uapi/linux/netfilter/ipset/ip_set_list.h: include
linux/netfilter/ipset/ip_set.h
include/uapi/linux/netfilter/xt_HMARK.h: include linux/netfilter.h
include/uapi/linux/netfilter/xt_TEE.h: include linux/netfilter.h
include/uapi/linux/netfilter/xt_TPROXY.h: include linux/netfilter.h
include/uapi/linux/netfilter/xt_ipvs.h: include linux/netfilter.h
include/uapi/linux/netfilter/xt_mac.h: include linux/if_ether.h
include/uapi/linux/netfilter/xt_sctp.h: use _Bool type, 1 for true and
0 for false
include/uapi/linux/netfilter/xt_recent.h: include linux/netfilter.h
include/uapi/linux/errqueue.h: include linux/time.h
include/uapi/asm-generic/ucontext.h: include asm/signal.h and
asm/sigcontext.h
arch/x86/include/uapi/asm/signal.h: use __kernel_size_t instead of
size_t
include/uapi/linux/auto_fs.h: include linux/limits.h
include/uapi/linux/openvswitch.h: use __u32 from linux/types.h
include/uapi/linux/target_core_user.h: use __u8, __u16, __u32 and
__u64 from linux/types.h
include/uapi/linux/omapfb.h: use __kernel_size_t instead of size_t
include/uapi/linux/atm_zatm.h: include linux/time.h
include/uapi/linux/scc.h: include linux/sockios.h
include/uapi/linux/btrfs.h: define NULL
include/uapi/linux/kexec.h: use __kernel_size_t instead of size_t
include/uapi/linux/reiserfs_xattr.h: use __kernel_size_t instead of
size_t
include/uapi/linux/patchkey.h: change #error to #warning if file
included directly
include/uapi/linux/coda.h: use __kernel_pid_t and add u_short etc
definitions for userspace
include/uapi/linux/android/binder.h: use __kernel_pid_t and
__kernel_uid_t arch/x86/include/uapi/asm/sembuf.h: include linux/types.h and
linux/ipc.h
include/uapi/linux/virtio_balloon.h: include linux/virtio_types.h HACK arch/x86/include/uapi/asm/sigcontext32.h: remove _fpx_sw_bytes
from union
HACK: fix include/uapi/xen/privcmd.h compilation in userspace HACK include/uapi/linux/coda_psdev.h: fix compilation in userspace HACK include/uapi/linux/elfcore.h: use __kernel_pid_t and remove
elf_greg_t stuff in userspace
HACK include/uapi/linux/errqueue.h: include time.h in userspace
arch/x86/include/asm/pvclock-abi.h | 41 +- arch/x86/include/asm/xen/interface.h | 185 +---- arch/x86/include/asm/xen/interface_32.h | 98 +-- arch/x86/include/asm/xen/interface_64.h | 144 +--- arch/x86/include/uapi/asm/Kbuild | 2 + arch/x86/include/uapi/asm/pvclock-abi.h | 47 ++ arch/x86/include/uapi/asm/sembuf.h | 3 + arch/x86/include/uapi/asm/sigcontext32.h | 1 - arch/x86/include/uapi/asm/signal.h | 2 +- arch/x86/include/uapi/asm/xen/Kbuild | 5 + arch/x86/include/uapi/asm/xen/interface.h | 198 ++++++ arch/x86/include/uapi/asm/xen/interface_32.h | 103 +++ arch/x86/include/uapi/asm/xen/interface_64.h | 150 ++++ include/uapi/asm-generic/ipcbuf.h | 2 + include/uapi/asm-generic/msgbuf.h | 2 + include/uapi/asm-generic/sembuf.h | 2 + include/uapi/asm-generic/shmbuf.h | 4 +- include/uapi/asm-generic/signal.h | 2 +- include/uapi/asm-generic/ucontext.h | 3 + include/uapi/drm/drm.h | 8 +- include/uapi/drm/drm_mode.h | 16 +- include/uapi/drm/exynos_drm.h | 7 +- include/uapi/drm/i810_drm.h | 2 + include/uapi/drm/msm_drm.h | 76 +-- include/uapi/drm/nouveau_drm.h | 86 +-- include/uapi/drm/qxl_drm.h | 74 +- include/uapi/drm/r128_drm.h | 2 + include/uapi/drm/radeon_drm.h | 129 ++-- include/uapi/drm/savage_drm.h | 2 + include/uapi/drm/sis_drm.h | 2 + include/uapi/drm/via_drm.h | 6 +- include/uapi/drm/vmwgfx_drm.h | 260 +++---- include/uapi/linux/agpgart.h | 1 + include/uapi/linux/android/binder.h | 4 +- include/uapi/linux/atm_zatm.h | 1 + include/uapi/linux/auto_fs.h | 1 + include/uapi/linux/btrfs.h | 6 + include/uapi/linux/coda.h | 11 +- include/uapi/linux/coda_psdev.h | 13 +- include/uapi/linux/dlm_netlink.h | 1 + include/uapi/linux/dm-log-userspace.h | 43 +- include/uapi/linux/elfcore.h | 14 +- include/uapi/linux/errqueue.h | 6 + include/uapi/linux/hdlc/ioctl.h | 4 + include/uapi/linux/hsi/cs-protocol.h | 1 + include/uapi/linux/hsi/hsi_char.h | 17 +- include/uapi/linux/if.h | 4 + include/uapi/linux/if_pppol2tp.h | 3 +- include/uapi/linux/if_pppox.h | 3 + include/uapi/linux/if_tunnel.h | 3 + include/uapi/linux/ip6_tunnel.h | 2 + include/uapi/linux/ipv6_route.h | 1 + include/uapi/linux/kexec.h | 4 +- include/uapi/linux/llc.h | 1 + include/uapi/linux/mqueue.h | 2 + include/uapi/linux/mroute.h | 1 + include/uapi/linux/mroute6.h | 1 + include/uapi/linux/netfilter.h | 3 +- include/uapi/linux/netfilter/ipset/ip_set_bitmap.h | 2 + include/uapi/linux/netfilter/ipset/ip_set_hash.h | 2 + include/uapi/linux/netfilter/ipset/ip_set_list.h | 2 + .../linux/netfilter/nf_conntrack_tuple_common.h | 3 + include/uapi/linux/netfilter/xt_HMARK.h | 1 + include/uapi/linux/netfilter/xt_RATEEST.h | 1 + include/uapi/linux/netfilter/xt_TEE.h | 2 + include/uapi/linux/netfilter/xt_TPROXY.h | 1 + include/uapi/linux/netfilter/xt_hashlimit.h | 1 + include/uapi/linux/netfilter/xt_ipvs.h | 1 + include/uapi/linux/netfilter/xt_mac.h | 2 + include/uapi/linux/netfilter/xt_osf.h | 2 + include/uapi/linux/netfilter/xt_physdev.h | 2 +- include/uapi/linux/netfilter/xt_policy.h | 2 + include/uapi/linux/netfilter/xt_rateest.h | 1 + include/uapi/linux/netfilter/xt_recent.h | 1 + include/uapi/linux/netfilter/xt_sctp.h | 12 +- include/uapi/linux/netfilter_arp/arp_tables.h | 1 + include/uapi/linux/netfilter_bridge.h | 1 + include/uapi/linux/netfilter_bridge/ebt_arp.h | 1 + include/uapi/linux/netfilter_bridge/ebt_arpreply.h | 2 + include/uapi/linux/netfilter_bridge/ebt_ip6.h | 1 + include/uapi/linux/netfilter_bridge/ebt_nat.h | 2 + include/uapi/linux/netfilter_bridge/ebtables.h | 6 +- include/uapi/linux/netfilter_ipv4/ip_tables.h | 1 + include/uapi/linux/netfilter_ipv6/ip6_tables.h | 1 + include/uapi/linux/netfilter_ipv6/ip6t_rt.h | 2 +- include/uapi/linux/nfsd/cld.h | 14 +- include/uapi/linux/omapfb.h | 2 +- include/uapi/linux/openvswitch.h | 4 +- include/uapi/linux/packet_diag.h | 1 + include/uapi/linux/patchkey.h | 2 +- include/uapi/linux/rds.h | 103 +-- include/uapi/linux/reiserfs_xattr.h | 2 +- include/uapi/linux/scc.h | 1 + include/uapi/linux/sctp.h | 8 +- include/uapi/linux/socket.h | 4 + include/uapi/linux/sysctl.h | 4 +- include/uapi/linux/target_core_user.h | 22 +- include/uapi/linux/virtio_balloon.h | 1 + include/uapi/scsi/scsi_bsg_fc.h | 54 +- include/uapi/scsi/scsi_netlink.h | 22 +- include/uapi/scsi/scsi_netlink_fc.h | 21 +- include/uapi/sound/emu10k1.h | 23 +- include/uapi/sound/hdspm.h | 40 +- include/uapi/xen/Kbuild | 1 + include/uapi/xen/gntalloc.h | 22 +- include/uapi/xen/gntdev.h | 34 +- include/uapi/xen/interface/Kbuild | 2 + include/uapi/xen/interface/xen.h | 759 +++++++++++++++++++++ include/xen/interface/xen.h | 754 +------------------- scripts/headers_compile_test.sh | 143 ++++ scripts/headers_install.sh | 14 +- 111 files changed, 2142 insertions(+), 1786 deletions(-) create mode 100644 arch/x86/include/uapi/asm/pvclock-abi.h create mode 100644 arch/x86/include/uapi/asm/xen/Kbuild create mode 100644 arch/x86/include/uapi/asm/xen/interface.h create mode 100644 arch/x86/include/uapi/asm/xen/interface_32.h create mode 100644 arch/x86/include/uapi/asm/xen/interface_64.h create mode 100644 include/uapi/xen/interface/Kbuild create mode 100644 include/uapi/xen/interface/xen.h create mode 100755 scripts/headers_compile_test.sh
Signature · 1 line
2.1.4
PATCH v3 1/98 headers_install.sh: enhance error handling
Exit with error if using undefined variables or if any sub command fails with error return value. unidef needs special handling since but this can be done without the trap. Enables exaniming intermediate files if some commands failed.
--- scripts/headers_install.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
scripts/headers_install.sh +9 -5
@@ -1,4 +1,6 @@ #!/bin/sh +set -e +set -u if [ $# -lt 2 ] then
@@ -26,7 +28,6 @@ shift # Iterate through files listed on command line FILE= -trap 'rm -f "$OUTDIR/$FILE" "$OUTDIR/$FILE.sed"' EXIT for i in "$@" do FILE="$(basename "$i")"
@@ -37,10 +38,13 @@ do -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \ -e 's/(^|[ \t(])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \ -e 's@#(ifndef|define|endif[ \t]*/[*])[ \t]*_UAPI@#\1 @' \ - "$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1 + "$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || \ + ( rm -f "$OUTDIR/$FILE.sed" ; exit 1 ) scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \ - > "$OUTDIR/$FILE" - [ $? -gt 1 ] && exit 1 + > "$OUTDIR/$FILE" || \ + ( if [ $? -gt 1 ]; then \ + rm -f "$OUTDIR/$FILE" "$OUTDIR/$FILE.sed" ; \ + exit 1 ; \ + fi ) rm -f "$OUTDIR/$FILE.sed" done -trap - EXIT
Signature · 1 line
2.1.4
PATCH v3 2/98 scripts/headers_compile_test.sh: compile test script for exported headers
In reply to Mikko RapeliUsers of kernel header files would be happier if they did not contain kernel specific parts and would contain #include statements for all other header files that they depend on, and in general would compile.
For each header file exported to userspace, this script creates a simple .c file which just includes the header file. Then it tries to compile it together with minimal header files from GCC and libc, and reports results.
Default libc and GCC header file locations are parsed from compiler configuration.
Kernel headers depend on GCC headers so their path is included in the test compiler command line.
Some gcc and kernel headers depend on libc headers which are made available by copying from the compiler default location to a temporary location and removing possibly existing kernel headers from this directory. This is a bit of a hack but seems to work in multiple environments.
Tested natively on:
Debian unstable, i586-linux-gnu and gcc 4.9.2 Raspbian Wheezy, arm-linux-gnueabihf and gcc 4.6.3 Ubuntu 12.04 LTS, x86_64-linux-gnu and gcc 4.6.3
Tested cross compilation using standard CROSS_COMPILE=/path/to/gcc with:
arm-linux-gnueabihf-gcc (crosstool-NG linaro-1.13.1-4.9-2014.09 - Linaro GCC 4.9-2014.09) 4.9.2 20140904 (prerelease)
Execute the script in the directory where kernel header files are installed. For example:
$ make headers_install $ cd usr/include $ ../../scripts/headers_compile_test.sh
Example statistics from 3.18.4 kernel:
130 files failed the compile test.
609 files passed the compile test.
Example error types from 3.18.4 kernel:
$ ../../scripts/headers_compile_test.sh 2>&1 | \ grep error: | sed -e 's/.*error://g' | sort | uniq -c | sort -rn
352 unknown type name ‘uint32_t’
134 unknown type name ‘uint64_t’
103 unknown type name ‘size_t’
43 unknown type name ‘__kernel_ulong_t’
38 unknown type name ‘uint8_t’
24 unknown type name ‘int32_t’
22 field ‘addr’ has incomplete type
18 field ‘tstamp’ has incomplete type
16 unknown type name ‘__kernel_time_t’
16 field ‘in’ has incomplete type
16 field ‘in6’ has incomplete type
14 unknown type name ‘__be16’
13 ‘IFNAMSIZ’ undeclared here (not in a function)
12 unknown type name ‘uint16_t’
9 field ‘ifru_netmask’ has incomplete type
9 field ‘ifru_hwaddr’ has incomplete type
9 field ‘ifru_dstaddr’ has incomplete type
9 field ‘ifru_broadaddr’ has incomplete type
9 field ‘ifru_addr’ has incomplete type
8 unknown type name ‘__kernel_pid_t’
7 unknown type name ‘u_short’
7 unknown type name ‘pid_t’
6 invalid application of ‘sizeof’ to incomplete type ‘struct timespec’
6 field ‘src’ has incomplete type
6 field ‘audio_tstamp’ has incomplete type
6 array type has incomplete element type
5 unknown type name ‘__kernel_long_t’
5 requested alignment is not an integer constant
5 field ‘smsk’ has incomplete type
4 unknown type name ‘__kernel_uid32_t’
4 unknown type name ‘__kernel_gid32_t’
4 ‘ETH_ALEN’ undeclared here (not in a function)
3 unknown type name ‘int64_t’
3 unknown type name ‘caddr_t’
3 ‘IPSET_ERR_TYPE_SPECIFIC’ undeclared here (not in a function)
3 field ‘trigger_tstamp’ has incomplete type
3 field ‘src_addr’ has incomplete type
3 field ‘sin_addr’ has incomplete type
3 field ‘laddr’ has incomplete type
3 field ‘id’ has incomplete type
3 field ‘dmsk’ has incomplete type
3 field ‘bssid’ has incomplete type
3 expected specifier-qualifier-list before ‘uint64_t’
2 unknown type name ‘u_long’
2 unknown type name ‘stack_t’
2 unknown type name ‘sigset_t’
2 unknown type name ‘sa_family_t’
2 unknown type name ‘__kernel_mode_t’
2 unknown type name ‘__kernel_key_t’
2 unknown type name ‘elf_gregset_t’
2 unknown type name ‘bool’
2 ‘uint64_t’ undeclared here (not in a function)
2 ‘true’ undeclared (first use in this function)
2 ‘NAME_MAX’ undeclared here (not in a function)
2 ‘__kernel_mode_t’ undeclared here (not in a function)
2 invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr’
2 field ‘uc_mcontext’ has incomplete type
2 field ‘tmsk’ has incomplete type
2 field ‘tgt’ has incomplete type
2 field ‘shm_perm’ has incomplete type
2 field ‘sem_perm’ has incomplete type
2 field ‘raddr’ has incomplete type
2 field ‘msg_perm’ has incomplete type
2 field ‘grp’ has incomplete type
2 field ‘dst’ has incomplete type
2 field ‘dst_addr’ has incomplete type
2 field ‘arp_pa’ has incomplete type
2 field ‘arp_netmask’ has incomplete type
2 field ‘arp_ha’ has incomplete type
2 ‘false’ undeclared (first use in this function)
1 xen/interface/xen.h: No such file or directory
1 via_drmclient.h: No such file or directory
1 unknown type name ‘wait_queue_head_t’
1 unknown type name ‘snd_seq_client_type_t’
1 unknown type name ‘int16_t’
1 unknown type name ‘ino_t’
1 unknown type name ‘elf_greg_t’
1 unknown type name ‘elf_fpxregset_t’
1 unknown type name ‘elf_fpregset_t’
1 unknown type name ‘__be32’
1 ‘SIOCDEVPRIVATE’ undeclared here (not in a function)
1 ‘sa_family_t’ undeclared here (not in a function)
1 ‘NULL’ undeclared (first use in this function)
1 ‘MSG_FIN’ undeclared here (not in a function)
1 ‘MAX_IPOPTLEN’ undeclared here (not in a function)
1 ‘MAX_ADDR_LEN’ undeclared here (not in a function)
1 ‘IFHWADDRLEN’ undeclared here (not in a function)
1 field ‘vmask’ has incomplete type
1 field ‘vifc_rmt_addr’ has incomplete type
1 field ‘vifc_lcl_addr’ has incomplete type
1 field ‘vaddr’ has incomplete type
1 field ‘uc_chain’ has incomplete type
1 field ‘tgt_ip’ has incomplete type
1 field ‘tcp’ has incomplete type
1 field ‘sw_reserved’ has incomplete type
1 field ‘sspp_addr’ has incomplete type
1 field ‘ssp_addr’ has incomplete type
1 field ‘src_mask’ has incomplete type
1 field ‘src_ip’ has incomplete type
1 field ‘spt_address’ has incomplete type
1 field ‘spp_address’ has incomplete type
1 field ‘spinfo_address’ has incomplete type
1 field ‘spc_aaddr’ has incomplete type
1 field ‘sas_obs_rto_ipaddr’ has incomplete type
1 field ‘saddr’ has incomplete type
1 field ‘rtmsg_src’ has incomplete type
1 field ‘rtmsg_gateway’ has incomplete type
1 field ‘rtmsg_dst’ has incomplete type
1 field ‘rt_genmask’ has incomplete type
1 field ‘rt_gateway’ has incomplete type
1 field ‘rt_dst’ has incomplete type
1 field ‘real’ has incomplete type
1 field ‘prefix’ has incomplete type
1 field ‘obj_list’ has incomplete type
1 field ‘mfcc_origin’ has incomplete type
1 field ‘mfcc_mcastgrp’ has incomplete type
1 field ‘mf6cc_origin’ has incomplete type
1 field ‘mf6cc_mcastgrp’ has incomplete type
1 field ‘mask’ has incomplete type
1 field ‘ival2’ has incomplete type
1 field ‘ival1’ has incomplete type
1 field ‘iph’ has incomplete type
1 field ‘ip’ has incomplete type
1 field ‘im_src’ has incomplete type
1 field ‘im_dst’ has incomplete type
1 field ‘im6_src’ has incomplete type
1 field ‘im6_dst’ has incomplete type
1 field ‘gw’ has incomplete type
1 field ‘expected’ has incomplete type
1 field ‘dst_mask’ has incomplete type
1 field ‘dest_addr’ has incomplete type
1 field ‘daddr’ has incomplete type
1 field ‘ap_addr’ has incomplete type
1 field ‘a6’ has incomplete type
1 field ‘a4’ has incomplete type
1 expected specifier-qualifier-list before ‘DECLARE_BITMAP’
1 expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘snd_seq_client_type_t’
1 #error "patchkey.h included directly"
1 ‘DLM_RESNAME_MAXLEN’ undeclared here (not in a function)--- scripts/headers_compile_test.sh | 143 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100755 scripts/headers_compile_test.sh
scripts/headers_compile_test.sh new file +143 -0
@@ -0,0 +1,143 @@ +#!/bin/bash +# bash due to arithmetics and pipefail +set -euo pipefail + +# Debugging +#set -x + +echo Simple compile test for header files meant for userspace. + +# sanity test +if [ ! -d ./linux ]; then + echo Sanity check error: ./linux directory not found + echo Should be called in usr/include after \'make headers_install\'. + echo Returns number of failed files, 0 if none. + exit 1 +fi + +# Support CC variable for compiler and ccache, and cross compiling. +# CC is used without quotes to support CC="ccache gcc". +set +u +if [ "$CC"foobar == "foobar" ]; then + CC=cc +fi + +if [ "$CROSS_COMPILE"foobar != "foobar" ]; then + # Using gcc name since some cross compiler tool chains don't provide + # the cc symlink + CC="$CROSS_COMPILE"gcc +fi +set -u + +# Kernel headers refer to some gcc and libc headers so make them available. +set +u +if [ "$ARCH_TRIPLET"foobar == "foobar" ]; then + # Taking triplet from gcc/cpp + ARCH_TRIPLET="$( $CC -v -x c -E - < /dev/null 2>&1 | \ + grep Target | sed -e 's/Target: //' )" +fi + +if [ "$LIBC"foobar == "foobar" ]; then + # trying to grep libc includes from gcc/cpp defaults + _TEMP="$( $CC -v -x c -E - < /dev/null 2>&1 | \ + sed -n -e '/^#include <...> search starts here:$/,/^End of search list.$/{//!p}' | \ + sed -e 's/^\ \//\//g' | \ + grep '/usr/include' )" + + # sanity check and prepare LIBC dirs + for d in $_TEMP; do + if [ ! -d "$d" ]; then + echo "$d not a directory" + exit 1 + fi + LIBC="$LIBC $d" + done +fi +set -u + +# Copy libc include files to temp directory for the tests. + +COMPILE_TEST_INC=../headers_compile_test_include +rm -rf "$COMPILE_TEST_INC" +mkdir -p "$COMPILE_TEST_INC" + +for d in $LIBC; do + # check if last part of dir is the arch triplet, cross compile paths + # can have it also elsewhere so just the last one counts. + if !( echo "$d" | egrep "$ARCH_TRIPLET$" > /dev/null ); then + # hopefully just main libc dir, e.g. /usr/include + cp -a "$d"/* "$COMPILE_TEST_INC"/ + elif ( echo "$d" | egrep "$ARCH_TRIPLET$" > /dev/null ); then + # hopefully the arch specific dir, e.g. /usr/include/x86_64-linux-gnu + cp -ar "$d"/* "$COMPILE_TEST_INC/" + else + echo "$d unexpected, bailing out" + exit 1 + fi +done + +# Simulate libc headers without kernel headers by removing +# all known kernel header dirs from the copied libc ones. +# This seems to magically work. +_KERNEL_DIRS="$( find . -type d | grep -v '^\.$' )" +( cd "$COMPILE_TEST_INC" && rm -rf $_KERNEL_DIRS ) + +# GCC headers +set +u +if [ "$GCC_INC"foobar == "foobar" ]; then + # Take from $CC default system include paths, filter out + # /usr/local/include and /usr/include stuff first, then try to match + # for gcc. + _TEMP="$( $CC -v -x c -E - < /dev/null 2>&1 | \ + sed -n -e '/^#include <...> search starts here:$/,/^End of search list.$/{//!p}' | \ + sed -e 's/^\ \//\//g' | \ + egrep -v '/usr/local/include' | \ + egrep -v '/usr/include' | \ + grep gcc | \ + xargs )" + + # merge and prepare for use with $CC + for d in $_TEMP; do + # sanity test + if [ ! -d "$d" ]; then + echo "$d: is not a directory" + exit 1 + fi + GCC_INC="$GCC_INC -I $d" + done +fi +set -u + +# For each header file, create a .c which includes the header file +# and try to compile it using only current directory for searching other +# included header files. +_FAILED=0 +_PASSED=0 +for f in $( find . -name "*\.h" | xargs ); do + _FAIL=0 + CFILE="$( echo "$( dirname "$f" )"/"$( basename "$f" .h )".c )" + + # create .c file + echo "#include <"$( echo "$f" | sed -e 's|^.\/||' )">" \ + > "$(dirname "$f")"/"$(basename "$f" .h)".c + + # compile test, CC not quoted to support ccache + echo $CC -Wall -c -nostdinc $GCC_INC -I . -I "$COMPILE_TEST_INC" -I "$COMPILE_TEST_INC/$ARCH_TRIPLET" "$CFILE" + $CC -Wall -c -nostdinc $GCC_INC -I . -I "$COMPILE_TEST_INC" -I "$COMPILE_TEST_INC/$ARCH_TRIPLET" "$CFILE" \ + || _FAIL=1 + + # report errors + if [ "$_FAIL" -gt 0 ]; then + echo "FAILED: $f" + _FAILED="$(( $_FAILED + 1 ))" + else + echo "PASSED: $f" + _PASSED="$(( $_PASSED + 1))" + fi +done + +echo Statistics: +echo "$_FAILED files failed the compile test." +echo "$_PASSED files passed the compile test." + +exit "$_FAILED"
Signature · 1 line
2.1.4
PATCH v3 3/98 drm.h: use __kernel_size_t instead of size_t
In reply to Mikko RapeliFixes userspace compilation error:
drm/drm.h:132:2: error: unknown type name ‘size_t’
--- include/uapi/drm/drm.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/uapi/drm/drm.h +4 -4
@@ -129,11 +129,11 @@ struct drm_version {int version_major;/**< Major version */ int version_minor;/**< Minor version */ int version_patchlevel;/**< Patch level */ -size_t name_len;/**< Length of name buffer */ +__kernel_size_t name_len;/**< Length of name buffer */ char __user *name;/**< Name of driver */ -size_t date_len;/**< Length of date buffer */ +__kernel_size_t date_len;/**< Length of date buffer */ char __user *date;/**< User-space buffer to hold date */ -size_t desc_len;/**< Length of desc buffer */ +__kernel_size_t desc_len;/**< Length of desc buffer */ char __user *desc;/**< User-space buffer to hold desc */ };
@@ -143,7 +143,7 @@ struct drm_version {* \sa drmGetBusid() and drmSetBusId(). */ struct drm_unique { -size_t unique_len;/**< Length of unique */ +__kernel_size_t unique_len;/**< Length of unique */ char __user *unique;/**< Unique name for driver instantiation */ };
Signature · 1 line
2.1.4
Re: [PATCH 03/98] drm.h: use __kernel_size_t instead of size_t
Quoted 29 lines · Mikko Rapeli
Fixes userspace compilation error:
drm/drm.h:132:2: error: unknown type name ‘size_t’Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/drm/drm.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)include/uapi/drm/drm.h +3
-3@@ -129,11 +129,11 @@ struct drm_version {int version_major;/**< Major version */ int version_minor;/**< Minor version */ int version_patchlevel;/**< Patch level */ -size_t name_len;/**< Length of name buffer */ +__kernel_size_t name_len;/**< Length of name buffer */ char __user *name;/**< Name of driver */ -size_t date_len;/**< Length of date buffer */ +__kernel_size_t date_len;/**< Length of date buffer */ char __user *date;/**< User-space buffer to hold date */ -size_t desc_len;/**< Length of desc buffer */ +__kernel_size_t desc_len;/**< Length of desc buffer */ char __user *desc;/**< User-space buffer to hold desc */ };
include/uapi/drm/drm.h struct drm_version { · line 146
Quoted 5 lines
include/uapi/drm/drm.h +1
-1@@ -143,7 +143,7 @@ struct drm_version {* \sa drmGetBusid() and drmSetBusId(). */ struct drm_unique { -size_t unique_len;/**< Length of unique */ +__kernel_size_t unique_len;/**< Length of unique */
As the file is used by other platforms than Linux this change will break them. Can you add a typedef similar to how __u8 and friends are handled at the top of the file.
Thanks
Emil
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 03/98] drm.h: use __kernel_size_t instead of size_t
Quoted 29 lines · Emil Velikov
Quoted 28 lines · Mikko Rapeli
Fixes userspace compilation error:
drm/drm.h:132:2: error: unknown type name ‘size_t’Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/drm/drm.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)include/uapi/drm/drm.h +3
-3@@ -129,11 +129,11 @@ struct drm_version {int version_major;/**< Major version */ int version_minor;/**< Minor version */ int version_patchlevel;/**< Patch level */ -size_t name_len;/**< Length of name buffer */ +__kernel_size_t name_len;/**< Length of name buffer */ char __user *name;/**< Name of driver */ -size_t date_len;/**< Length of date buffer */ +__kernel_size_t date_len;/**< Length of date buffer */ char __user *date;/**< User-space buffer to hold date */ -size_t desc_len;/**< Length of desc buffer */ +__kernel_size_t desc_len;/**< Length of desc buffer */ char __user *desc;/**< User-space buffer to hold desc */ };
Quoted 9 lines
include/uapi/drm/drm.h struct drm_version { · line 146
Quoted 6 lines
include/uapi/drm/drm.h +1
-1@@ -143,7 +143,7 @@ struct drm_version {* \sa drmGetBusid() and drmSetBusId(). */ struct drm_unique { -size_t unique_len;/**< Length of unique */ +__kernel_size_t unique_len;/**< Length of unique */ As the file is used by other platforms than Linux this change will break them. Can you add a typedef similar to how
__u8and friends are handled at the top of the file.
Yes, I added typedef size_t __kernel_size_t; for other platforms.
-Mikko
Re: [PATCH 03/98] drm.h: use __kernel_size_t instead of size_t
In reply to Emil VelikovQuoted 29 lines · Emil Velikov
Quoted 28 lines · Mikko Rapeli
Fixes userspace compilation error:
drm/drm.h:132:2: error: unknown type name ‘size_t’Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/drm/drm.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)include/uapi/drm/drm.h +3
-3@@ -129,11 +129,11 @@ struct drm_version {int version_major;/**< Major version */ int version_minor;/**< Minor version */ int version_patchlevel;/**< Patch level */ -size_t name_len;/**< Length of name buffer */ +__kernel_size_t name_len;/**< Length of name buffer */ char __user *name;/**< Name of driver */ -size_t date_len;/**< Length of date buffer */ +__kernel_size_t date_len;/**< Length of date buffer */ char __user *date;/**< User-space buffer to hold date */ -size_t desc_len;/**< Length of desc buffer */ +__kernel_size_t desc_len;/**< Length of desc buffer */ char __user *desc;/**< User-space buffer to hold desc */ };
Quoted 9 lines
include/uapi/drm/drm.h struct drm_version { · line 146
Quoted 6 lines
include/uapi/drm/drm.h +1
-1@@ -143,7 +143,7 @@ struct drm_version {* \sa drmGetBusid() and drmSetBusId(). */ struct drm_unique { -size_t unique_len;/**< Length of unique */ +__kernel_size_t unique_len;/**< Length of unique */ As the file is used by other platforms than Linux this change will break them. Can you add a typedef similar to how
__u8and friends are handled at the top of the file.
This file isn't used by anyone else than Linus since years. All of the typedefs can be nuked imo.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
PATCH v3 4/98 drm_mode.h: use __u32 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation error:
drm/drm_mode.h:472:2: error: unknown type name ‘uint32_t’
--- include/uapi/drm/drm_mode.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
include/uapi/drm/drm_mode.h +8 -8
@@ -508,14 +508,14 @@ struct drm_mode_crtc_page_flip {/* create a dumb scanout buffer */ struct drm_mode_create_dumb { -uint32_t height; -uint32_t width; -uint32_t bpp; -uint32_t flags; +__u32 height; +__u32 width; +__u32 bpp; +__u32 flags;/* handle, pitch, size will be returned */ -uint32_t handle; -uint32_t pitch; -uint64_t size; +__u32 handle; +__u32 pitch; +__u64 size; };/* set up for mmap of a dumb scanout buffer */
@@ -532,7 +532,7 @@ struct drm_mode_map_dumb { };struct drm_mode_destroy_dumb { -uint32_t handle; +__u32 handle; };/* page-flip flags are valid, plus: */
Signature · 1 line
2.1.4
Re: [PATCH 04/98] drm_mode.h: use __u32 and __u64 from linux/types.h
Quoted 3 lines · Mikko Rapeli
Fixes userspace compilation error:
drm/drm_mode.h:472:2: error: unknown type name ‘uint32_t’
It's even more or less required by the coding style. Chapter 5 (typedefs) says:
(e) Types safe for use in userspace.
In certain structures which are visible to userspace, we cannot require C99 types and cannot use the 'u32' form above. Thus, we use __u32 and similar types in all structures which are shared with userspace.
So this is probably an improvement in any case.
Thanks,
Frans
Quoted 49 lines
Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/drm/drm_mode.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)include/uapi/drm/drm_mode.h +8
-8@@ -508,14 +508,14 @@ struct drm_mode_crtc_page_flip {/* create a dumb scanout buffer */ struct drm_mode_create_dumb { -uint32_t height; -uint32_t width; -uint32_t bpp; -uint32_t flags; +__u32 height; +__u32 width; +__u32 bpp; +__u32 flags;/* handle, pitch, size will be returned */ -uint32_t handle; -uint32_t pitch; -uint64_t size; +__u32 handle; +__u32 pitch; +__u64 size; };/* set up for mmap of a dumb scanout buffer */ @@ -532,7 +532,7 @@ struct drm_mode_map_dumb { };struct drm_mode_destroy_dumb { -uint32_t handle; +__u32 handle; };/* page-flip flags are valid, plus: */ Signature · 7 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
PATCH v3 5/98 exynos_drm.h: use __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation error:
drm/exynos_drm.h:30:2: error: unknown type name ‘uint64_t’
--- include/uapi/drm/exynos_drm.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
include/uapi/drm/exynos_drm.h +4 -3
@@ -15,6 +15,7 @@#ifndef _UAPI_EXYNOS_DRM_H_#define _UAPI_EXYNOS_DRM_H_ +#include <linux/types.h> #include <drm/drm.h> /**
@@ -27,7 +28,7 @@* - this handle will be set by gem module of kernel side. */ struct drm_exynos_gem_create { -uint64_t size; +__u64 size;unsigned int flags;unsigned int handle; };
@@ -44,7 +45,7 @@ struct drm_exynos_gem_create {struct drm_exynos_gem_info {unsigned int handle;unsigned int flags; -uint64_t size; +__u64 size; };/**
@@ -58,7 +59,7 @@ struct drm_exynos_gem_info {struct drm_exynos_vidi_connection {unsigned int connection;unsigned int extensions; -uint64_t edid; +__u64 edid; };/* memory type definitions. */
Signature · 1 line
2.1.4
Re: [PATCH 05/98] exynos_drm.h: use __u64 from linux/types.h
Quoted 5 lines · Mikko Rapeli
Fixes userspace compilation error:
drm/exynos_drm.h:30:2: error: unknown type name ‘uint64_t’Signed-off-by Mikko Rapeli <[email protected]>
This is another thing which we need to address. We should not be using unsigned int/unsigned long/uintXX_t/etc in here, but the __uXX and __sXX types.
The lesson learned from other DRM developers is that using these types simplifies the API especially when it comes to the differences between 32-bit and 64-bit machines, and compat applications.
Note that drm/drm.h is all that should need to be included - drm/drm.h takes care of including linux/types.h when building on Linux platforms. (note: if your compiler doesn't set __linux__ then you're probably not using the proper compiler...)
Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up according to speedtest.net.
Christian König
maintainerRe: [PATCH 05/98] exynos_drm.h: use __u64 from linux/types.h
Quoted 10 lines · Russell King - ARM Linux
Quoted 5 lines · Mikko Rapeli
Fixes userspace compilation error:
drm/exynos_drm.h:30:2: error: unknown type name ‘uint64_t’Signed-off-by Mikko Rapeli <[email protected]>This is another thing which we need to address. We should not be using unsigned int/unsigned long/uintXX_t/etc in here, but the
__uXXand__sXXtypes.
Quoted 9 lines
The lesson learned from other DRM developers is that using these types simplifies the API especially when it comes to the differences between 32-bit and 64-bit machines, and compat applications.
Note that
drm/drm.his all that should need to be included -drm/drm.htakes care of includinglinux/types.hwhen building on Linux platforms. (note: if your compiler doesn't set__linux__then you're probably not using the proper compiler...)
Using types that differs on 32-bit and 64-bit machines for a kernel interface is indeed a rather bad idea. This not only includes longs, but pointers as well.
But the int8_t, int16_t int32_t, int64_t and their unsigned counterparts are defined in stdint.h which is part of the ISO/IEC 9899:1999 standard, similar is true for size_t.
The __uXX, __sXX and _kernel_size_t types are linux specific as far as I know.
For best interoperability and standard conformance I think that definitions from the C standard we use should out-rule linux specific definitions.
Additional to that "linux/types.h" is not part of the uapi as far as I know, so including it in a header which is part of the uapi should be forbidden.
So this is a NAK from my side for the whole series, userspace programs should include <stdint.h> for the definition of the ISO/IEC 9899:1999 standard types if necessary.
Regards,
Christian.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 05/98] exynos_drm.h: use __u64 from linux/types.h
Quoted 3 lines · Christian König
Using types that differs on 32-bit and 64-bit machines for a kernel interface is indeed a rather bad idea. This not only includes longs, but pointers as well.
[cut standard stdint.h types argument which we've heard before]
You need to read Linus' rant on this subject:
From: Linus Torvalds <[email protected]>
Subject: Re: [RFC] Splitting kernel headers and deprecating __KERNEL__
Date: Mon, 29 Nov 2004 01:30:46 GMT
Ok, this discussion has gone on for too long anyway, but let's make it easier for everybody. The kernel uses u8/u16/u32 because:
- the kernel should not depend on, or pollute user-space naming. YOU MUST NOT USE "uint32_t" when that may not be defined, and user-space rules for when it is defined are arcane and totally arbitrary.
- since the kernel cannot use those types for anything that is visible to user space anyway, there has to be alternate names. The tradition is to prepend two underscores, so the kernel would have to use "__uint32_t" etc for its header files.
- at that point, there's no longer any valid argument that it's a "standard type" (it ain't), and I personally find it a lot more readable to just use the types that the kernel has always used:
__u8/__u16/__u32. For stuff that is only used for the kernel, the shorter "u8/u16/u32" versions may be used.
In short: having the kernel use the same names as user space is ACTIVELY BAD, exactly because those names have standards-defined visibility, which means that the kernel _cannot_ use them in all places anyway. So don't even _try_.
Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up according to speedtest.net.
Christian König
maintainerRe: [PATCH 05/98] exynos_drm.h: use __u64 from linux/types.h
Yeah, completely agree with Linus on the visibility problem and that's exactly the reason why we don't include <stdint.h> in the kernel header and expect userspace to define the ISO types somewhere.
But using the types from "include/linux/types.h" and especially including it into the uapi headers doesn't make the situation better, but rather worse.
With this step we not only make the headers depend on another header that isn't part of the uapi, but also pollute the user space namespace with __sXX and __uXX types which aren't defined anywhere else.
Regards,
Christian.
Quoted 36 lines · Russell King - ARM Linux
Quoted 3 lines · Christian König
Using types that differs on 32-bit and 64-bit machines for a kernel interface is indeed a rather bad idea. This not only includes longs, but pointers as well.
[cut standard
stdint.htypes argument which we've heard before]You need to read Linus' rant on this subject:
From: Linus Torvalds <[email protected]>
Subject: Re: [RFC] Splitting kernel headers and deprecating__KERNEL__
Date: Mon, 29 Nov 2004 01:30:46 GMTOk, this discussion has gone on for too long anyway, but let's make it easier for everybody. The kernel uses u8/u16/u32 because:
- the kernel should not depend on, or pollute user-space naming. YOU MUST NOT USE "
uint32_t" when that may not be defined, and user-space rules for when it is defined are arcane and totally arbitrary.- since the kernel cannot use those types for anything that is visible to user space anyway, there has to be alternate names. The tradition is to prepend two underscores, so the kernel would have to use "
__uint32_t" etc for its header files.- at that point, there's no longer any valid argument that it's a "standard type" (it ain't), and I personally find it a lot more readable to just use the types that the kernel has always used:
__u8/__u16/__u32. For stuff that is only used for the kernel, the shorter "u8/u16/u32" versions may be used.In short: having the kernel use the same names as user space is ACTIVELY BAD, exactly because those names have standards-defined visibility, which means that the kernel _cannot_ use them in all places anyway. So don't even _try_.
Re: [PATCH 05/98] exynos_drm.h: use __u64 from linux/types.h
Quoted 10 lines · Christian König
Yeah, completely agree with Linus on the visibility problem and that's exactly the reason why we don't include <
stdint.h> in the kernel header and expect userspace to define the ISO types somewhere.But using the types from "
include/linux/types.h" and especially including it into the uapi headers doesn't make the situation better, but rather worse.With this step we not only make the headers depend on another header that isn't part of the uapi, but also pollute the user space namespace with
__sXXand__uXXtypes which aren't defined anywhere else.
These __uXX and __sXX types are defined in include/uapi/asm-generic/ll64.h and pulled in by include/uapi/linux/types.h. Including linux/types.h is therefore valid.
Frans
Re: [PATCH 05/98] exynos_drm.h: use __u64 from linux/types.h
In reply to Christian KönigQuoted 10 lines · Christian König
Yeah, completely agree with Linus on the visibility problem and that's exactly the reason why we don't include <
stdint.h> in the kernel header and expect userspace to define the ISO types somewhere.But using the types from "
include/linux/types.h" and especially including it into the uapi headers doesn't make the situation better, but rather worse.With this step we not only make the headers depend on another header that isn't part of the uapi, but also pollute the user space namespace with
__sXXand__uXXtypes which aren't defined anywhere else.
1) Header files are permitted to pollute userspace with __-defined stuff.
2) __[su]XX types are defined as part of the kernel's uapi. include/uapi/linux/types.h includes asm/types.h, which in userspace picks up include/uapi/asm-generic/types.h. That picks up asm-generic/int-ll64.h, which defines these types.
Moreover, this is done throughout the kernel headers _already_ (as you would expect for a policy set 10+ years ago).
Please, I'm not interested in this discussion, so please don't argue with me - I may agree with your position, but what you think and what I think are really not relevant here. If you have a problem, take it up with Linus - I made that clear in my email.
Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up according to speedtest.net.
Christian König
maintainerRe: [PATCH 05/98] exynos_drm.h: use __u64 from linux/types.h
Quoted 18 lines · Russell King - ARM Linux
Quoted 10 lines · Christian König
Yeah, completely agree with Linus on the visibility problem and that's exactly the reason why we don't include <
stdint.h> in the kernel header and expect userspace to define the ISO types somewhere.But using the types from "
include/linux/types.h" and especially including it into the uapi headers doesn't make the situation better, but rather worse.With this step we not only make the headers depend on another header that isn't part of the uapi, but also pollute the user space namespace with
__sXXand__uXXtypes which aren't defined anywhere else.1) Header files are permitted to pollute userspace with __-defined stuff.
2) __[su]XX types are defined as part of the kernel's uapi.
include/uapi/linux/types.hincludesasm/types.h, which in userspace picks upinclude/uapi/asm-generic/types.h. That picks upasm-generic/int-ll64.h, which defines these types.
Quoted 8 lines
Moreover, this is done throughout the kernel headers _already_ (as you would expect for a policy set 10+ years ago).
Please, I'm not interested in this discussion, so please don't argue with me - I may agree with your position, but what you think and what I think are really not relevant here. If you have a problem, take it up with Linus - I made that clear in my email.
In this case I'm fine with the changes, but I'm still not sure if that's a good idea or not.
Sticking to ISO C still sounds better than doing something on our own. And it now looks a bit different than it was in 2004, stdint.h is widely adopted in userspace if I'm not completely mistaken.
Anyway you're perfectly right that Linus need to decide and I'm not in the mod to argue with him either (got way to much other things to do as well).
Regards,
Christian.
Re: [PATCH 05/98] exynos_drm.h: use __u64 from linux/types.h
In reply to Christian KönigQuoted 3 lines · Christian König
Additional to that "
linux/types.h" is not part of the uapi as far as I know, so including it in a header which is part of the uapi should be forbidden.
linux/types.h is part of uapi. See usr/include after 'make headers_install'.
-Mikko
Re: [PATCH 05/98] exynos_drm.h: use __u64 from linux/types.h
In reply to Russell King - ARM LinuxQuoted 4 lines · Russell King - ARM Linux
Note that
drm/drm.his all that should need to be included -drm/drm.htakes care of includinglinux/types.hwhen building on Linux platforms. (note: if your compiler doesn't set__linux__then you're probably not using the proper compiler...)
Thanks, I'll fix this by including only drm/drm.h in exynos_drm.h, nouveau_drm.h, radeon_drm.h and via_drm.h patches.
I'm using standard gcc from Debian for the x86 compilation.
-Mikko
PATCH v3 6/98 nouveau_drm.h: use __u32 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
drm/nouveau_drm.h:41:2: error: unknown type name ‘uint32_t’
--- include/uapi/drm/nouveau_drm.h | 86 +++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 42 deletions(-)
include/uapi/drm/nouveau_drm.h +44 -42
@@ -35,6 +35,8 @@#define NOUVEAU_ABI16_DEVICE 0xdddddddd#define NOUVEAU_ABI16_CHAN (n) (0xcccc0000 | (n)) +#include <linux/types.h> +#define NOUVEAU_GEM_DOMAIN_CPU (1 << 0)#define NOUVEAU_GEM_DOMAIN_VRAM (1 << 1)#define NOUVEAU_GEM_DOMAIN_GART (1 << 2)
@@ -49,34 +51,34 @@#define NOUVEAU_GEM_TILE_NONCONTIG 0x00000008struct drm_nouveau_gem_info { -uint32_t handle; -uint32_t domain; -uint64_t size; -uint64_t offset; -uint64_t map_handle; -uint32_t tile_mode; -uint32_t tile_flags; +__u32 handle; +__u32 domain; +__u64 size; +__u64 offset; +__u64 map_handle; +__u32 tile_mode; +__u32 tile_flags; };struct drm_nouveau_gem_new {struct drm_nouveau_gem_info info; -uint32_t channel_hint; -uint32_t align; +__u32 channel_hint; +__u32 align; };#define NOUVEAU_GEM_MAX_BUFFERS 1024struct drm_nouveau_gem_pushbuf_bo_presumed { -uint32_t valid; -uint32_t domain; -uint64_t offset; +__u32 valid; +__u32 domain; +__u64 offset; };struct drm_nouveau_gem_pushbuf_bo { -uint64_t user_priv; -uint32_t handle; -uint32_t read_domains; -uint32_t write_domains; -uint32_t valid_domains; +__u64 user_priv; +__u32 handle; +__u32 read_domains; +__u32 write_domains; +__u32 valid_domains;struct drm_nouveau_gem_pushbuf_bo_presumed presumed; };
@@ -85,46 +87,46 @@ struct drm_nouveau_gem_pushbuf_bo {#define NOUVEAU_GEM_RELOC_OR (1 << 2)#define NOUVEAU_GEM_MAX_RELOCS 1024struct drm_nouveau_gem_pushbuf_reloc { -uint32_t reloc_bo_index; -uint32_t reloc_bo_offset; -uint32_t bo_index; -uint32_t flags; -uint32_t data; -uint32_t vor; -uint32_t tor; +__u32 reloc_bo_index; +__u32 reloc_bo_offset; +__u32 bo_index; +__u32 flags; +__u32 data; +__u32 vor; +__u32 tor; };#define NOUVEAU_GEM_MAX_PUSH 512struct drm_nouveau_gem_pushbuf_push { -uint32_t bo_index; -uint32_t pad; -uint64_t offset; -uint64_t length; +__u32 bo_index; +__u32 pad; +__u64 offset; +__u64 length; };struct drm_nouveau_gem_pushbuf { -uint32_t channel; -uint32_t nr_buffers; -uint64_t buffers; -uint32_t nr_relocs; -uint32_t nr_push; -uint64_t relocs; -uint64_t push; -uint32_t suffix0; -uint32_t suffix1; -uint64_t vram_available; -uint64_t gart_available; +__u32 channel; +__u32 nr_buffers; +__u64 buffers; +__u32 nr_relocs; +__u32 nr_push; +__u64 relocs; +__u64 push; +__u32 suffix0; +__u32 suffix1; +__u64 vram_available; +__u64 gart_available; };#define NOUVEAU_GEM_CPU_PREP_NOWAIT 0x00000001#define NOUVEAU_GEM_CPU_PREP_WRITE 0x00000004struct drm_nouveau_gem_cpu_prep { -uint32_t handle; -uint32_t flags; +__u32 handle; +__u32 flags; };struct drm_nouveau_gem_cpu_fini { -uint32_t handle; +__u32 handle; };#define DRM_NOUVEAU_GETPARAM 0x00/* deprecated */
Signature · 1 line
2.1.4
PATCH v3 7/98 radeon_drm.h: use __u32 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compiler error:
drm/radeon_drm.h:794:2: error: unknown type name ‘uint64_t’
--- include/uapi/drm/radeon_drm.h | 129 +++++++++++++++++++++--------------------- 1 file changed, 65 insertions(+), 64 deletions(-)
include/uapi/drm/radeon_drm.h +65 -64
@@ -33,6 +33,7 @@#ifndef __RADEON_DRM_H__#define __RADEON_DRM_H__ +#include <linux/types.h> #include <drm/drm.h> /* WARNING: If you change any of these defines, make sure to change the
@@ -793,9 +794,9 @@ typedef struct drm_radeon_surface_free {#define RADEON_GEM_DOMAIN_VRAM 0x4struct drm_radeon_gem_info { -uint64_t gart_size; -uint64_t vram_size; -uint64_t vram_visible; +__u64 gart_size; +__u64 vram_size; +__u64 vram_visible; };#define RADEON_GEM_NO_BACKING_STORE (1 << 0)
@@ -807,11 +808,11 @@ struct drm_radeon_gem_info {#define RADEON_GEM_NO_CPU_ACCESS (1 << 4)struct drm_radeon_gem_create { -uint64_t size; -uint64_t alignment; -uint32_t handle; -uint32_t initial_domain; -uint32_t flags; +__u64 size; +__u64 alignment; +__u32 handle; +__u32 initial_domain; +__u32 flags; };/*
@@ -825,10 +826,10 @@ struct drm_radeon_gem_create {#define RADEON_GEM_USERPTR_REGISTER (1 << 3)struct drm_radeon_gem_userptr { -uint64_t addr; -uint64_t size; -uint32_t flags; -uint32_t handle; +__u64 addr; +__u64 size; +__u32 flags; +__u32 handle; };#define RADEON_TILING_MACRO 0x1
@@ -850,72 +851,72 @@ struct drm_radeon_gem_userptr {#define RADEON_TILING_EG_STENCIL_TILE_SPLIT_MASK 0xfstruct drm_radeon_gem_set_tiling { -uint32_t handle; -uint32_t tiling_flags; -uint32_t pitch; +__u32 handle; +__u32 tiling_flags; +__u32 pitch; };struct drm_radeon_gem_get_tiling { -uint32_t handle; -uint32_t tiling_flags; -uint32_t pitch; +__u32 handle; +__u32 tiling_flags; +__u32 pitch; };struct drm_radeon_gem_mmap { -uint32_t handle; -uint32_t pad; -uint64_t offset; -uint64_t size; -uint64_t addr_ptr; +__u32 handle; +__u32 pad; +__u64 offset; +__u64 size; +__u64 addr_ptr; };struct drm_radeon_gem_set_domain { -uint32_t handle; -uint32_t read_domains; -uint32_t write_domain; +__u32 handle; +__u32 read_domains; +__u32 write_domain; };struct drm_radeon_gem_wait_idle { -uint32_t handle; -uint32_t pad; +__u32 handle; +__u32 pad; };struct drm_radeon_gem_busy { -uint32_t handle; -uint32_t domain; +__u32 handle; +__u32 domain; };struct drm_radeon_gem_pread {/** Handle for the object being read. */ -uint32_t handle; -uint32_t pad; +__u32 handle; +__u32 pad;/** Offset into the object to read from */ -uint64_t offset; +__u64 offset;/** Length of data to read */ -uint64_t size; +__u64 size;/** Pointer to write the data into. */ /* void *, but pointers are not 32/64 compatible */ -uint64_t data_ptr; +__u64 data_ptr; };struct drm_radeon_gem_pwrite {/** Handle for the object being written to. */ -uint32_t handle; -uint32_t pad; +__u32 handle; +__u32 pad;/** Offset into the object to write to */ -uint64_t offset; +__u64 offset;/** Length of data to write */ -uint64_t size; +__u64 size;/** Pointer to read the data from. */ /* void *, but pointers are not 32/64 compatible */ -uint64_t data_ptr; +__u64 data_ptr; };/* Sets or returns a value associated with a buffer. */ struct drm_radeon_gem_op { -uint32_t handle;/* buffer */ -uint32_t op;/* RADEON_GEM_OP_* */ -uint64_t value;/* input or return value */ +__u32 handle;/* buffer */ +__u32 op;/* RADEON_GEM_OP_* */ +__u64 value;/* input or return value */ };#define RADEON_GEM_OP_GET_INITIAL_DOMAIN 0
@@ -935,11 +936,11 @@ struct drm_radeon_gem_op {#define RADEON_VM_PAGE_SNOOPED (1 << 4)struct drm_radeon_gem_va { -uint32_t handle; -uint32_t operation; -uint32_t vm_id; -uint32_t flags; -uint64_t offset; +__u32 handle; +__u32 operation; +__u32 vm_id; +__u32 flags; +__u64 offset; };#define RADEON_CHUNK_ID_RELOCS 0x01
@@ -961,29 +962,29 @@ struct drm_radeon_gem_va {/* 0 = normal, + = higher priority, - = lower priority */ struct drm_radeon_cs_chunk { -uint32_t chunk_id; -uint32_t length_dw; -uint64_t chunk_data; +__u32 chunk_id; +__u32 length_dw; +__u64 chunk_data; };/* drm_radeon_cs_reloc.flags */ #define RADEON_RELOC_PRIO_MASK (0xf << 0)struct drm_radeon_cs_reloc { -uint32_t handle; -uint32_t read_domains; -uint32_t write_domain; -uint32_t flags; +__u32 handle; +__u32 read_domains; +__u32 write_domain; +__u32 flags; };struct drm_radeon_cs { -uint32_t num_chunks; -uint32_t cs_id; -/* this points to uint64_t * which point to cs chunks */ -uint64_t chunks; +__u32 num_chunks; +__u32 cs_id; +/* this points to __u64 * which point to cs chunks */ +__u64 chunks;/* updates to the limits after this CS ioctl */ -uint64_t gart_limit; -uint64_t vram_limit; +__u64 gart_limit; +__u64 vram_limit; };#define RADEON_INFO_DEVICE_ID 0x00
@@ -1040,9 +1041,9 @@ struct drm_radeon_cs {#define RADEON_INFO_READ_REG 0x24struct drm_radeon_info { -uint32_t request; -uint32_t pad; -uint64_t value; +__u32 request; +__u32 pad; +__u64 value; };/* Those correspond to the tile index to use, this is to explicitly state
Signature · 1 line
2.1.4
PATCH v3 8/98 r128_drm.h: include drm/drm.h
In reply to Mikko RapeliFixes compile error:
drm/r128_drm.h:156:23: error: array type has incomplete element type
struct drm_clip_rect boxes[R128_NR_SAREA_CLIPRECTS];
--- include/uapi/drm/r128_drm.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/drm/r128_drm.h +2 -0
@@ -33,6 +33,8 @@#ifndef __R128_DRM_H__#define __R128_DRM_H__ +#include <drm/drm.h> +/* WARNING: If you change any of these defines, make sure to change the * defines in the X server file (r128_sarea.h) */
Signature · 1 line
2.1.4
PATCH v3 9/98 via_drm.h: include linux/types.h instead of non-existing via_drmclient.h
In reply to Mikko RapeliFixes compiler error:
drm/via_drm.h:36:27: fatal error: via_drmclient.h: No such file or directory
--- include/uapi/drm/via_drm.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
include/uapi/drm/via_drm.h +1 -3
@@ -24,6 +24,7 @@#ifndef _VIA_DRM_H_#define _VIA_DRM_H_ +#include <linux/types.h> #include <drm/drm.h> /* WARNING: These defines must be the same as what the Xserver uses.
@@ -33,9 +34,6 @@#ifndef _VIA_DEFINES_#define _VIA_DEFINES_ -#ifndef __KERNEL__ -#include "via_drmclient.h" -#endif #define VIA_NR_SAREA_CLIPRECTS 8#define VIA_NR_XVMC_PORTS 10
Signature · 1 line
2.1.4
Re: [PATCH 09/98] via_drm.h: include linux/types.h instead of non-existing via_drmclient.h
Hi Mikko,
Quoted 14 lines · Mikko Rapeli
Fixes compiler error:
drm/via_drm.h:36:27: fatal error:via_drmclient.h: No such file or directorySigned-off-by Mikko Rapeli <[email protected]>--- include/uapi/drm/via_drm.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)include/uapi/drm/via_drm.h +0
-0
include/uapi/drm/via_drm.h line 27
Quoted 4 lines
include/uapi/drm/via_drm.h +1
-0@@ -24,6 +24,7 @@#ifndef _VIA_DRM_H_#define _VIA_DRM_H_ +#include <linux/types.h>
As mentioned elsewhere one could avoid this, and just use drm.h to manage the approapriate types (uint32_t vs __u32 and so on).
include/uapi/drm/via_drm.h line 37
Quoted 11 lines
include/uapi/drm/via_drm.h +0
-3#include <drm/drm.h> /* WARNING: These defines must be the same as what the Xserver uses. @@ -33,9 +34,6 @@#ifndef _VIA_DEFINES_#define _VIA_DEFINES_ -#ifndef __KERNEL__ -#include "via_drmclient.h" -#endif
I fear that this one is a particular example of a nasty legacy from the UMS days. The file is available/provided in very old mesa versions and at the very same time mesa requires via_drm.h. So I would kindly ask that you:
- Grab the libdrm userspace package, and apply a similar change.
- Rebuild/install the above.
- Fetch mesa 7.11, and try building the via dri module. Ideally
things will continue to build, alternatively we might need to add another/additional guard for this include.
Thanks
Emil
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 09/98] via_drm.h: include linux/types.h instead of non-existing via_drmclient.h
Quoted 40 lines · Emil Velikov
Hi Mikko,
Quoted 14 lines · Mikko Rapeli
Fixes compiler error:
drm/via_drm.h:36:27: fatal error:via_drmclient.h: No such file or directorySigned-off-by Mikko Rapeli <[email protected]>--- include/uapi/drm/via_drm.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)include/uapi/drm/via_drm.h +0
-0include/uapi/drm/via_drm.h line 27
Quoted 4 lines
include/uapi/drm/via_drm.h +1
-0@@ -24,6 +24,7 @@#ifndef _VIA_DRM_H_#define _VIA_DRM_H_ +#include <linux/types.h> As mentioned elsewhere one could avoid this, and just use
drm.hto manage the approapriate types (uint32_tvs__u32and so on).include/uapi/drm/via_drm.h line 37
Quoted 11 lines
include/uapi/drm/via_drm.h +0
-3#include <drm/drm.h> /* WARNING: These defines must be the same as what the Xserver uses. @@ -33,9 +34,6 @@#ifndef _VIA_DEFINES_#define _VIA_DEFINES_ -#ifndef __KERNEL__ -#include "via_drmclient.h" -#endif I fear that this one is a particular example of a nasty legacy from the UMS days. The file is available/provided in very old mesa versions and at the very same time mesa requires
via_drm.h. So I would kindly ask that you:
Quoted 6 lines
- Grab the libdrm userspace package, and apply a similar change.
- Rebuild/install the above.
- Fetch mesa 7.11, and try building the via dri module. Ideally
things will continue to build, alternatively we might need to add another/additional guard for this include.
So the situation is "funnier" than expected:
- There are at least two users of via_drm.h (mesa and xf86-video-via)
with each providing different via_drmclient.h.
- Neither of the two projects includes the latter header, despite
that it uses the macros defined within.
- via_drm.h is included via multiple headers, so adding extra ifdef
guards sounds like a bad idea.
- While new version of the ddx can be released, a mesa one is
unlikely - 7.11.2 was released ~4 years ago.
- Even if we cover the above two project, other projects (how many,
where are they hosted, etc.) may need the same treatment.
With the above said I'd suspect that we're safer leaving the include as is ? Yes, it is busted if one tries to use the standalone header, jet (most/all?) official users rely on that behaviour :-\
Cheers
Emil
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 10/98 via_drm.h: hide struct via_file_private in userspace
In reply to Mikko RapeliFixes compiler error since list_head is not exported to userspace headers.
--- include/uapi/drm/via_drm.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/drm/via_drm.h +2 -0
@@ -272,8 +272,10 @@ typedef struct drm_via_dmablit { drm_via_blitsync_t sync; } drm_via_dmablit_t; +#ifdef __KERNEL__struct via_file_private {struct list_head obj_list; }; +#endif #endif /* _VIA_DRM_H_ */
Signature · 1 line
2.1.4
Re: [PATCH 10/98] via_drm.h: hide struct via_file_private in userspace
Hi Mikko,
Quoted 12 lines · Mikko Rapeli
Fixes compiler error since
list_headis not exported to userspace headers.Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/drm/via_drm.h | 2 ++ 1 file changed, 2 insertions(+)include/uapi/drm/via_drm.h +0
-0
include/uapi/drm/via_drm.h typedef struct drm_via_dmablit { · line 280
Quoted 9 lines
include/uapi/drm/via_drm.h +2
-0@@ -272,8 +272,10 @@ typedef struct drm_via_dmablit {drm_via_blitsync_t sync; } drm_via_dmablit_t; +#ifdef __KERNEL__struct via_file_private {struct list_head obj_list; }; +#endif
We might want to follow the example of other drivers (i915) and move it to drivers/gpu/drm/via_drv.h, There are two users of this struct (via_drv.c and via_mm.c), and each one explicitly includes the header. How does that sound ?
Same suggestion goes for the equivalent sis patch.
Cheers
Emil
Re: [PATCH 10/98] via_drm.h: hide struct via_file_private in userspace
Quoted 29 lines · Emil Velikov
Hi Mikko,
Quoted 12 lines · Mikko Rapeli
Fixes compiler error since
list_headis not exported to userspace headers.Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/drm/via_drm.h | 2 ++ 1 file changed, 2 insertions(+)include/uapi/drm/via_drm.h +0
-0include/uapi/drm/via_drm.h typedef struct drm_via_dmablit { · line 280
Quoted 9 lines
include/uapi/drm/via_drm.h +2
-0@@ -272,8 +272,10 @@ typedef struct drm_via_dmablit {drm_via_blitsync_t sync; } drm_via_dmablit_t; +#ifdef __KERNEL__struct via_file_private {struct list_head obj_list; }; +#endif We might want to follow the example of other drivers (i915) and move it to
drivers/gpu/drm/via_drv.h, There are two users of this struct (via_drv.candvia_mm.c), and each one explicitly includes the header. How does that sound ?
Quoted 1 line
Same suggestion goes for the equivalent sis patch.
Thanks, moved both of the file_private definitions to the driver headers.
-Mikko
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 11/98 savage_drm.h: include <drm/drm.h>
In reply to Mikko RapeliFixes compiler error:
drm/savage_drm.h:50:24: error: array type has incomplete element type
struct drm_tex_region texList[SAVAGE_NR_TEX_HEAPS][SAVAGE_NR_TEX_REGIONS +
--- include/uapi/drm/savage_drm.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/drm/savage_drm.h +2 -0
@@ -26,6 +26,8 @@#ifndef __SAVAGE_DRM_H__#define __SAVAGE_DRM_H__ +#include <drm/drm.h> +#ifndef __SAVAGE_SAREA_DEFINES__#define __SAVAGE_SAREA_DEFINES__
Signature · 1 line
2.1.4
PATCH v3 12/98 sis_drm.h: hide sis_file_private in userspace
In reply to Mikko RapeliFixes compiler error:
drm/sis_drm.h:68:19: error: field ‘obj_list’ has incomplete type
struct list_head obj_list;
--- include/uapi/drm/sis_drm.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/drm/sis_drm.h +2 -0
@@ -64,8 +64,10 @@ typedef struct { unsigned long offset, size; } drm_sis_fb_t; +#ifdef __KERNEL__struct sis_file_private {struct list_head obj_list; }; +#endif #endif /* __SIS_DRM_H__ */
Signature · 1 line
2.1.4
PATCH v3 13/98 drm/i810_drm.h: include drm/drm.h
In reply to Mikko RapeliFixes userspace compilation error:
error: array type has incomplete element type struct drm_clip_rect boxes[I810_NR_SAREA_CLIPRECTS];
--- include/uapi/drm/i810_drm.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/drm/i810_drm.h +2 -0
@@ -1,6 +1,8 @@#ifndef _I810_DRM_H_#define _I810_DRM_H_ +#include <drm/drm.h> +/* WARNING: These defines must be the same as what the Xserver uses. * if you change them, you must change the defines in the Xserver. */
Signature · 1 line
2.1.4
PATCH v3 14/98 include/uapi/drm/vmwgfx_drm.h: use __s32, __u32 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
error: unknown type name ‘uint32_t’
--- include/uapi/drm/vmwgfx_drm.h | 260 +++++++++++++++++++++--------------------- 1 file changed, 130 insertions(+), 130 deletions(-)
include/uapi/drm/vmwgfx_drm.h +130 -130
@@ -108,9 +108,9 @@ enum drm_vmw_handle_type {*/ struct drm_vmw_getparam_arg { -uint64_t value; -uint32_t param; -uint32_t pad64; +__u64 value; +__u32 param; +__u32 pad64; };/*************************************************************************/
@@ -131,8 +131,8 @@ struct drm_vmw_getparam_arg {*/ struct drm_vmw_context_arg { -int32_t cid; -uint32_t pad64; +__s32 cid; +__u32 pad64; };/*************************************************************************/
@@ -162,7 +162,7 @@ struct drm_vmw_context_arg {* @mip_levels: Number of mip levels for each face. * An unused face should have 0 encoded. * @size_addr: Address of a user-space array of sruct drm_vmw_size -* cast to an uint64_t for 32-64 bit compatibility. +* cast to an __u64 for 32-64 bit compatibility. * The size of the array should equal the total number of mipmap levels. * @shareable: Boolean whether other clients (as identified by file descriptors) * may reference this surface.
@@ -174,12 +174,12 @@ struct drm_vmw_context_arg {*/ struct drm_vmw_surface_create_req { -uint32_t flags; -uint32_t format; -uint32_t mip_levels[DRM_VMW_MAX_SURFACE_FACES ]; -uint64_t size_addr; -int32_t shareable; -int32_t scanout; +__u32 flags; +__u32 format; +__u32 mip_levels[DRM_VMW_MAX_SURFACE_FACES ]; +__u64 size_addr; +__s32 shareable; +__s32 scanout; };/**
@@ -194,7 +194,7 @@ struct drm_vmw_surface_create_req {*/ struct drm_vmw_surface_arg { -int32_t sid; +__s32 sid;enum drm_vmw_handle_type handle_type; };
@@ -210,10 +210,10 @@ struct drm_vmw_surface_arg {*/ struct drm_vmw_size { -uint32_t width; -uint32_t height; -uint32_t depth; -uint32_t pad64; +__u32 width; +__u32 height; +__u32 depth; +__u32 pad64; };/**
@@ -281,13 +281,13 @@ union drm_vmw_surface_reference_arg {/** * struct drm_vmw_execbuf_arg * -* @commands: User-space address of a command buffer cast to an uint64_t. +* @commands: User-space address of a command buffer cast to an __u64. * @command-size: Size in bytes of the command buffer. * @throttle-us: Sleep until software is less than @throttle_us * microseconds ahead of hardware. The driver may round this value * to the nearest kernel tick. * @fence_rep: User-space address of a struct drm_vmw_fence_rep cast to an -* uint64_t. +* __u64. * @version: Allows expanding the execbuf ioctl parameters without breaking * backwards compatibility, since user-space will always tell the kernel * which version it uses.
@@ -299,12 +299,12 @@ union drm_vmw_surface_reference_arg {#define DRM_VMW_EXECBUF_VERSION 1struct drm_vmw_execbuf_arg { -uint64_t commands; -uint32_t command_size; -uint32_t throttle_us; -uint64_t fence_rep; -uint32_t version; -uint32_t flags; +__u64 commands; +__u32 command_size; +__u32 throttle_us; +__u64 fence_rep; +__u32 version; +__u32 flags; };/**
@@ -333,12 +333,12 @@ struct drm_vmw_execbuf_arg {*/ struct drm_vmw_fence_rep { -uint32_t handle; -uint32_t mask; -uint32_t seqno; -uint32_t passed_seqno; -uint32_t pad64; -int32_t error; +__u32 handle; +__u32 mask; +__u32 seqno; +__u32 passed_seqno; +__u32 pad64; +__s32 error; };/*************************************************************************/
@@ -368,8 +368,8 @@ struct drm_vmw_fence_rep {*/ struct drm_vmw_alloc_dmabuf_req { -uint32_t size; -uint32_t pad64; +__u32 size; +__u32 pad64; };/**
@@ -386,11 +386,11 @@ struct drm_vmw_alloc_dmabuf_req {*/ struct drm_vmw_dmabuf_rep { -uint64_t map_handle; -uint32_t handle; -uint32_t cur_gmr_id; -uint32_t cur_gmr_offset; -uint32_t pad64; +__u64 map_handle; +__u32 handle; +__u32 cur_gmr_id; +__u32 cur_gmr_offset; +__u32 pad64; };/**
@@ -423,8 +423,8 @@ union drm_vmw_alloc_dmabuf_arg {*/ struct drm_vmw_unref_dmabuf_arg { -uint32_t handle; -uint32_t pad64; +__u32 handle; +__u32 pad64; };/*************************************************************************/
@@ -447,10 +447,10 @@ struct drm_vmw_unref_dmabuf_arg {*/ struct drm_vmw_rect { -int32_t x; -int32_t y; -uint32_t w; -uint32_t h; +__s32 x; +__s32 y; +__u32 w; +__u32 h; };/**
@@ -472,21 +472,21 @@ struct drm_vmw_rect {*/ struct drm_vmw_control_stream_arg { -uint32_t stream_id; -uint32_t enabled; +__u32 stream_id; +__u32 enabled; -uint32_t flags; -uint32_t color_key; +__u32 flags; +__u32 color_key; -uint32_t handle; -uint32_t offset; -int32_t format; -uint32_t size; -uint32_t width; -uint32_t height; -uint32_t pitch[3 ]; +__u32 handle; +__u32 offset; +__s32 format; +__u32 size; +__u32 width; +__u32 height; +__u32 pitch[3 ]; -uint32_t pad64; +__u32 pad64;struct drm_vmw_rect src;struct drm_vmw_rect dst; };
@@ -514,12 +514,12 @@ struct drm_vmw_control_stream_arg {*/ struct drm_vmw_cursor_bypass_arg { -uint32_t flags; -uint32_t crtc_id; -int32_t xpos; -int32_t ypos; -int32_t xhot; -int32_t yhot; +__u32 flags; +__u32 crtc_id; +__s32 xpos; +__s32 ypos; +__s32 xhot; +__s32 yhot; };/*************************************************************************/
@@ -537,8 +537,8 @@ struct drm_vmw_cursor_bypass_arg {*/ struct drm_vmw_stream_arg { -uint32_t stream_id; -uint32_t pad64; +__u32 stream_id; +__u32 pad64; };/*************************************************************************/
@@ -560,7 +560,7 @@ struct drm_vmw_stream_arg {/** * struct drm_vmw_get_3d_cap_arg * -* @buffer: Pointer to a buffer for capability data, cast to an uint64_t +* @buffer: Pointer to a buffer for capability data, cast to an __u64 * @size: Max size to copy * * Input argument to the DRM_VMW_GET_3D_CAP_IOCTL
@@ -568,9 +568,9 @@ struct drm_vmw_stream_arg {*/ struct drm_vmw_get_3d_cap_arg { -uint64_t buffer; -uint32_t max_size; -uint32_t pad64; +__u64 buffer; +__u32 max_size; +__u32 pad64; };/*************************************************************************/
@@ -619,14 +619,14 @@ struct drm_vmw_get_3d_cap_arg {*/ struct drm_vmw_fence_wait_arg { -uint32_t handle; -int32_t cookie_valid; -uint64_t kernel_cookie; -uint64_t timeout_us; -int32_t lazy; -int32_t flags; -int32_t wait_options; -int32_t pad64; +__u32 handle; +__s32 cookie_valid; +__u64 kernel_cookie; +__u64 timeout_us; +__s32 lazy; +__s32 flags; +__s32 wait_options; +__s32 pad64; };/*************************************************************************/
@@ -650,12 +650,12 @@ struct drm_vmw_fence_wait_arg {*/ struct drm_vmw_fence_signaled_arg { -uint32_t handle; -uint32_t flags; -int32_t signaled; -uint32_t passed_seqno; -uint32_t signaled_flags; -uint32_t pad64; +__u32 handle; +__u32 flags; +__s32 signaled; +__u32 passed_seqno; +__u32 signaled_flags; +__u32 pad64; };/*************************************************************************/
@@ -676,8 +676,8 @@ struct drm_vmw_fence_signaled_arg {*/ struct drm_vmw_fence_arg { -uint32_t handle; -uint32_t pad64; +__u32 handle; +__u32 pad64; };
@@ -698,9 +698,9 @@ struct drm_vmw_fence_arg {struct drm_vmw_event_fence {struct drm_event base; -uint64_t user_data; -uint32_t tv_sec; -uint32_t tv_usec; +__u64 user_data; +__u32 tv_sec; +__u32 tv_usec; };/*
@@ -712,17 +712,17 @@ struct drm_vmw_event_fence {/** * struct drm_vmw_fence_event_arg * -* @fence_rep: Pointer to fence_rep structure cast to uint64_t or 0 if +* @fence_rep: Pointer to fence_rep structure cast to __u64 or 0 if * the fence is not supposed to be referenced by user-space. * @user_info: Info to be delivered with the event. * @handle: Attach the event to this fence only. * @flags: A set of flags as defined above. */ struct drm_vmw_fence_event_arg { -uint64_t fence_rep; -uint64_t user_data; -uint32_t handle; -uint32_t flags; +__u64 fence_rep; +__u64 user_data; +__u32 handle; +__u32 flags; };
@@ -742,7 +742,7 @@ struct drm_vmw_fence_event_arg {* @sid: Surface id to present from. * @dest_x: X placement coordinate for surface. * @dest_y: Y placement coordinate for surface. -* @clips_ptr: Pointer to an array of clip rects cast to an uint64_t. +* @clips_ptr: Pointer to an array of clip rects cast to an __u64. * @num_clips: Number of cliprects given relative to the framebuffer origin, * in the same coordinate space as the frame buffer. * @pad64: Unused 64-bit padding.
@@ -751,13 +751,13 @@ struct drm_vmw_fence_event_arg {*/ struct drm_vmw_present_arg { -uint32_t fb_id; -uint32_t sid; -int32_t dest_x; -int32_t dest_y; -uint64_t clips_ptr; -uint32_t num_clips; -uint32_t pad64; +__u32 fb_id; +__u32 sid; +__s32 dest_x; +__s32 dest_y; +__u64 clips_ptr; +__u32 num_clips; +__u32 pad64; };
@@ -775,16 +775,16 @@ struct drm_vmw_present_arg {* struct drm_vmw_present_arg * @fb_id: fb_id to present / read back from. * @num_clips: Number of cliprects. -* @clips_ptr: Pointer to an array of clip rects cast to an uint64_t. -* @fence_rep: Pointer to a struct drm_vmw_fence_rep, cast to an uint64_t. +* @clips_ptr: Pointer to an array of clip rects cast to an __u64. +* @fence_rep: Pointer to a struct drm_vmw_fence_rep, cast to an __u64. * If this member is NULL, then the ioctl should not return a fence. */ struct drm_vmw_present_readback_arg { -uint32_t fb_id; -uint32_t num_clips; -uint64_t clips_ptr; -uint64_t fence_rep; +__u32 fb_id; +__u32 num_clips; +__u64 clips_ptr; +__u64 fence_rep; };/*************************************************************************/
@@ -800,14 +800,14 @@ struct drm_vmw_present_readback_arg {* struct drm_vmw_update_layout_arg * * @num_outputs: number of active connectors -* @rects: pointer to array of drm_vmw_rect cast to an uint64_t +* @rects: pointer to array of drm_vmw_rect cast to an __u64 * * Input argument to the DRM_VMW_UPDATE_LAYOUT Ioctl. */ struct drm_vmw_update_layout_arg { -uint32_t num_outputs; -uint32_t pad64; -uint64_t rects; +__u32 num_outputs; +__u32 pad64; +__u64 rects; };
@@ -845,10 +845,10 @@ enum drm_vmw_shader_type {*/ struct drm_vmw_shader_create_arg {enum drm_vmw_shader_type shader_type; -uint32_t size; -uint32_t buffer_handle; -uint32_t shader_handle; -uint64_t offset; +__u32 size; +__u32 buffer_handle; +__u32 shader_handle; +__u64 offset; };/*************************************************************************/
@@ -867,8 +867,8 @@ struct drm_vmw_shader_create_arg {* Input argument to the DRM_VMW_UNREF_SHADER ioctl. */ struct drm_vmw_shader_arg { -uint32_t handle; -uint32_t pad64; +__u32 handle; +__u32 pad64; };/*************************************************************************/
@@ -912,14 +912,14 @@ enum drm_vmw_surface_flags {* Part of output argument for the DRM_VMW_GB_SURFACE_REF Ioctl. */ struct drm_vmw_gb_surface_create_req { -uint32_t svga3d_flags; -uint32_t format; -uint32_t mip_levels; +__u32 svga3d_flags; +__u32 format; +__u32 mip_levels;enum drm_vmw_surface_flags drm_surface_flags; -uint32_t multisample_count; -uint32_t autogen_filter; -uint32_t buffer_handle; -uint32_t pad64; +__u32 multisample_count; +__u32 autogen_filter; +__u32 buffer_handle; +__u32 pad64;struct drm_vmw_size base_size; };
@@ -938,11 +938,11 @@ struct drm_vmw_gb_surface_create_req {* Output argument for the DRM_VMW_GB_SURFACE_CREATE ioctl. */ struct drm_vmw_gb_surface_create_rep { -uint32_t handle; -uint32_t backup_size; -uint32_t buffer_handle; -uint32_t buffer_size; -uint64_t buffer_map_handle; +__u32 handle; +__u32 backup_size; +__u32 buffer_handle; +__u32 buffer_size; +__u64 buffer_map_handle; };/**
@@ -1055,8 +1055,8 @@ enum drm_vmw_synccpu_op {struct drm_vmw_synccpu_arg {enum drm_vmw_synccpu_op op;enum drm_vmw_synccpu_flags flags; -uint32_t handle; -uint32_t pad64; +__u32 handle; +__u32 pad64; };#endif
Signature · 1 line
2.1.4
PATCH v3 15/98 include/uapi/drm/qxl_drm.h: use __s32, __u32 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
error: unknown type name ‘uint32_t’
--- include/uapi/drm/qxl_drm.h | 74 +++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 37 deletions(-)
include/uapi/drm/qxl_drm.h +37 -37
@@ -30,7 +30,7 @@/* Please note that modifications to all structs defined here are * subject to backwards-compatibility constraints. * -* Do not use pointers, use uint64_t instead for 32 bit / 64 bit user/kernel +* Do not use pointers, use __u64 instead for 32 bit / 64 bit user/kernel * compatibility Keep fields aligned to their size */
@@ -48,14 +48,14 @@#define DRM_QXL_ALLOC_SURF 0x06struct drm_qxl_alloc { -uint32_t size; -uint32_t handle;/* 0 is an invalid handle */ +__u32 size; +__u32 handle;/* 0 is an invalid handle */ };struct drm_qxl_map { -uint64_t offset;/* use for mmap system call */ -uint32_t handle; -uint32_t pad; +__u64 offset;/* use for mmap system call */ +__u32 handle; +__u32 pad; };/*
@@ -68,59 +68,59 @@ struct drm_qxl_map {#define QXL_RELOC_TYPE_SURF 2struct drm_qxl_reloc { -uint64_t src_offset;/* offset into src_handle or src buffer */ -uint64_t dst_offset;/* offset in dest handle */ -uint32_t src_handle;/* dest handle to compute address from */ -uint32_t dst_handle;/* 0 if to command buffer */ -uint32_t reloc_type; -uint32_t pad; +__u64 src_offset;/* offset into src_handle or src buffer */ +__u64 dst_offset;/* offset in dest handle */ +__u32 src_handle;/* dest handle to compute address from */ +__u32 dst_handle;/* 0 if to command buffer */ +__u32 reloc_type; +__u32 pad; };struct drm_qxl_command { -uint64_t __user command;/* void* */ -uint64_t __user relocs;/* struct drm_qxl_reloc* */ -uint32_t type; -uint32_t command_size; -uint32_t relocs_num; -uint32_t pad; +__u64 __user command;/* void* */ +__u64 __user relocs;/* struct drm_qxl_reloc* */ +__u32 type; +__u32 command_size; +__u32 relocs_num; +__u32 pad; };/* XXX: call it drm_qxl_commands? */ struct drm_qxl_execbuffer { -uint32_t flags;/* for future use */ -uint32_t commands_num; -uint64_t __user commands;/* struct drm_qxl_command* */ +__u32 flags;/* for future use */ +__u32 commands_num; +__u64 __user commands;/* struct drm_qxl_command* */ };struct drm_qxl_update_area { -uint32_t handle; -uint32_t top; -uint32_t left; -uint32_t bottom; -uint32_t right; -uint32_t pad; +__u32 handle; +__u32 top; +__u32 left; +__u32 bottom; +__u32 right; +__u32 pad; };#define QXL_PARAM_NUM_SURFACES 1/* rom->n_surfaces */ #define QXL_PARAM_MAX_RELOCS 2struct drm_qxl_getparam { -uint64_t param; -uint64_t value; +__u64 param; +__u64 value; };/* these are one bit values */ struct drm_qxl_clientcap { -uint32_t index; -uint32_t pad; +__u32 index; +__u32 pad; };struct drm_qxl_alloc_surf { -uint32_t format; -uint32_t width; -uint32_t height; -int32_t stride; -uint32_t handle; -uint32_t pad; +__u32 format; +__u32 width; +__u32 height; +__s32 stride; +__u32 handle; +__u32 pad; };#define DRM_IOCTL_QXL_ALLOC \
Signature · 1 line
2.1.4
PATCH v3 16/98 include/uapi/drm/msm_drm.h: use __s32, __s64, __u32 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
error: unknown type name ‘uint32_t’
--- include/uapi/drm/msm_drm.h | 76 +++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 38 deletions(-)
include/uapi/drm/msm_drm.h +38 -38
@@ -23,7 +23,7 @@/* Please note that modifications to all structs defined here are * subject to backwards-compatibility constraints: -* 1) Do not use pointers, use uint64_t instead for 32 bit / 64 bit +* 1) Do not use pointers, use __u64 instead for 32 bit / 64 bit * user/kernel compatibility * 2) Keep fields aligned to their size * 3) Because of how drm_ioctl() works, we can add new fields at
@@ -44,8 +44,8 @@* same as 'struct timespec' but 32/64b ABI safe. */ struct drm_msm_timespec { -int64_t tv_sec;/* seconds */ -int64_t tv_nsec;/* nanoseconds */ +__s64 tv_sec;/* seconds */ +__s64 tv_nsec;/* nanoseconds */ };#define MSM_PARAM_GPU_ID 0x01
@@ -53,9 +53,9 @@ struct drm_msm_timespec {#define MSM_PARAM_CHIP_ID 0x03struct drm_msm_param { -uint32_t pipe;/* in, MSM_PIPE_x */ -uint32_t param;/* in, MSM_PARAM_x */ -uint64_t value;/* out (get_param) or in (set_param) */ +__u32 pipe;/* in, MSM_PIPE_x */ +__u32 param;/* in, MSM_PARAM_x */ +__u64 value;/* out (get_param) or in (set_param) */ };/*
@@ -77,15 +77,15 @@ struct drm_msm_param { MSM_BO_UNCACHED)struct drm_msm_gem_new { -uint64_t size;/* in */ -uint32_t flags;/* in, mask of MSM_BO_x */ -uint32_t handle;/* out */ +__u64 size;/* in */ +__u32 flags;/* in, mask of MSM_BO_x */ +__u32 handle;/* out */ };struct drm_msm_gem_info { -uint32_t handle;/* in */ -uint32_t pad; -uint64_t offset;/* out, offset to pass to mmap() */ +__u32 handle;/* in */ +__u32 pad; +__u64 offset;/* out, offset to pass to mmap() */ };#define MSM_PREP_READ 0x01
@@ -95,13 +95,13 @@ struct drm_msm_gem_info {#define MSM_PREP_FLAGS (MSM_PREP_READ | MSM_PREP_WRITE | MSM_PREP_NOSYNC)struct drm_msm_gem_cpu_prep { -uint32_t handle;/* in */ -uint32_t op;/* in, mask of MSM_PREP_x */ +__u32 handle;/* in */ +__u32 op;/* in, mask of MSM_PREP_x */ struct drm_msm_timespec timeout;/* in */ };struct drm_msm_gem_cpu_fini { -uint32_t handle;/* in */ +__u32 handle;/* in */ };/*
@@ -120,11 +120,11 @@ struct drm_msm_gem_cpu_fini {* otherwise EINVAL. */ struct drm_msm_gem_submit_reloc { -uint32_t submit_offset;/* in, offset from submit_bo */ -uint32_t or;/* in, value OR'd with result */ -int32_t shift;/* in, amount of left shift (can be negative) */ -uint32_t reloc_idx;/* in, index of reloc_bo buffer */ -uint64_t reloc_offset;/* in, offset from start of reloc_bo */ +__u32 submit_offset;/* in, offset from submit_bo */ +__u32 or;/* in, value OR'd with result */ +__s32 shift;/* in, amount of left shift (can be negative) */ +__u32 reloc_idx;/* in, index of reloc_bo buffer */ +__u64 reloc_offset;/* in, offset from start of reloc_bo */ };/* submit-types:
@@ -139,13 +139,13 @@ struct drm_msm_gem_submit_reloc {#define MSM_SUBMIT_CMD_IB_TARGET_BUF 0x0002#define MSM_SUBMIT_CMD_CTX_RESTORE_BUF 0x0003struct drm_msm_gem_submit_cmd { -uint32_t type;/* in, one of MSM_SUBMIT_CMD_x */ -uint32_t submit_idx;/* in, index of submit_bo cmdstream buffer */ -uint32_t submit_offset;/* in, offset into submit_bo */ -uint32_t size;/* in, cmdstream size */ -uint32_t pad; -uint32_t nr_relocs;/* in, number of submit_reloc's */ -uint64_t __user relocs;/* in, ptr to array of submit_reloc's */ +__u32 type;/* in, one of MSM_SUBMIT_CMD_x */ +__u32 submit_idx;/* in, index of submit_bo cmdstream buffer */ +__u32 submit_offset;/* in, offset into submit_bo */ +__u32 size;/* in, cmdstream size */ +__u32 pad; +__u32 nr_relocs;/* in, number of submit_reloc's */ +__u64 __user relocs;/* in, ptr to array of submit_reloc's */ };/* Each buffer referenced elsewhere in the cmdstream submit (ie. the
@@ -165,9 +165,9 @@ struct drm_msm_gem_submit_cmd {#define MSM_SUBMIT_BO_FLAGS (MSM_SUBMIT_BO_READ | MSM_SUBMIT_BO_WRITE)struct drm_msm_gem_submit_bo { -uint32_t flags;/* in, mask of MSM_SUBMIT_BO_x */ -uint32_t handle;/* in, GEM handle */ -uint64_t presumed;/* in/out, presumed buffer address */ +__u32 flags;/* in, mask of MSM_SUBMIT_BO_x */ +__u32 handle;/* in, GEM handle */ +__u64 presumed;/* in/out, presumed buffer address */ };/* Each cmdstream submit consists of a table of buffers involved, and
@@ -175,12 +175,12 @@ struct drm_msm_gem_submit_bo {* (context-restore), and IB buffers needed for per tile/bin draw cmds. */ struct drm_msm_gem_submit { -uint32_t pipe;/* in, MSM_PIPE_x */ -uint32_t fence;/* out */ -uint32_t nr_bos;/* in, number of submit_bo's */ -uint32_t nr_cmds;/* in, number of submit_cmd's */ -uint64_t __user bos;/* in, ptr to array of submit_bo's */ -uint64_t __user cmds;/* in, ptr to array of submit_cmd's */ +__u32 pipe;/* in, MSM_PIPE_x */ +__u32 fence;/* out */ +__u32 nr_bos;/* in, number of submit_bo's */ +__u32 nr_cmds;/* in, number of submit_cmd's */ +__u64 __user bos;/* in, ptr to array of submit_bo's */ +__u64 __user cmds;/* in, ptr to array of submit_cmd's */ };/* The normal way to synchronize with the GPU is just to CPU_PREP on
@@ -191,8 +191,8 @@ struct drm_msm_gem_submit {* APIs without requiring a dummy bo to synchronize on. */ struct drm_msm_wait_fence { -uint32_t fence;/* in */ -uint32_t pad; +__u32 fence;/* in */ +__u32 pad;struct drm_msm_timespec timeout;/* in */ };
Signature · 1 line
2.1.4
PATCH v3 17/98 include/uapi/linux/agpgart.h: include stdlib.h in userspace
In reply to Mikko RapeliFixes userspace compiler error:
error: unknown type name ‘size_t’
--- include/uapi/linux/agpgart.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/agpgart.h +1 -0
@@ -52,6 +52,7 @@ #ifndef __KERNEL__ #include <linux/types.h> +#include <stdlib.h> struct agp_version { __u16 major;
Signature · 1 line
2.1.4
PATCH v3 18/98 include/uapi/sound/emu10k1.h: added EMU10K1 version of DECLARE_BITMAP etc macros
In reply to Mikko RapeliFixes userspace compilation error:
error: expected specifier-qualifier-list before ‘DECLARE_BITMAP’
DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */
DECLARE_BITMAP etc macros are not meant for userspace headers and thus added here as private copies for emu10k.h.
Fix was suggested by Arnd Bergmann <[email protected]> in message <2168807.4Yxh5gl11Q@wuerfel> on lkml.
--- include/uapi/sound/emu10k1.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)
include/uapi/sound/emu10k1.h +20 -3
@@ -34,6 +34,23 @@#define EMU10K1_FX8010_PCM_COUNT 8 +/* +* Following definitions are copies from kernel headers to support compiling +* this header file in userspace. The definitions are not generally available +* in uapi headers so the needed things are copied here wtih __EMU10k1 prefix. +*/ + +/* From include/linux/bitops.h */ +#define __EMU10K1_BITS_PER_BYTE 8 +/* From include/linux/kernel.h */ +#define __EMU10K1_DIV_ROUND_UP (n,d) (((n) + (d) - 1) / (d)) +/* From include/linux/bitops.h */ +#define __EMU10K1_BITS_TO_LONGS (nr) \ + __EMU10K1_DIV_ROUND_UP(nr, __EMU10K1_BITS_PER_BYTE * sizeof(long)) +/* From include/linux/types.h */ +#define __EMU10K1_DECLARE_BITMAP (name,bits) \ + unsigned long name[__EMU10K1_BITS_TO_LONGS(bits)] +/* instruction set */ #define iMAC0 0x00/* R = A + (X * Y >> 31) ; saturation */ #define iMAC1 0x01/* R = A + (-X * Y >> 31) ; saturation */
@@ -300,7 +317,7 @@ struct snd_emu10k1_fx8010_control_old_gpr {struct snd_emu10k1_fx8010_code {char name[128 ]; - DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ + __EMU10K1_DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */__u32 __user *gpr_map;/* initializers */ unsigned int gpr_add_control_count;/* count of GPR controls to add/replace */
@@ -313,11 +330,11 @@ struct snd_emu10k1_fx8010_code {unsigned int gpr_list_control_total;/* total count of GPR controls */ struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls;/* listed GPR controls */ -DECLARE_BITMAP (tram_valid,0x100 );/* bitmask of valid initializers */ +__EMU10K1_DECLARE_BITMAP (tram_valid,0x100 );/* bitmask of valid initializers */ __u32 __user *tram_data_map;/* data initializers */ __u32 __user *tram_addr_map;/* map initializers */ -DECLARE_BITMAP (code_valid,1024 );/* bitmask of valid instructions */ +__EMU10K1_DECLARE_BITMAP (code_valid,1024 );/* bitmask of valid instructions */ __u32 __user *code;/* one instruction - 64 bits */ };
Signature · 6 lines
2.1.4 _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Re: [PATCH 18/98] include/uapi/sound/emu10k1.h: added EMU10K1 version of DECLARE_BITMAP etc macros
At Sat, 30 May 2015 17:38:10 +0200,
Quoted 31 lines · Mikko Rapeli
Fixes userspace compilation error:
error: expected specifier-qualifier-list before ‘DECLARE_BITMAP’
DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */
DECLARE_BITMAPetc macros are not meant for userspace headers and thus added here as private copies foremu10k.h.Fix was suggested by Arnd Bergmann <[email protected]> in message <2168807.4Yxh5gl11Q@wuerfel> on lkml.
Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/sound/emu10k1.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)include/uapi/sound/emu10k1.h +6
-0@@ -34,6 +34,23 @@#define EMU10K1_FX8010_PCM_COUNT 8 +/* +* Following definitions are copies from kernel headers to support compiling +* this header file in userspace. The definitions are not generally available +* in uapi headers so the needed things are copied here wtih __EMU10k1 prefix. +*/ +
include/uapi/sound/emu10k1.h line 52
Quoted 10 lines
include/uapi/sound/emu10k1.h +10
-0+/* From include/linux/bitops.h */ +#define __EMU10K1_BITS_PER_BYTE 8 +/* From include/linux/kernel.h */ +#define __EMU10K1_DIV_ROUND_UP (n,d) (((n) + (d) - 1) / (d)) +/* From include/linux/bitops.h */ +#define __EMU10K1_BITS_TO_LONGS (nr) \ + __EMU10K1_DIV_ROUND_UP(nr, __EMU10K1_BITS_PER_BYTE * sizeof(long)) +/* From include/linux/types.h */ +#define __EMU10K1_DECLARE_BITMAP (name,bits) \ + unsigned long name[__EMU10K1_BITS_TO_LONGS(bits)]
This is way too complicated just for a few expansion of the aligned size arrays, IMO. Rather simplify it like below with a comment:
/* the array must be aligned to unsigned long (i.e. 4 or 8 bytes) */ #define __EMU10K1_DECLARE_BITMAP(name) \
unsigned long name[(bits) / sizeof(unsigned long)]
or expand as is at each place like:
unsigned long gpr_valid[0x200 / sizeof(unsigned long)];
thanks,
Takashi
Quoted 29 lines
include/uapi/sound/emu10k1.h +3
-3/* instruction set */ #define iMAC0 0x00/* R = A + (X * Y >> 31) ; saturation */ #define iMAC1 0x01/* R = A + (-X * Y >> 31) ; saturation */ @@ -300,7 +317,7 @@ struct snd_emu10k1_fx8010_control_old_gpr {struct snd_emu10k1_fx8010_code {char name[128 ]; - DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ + __EMU10K1_DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */__u32 __user *gpr_map;/* initializers */ unsigned int gpr_add_control_count;/* count of GPR controls to add/replace */ @@ -313,11 +330,11 @@ struct snd_emu10k1_fx8010_code {unsigned int gpr_list_control_total;/* total count of GPR controls */ struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls;/* listed GPR controls */ -DECLARE_BITMAP (tram_valid,0x100 );/* bitmask of valid initializers */ +__EMU10K1_DECLARE_BITMAP (tram_valid,0x100 );/* bitmask of valid initializers */ __u32 __user *tram_data_map;/* data initializers */ __u32 __user *tram_addr_map;/* map initializers */ -DECLARE_BITMAP (code_valid,1024 );/* bitmask of valid instructions */ +__EMU10K1_DECLARE_BITMAP (code_valid,1024 );/* bitmask of valid instructions */ __u32 __user *code;/* one instruction - 64 bits */ };Signature · 1 line
2.1.4
Re: [PATCH 18/98] include/uapi/sound/emu10k1.h: added EMU10K1 version of DECLARE_BITMAP etc macros
At Sun, 31 May 2015 09:18:57 +0200,
Quoted 48 lines · Takashi Iwai
At Sat, 30 May 2015 17:38:10 +0200,
Quoted 31 lines · Mikko Rapeli
Fixes userspace compilation error:
error: expected specifier-qualifier-list before ‘DECLARE_BITMAP’
DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */
DECLARE_BITMAPetc macros are not meant for userspace headers and thus added here as private copies foremu10k.h.Fix was suggested by Arnd Bergmann <[email protected]> in message <2168807.4Yxh5gl11Q@wuerfel> on lkml.
Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/sound/emu10k1.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)include/uapi/sound/emu10k1.h +6
-0@@ -34,6 +34,23 @@#define EMU10K1_FX8010_PCM_COUNT 8 +/* +* Following definitions are copies from kernel headers to support compiling +* this header file in userspace. The definitions are not generally available +* in uapi headers so the needed things are copied here wtih __EMU10k1 prefix. +*/ +include/uapi/sound/emu10k1.h line 52
Quoted 10 lines
include/uapi/sound/emu10k1.h +10
-0+/* From include/linux/bitops.h */ +#define __EMU10K1_BITS_PER_BYTE 8 +/* From include/linux/kernel.h */ +#define __EMU10K1_DIV_ROUND_UP (n,d) (((n) + (d) - 1) / (d)) +/* From include/linux/bitops.h */ +#define __EMU10K1_BITS_TO_LONGS (nr) \ + __EMU10K1_DIV_ROUND_UP(nr, __EMU10K1_BITS_PER_BYTE * sizeof(long)) +/* From include/linux/types.h */ +#define __EMU10K1_DECLARE_BITMAP (name,bits) \ + unsigned long name[__EMU10K1_BITS_TO_LONGS(bits)]This is way too complicated just for a few expansion of the aligned size arrays, IMO. Rather simplify it like below with a comment:
Quoted 3 lines
/* the array must be aligned to unsigned long (i.e. 4 or 8 bytes) */ #define
__EMU10K1_DECLARE_BITMAP(name)\
unsigned long name[(bits) / sizeof(unsigned long)]
Crap, of course, it must be multiplied with 8.
/* the array must be aligned to unsigned long (i.e. 32 or 64) */ #define __EMU10K1_DECLARE_BITMAP(name) \
unsigned long name[(bits) / (sizeof(unsigned long) * 8)]
Takashi
Re: [PATCH 18/98] include/uapi/sound/emu10k1.h: added EMU10K1 version of DECLARE_BITMAP etc macros
Quoted 54 lines · Takashi Iwai
At Sun, 31 May 2015 09:18:57 +0200,
Quoted 48 lines · Takashi Iwai
At Sat, 30 May 2015 17:38:10 +0200,
Quoted 31 lines · Mikko Rapeli
Fixes userspace compilation error:
error: expected specifier-qualifier-list before ‘DECLARE_BITMAP’
DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */
DECLARE_BITMAPetc macros are not meant for userspace headers and thus added here as private copies foremu10k.h.Fix was suggested by Arnd Bergmann <[email protected]> in message <2168807.4Yxh5gl11Q@wuerfel> on lkml.
Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/sound/emu10k1.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)include/uapi/sound/emu10k1.h +6
-0@@ -34,6 +34,23 @@#define EMU10K1_FX8010_PCM_COUNT 8 +/* +* Following definitions are copies from kernel headers to support compiling +* this header file in userspace. The definitions are not generally available +* in uapi headers so the needed things are copied here wtih __EMU10k1 prefix. +*/ +include/uapi/sound/emu10k1.h line 52
Quoted 10 lines
include/uapi/sound/emu10k1.h +10
-0+/* From include/linux/bitops.h */ +#define __EMU10K1_BITS_PER_BYTE 8 +/* From include/linux/kernel.h */ +#define __EMU10K1_DIV_ROUND_UP (n,d) (((n) + (d) - 1) / (d)) +/* From include/linux/bitops.h */ +#define __EMU10K1_BITS_TO_LONGS (nr) \ + __EMU10K1_DIV_ROUND_UP(nr, __EMU10K1_BITS_PER_BYTE * sizeof(long)) +/* From include/linux/types.h */ +#define __EMU10K1_DECLARE_BITMAP (name,bits) \ + unsigned long name[__EMU10K1_BITS_TO_LONGS(bits)]This is way too complicated just for a few expansion of the aligned size arrays, IMO. Rather simplify it like below with a comment:
Quoted 3 lines
/* the array must be aligned to unsigned long (i.e. 4 or 8 bytes) */ #define
__EMU10K1_DECLARE_BITMAP(name)\
unsigned long name[(bits) / sizeof(unsigned long)]
Quoted 5 lines
Crap, of course, it must be multiplied with 8.
/* the array must be aligned to unsigned long (i.e. 32 or 64) */ #define
__EMU10K1_DECLARE_BITMAP(name)\
unsigned long name[(bits) / (sizeof(unsigned long) * 8)]
Thanks, I'll use this definition instead.
-Mikko
PATCH v3 19/98 dm-log-userspace.h: use __u32, __s32 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
linux/dm-log-userspace.h:416:2: error: unknown type name ‘uint64_t’
--- include/uapi/linux/dm-log-userspace.h | 43 ++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 21 deletions(-)
include/uapi/linux/dm-log-userspace.h +22 -21
@@ -7,6 +7,7 @@#ifndef __DM_LOG_USERSPACE_H__#define __DM_LOG_USERSPACE_H__ +#include <linux/types.h> #include <linux/dm-ioctl.h> /* For DM_UUID_LEN */ /*
@@ -147,12 +148,12 @@/* * DM_ULOG_GET_REGION_SIZE corresponds to (found in dm-dirty-log.h): -* uint32_t (*get_region_size)(struct dm_dirty_log *log); +* __u32 (*get_region_size)(struct dm_dirty_log *log); * * Payload-to-userspace: * None. * Payload-to-kernel: -* uint64_t - contains the region size +* __u64 - contains the region size * * The region size is something that was determined at constructor time. * It is returned in the payload area and 'data_size' is set to
@@ -168,11 +169,11 @@* int (*is_clean)(struct dm_dirty_log *log, region_t region); * * Payload-to-userspace: -* uint64_t - the region to get clean status on +* __u64 - the region to get clean status on * Payload-to-kernel: * int64_t - 1 if clean, 0 otherwise * -* Payload is sizeof(uint64_t) and contains the region for which the clean +* Payload is sizeof(__u64) and contains the region for which the clean * status is being made. * * When the request has been processed, user-space must return the
@@ -187,7 +188,7 @@* int can_block); * * Payload-to-userspace: -* uint64_t - the region to get sync status on +* __u64 - the region to get sync status on * Payload-to-kernel: * int64_t - 1 if in-sync, 0 otherwise *
@@ -203,7 +204,7 @@* Payload-to-userspace: * If the 'integrated_flush' directive is present in the constructor * table, the payload is as same as DM_ULOG_MARK_REGION: -* uint64_t [] - region(s) to mark +* __u64 [] - region(s) to mark * else * None * Payload-to-kernel:
@@ -225,13 +226,13 @@* void (*mark_region)(struct dm_dirty_log *log, region_t region); * * Payload-to-userspace: -* uint64_t [] - region(s) to mark +* __u64 [] - region(s) to mark * Payload-to-kernel: * None. * * Incoming payload contains the one or more regions to mark dirty. * The number of regions contained in the payload can be determined from -* 'data_size/sizeof(uint64_t)'. +* 'data_size/sizeof(__u64)'. * * When the request has been processed, user-space must return the * dm_ulog_request to the kernel - setting the 'error' field and clearing
@@ -244,13 +245,13 @@* void (*clear_region)(struct dm_dirty_log *log, region_t region); * * Payload-to-userspace: -* uint64_t [] - region(s) to clear +* __u64 [] - region(s) to clear * Payload-to-kernel: * None. * * Incoming payload contains the one or more regions to mark clean. * The number of regions contained in the payload can be determined from -* 'data_size/sizeof(uint64_t)'. +* 'data_size/sizeof(__u64)'. * * When the request has been processed, user-space must return the * dm_ulog_request to the kernel - setting the 'error' field and clearing
@@ -267,7 +268,7 @@* Payload-to-kernel: * { * int64_t i; -- 1 if recovery necessary, 0 otherwise -* uint64_t r; -- The region to recover if i=1 +* __u64 r; -- The region to recover if i=1 * } * 'data_size' should be set appropriately. *
@@ -283,7 +284,7 @@* * Payload-to-userspace: * { -* uint64_t - region to set sync state on +* __u64 - region to set sync state on * int64_t - 0 if not-in-sync, 1 if in-sync * } * Payload-to-kernel:
@@ -302,7 +303,7 @@* Payload-to-userspace: * None. * Payload-to-kernel: -* uint64_t - the number of in-sync regions +* __u64 - the number of in-sync regions * * No incoming payload. Kernel-bound payload contains the number of * regions that are in-sync (in a size_t).
@@ -350,11 +351,11 @@* int (*is_remote_recovering)(struct dm_dirty_log *log, region_t region); * * Payload-to-userspace: -* uint64_t - region to determine recovery status on +* __u64 - region to determine recovery status on * Payload-to-kernel: * { * int64_t is_recovering; -- 0 if no, 1 if yes -* uint64_t in_sync_hint; -- lowest region still needing resync +* __u64 in_sync_hint; -- lowest region still needing resync * } * * When the request has been processed, user-space must return the
@@ -413,16 +414,16 @@ struct dm_ulog_request {* differentiate between logs that are being swapped and have the * same 'uuid'. (Think "live" and "inactive" device-mapper tables.) */ -uint64_t luid; +__u64 luid;char uuid[DM_UUID_LEN ];char padding[3 ];/* Padding because DM_UUID_LEN = 129 */ -uint32_t version;/* See DM_ULOG_REQUEST_VERSION */ -int32_t error;/* Used to report back processing errors */ +__u32 version;/* See DM_ULOG_REQUEST_VERSION */ +__s32 error;/* Used to report back processing errors */ -uint32_t seq;/* Sequence number for request */ -uint32_t request_type;/* DM_ULOG_* defined above */ -uint32_t data_size;/* How much data (not including this struct) */ +__u32 seq;/* Sequence number for request */ +__u32 request_type;/* DM_ULOG_* defined above */ +__u32 data_size;/* How much data (not including this struct) */ char data[0 ]; };
Signature · 1 line
2.1.4
PATCH v3 20/98 hsi_char.h: use __u32 from linux/types.h
In reply to Mikko RapeliFixes userspace compiler errors like:
linux/hsi/hsi_char.h:51:2: error: unknown type name ‘uint32_t’
--- include/uapi/linux/hsi/hsi_char.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
include/uapi/linux/hsi/hsi_char.h +9 -8
@@ -20,10 +20,11 @@* 02110-1301 USA */ -#ifndef __HSI_CHAR_H#define __HSI_CHAR_H +#include <linux/types.h> +#define HSI_CHAR_MAGIC 'k'#define HSC_IOW (num, dtype) _IOW(HSI_CHAR_MAGIC, num, dtype)#define HSC_IOR (num, dtype) _IOR(HSI_CHAR_MAGIC, num, dtype)
@@ -48,16 +49,16 @@#define HSC_ARB_PRIO 1struct hsc_rx_config { -uint32_t mode; -uint32_t flow; -uint32_t channels; +__u32 mode; +__u32 flow; +__u32 channels; };struct hsc_tx_config { -uint32_t mode; -uint32_t channels; -uint32_t speed; -uint32_t arb_mode; +__u32 mode; +__u32 channels; +__u32 speed; +__u32 arb_mode; };#endif /* __HSI_CHAR_H */
Signature · 1 line
2.1.4
PATCH v3 21/98 include/uapi/linux/hsi/cs-protocol.h: include linux/time.h
In reply to Mikko RapeliFixes userspace compilation errors due to missing timespec definition.
--- include/uapi/linux/hsi/cs-protocol.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/hsi/cs-protocol.h +1 -0
@@ -26,6 +26,7 @@#include <linux/types.h> #include <linux/ioctl.h> +#include <linux/time.h> /* chardev parameters */ #define CS_DEV_FILE_NAME "/dev/cmt_speech"
Signature · 1 line
2.1.4
PATCH v3 22/98 ebtables.h: use __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation error:
linux/netfilter_bridge/ebtables.h:38:2: error: unknown type name ‘uint64_t’
--- include/uapi/linux/netfilter_bridge/ebtables.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
include/uapi/linux/netfilter_bridge/ebtables.h +4 -2
@@ -12,6 +12,8 @@#ifndef _UAPI__LINUX_BRIDGE_EFF_H#define _UAPI__LINUX_BRIDGE_EFF_H +#include <linux/types.h> +#include <linux/if.h> #include <linux/netfilter_bridge.h> #define EBT_TABLE_MAXNAMELEN 32
@@ -33,8 +35,8 @@ struct xt_match;struct xt_target ;struct ebt_counter { -uint64_t pcnt; -uint64_t bcnt; +__u64 pcnt; +__u64 bcnt; };struct ebt_replace {
Signature · 1 line
2.1.4
PATCH v3 23/98 cld.h: use __u8, __u16, __s16, __u32 and __s64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
linux/nfsd/cld.h:40:2: error: unknown type name ‘uint16_t’
--- include/uapi/linux/nfsd/cld.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
include/uapi/linux/nfsd/cld.h +8 -6
@@ -22,6 +22,8 @@#ifndef _NFSD_CLD_H#define _NFSD_CLD_H +#include <linux/types.h> +/* latest upcall version available */ #define CLD_UPCALL_VERSION 1
@@ -37,18 +39,18 @@ enum cld_command {/* representation of long-form NFSv4 client ID */ struct cld_name { -uint16_t cn_len;/* length of cm_id */ +__u16 cn_len;/* length of cm_id */ unsigned char cn_id[NFS4_OPAQUE_LIMIT ];/* client-provided */ } __attribute__((packed));/* message struct for communication with userspace */ struct cld_msg { -uint8_t cm_vers;/* upcall version */ -uint8_t cm_cmd;/* upcall command */ -int16_t cm_status;/* return code */ -uint32_t cm_xid;/* transaction id */ +__u8 cm_vers;/* upcall version */ +__u8 cm_cmd;/* upcall command */ +__s16 cm_status;/* return code */ +__u32 cm_xid;/* transaction id */ union { -int64_t cm_gracetime;/* grace period start time */ +__s64 cm_gracetime;/* grace period start time */ struct cld_name cm_name; } __attribute__((packed)) cm_u; } __attribute__((packed));
Signature · 1 line
2.1.4
PATCH v3 24/98 rds.h: use __u8, __u16, __s16, __u32 and __s64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
linux/rds.h:96:2: error: unknown type name ‘uint8_t’
--- include/uapi/linux/rds.h | 102 +++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 51 deletions(-)
include/uapi/linux/rds.h +51 -51
@@ -93,8 +93,8 @@#define RDS_INFO_LAST 10010struct rds_info_counter { -uint8_t name[32 ]; -uint64_t value; +__u8 name[32 ]; +__u64 value; } __attribute__((packed));#define RDS_INFO_CONNECTION_FLAG_SENDING 0x01
@@ -104,35 +104,35 @@ struct rds_info_counter {#define TRANSNAMSIZ 16struct rds_info_connection { -uint64_t next_tx_seq; -uint64_t next_rx_seq; +__u64 next_tx_seq; +__u64 next_rx_seq;__be32 laddr;__be32 faddr; -uint8_t transport[TRANSNAMSIZ ];/* null term ascii */ -uint8_t flags; +__u8 transport[TRANSNAMSIZ ];/* null term ascii */ +__u8 flags; } __attribute__((packed));#define RDS_INFO_MESSAGE_FLAG_ACK 0x01#define RDS_INFO_MESSAGE_FLAG_FAST_ACK 0x02struct rds_info_message { -uint64_t seq; -uint32_t len; +__u64 seq; +__u32 len;__be32 laddr;__be32 faddr;__be16 lport;__be16 fport; -uint8_t flags; +__u8 flags; } __attribute__((packed));struct rds_info_socket { -uint32_t sndbuf; +__u32 sndbuf;__be32 bound_addr;__be32 connected_addr;__be16 bound_port;__be16 connected_port; -uint32_t rcvbuf; -uint64_t inum; +__u32 rcvbuf; +__u64 inum; } __attribute__((packed));struct rds_info_tcp_socket {
@@ -140,25 +140,25 @@ struct rds_info_tcp_socket {__be16 local_port;__be32 peer_addr;__be16 peer_port; -uint64_t hdr_rem; -uint64_t data_rem; -uint32_t last_sent_nxt; -uint32_t last_expected_una; -uint32_t last_seen_una; +__u64 hdr_rem; +__u64 data_rem; +__u32 last_sent_nxt; +__u32 last_expected_una; +__u32 last_seen_una; } __attribute__((packed));#define RDS_IB_GID_LEN 16struct rds_info_rdma_connection {__be32 src_addr;__be32 dst_addr; -uint8_t src_gid[RDS_IB_GID_LEN ]; -uint8_t dst_gid[RDS_IB_GID_LEN ]; +__u8 src_gid[RDS_IB_GID_LEN ]; +__u8 dst_gid[RDS_IB_GID_LEN ]; -uint32_t max_send_wr; -uint32_t max_recv_wr; -uint32_t max_send_sge; -uint32_t rdma_mr_max; -uint32_t rdma_mr_size; +__u32 max_send_wr; +__u32 max_recv_wr; +__u32 max_send_sge; +__u32 rdma_mr_max; +__u32 rdma_mr_size; };/*
@@ -199,70 +199,70 @@ struct rds_info_rdma_connection {* (so that the application does not have to worry about * alignment). */ -typedef uint64_t rds_rdma_cookie_t ; +typedef __u64 rds_rdma_cookie_t ;struct rds_iovec { -uint64_t addr; -uint64_t bytes; +__u64 addr; +__u64 bytes; };struct rds_get_mr_args {struct rds_iovec vec; -uint64_t cookie_addr; -uint64_t flags; +__u64 cookie_addr; +__u64 flags; };struct rds_get_mr_for_dest_args {struct sockaddr_storage dest_addr;struct rds_iovec vec; -uint64_t cookie_addr; -uint64_t flags; +__u64 cookie_addr; +__u64 flags; };struct rds_free_mr_args {rds_rdma_cookie_t cookie; -uint64_t flags; +__u64 flags; };struct rds_rdma_args {rds_rdma_cookie_t cookie;struct rds_iovec remote_vec; -uint64_t local_vec_addr; -uint64_t nr_local; -uint64_t flags; -uint64_t user_token; +__u64 local_vec_addr; +__u64 nr_local; +__u64 flags; +__u64 user_token; };struct rds_atomic_args {rds_rdma_cookie_t cookie; -uint64_t local_addr; -uint64_t remote_addr; +__u64 local_addr; +__u64 remote_addr;union {struct { -uint64_t compare; -uint64_t swap; +__u64 compare; +__u64 swap; } cswp;struct { -uint64_t add; +__u64 add; } fadd;struct { -uint64_t compare; -uint64_t swap; -uint64_t compare_mask; -uint64_t swap_mask; +__u64 compare; +__u64 swap; +__u64 compare_mask; +__u64 swap_mask; } m_cswp;struct { -uint64_t add; -uint64_t nocarry_mask; +__u64 add; +__u64 nocarry_mask; } m_fadd; }; -uint64_t flags; -uint64_t user_token; +__u64 flags; +__u64 user_token; };struct rds_rdma_notify { -uint64_t user_token; -int32_t status; +__u64 user_token; +__s32 status; };#define RDS_RDMA_SUCCESS 0
Signature · 1 line
2.1.4
PATCH v3 25/98 sctp.h: use __u8 and __u32 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
linux/sctp.h:652:2: error: unknown type name ‘uint32_t’
--- include/uapi/linux/sctp.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/uapi/linux/sctp.h +4 -4
@@ -718,13 +718,13 @@ struct sctp_authkeyid {*/ struct sctp_sack_info {sctp_assoc_t sack_assoc_id; -uint32_t sack_delay; -uint32_t sack_freq; +__u32 sack_delay; +__u32 sack_freq; };struct sctp_assoc_value {sctp_assoc_t assoc_id; -uint32_t assoc_value; +__u32 assoc_value; };/*
@@ -794,7 +794,7 @@ struct sctp_status {struct sctp_authchunks {sctp_assoc_t gauth_assoc_id;__u32 gauth_number_of_chunks; -uint8_t gauth_chunks[]; +__u8 gauth_chunks[]; };/* The broken spelling has been released already in lksctp-tools header,
Signature · 1 line
2.1.4
Re: [PATCH 25/98] sctp.h: use __u8 and __u32 from linux/types.h
Quoted 47 lines · Mikko Rapeli
Fixes userspace compilation errors like:
linux/sctp.h:652:2: error: unknown type name ‘uint32_t’Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/linux/sctp.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)include/uapi/linux/sctp.h +4
-4@@ -718,13 +718,13 @@ struct sctp_authkeyid {*/ struct sctp_sack_info {sctp_assoc_t sack_assoc_id; -uint32_t sack_delay; -uint32_t sack_freq; +__u32 sack_delay; +__u32 sack_freq; };struct sctp_assoc_value {sctp_assoc_t assoc_id; -uint32_t assoc_value; +__u32 assoc_value; };/* @@ -794,7 +794,7 @@ struct sctp_status {struct sctp_authchunks {sctp_assoc_t gauth_assoc_id;__u32 gauth_number_of_chunks; -uint8_t gauth_chunks[]; +__u8 gauth_chunks[]; };/* The broken spelling has been released already in lksctp-tools header, Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-sctp" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 26/98 scsi_bsg_fc.h: use __u8, __u32 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
scsi/scsi_bsg_fc.h:83:2: error: unknown type name ‘uint8_t’
--- include/uapi/scsi/scsi_bsg_fc.h | 54 +++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 26 deletions(-)
include/uapi/scsi/scsi_bsg_fc.h +28 -26
@@ -22,6 +22,8 @@#ifndef SCSI_BSG_FC_H #define SCSI_BSG_FC_H +#include <linux/types.h> +/* * This file intended to be included by both kernel and user space */
@@ -80,10 +82,10 @@* with the transport upon completion of the login. */ struct fc_bsg_host_add_rport { -uint8_t reserved; +__u8 reserved;/* FC Address Identier of the remote port to login to */ -uint8_t port_id[3 ]; +__u8 port_id[3 ]; };/* Response:
@@ -101,10 +103,10 @@ struct fc_bsg_host_add_rport {* remain logged in with the remote port. */ struct fc_bsg_host_del_rport { -uint8_t reserved; +__u8 reserved;/* FC Address Identier of the remote port to logout of */ -uint8_t port_id[3 ]; +__u8 port_id[3 ]; };/* Response:
@@ -125,10 +127,10 @@ struct fc_bsg_host_els {* ELS Command Code being sent (must be the same as byte 0 * of the payload) */ -uint8_t command_code; +__u8 command_code;/* FC Address Identier of the remote port to send the ELS to */ -uint8_t port_id[3 ]; +__u8 port_id[3 ]; };/* Response:
@@ -165,14 +167,14 @@ struct fc_bsg_ctels_reply {* Note: x_RJT/BSY status will indicae that the rjt_data field * is valid and contains the reason/explanation values. */ -uint32_t status;/* See FC_CTELS_STATUS_xxx */ +__u32 status;/* See FC_CTELS_STATUS_xxx */ /* valid if status is not FC_CTELS_STATUS_OK */ struct { -uint8_t action;/* fragment_id for CT REJECT */ -uint8_t reason_code; -uint8_t reason_explanation; -uint8_t vendor_unique; +__u8 action;/* fragment_id for CT REJECT */ +__u8 reason_code; +__u8 reason_explanation; +__u8 vendor_unique; } rjt_data; };
@@ -188,17 +190,17 @@ struct fc_bsg_ctels_reply {* and whether to tear it down after the request. */ struct fc_bsg_host_ct { -uint8_t reserved; +__u8 reserved;/* FC Address Identier of the remote port to send the ELS to */ -uint8_t port_id[3 ]; +__u8 port_id[3 ];/* * We need words 0-2 of the generic preamble for the LLD's */ -uint32_t preamble_word0;/* revision & IN_ID */ -uint32_t preamble_word1;/* GS_Type, GS_SubType, Options, Rsvd */ -uint32_t preamble_word2;/* Cmd Code, Max Size */ +__u32 preamble_word0;/* revision & IN_ID */ +__u32 preamble_word1;/* GS_Type, GS_SubType, Options, Rsvd */ +__u32 preamble_word2;/* Cmd Code, Max Size */ };/* Response:
@@ -218,17 +220,17 @@ struct fc_bsg_host_vendor {* Identifies the vendor that the message is formatted for. This * should be the recipient of the message. */ -uint64_t vendor_id; +__u64 vendor_id;/* start of vendor command area */ -uint32_t vendor_cmd[0 ]; +__u32 vendor_cmd[0 ]; };/* Response: */ struct fc_bsg_host_vendor_reply {/* start of vendor response area */ -uint32_t vendor_rsp[0 ]; +__u32 vendor_rsp[0 ]; };
@@ -247,7 +249,7 @@ struct fc_bsg_rport_els {* ELS Command Code being sent (must be the same as * byte 0 of the payload) */ -uint8_t els_code; +__u8 els_code; };/* Response:
@@ -265,9 +267,9 @@ struct fc_bsg_rport_ct {/* * We need words 0-2 of the generic preamble for the LLD's */ -uint32_t preamble_word0;/* revision & IN_ID */ -uint32_t preamble_word1;/* GS_Type, GS_SubType, Options, Rsvd */ -uint32_t preamble_word2;/* Cmd Code, Max Size */ +__u32 preamble_word0;/* revision & IN_ID */ +__u32 preamble_word1;/* GS_Type, GS_SubType, Options, Rsvd */ +__u32 preamble_word2;/* Cmd Code, Max Size */ };/* Response: *
@@ -279,7 +281,7 @@ struct fc_bsg_rport_ct {/* request (CDB) structure of the sg_io_v4 */ struct fc_bsg_request { -uint32_t msgcode; +__u32 msgcode;union {struct fc_bsg_host_add_rport h_addrport;struct fc_bsg_host_del_rport h_delrport;
@@ -303,10 +305,10 @@ struct fc_bsg_reply {* msg and status fields. The per-msgcode reply structure * will contain valid data. */ -uint32_t result; +__u32 result;/* If there was reply_payload, how much was recevied ? */ -uint32_t reply_payload_rcv_len; +__u32 reply_payload_rcv_len;union {struct fc_bsg_host_vendor_reply vendor_reply;
Signature · 1 line
2.1.4
PATCH v3 27/98 scsi_netlink.h: use __u8, __u16 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
scsi/scsi_netlink.h:43:2: error: unknown type name ‘uint8_t’
--- include/uapi/scsi/scsi_netlink.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
include/uapi/scsi/scsi_netlink.h +11 -11
@@ -22,8 +22,8 @@#ifndef SCSI_NETLINK_H #define SCSI_NETLINK_H -#include <linux/netlink.h> #include <linux/types.h> +#include <linux/netlink.h> /* * This file intended to be included by both kernel and user space
@@ -40,12 +40,12 @@/* SCSI_TRANSPORT_MSG event message header */ struct scsi_nl_hdr { -uint8_t version; -uint8_t transport; -uint16_t magic; -uint16_t msgtype; -uint16_t msglen; -} __attribute__((aligned (sizeof (uint64_t )))); +__u8 version; +__u8 transport; +__u16 magic; +__u16 msgtype; +__u16 msglen; +} __attribute__((aligned (sizeof (__u64))));/* scsi_nl_hdr->version value */ #define SCSI_NL_VERSION 1
@@ -89,10 +89,10 @@ struct scsi_nl_hdr {*/ struct scsi_nl_host_vendor_msg {struct scsi_nl_hdr snlh;/* must be 1st element ! */ -uint64_t vendor_id; -uint16_t host_no; -uint16_t vmsg_datalen; -} __attribute__((aligned (sizeof (uint64_t )))); +__u64 vendor_id; +__u16 host_no; +__u16 vmsg_datalen; +} __attribute__((aligned (sizeof (__u64))));/*
Signature · 1 line
2.1.4
PATCH v3 28/98 scsi_netlink_fc.h: use __u16, __u32 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
scsi/scsi_netlink_fc.h:60:2: error: expected specifier-qualifier-list before ‘uint64_t’
--- include/uapi/scsi/scsi_netlink_fc.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
include/uapi/scsi/scsi_netlink_fc.h +8 -8
@@ -57,14 +57,14 @@*/ struct fc_nl_event {struct scsi_nl_hdr snlh;/* must be 1st element ! */ -uint64_t seconds; -uint64_t vendor_id; -uint16_t host_no; -uint16_t event_datalen; -uint32_t event_num; -uint32_t event_code; -uint32_t event_data; -} __attribute__((aligned (sizeof (uint64_t )))); +__u64 seconds; +__u64 vendor_id; +__u16 host_no; +__u16 event_datalen; +__u32 event_num; +__u32 event_code; +__u32 event_data; +} __attribute__((aligned (sizeof (__u64))));#endif /* SCSI_NETLINK_FC_H */
Signature · 1 line
2.1.4
PATCH v3 29/98 scsi_netlink_fc.h: include stdint.h in userspace
In reply to Mikko RapeliFixes compilation error:
scsi/scsi_netlink_fc.h:60:2: error: expected specifier-qualifier-list before ‘uint64_t’
--- include/uapi/scsi/scsi_netlink_fc.h | 5 +++++ 1 file changed, 5 insertions(+)
include/uapi/scsi/scsi_netlink_fc.h +5 -0
@@ -21,6 +21,11 @@#ifndef SCSI_NETLINK_FC_H #define SCSI_NETLINK_FC_H +#ifdef __KERNEL__ +#include <linux/types.h> +#else +#include <stdint.h> +#endif #include <scsi/scsi_netlink.h> /*
Signature · 1 line
2.1.4
Re: [PATCH 29/98] scsi_netlink_fc.h: include stdint.h in userspace
Quoted 15 lines · Mikko Rapeli
Fixes compilation error:
scsi/scsi_netlink_fc.h:60:2: error: expected specifier-qualifier-list before ‘uint64_t’Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/scsi/scsi_netlink_fc.h | 5 +++++ 1 file changed, 5 insertions(+)include/uapi/scsi/scsi_netlink_fc.h +0
-0@@ -21,6 +21,11 @@#ifndef SCSI_NETLINK_FC_H
include/uapi/scsi/scsi_netlink_fc.h line 31
Quoted 10 lines
include/uapi/scsi/scsi_netlink_fc.h +5
-0#define SCSI_NETLINK_FC_H +#ifdef __KERNEL__ +#include <linux/types.h> +#else +#include <stdint.h> +#endif #include <scsi/scsi_netlink.h> /*
Shouldn't we be using __u64 and __u16 in this header instead?
Frans
Re: [PATCH 29/98] scsi_netlink_fc.h: include stdint.h in userspace
Quoted 25 lines · Frans Klaver
Quoted 24 lines · Mikko Rapeli
Fixes compilation error:
scsi/scsi_netlink_fc.h:60:2: error: expected specifier-qualifier-list before ‘uint64_t’Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/scsi/scsi_netlink_fc.h | 5 +++++ 1 file changed, 5 insertions(+)include/uapi/scsi/scsi_netlink_fc.h +5
-0@@ -21,6 +21,11 @@#ifndef SCSI_NETLINK_FC_H #define SCSI_NETLINK_FC_H +#ifdef __KERNEL__ +#include <linux/types.h> +#else +#include <stdint.h> +#endif #include <scsi/scsi_netlink.h>
Quoted 3 lines
include/uapi/scsi/scsi_netlink_fc.h line 31
Quoted 1 line
include/uapi/scsi/scsi_netlink_fc.h +0
-0/* Shouldn't we be using
__u64and__u16in this header instead?
Indeed, this was a rebase/merge botch. Thanks!
-Mikko
PATCH v3 30/98 hdspm.h: use __u8, __u32 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
sound/hdspm.h:43:2: error: unknown type name ‘uint32_t’
--- include/uapi/sound/hdspm.h | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-)
include/uapi/sound/hdspm.h +18 -22
@@ -20,11 +20,7 @@* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef __KERNEL__#include <linux/types.h> -#else -#include <stdint.h> -#endif /* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */ #define HDSPM_MAX_CHANNELS 64
@@ -46,15 +42,15 @@ enum hdspm_speed {/* -------------------- IOCTL Peak/RMS Meters -------------------- */ struct hdspm_peak_rms { -uint32_t input_peaks[64 ]; -uint32_t playback_peaks[64 ]; -uint32_t output_peaks[64 ]; +__u32 input_peaks[64 ]; +__u32 playback_peaks[64 ]; +__u32 output_peaks[64 ]; -uint64_t input_rms[64 ]; -uint64_t playback_rms[64 ]; -uint64_t output_rms[64 ]; +__u64 input_rms[64 ]; +__u64 playback_rms[64 ]; +__u64 output_rms[64 ]; -uint8_t speed;/* enum {ss, ds, qs} */ +__u8 speed;/* enum {ss, ds, qs} */ int status2; };
@@ -155,21 +151,21 @@ enum hdspm_syncsource { };struct hdspm_status { -uint8_t card_type;/* enum hdspm_io_type */ +__u8 card_type;/* enum hdspm_io_type */ enum hdspm_syncsource autosync_source; -uint64_t card_clock; -uint32_t master_period; +__u64 card_clock; +__u32 master_period;union {struct { -uint8_t sync_wc;/* enum hdspm_sync */ -uint8_t sync_madi;/* enum hdspm_sync */ -uint8_t sync_tco;/* enum hdspm_sync */ -uint8_t sync_in;/* enum hdspm_sync */ -uint8_t madi_input;/* enum hdspm_madi_input */ -uint8_t channel_format;/* enum hdspm_madi_channel_format */ -uint8_t frame_format;/* enum hdspm_madi_frame_format */ +__u8 sync_wc;/* enum hdspm_sync */ +__u8 sync_madi;/* enum hdspm_sync */ +__u8 sync_tco;/* enum hdspm_sync */ +__u8 sync_in;/* enum hdspm_sync */ +__u8 madi_input;/* enum hdspm_madi_input */ +__u8 channel_format;/* enum hdspm_madi_channel_format */ +__u8 frame_format;/* enum hdspm_madi_frame_format */ } madi; } card_specific; };
@@ -184,7 +180,7 @@ struct hdspm_status {#define HDSPM_ADDON_TCO 1struct hdspm_version { -uint8_t card_type;/* enum hdspm_io_type */ +__u8 card_type;/* enum hdspm_io_type */ char cardname[20 ];unsigned int serial;unsigned short firmware_rev;
Signature · 1 line
2.1.4
Re: [PATCH 30/98] hdspm.h: use __u8, __u32 and __u64 from linux/types.h
At Sat, 30 May 2015 17:38:22 +0200,
Quoted 4 lines · Mikko Rapeli
Fixes userspace compilation errors like:
sound/hdspm.h:43:2: error: unknown type name ‘uint32_t’
Hmm, how do you get this error at all?
The header includes stdint.h for user-space.
thanks,
Takashi
Quoted 89 lines
Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/sound/hdspm.h | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-)include/uapi/sound/hdspm.h +18
-22@@ -20,11 +20,7 @@* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef __KERNEL__#include <linux/types.h> -#else -#include <stdint.h> -#endif /* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */ #define HDSPM_MAX_CHANNELS 64@@ -46,15 +42,15 @@ enum hdspm_speed {/* -------------------- IOCTL Peak/RMS Meters -------------------- */ struct hdspm_peak_rms { -uint32_t input_peaks[64 ]; -uint32_t playback_peaks[64 ]; -uint32_t output_peaks[64 ]; +__u32 input_peaks[64 ]; +__u32 playback_peaks[64 ]; +__u32 output_peaks[64 ]; -uint64_t input_rms[64 ]; -uint64_t playback_rms[64 ]; -uint64_t output_rms[64 ]; +__u64 input_rms[64 ]; +__u64 playback_rms[64 ]; +__u64 output_rms[64 ]; -uint8_t speed;/* enum {ss, ds, qs} */ +__u8 speed;/* enum {ss, ds, qs} */ int status2; };@@ -155,21 +151,21 @@ enum hdspm_syncsource { };struct hdspm_status { -uint8_t card_type;/* enum hdspm_io_type */ +__u8 card_type;/* enum hdspm_io_type */ enum hdspm_syncsource autosync_source; -uint64_t card_clock; -uint32_t master_period; +__u64 card_clock; +__u32 master_period;union {struct { -uint8_t sync_wc;/* enum hdspm_sync */ -uint8_t sync_madi;/* enum hdspm_sync */ -uint8_t sync_tco;/* enum hdspm_sync */ -uint8_t sync_in;/* enum hdspm_sync */ -uint8_t madi_input;/* enum hdspm_madi_input */ -uint8_t channel_format;/* enum hdspm_madi_channel_format */ -uint8_t frame_format;/* enum hdspm_madi_frame_format */ +__u8 sync_wc;/* enum hdspm_sync */ +__u8 sync_madi;/* enum hdspm_sync */ +__u8 sync_tco;/* enum hdspm_sync */ +__u8 sync_in;/* enum hdspm_sync */ +__u8 madi_input;/* enum hdspm_madi_input */ +__u8 channel_format;/* enum hdspm_madi_channel_format */ +__u8 frame_format;/* enum hdspm_madi_frame_format */ } madi; } card_specific; };@@ -184,7 +180,7 @@ struct hdspm_status {#define HDSPM_ADDON_TCO 1struct hdspm_version { -uint8_t card_type;/* enum hdspm_io_type */ +__u8 card_type;/* enum hdspm_io_type */ char cardname[20 ];unsigned int serial;unsigned short firmware_rev;Signature · 1 line
2.1.4
Re: [PATCH 30/98] hdspm.h: use __u8, __u32 and __u64 from linux/types.h
Quoted 9 lines · Takashi Iwai
At Sat, 30 May 2015 17:38:22 +0200,
Quoted 4 lines · Mikko Rapeli
Fixes userspace compilation errors like:
sound/hdspm.h:43:2: error: unknown type name ‘uint32_t’Hmm, how do you get this error at all?
The header includesstdint.hfor user-space.
Yes, sorry. This patch removes the stdint.h include and uses kernel __u32 types instead. Will fix the commit message. Thanks!
-Mikko
PATCH v3 31/98 gntalloc.h: use __u16, __u32 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
xen/gntalloc.h:22:2: error: unknown type name ‘uint16_t’
--- include/uapi/xen/gntalloc.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
include/uapi/xen/gntalloc.h +12 -10
@@ -11,6 +11,8 @@#ifndef __LINUX_PUBLIC_GNTALLOC_H__#define __LINUX_PUBLIC_GNTALLOC_H__ +#include <linux/types.h> +/* * Allocates a new page and creates a new grant reference. */
@@ -19,17 +21,17 @@ _IOC(_IOC_NONE, 'G', 5, sizeof(struct ioctl_gntalloc_alloc_gref))struct ioctl_gntalloc_alloc_gref {/* IN parameters */ /* The ID of the domain to be given access to the grants. */ -uint16_t domid; +__u16 domid;/* Flags for this mapping */ -uint16_t flags; +__u16 flags;/* Number of pages to map */ -uint32_t count; +__u32 count;/* OUT parameters */ /* The offset to be used on a subsequent call to mmap(). */ -uint64_t index; +__u64 index;/* The grant references of the newly created grant, one per page */ /* Variable size, depending on count */ -uint32_t gref_ids[1 ]; +__u32 gref_ids[1 ]; };#define GNTALLOC_FLAG_WRITABLE 1
@@ -43,9 +45,9 @@ _IOC(_IOC_NONE, 'G', 6, sizeof(struct ioctl_gntalloc_dealloc_gref))struct ioctl_gntalloc_dealloc_gref {/* IN parameters */ /* The offset returned in the map operation */ -uint64_t index; +__u64 index;/* Number of references to unmap */ -uint32_t count; +__u32 count; };/*
@@ -67,11 +69,11 @@ struct ioctl_gntalloc_unmap_notify {* be cleared. Otherwise, it can be any byte in the page whose * notification we are adjusting. */ -uint64_t index; +__u64 index;/* Action(s) to take on unmap */ -uint32_t action; +__u32 action;/* Event channel to notify */ -uint32_t event_channel_port; +__u32 event_channel_port; };/* Clear (set to zero) the byte specified by index */
Signature · 1 line
2.1.4
PATCH v3 31/98 gntalloc.h: use __u16, __u32 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
xen/gntalloc.h:22:2: error: unknown type name ‘uint16_t’
--- include/uapi/xen/gntalloc.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
include/uapi/xen/gntalloc.h +12 -10
@@ -11,6 +11,8 @@#ifndef __LINUX_PUBLIC_GNTALLOC_H__#define __LINUX_PUBLIC_GNTALLOC_H__ +#include <linux/types.h> +/* * Allocates a new page and creates a new grant reference. */
@@ -19,17 +21,17 @@ _IOC(_IOC_NONE, 'G', 5, sizeof(struct ioctl_gntalloc_alloc_gref))struct ioctl_gntalloc_alloc_gref {/* IN parameters */ /* The ID of the domain to be given access to the grants. */ -uint16_t domid; +__u16 domid;/* Flags for this mapping */ -uint16_t flags; +__u16 flags;/* Number of pages to map */ -uint32_t count; +__u32 count;/* OUT parameters */ /* The offset to be used on a subsequent call to mmap(). */ -uint64_t index; +__u64 index;/* The grant references of the newly created grant, one per page */ /* Variable size, depending on count */ -uint32_t gref_ids[1 ]; +__u32 gref_ids[1 ]; };#define GNTALLOC_FLAG_WRITABLE 1
@@ -43,9 +45,9 @@ _IOC(_IOC_NONE, 'G', 6, sizeof(struct ioctl_gntalloc_dealloc_gref))struct ioctl_gntalloc_dealloc_gref {/* IN parameters */ /* The offset returned in the map operation */ -uint64_t index; +__u64 index;/* Number of references to unmap */ -uint32_t count; +__u32 count; };/*
@@ -67,11 +69,11 @@ struct ioctl_gntalloc_unmap_notify {* be cleared. Otherwise, it can be any byte in the page whose * notification we are adjusting. */ -uint64_t index; +__u64 index;/* Action(s) to take on unmap */ -uint32_t action; +__u32 action;/* Event channel to notify */ -uint32_t event_channel_port; +__u32 event_channel_port; };/* Clear (set to zero) the byte specified by index */
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
PATCH v3 32/98 gntdev.h: use __u32 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
xen/gntdev.h:38:2: error: unknown type name ‘uint32_t’
--- include/uapi/xen/gntdev.h | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-)
include/uapi/xen/gntdev.h +18 -16
@@ -33,11 +33,13 @@#ifndef __LINUX_PUBLIC_GNTDEV_H__#define __LINUX_PUBLIC_GNTDEV_H__ +#include <linux/types.h> +struct ioctl_gntdev_grant_ref {/* The domain ID of the grant to be mapped. */ -uint32_t domid; +__u32 domid;/* The grant reference of the grant to be mapped. */ -uint32_t ref; +__u32 ref; };/*
@@ -50,11 +52,11 @@ _IOC(_IOC_NONE, 'G', 0, sizeof(struct ioctl_gntdev_map_grant_ref))struct ioctl_gntdev_map_grant_ref {/* IN parameters */ /* The number of grants to be mapped. */ -uint32_t count; -uint32_t pad; +__u32 count; +__u32 pad;/* OUT parameters */ /* The offset to be used on a subsequent call to mmap(). */ -uint64_t index; +__u64 index;/* Variable IN parameter. */ /* Array of grant references, of size @count. */ struct ioctl_gntdev_grant_ref refs[1 ];
@@ -70,10 +72,10 @@ _IOC(_IOC_NONE, 'G', 1, sizeof(struct ioctl_gntdev_unmap_grant_ref))struct ioctl_gntdev_unmap_grant_ref {/* IN parameters */ /* The offset was returned by the corresponding map operation. */ -uint64_t index; +__u64 index;/* The number of pages to be unmapped. */ -uint32_t count; -uint32_t pad; +__u32 count; +__u32 pad; };/*
@@ -93,13 +95,13 @@ _IOC(_IOC_NONE, 'G', 2, sizeof(struct ioctl_gntdev_get_offset_for_vaddr))struct ioctl_gntdev_get_offset_for_vaddr {/* IN parameters */ /* The virtual address of the first mapped page in a range. */ -uint64_t vaddr; +__u64 vaddr;/* OUT parameters */ /* The offset that was used in the initial mmap() operation. */ -uint64_t offset; +__u64 offset;/* The number of pages mapped in the VM area that begins at @vaddr. */ -uint32_t count; -uint32_t pad; +__u32 count; +__u32 pad; };/*
@@ -113,7 +115,7 @@ _IOC(_IOC_NONE, 'G', 3, sizeof(struct ioctl_gntdev_set_max_grants))struct ioctl_gntdev_set_max_grants {/* IN parameter */ /* The maximum number of grants that may be mapped at once. */ -uint32_t count; +__u32 count; };/*
@@ -135,11 +137,11 @@ struct ioctl_gntdev_unmap_notify {* be cleared. Otherwise, it can be any byte in the page whose * notification we are adjusting. */ -uint64_t index; +__u64 index;/* Action(s) to take on unmap */ -uint32_t action; +__u32 action;/* Event channel to notify */ -uint32_t event_channel_port; +__u32 event_channel_port; };/* Clear (set to zero) the byte specified by index */
Signature · 1 line
2.1.4
PATCH v3 32/98 gntdev.h: use __u32 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
xen/gntdev.h:38:2: error: unknown type name ‘uint32_t’
--- include/uapi/xen/gntdev.h | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-)
include/uapi/xen/gntdev.h +18 -16
@@ -33,11 +33,13 @@#ifndef __LINUX_PUBLIC_GNTDEV_H__#define __LINUX_PUBLIC_GNTDEV_H__ +#include <linux/types.h> +struct ioctl_gntdev_grant_ref {/* The domain ID of the grant to be mapped. */ -uint32_t domid; +__u32 domid;/* The grant reference of the grant to be mapped. */ -uint32_t ref; +__u32 ref; };/*
@@ -50,11 +52,11 @@ _IOC(_IOC_NONE, 'G', 0, sizeof(struct ioctl_gntdev_map_grant_ref))struct ioctl_gntdev_map_grant_ref {/* IN parameters */ /* The number of grants to be mapped. */ -uint32_t count; -uint32_t pad; +__u32 count; +__u32 pad;/* OUT parameters */ /* The offset to be used on a subsequent call to mmap(). */ -uint64_t index; +__u64 index;/* Variable IN parameter. */ /* Array of grant references, of size @count. */ struct ioctl_gntdev_grant_ref refs[1 ];
@@ -70,10 +72,10 @@ _IOC(_IOC_NONE, 'G', 1, sizeof(struct ioctl_gntdev_unmap_grant_ref))struct ioctl_gntdev_unmap_grant_ref {/* IN parameters */ /* The offset was returned by the corresponding map operation. */ -uint64_t index; +__u64 index;/* The number of pages to be unmapped. */ -uint32_t count; -uint32_t pad; +__u32 count; +__u32 pad; };/*
@@ -93,13 +95,13 @@ _IOC(_IOC_NONE, 'G', 2, sizeof(struct ioctl_gntdev_get_offset_for_vaddr))struct ioctl_gntdev_get_offset_for_vaddr {/* IN parameters */ /* The virtual address of the first mapped page in a range. */ -uint64_t vaddr; +__u64 vaddr;/* OUT parameters */ /* The offset that was used in the initial mmap() operation. */ -uint64_t offset; +__u64 offset;/* The number of pages mapped in the VM area that begins at @vaddr. */ -uint32_t count; -uint32_t pad; +__u32 count; +__u32 pad; };/*
@@ -113,7 +115,7 @@ _IOC(_IOC_NONE, 'G', 3, sizeof(struct ioctl_gntdev_set_max_grants))struct ioctl_gntdev_set_max_grants {/* IN parameter */ /* The maximum number of grants that may be mapped at once. */ -uint32_t count; +__u32 count; };/*
@@ -135,11 +137,11 @@ struct ioctl_gntdev_unmap_notify {* be cleared. Otherwise, it can be any byte in the page whose * notification we are adjusting. */ -uint64_t index; +__u64 index;/* Action(s) to take on unmap */ -uint32_t action; +__u32 action;/* Event channel to notify */ -uint32_t event_channel_port; +__u32 event_channel_port; };/* Clear (set to zero) the byte specified by index */
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
PATCH v3 33/98 include/uapi/linux/sysctl.h: use __kernel_size_t instead of size_t
In reply to Mikko RapeliFixes userspace compilation error:
error: unknown type name ‘size_t’
--- include/uapi/linux/sysctl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/sysctl.h +2 -2
@@ -37,9 +37,9 @@ struct __sysctl_args {int __user *name;int nlen;void __user *oldval; -size_t __user *oldlenp; +__kernel_size_t __user *oldlenp;void __user *newval; -size_t newlen; +__kernel_size_t newlen;unsigned long __unused[4 ]; };
Signature · 1 line
2.1.4
PATCH v3 34/98 include/uapi/asm-generic/ipcbuf.h: include linux/posix_types.h
In reply to Mikko RapeliFixes userspace compilation error:
error: unknown type name ‘__kernel_key_t’
--- include/uapi/asm-generic/ipcbuf.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/asm-generic/ipcbuf.h +2 -0
@@ -1,6 +1,8 @@#ifndef __ASM_GENERIC_IPCBUF_H#define __ASM_GENERIC_IPCBUF_H +#include <linux/posix_types.h> +/* * The generic ipc64_perm structure: * Note extra padding because this structure is passed back and forth
Signature · 1 line
2.1.4
PATCH v3 35/98 include/uapi/asm-generic/msgbuf.h: include asm/ipcbuf.h
In reply to Mikko RapeliFixes userspace compilation errors like:
error: field ‘msg_perm’ has incomplete type
struct ipc64_perm msg_perm
--- include/uapi/asm-generic/msgbuf.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/asm-generic/msgbuf.h +2 -0
@@ -2,6 +2,8 @@#define __ASM_GENERIC_MSGBUF_H#include <asm/bitsperlong.h> +#include <asm/ipcbuf.h> +/* * generic msqid64_ds structure. *
Signature · 1 line
2.1.4
PATCH v3 36/98 include/uapi/asm-generic/shmbuf.h: include fixes
In reply to Mikko RapeliInclude linux/types.h and asm/msgbuf.h and use __kernel_size_t instead of size_t.
Fixes userspace compilation errors like:
error: field ‘shm_perm’ has incomplete type struct ipc64_perm shm_perm; /* operation perms */
error: unknown type name ‘size_t’
error: unknown type name ‘__kernel_time_t’
--- include/uapi/asm-generic/shmbuf.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
include/uapi/asm-generic/shmbuf.h +3 -1
@@ -1,7 +1,9 @@#ifndef __ASM_GENERIC_SHMBUF_H#define __ASM_GENERIC_SHMBUF_H +#include <linux/types.h> #include <asm/bitsperlong.h> +#include <asm/msgbuf.h> /* * The shmid64_ds structure for x86 architecture.
@@ -24,7 +26,7 @@struct shmid64_ds {struct ipc64_perm shm_perm;/* operation perms */ -size_t shm_segsz;/* size of segment (bytes) */ +__kernel_size_t shm_segsz;/* size of segment (bytes) */ __kernel_time_t shm_atime;/* last attach time */ #if __BITS_PER_LONG !=64 unsigned long __unused1;
Signature · 1 line
2.1.4
PATCH v3 37/98 asm-generic/sembuf.h: include asm/posix_types.h and asm/ipcbuf.h
In reply to Mikko RapeliFixes userspace compilation errors like:
error: field ‘msg_perm’ has incomplete type
struct ipc64_perm msg_perm;
error: unknown type name ‘__kernel_ulong_t’
--- include/uapi/asm-generic/sembuf.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/asm-generic/sembuf.h +2 -0
@@ -2,6 +2,8 @@#define __ASM_GENERIC_SEMBUF_H#include <asm/bitsperlong.h> +#include <asm/posix_types.h> +#include <asm/ipcbuf.h> /* * The semid64_ds structure for x86 architecture.
Signature · 1 line
2.1.4
PATCH v3 38/98 include/uapi/asm-generic/signal.h: use __kernel_size_t instead of size_t
In reply to Mikko RapeliFixes userspace compiler error:
error: unknown type name ‘size_t’
--- include/uapi/asm-generic/signal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/asm-generic/signal.h +1 -1
@@ -111,7 +111,7 @@ struct sigaction {typedef struct sigaltstack {void __user *ss_sp;int ss_flags; -size_t ss_size; +__kernel_size_t ss_size; }stack_t ;#endif /* __ASSEMBLY__ */
Signature · 1 line
2.1.4
PATCH v3 39/98 include/uapi/linux/socket.h: include sys/socket.h in userspace
In reply to Mikko RapeliThis libc header has sockaddr definition for userspace.
Fixes userspace compilation errors like these from kernel headers including only linux/socket.h:
error: field ‘ifru_addr’ has incomplete type
struct sockaddr ifru_addr;
--- include/uapi/linux/socket.h | 4 ++++ 1 file changed, 4 insertions(+)
include/uapi/linux/socket.h +4 -0
@@ -1,6 +1,10 @@#ifndef _UAPI_LINUX_SOCKET_H#define _UAPI_LINUX_SOCKET_H +#ifndef __KERNEL__ +#include <sys/socket.h> +#endif +/* * Desired design of maximum size and alignment (see RFC2553) */
Signature · 1 line
2.1.4
PATCH v3 40/98 include/uapi/linux/rds.h: include linux/socket.h and linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
error: unknown type name ‘__be32’
error: field ‘dest_addr’ has incomplete type
struct sockaddr_storage dest_addr;
--- include/uapi/linux/rds.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/rds.h +1 -0
@@ -35,6 +35,7 @@#define _LINUX_RDS_H#include <linux/types.h> +#include <linux/socket.h> #define RDS_IB_ABI_VERSION 0x301
Signature · 1 line
2.1.4
PATCH v3 41/98 include/uapi/linux/if_pppox.h: include linux/if.h
In reply to Mikko RapeliFixes userspace compilation error:
error: ‘IFNAMSIZ’ undeclared here (not in a function)
--- include/uapi/linux/if_pppox.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/if_pppox.h +1 -0
@@ -21,6 +21,7 @@#include <asm/byteorder.h> #include <linux/socket.h> +#include <linux/if.h> #include <linux/if_ether.h> #include <linux/if_pppol2tp.h>
Signature · 1 line
2.1.4
PATCH v3 42/98 include/uapi/linux/if_tunnel.h: include linux/if.h, linux/ip.h and linux/in6.h
In reply to Mikko RapeliFixes userspace compilation errors like:
error: field ‘iph’ has incomplete type
error: field ‘prefix’ has incomplete type
--- include/uapi/linux/if_tunnel.h | 3 +++ 1 file changed, 3 insertions(+)
include/uapi/linux/if_tunnel.h +3 -0
@@ -2,6 +2,9 @@#define _UAPI_IF_TUNNEL_H_#include <linux/types.h> +#include <linux/if.h> +#include <linux/ip.h> +#include <linux/in6.h> #include <asm/byteorder.h>
Signature · 1 line
2.1.4
PATCH v3 43/98 include/uapi/linux/hdlc/ioctl.h: include linux/if.h
In reply to Mikko RapeliFixes userspace compiler error:
error: ‘IFNAMSIZ’ undeclared here (not in a function)
--- include/uapi/linux/hdlc/ioctl.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/hdlc/ioctl.h +1 -0
@@ -1,6 +1,7 @@#ifndef __HDLC_IOCTL_H__#define __HDLC_IOCTL_H__ +#include <linux/if.h> #define GENERIC_HDLC_VERSION 4/* For synchronization with sethdlc utility */
Signature · 1 line
2.1.4
Re: [PATCH 43/98] include/uapi/linux/hdlc/ioctl.h: include linux/if.h
Quoted 14 lines · Mikko Rapeli
Fixes userspace compiler error:
error: ‘IFNAMSIZ’ undeclared here (not in a function)
Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/linux/hdlc/ioctl.h | 1 + 1 file changed, 1 insertion(+)include/uapi/linux/hdlc/ioctl.h +0
-0
include/uapi/linux/hdlc/ioctl.h line 6
Quoted 6 lines
include/uapi/linux/hdlc/ioctl.h +1
-0@@ -1,6 +1,7 @@#ifndef __HDLC_IOCTL_H__#define __HDLC_IOCTL_H__ +#include <linux/if.h> #define GENERIC_HDLC_VERSION 4/* For synchronization with sethdlc utility */
What's the point of this one if you break this circular dependency in patch 49? Are those in between related?
Thanks,
Frans
PATCH v3 44/98 nf_conntrack_tuple_common.h: include linux/types.h and linux/netfilter.h
In reply to Mikko RapeliFixes userspace compilation errors like:
error: unknown type name ‘__be16’
--- include/uapi/linux/netfilter/nf_conntrack_tuple_common.h | 3 +++ 1 file changed, 3 insertions(+)
include/uapi/linux/netfilter/nf_conntrack_tuple_common.h +3 -0
@@ -1,6 +1,9 @@#ifndef _NF_CONNTRACK_TUPLE_COMMON_H#define _NF_CONNTRACK_TUPLE_COMMON_H +#include <linux/types.h> +#include <linux/netfilter.h> +enum ip_conntrack_dir {IP_CT_DIR_ORIGINAL , IP_CT_DIR_REPLY,
Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 45/98 include/uapi/linux/ipv6_route.h: include linux/in6.h
In reply to Mikko RapeliFixes userspace compile errors like:
error: field ‘mf6cc_origin’ has incomplete type
struct sockaddr_in6 mf6cc_origin; /* Origin of mcast */
--- include/uapi/linux/mroute6.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/mroute6.h +1 -0
@@ -3,6 +3,7 @@#include <linux/types.h> #include <linux/sockios.h> +#include <linux/in6.h> /* * Based on the MROUTING 3.5 defines primarily to keep
Signature · 1 line
2.1.4
PATCH v3 46/98 include/uapi/linux/ipv6_route.h: include linux/in6.h
In reply to Mikko RapeliFixes userspace compile errors like:
error: field ‘rtmsg_dst’ has incomplete type
struct in6_addr rtmsg_dst;
--- include/uapi/linux/ipv6_route.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/ipv6_route.h +1 -0
@@ -14,6 +14,7 @@#define _UAPI_LINUX_IPV6_ROUTE_H#include <linux/types.h> +#include <linux/in6.h> #define RTF_DEFAULT 0x00010000/* default - learned via ND */ #define RTF_ALLONLINK 0x00020000/* (deprecated and will be removed)
Signature · 1 line
2.1.4
PATCH v3 47/98 include/uapi/linux/if_pppol2tp.h: include linux/in.h and linux/in6.h
In reply to Mikko RapeliFixes userspace compilation errors like:
error: field ‘addr’ has incomplete type
struct sockaddr_in addr; /* IP address and port to send to */
^
error: field ‘addr’ has incomplete type
struct sockaddr_in6 addr; /* IP address and port to send to */
--- include/uapi/linux/if_pppol2tp.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/uapi/linux/if_pppol2tp.h +2 -1
@@ -16,7 +16,8 @@#define _UAPI__LINUX_IF_PPPOL2TP_H#include <linux/types.h> - +#include <linux/in.h> +#include <linux/in6.h> /* Structure used to connect() the socket to a particular tunnel UDP * socket over IPv4.
Signature · 1 line
2.1.4
PATCH v3 48/98 include/uapi/linux/if_pppox.h: include linux/in.h and linux/in6.h
In reply to Mikko RapeliFixes userspace compilation errors:
error: field ‘addr’ has incomplete type
struct sockaddr_in addr; /* IP address and port to send to */
error: field ‘addr’ has incomplete type
struct sockaddr_in6 addr; /* IP address and port to send to */
--- include/uapi/linux/if_pppox.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/linux/if_pppox.h +2 -0
@@ -24,6 +24,8 @@#include <linux/if.h> #include <linux/if_ether.h> #include <linux/if_pppol2tp.h> +#include <linux/in.h> +#include <linux/in6.h> /* For user-space programs to pick up these definitions * which they wouldn't get otherwise without defining __KERNEL__
Signature · 1 line
2.1.4
PATCH v3 49/98 Break dependency loop between linux/if.h and linux/hdlc/ioctl.h
In reply to Mikko RapeliThis isn't pretty but does the job. I assume including plain linux/hdlc/ioctl.h without linux/if.h is much more rare than the other way round, and that these header file names are part of API, and that creating a new header file just for IFNAMSIZ isn't a good idea either.
Fixes userspace compiler error:
error: ‘IFNAMSIZ’ undeclared here (not in a function)
--- include/uapi/linux/hdlc/ioctl.h | 5 ++++- include/uapi/linux/if.h | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)
include/uapi/linux/hdlc/ioctl.h +4 -1
@@ -1,7 +1,10 @@#ifndef __HDLC_IOCTL_H__#define __HDLC_IOCTL_H__ -#include <linux/if.h> +/* For breaking dependency loop between if.h and hdlc/ioctl.h */ +#ifndef IFNAMSIZ +#define IFNAMSIZ 16 +#endif #define GENERIC_HDLC_VERSION 4/* For synchronization with sethdlc utility */
include/uapi/linux/if.h +4 -0
@@ -23,6 +23,10 @@#include <linux/socket.h> /* for "struct sockaddr" et al */ #include <linux/compiler.h> /* for "__user" et al */ +/** +* IFNAMSIZ is also defined in linux/hdlc/ioctl.h if it does not exists +* to break dependency loop between linux/if.h and linux/hdlc/ioctl.h. +*/ #define IFNAMSIZ 16#define IFALIASZ 256#include <linux/hdlc/ioctl.h>
Signature · 1 line
2.1.4
Re: [PATCH 49/98] Break dependency loop between linux/if.h and linux/hdlc/ioctl.h
Quoted 36 lines · Mikko Rapeli
This isn't pretty but does the job. I assume including plain
linux/hdlc/ioctl.hwithoutlinux/if.his much more rare than the other way round, and that these header file names are part of API, and that creating a new header file just for IFNAMSIZ isn't a good idea either.Fixes userspace compiler error:
error: ‘IFNAMSIZ’ undeclared here (not in a function)
Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/linux/hdlc/ioctl.h | 5 ++++- include/uapi/linux/if.h | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)include/uapi/linux/hdlc/ioctl.h +4
-1@@ -1,7 +1,10 @@#ifndef __HDLC_IOCTL_H__#define __HDLC_IOCTL_H__ -#include <linux/if.h> +/* For breaking dependency loop between if.h and hdlc/ioctl.h */ +#ifndef IFNAMSIZ +#define IFNAMSIZ 16 +#endif #define GENERIC_HDLC_VERSION 4/* For synchronization with sethdlc utility */ include/uapi/linux/if.h +0
-0
include/uapi/linux/if.h line 32
Quoted 10 lines
include/uapi/linux/if.h +4
-0@@ -23,6 +23,10 @@#include <linux/socket.h> /* for "struct sockaddr" et al */ #include <linux/compiler.h> /* for "__user" et al */ +/** +* IFNAMSIZ is also defined in linux/hdlc/ioctl.h if it does not exists +* to break dependency loop between linux/if.h and linux/hdlc/ioctl.h. +*/ #define IFNAMSIZ 16#define IFALIASZ 256#include <linux/hdlc/ioctl.h>
This feels backwards to me. Wouldn't it be less funky to accept that IFNAMSIZE isn't defined in if.h, but rather in hdlc/ioctl.h? If now someone feels giddy and does
#include <linux/hdlc/ioctl.h>
#include <linux/if.h>
We have a new and unnecessary warning on our hands ;-)
Thanks,
Frans
Re: [PATCH 43/98] include/uapi/linux/hdlc/ioctl.h: include linux/if.h
Quoted 18 lines · Frans Klaver
Quoted 17 lines · Mikko Rapeli
Fixes userspace compiler error:
error: ‘IFNAMSIZ’ undeclared here (not in a function)
Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/linux/hdlc/ioctl.h | 1 + 1 file changed, 1 insertion(+)include/uapi/linux/hdlc/ioctl.h +0
-0@@ -1,6 +1,7 @@#ifndef __HDLC_IOCTL_H__#define __HDLC_IOCTL_H__
Quoted 6 lines
include/uapi/linux/hdlc/ioctl.h line 9
Quoted 3 lines
include/uapi/linux/hdlc/ioctl.h +1
-0+#include <linux/if.h> #define GENERIC_HDLC_VERSION 4/* For synchronization with sethdlc utility */ What's the point of this one if you break this circular dependency in patch 49? Are those in between related?
They are indeed...
Quoted 40 lines · Frans Klaver
Quoted 39 lines · Mikko Rapeli
This isn't pretty but does the job. I assume including plain
linux/hdlc/ioctl.hwithoutlinux/if.his much more rare than the other way round, and that these header file names are part of API, and that creating a new header file just for IFNAMSIZ isn't a good idea either.Fixes userspace compiler error:
error: ‘IFNAMSIZ’ undeclared here (not in a function)
Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/linux/hdlc/ioctl.h | 5 ++++- include/uapi/linux/if.h | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)include/uapi/linux/hdlc/ioctl.h +4
-1@@ -1,7 +1,10 @@#ifndef __HDLC_IOCTL_H__#define __HDLC_IOCTL_H__ -#include <linux/if.h> +/* For breaking dependency loop between if.h and hdlc/ioctl.h */ +#ifndef IFNAMSIZ +#define IFNAMSIZ 16 +#endif #define GENERIC_HDLC_VERSION 4/* For synchronization with sethdlc utility */ include/uapi/linux/if.h +0
-0@@ -23,6 +23,10 @@#include <linux/socket.h> /* for "struct sockaddr" et al */ #include <linux/compiler.h> /* for "__user" et al */
Quoted 10 lines
include/uapi/linux/if.h line 32
Quoted 7 lines
include/uapi/linux/if.h +4
-0+/** +* IFNAMSIZ is also defined in linux/hdlc/ioctl.h if it does not exists +* to break dependency loop between linux/if.h and linux/hdlc/ioctl.h. +*/ #define IFNAMSIZ 16#define IFALIASZ 256#include <linux/hdlc/ioctl.h> This feels backwards to me. Wouldn't it be less funky to accept that IFNAMSIZE isn't defined in
if.h, but rather inhdlc/ioctl.h? If now
That is much less funky, thanks! I'll squash these to commits into a one which moves IFNAMSIZ to linux/hdlc/ioctl.h.
-Mikko
PATCH v3 50/98 include/uapi/linux/packet_diag.h: include linux/netdevice.h
In reply to Mikko RapeliFixes userspace compilation error:
error: ‘MAX_ADDR_LEN’ undeclared here (not in a function)
--- include/uapi/linux/packet_diag.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/packet_diag.h +1 -0
@@ -2,6 +2,7 @@#define __PACKET_DIAG_H__#include <linux/types.h> +#include <linux/netdevice.h> struct packet_diag_req {__u8 sdiag_family;
Signature · 1 line
2.1.4
PATCH v3 51/98 include/uapi/linux/llc.h: include linux/if.h
In reply to Mikko RapeliFixes userspace compile error:
error: ‘IFHWADDRLEN’ undeclared here (not in a function)
unsigned char sllc_mac[IFHWADDRLEN];
--- include/uapi/linux/llc.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/llc.h +1 -0
@@ -14,6 +14,7 @@#define _UAPI__LINUX_LLC_H#include <linux/socket.h> +#include <linux/if.h> #define __LLC_SOCK_SIZE__ 16/* sizeof(sockaddr_llc), word align. */ struct sockaddr_llc {
Signature · 1 line
2.1.4
PATCH v3 52/98 include/uapi/linux/mqueue.h: include linux/types.h
In reply to Mikko RapeliFixes userspace compile error:
error: unknown type name ‘__kernel_long_t’
__kernel_long_t mq_flags; /* message queue flags */
--- include/uapi/linux/mqueue.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/linux/mqueue.h +2 -0
@@ -18,6 +18,8 @@#ifndef _LINUX_MQUEUE_H#define _LINUX_MQUEUE_H +#include <linux/types.h> +#define MQ_PRIO_MAX 32768/* per-uid limit of kernel memory used by mqueue, in bytes */ #define MQ_BYTES_MAX 819200
Signature · 1 line
2.1.4
PATCH v3 53/98 include/uapi/linux/mroute.h: include linux/in.h
In reply to Mikko RapeliFixes userspace compile errors like:
error: field ‘vifc_lcl_addr’ has incomplete type
struct in_addr vifc_lcl_addr; /* Local interface address */
--- include/uapi/linux/mroute.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/mroute.h +1 -0
@@ -3,6 +3,7 @@#include <linux/sockios.h> #include <linux/types.h> +#include <linux/in.h> /* * Based on the MROUTING 3.5 defines primarily to keep
Signature · 1 line
2.1.4
PATCH v3 54/98 include/uapi/linux/dlm_netlink.h: include linux/dlmconstants.h
In reply to Mikko RapeliFixes userspace compilation error:
error: ‘DLM_RESNAME_MAXLEN’ undeclared here (not in a function)
char resource_name[DLM_RESNAME_MAXLEN];
--- include/uapi/linux/dlm_netlink.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/dlm_netlink.h +1 -0
@@ -10,6 +10,7 @@#define _DLM_NETLINK_H#include <linux/types.h> +#include <linux/dlmconstants.h> enum {DLM_STATUS_WAITING =1 ,
Signature · 1 line
2.1.4
PATCH v3 55/98 include/uapi/linux/ip6_tunnel.h: include linux/if.h and linux/in6.h
In reply to Mikko RapeliFixes userspace compile errors like:
error: ‘IFNAMSIZ’ undeclared here (not in a function)
error: field ‘laddr’ has incomplete type
struct in6_addr laddr; /* local tunnel end-point address */
--- include/uapi/linux/ip6_tunnel.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/linux/ip6_tunnel.h +2 -0
@@ -2,6 +2,8 @@#define _IP6_TUNNEL_H#include <linux/types.h> +#include <linux/if.h> +#include <linux/in6.h> #define IPV6_TLV_TNL_ENCAP_LIMIT 4#define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4
Signature · 1 line
2.1.4
PATCH v3 56/98 include/uapi/linux/netfilter.h: include in.h and in6.h
In reply to Mikko RapeliFixes userspace compile errors like:
error: field ‘in’ has incomplete type
error: field ‘in6’ has incomplete type
--- include/uapi/linux/netfilter.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/uapi/linux/netfilter.h +2 -1
@@ -4,7 +4,8 @@#include <linux/types.h> #include <linux/compiler.h> #include <linux/sysctl.h> - +#include <linux/in.h> +#include <linux/in6.h> /* Responses from hook functions. */ #define NF_DROP 0
Signature · 1 line
2.1.4
PATCH v3 57/98 include/uapi/linux/netfilter_bridge.h: include in.h
In reply to Mikko RapeliFixes userspace compilation errors like:
error: field ‘in’ has incomplete type
struct in_addr in;
--- include/uapi/linux/netfilter_bridge.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/netfilter_bridge.h +1 -0
@@ -4,6 +4,7 @@/* bridge-specific defines for netfilter. */ +#include <linux/in.h> #include <linux/netfilter.h> #include <linux/if_ether.h> #include <linux/if_vlan.h>
Signature · 1 line
2.1.4
PATCH v3 58/98 include/uapi/linux/netfilter_ipv4/ip_tables.h: include linux/if.h
In reply to Mikko RapeliFixes userspace compilation error:
error: ‘IFNAMSIZ’ undeclared here (not in a function)
--- include/uapi/linux/netfilter_ipv4/ip_tables.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/netfilter_ipv4/ip_tables.h +1 -0
@@ -17,6 +17,7 @@#include <linux/types.h> #include <linux/compiler.h> +#include <linux/if.h> #include <linux/netfilter_ipv4.h> #include <linux/netfilter/x_tables.h>
Signature · 1 line
2.1.4
PATCH v3 59/98 include/uapi/linux/netfilter: include linux/if.h in several headers
In reply to Mikko RapeliFixes userspace compile errors:
error: ‘IFNAMSIZ’ undeclared here (not in a function)
--- include/uapi/linux/netfilter/xt_RATEEST.h | 1 + include/uapi/linux/netfilter/xt_hashlimit.h | 1 + include/uapi/linux/netfilter/xt_physdev.h | 2 +- include/uapi/linux/netfilter/xt_rateest.h | 1 + include/uapi/linux/netfilter_arp/arp_tables.h | 1 + include/uapi/linux/netfilter_ipv6/ip6_tables.h | 1 + 6 files changed, 6 insertions(+), 1 deletion(-)
include/uapi/linux/netfilter/xt_RATEEST.h +1 -0
@@ -2,6 +2,7 @@#define _XT_RATEEST_TARGET_H#include <linux/types.h> +#include <linux/if.h> struct xt_rateest_target_info {char name[IFNAMSIZ ];
include/uapi/linux/netfilter/xt_hashlimit.h +1 -0
@@ -2,6 +2,7 @@#define _UAPI_XT_HASHLIMIT_H#include <linux/types.h> +#include <linux/if.h> /* timings are in milliseconds. */ #define XT_HASHLIMIT_SCALE 10000
include/uapi/linux/netfilter/xt_physdev.h +1 -1
@@ -2,7 +2,7 @@#define _UAPI_XT_PHYSDEV_H#include <linux/types.h> - +#include <linux/if.h> #define XT_PHYSDEV_OP_IN 0x01#define XT_PHYSDEV_OP_OUT 0x02
include/uapi/linux/netfilter/xt_rateest.h +1 -0
@@ -2,6 +2,7 @@#define _XT_RATEEST_MATCH_H#include <linux/types.h> +#include <linux/if.h> enum xt_rateest_match_flags {XT_RATEEST_MATCH_INVERT =1 <<0 ,
include/uapi/linux/netfilter_arp/arp_tables.h +1 -0
@@ -11,6 +11,7 @@#include <linux/types.h> #include <linux/compiler.h> +#include <linux/if.h> #include <linux/netfilter_arp.h> #include <linux/netfilter/x_tables.h>
include/uapi/linux/netfilter_ipv6/ip6_tables.h +1 -0
@@ -17,6 +17,7 @@#include <linux/types.h> #include <linux/compiler.h> +#include <linux/if.h> #include <linux/netfilter_ipv6.h> #include <linux/netfilter/x_tables.h>
Signature · 1 line
2.1.4
PATCH v3 60/98 include/uapi/linux/netfilter/xt_osf.h: include linux/ip.h and linux/tcp.h
In reply to Mikko RapeliFixes userspace compilation errors:
error: ‘MAX_IPOPTLEN’ undeclared here (not in a function)
error: field ‘ip’ has incomplete type
error: field ‘tcp’ has incomplete type
--- include/uapi/linux/netfilter/xt_osf.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/linux/netfilter/xt_osf.h +2 -0
@@ -20,6 +20,8 @@#define _XT_OSF_H#include <linux/types.h> +#include <linux/ip.h> +#include <linux/tcp.h> #define MAXGENRELEN 32
Signature · 1 line
2.1.4
PATCH v3 61/98 include/uapi/linux/netfilter_ipv6/ip6t_rt.h: include linux/in6.h
In reply to Mikko RapeliFixes userspace compiler error:
error: array type has incomplete element type
struct in6_addr addrs[IP6T_RT_HOPS]; /* Hops */
--- include/uapi/linux/netfilter_ipv6/ip6t_rt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/netfilter_ipv6/ip6t_rt.h +1 -1
@@ -2,7 +2,7 @@#define _IP6T_RT_H#include <linux/types.h> -/*#include <linux/in6.h>*/ +#include <linux/in6.h> #define IP6T_RT_HOPS 16
Signature · 1 line
2.1.4
PATCH v3 62/98 include/uapi/linux/netfilter_bridge/ebt_ip6.h: include linux/in6.h
In reply to Mikko RapeliFixes userspace compiler errors like
error: field ‘saddr’ has incomplete type
struct in6_addr saddr;
--- include/uapi/linux/netfilter_bridge/ebt_ip6.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/netfilter_bridge/ebt_ip6.h +1 -0
@@ -13,6 +13,7 @@#define __LINUX_BRIDGE_EBT_IP6_H#include <linux/types.h> +#include <linux/in6.h> #define EBT_IP6_SOURCE 0x01#define EBT_IP6_DEST 0x02
Signature · 1 line
2.1.4
PATCH v3 63/98 include/uapi/linux/netfilter/xt_policy.h: include linux/in.h and linux/in6.h
In reply to Mikko RapeliFixes userspace compiler errors:
error: field ‘a4’ has incomplete type
struct in_addr a4;
error: field ‘a6’ has incomplete type
struct in6_addr a6;
--- include/uapi/linux/netfilter/xt_policy.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/linux/netfilter/xt_policy.h +2 -0
@@ -2,6 +2,8 @@#define _XT_POLICY_H#include <linux/types.h> +#include <linux/in.h> +#include <linux/in6.h> #define XT_POLICY_MAX_ELEM 4
Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 64/98 include/uapi/linux/netfilter_bridge/ebt_arp.h: include linux/if_ether.h
In reply to Mikko RapeliFixes userspace compile error:
error: ‘ETH_ALEN’ undeclared here (not in a function)
unsigned char smaddr[ETH_ALEN];
--- include/uapi/linux/netfilter_bridge/ebt_arp.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/netfilter_bridge/ebt_arp.h +1 -0
@@ -2,6 +2,7 @@#define __LINUX_BRIDGE_EBT_ARP_H#include <linux/types.h> +#include <linux/if_ether.h> #define EBT_ARP_OPCODE 0x01#define EBT_ARP_HTYPE 0x02
Signature · 1 line
2.1.4
PATCH v3 65/98 include/uapi/linux/netfilter_bridge/ebt_arpreply.h: include linux/if_ether.h
In reply to Mikko RapeliFixes userspace compile error:
error: ‘ETH_ALEN’ undeclared here (not in a function)
unsigned char mac[ETH_ALEN];
--- include/uapi/linux/netfilter_bridge/ebt_arpreply.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/linux/netfilter_bridge/ebt_arpreply.h +2 -0
@@ -1,6 +1,8 @@ #ifndef __LINUX_BRIDGE_EBT_ARPREPLY_H #define __LINUX_BRIDGE_EBT_ARPREPLY_H +#include <linux/if_ether.h> + struct ebt_arpreply_info { unsigned char mac[ETH_ALEN]; int target;
Signature · 1 line
2.1.4
PATCH v3 66/98 include/uapi/linux/netfilter_bridge/ebt_nat.h: include linux/if_ether.h
In reply to Mikko RapeliFixes userspace compile error:
error: ‘ETH_ALEN’ undeclared here (not in a function)
unsigned char mac[ETH_ALEN];
--- include/uapi/linux/netfilter_bridge/ebt_nat.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/linux/netfilter_bridge/ebt_nat.h +2 -0
@@ -1,6 +1,8 @@ #ifndef __LINUX_BRIDGE_EBT_NAT_H #define __LINUX_BRIDGE_EBT_NAT_H +#include <linux/if_ether.h> + #define NAT_ARP_BIT (0x00000010) struct ebt_nat_info { unsigned char mac[ETH_ALEN];
Signature · 1 line
2.1.4
PATCH v3 67/98 include/uapi/linux/netfilter/ipset/ip_set_bitmap.h: include linux/netfilter/ipset/ip_set.h
In reply to Mikko RapeliFixes userspace compilation error:
error: ‘IPSET_ERR_TYPE_SPECIFIC’ undeclared here (not in a function)
IPSET_ERR_BITMAP_RANGE = IPSET_ERR_TYPE_SPECIFIC,
--- include/uapi/linux/netfilter/ipset/ip_set_bitmap.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/linux/netfilter/ipset/ip_set_bitmap.h +2 -0
@@ -1,6 +1,8 @@#ifndef _UAPI__IP_SET_BITMAP_H#define _UAPI__IP_SET_BITMAP_H +#include <linux/netfilter/ipset/ip_set.h> +/* Bitmap type specific error codes */ enum { /* The element is out of the range of the set */
Signature · 1 line
2.1.4
Re: [PATCH 67/98] include/uapi/linux/netfilter/ipset/ip_set_bitmap.h: include linux/netfilter/ipset/ip_set.h
Quoted 4 lines · Mikko Rapeli
Fixes userspace compilation error:
error: ?IPSET_ERR_TYPE_SPECIFIC? undeclared here (not in a function)
IPSET_ERR_BITMAP_RANGE=IPSET_ERR_TYPE_SPECIFIC,
What kind of userspace compilation generates the error message above? How can one reproduce it?
Best regards,
Jozsef
Quoted 26 lines
Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/linux/netfilter/ipset/ip_set_bitmap.h | 2 ++ 1 file changed, 2 insertions(+)include/uapi/linux/netfilter/ipset/ip_set_bitmap.h +2
-0@@ -1,6 +1,8 @@#ifndef _UAPI__IP_SET_BITMAP_H#define _UAPI__IP_SET_BITMAP_H +#include <linux/netfilter/ipset/ip_set.h> +/* Bitmap type specific error codes */ enum { /* The element is out of the range of the set */Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
H-1525 Budapest 114, POB. 49, Hungary
Re: [PATCH 67/98] include/uapi/linux/netfilter/ipset/ip_set_bitmap.h: include linux/netfilter/ipset/ip_set.h
Quoted 9 lines · Jozsef Kadlecsik
Quoted 4 lines · Mikko Rapeli
Fixes userspace compilation error:
error: ?IPSET_ERR_TYPE_SPECIFIC? undeclared here (not in a function)
IPSET_ERR_BITMAP_RANGE=IPSET_ERR_TYPE_SPECIFIC,What kind of userspace compilation generates the error message above? How can one reproduce it?
Here's the test which reproduces this https://lkml.org/lkml/2015/5/30/98
Should run on at least Debian based distributions and some cross compilers. In the end the script generates a .c file which includes only this header file and tries to compile it with a call like:
cc -Wall -c -nostdinc -I /usr/lib/gcc/i586-linux-gnu/4.9/include -I /usr/lib/gcc/i586-linux-gnu/4.9/include-fixed -I . -I ../headers_compile_test_include -I ../headers_compile_test_include/i586-linux-gnu ./linux/netfilter/ipset/ip_set_bitmap.c
-Mikko
PATCH v3 68/98 include/uapi/linux/netfilter/ipset/ip_set_hash.h: include linux/netfilter/ipset/ip_set.h
In reply to Mikko RapeliFixes userspace compilation error:
error: ‘IPSET_ERR_TYPE_SPECIFIC’ undeclared here (not in a function)
IPSET_ERR_HASH_FULL = IPSET_ERR_TYPE_SPECIFIC,
--- include/uapi/linux/netfilter/ipset/ip_set_hash.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/linux/netfilter/ipset/ip_set_hash.h +2 -0
@@ -1,6 +1,8 @@#ifndef _UAPI__IP_SET_HASH_H#define _UAPI__IP_SET_HASH_H +#include <linux/netfilter/ipset/ip_set.h> +/* Hash type specific error codes */ enum { /* Hash is full */
Signature · 1 line
2.1.4
PATCH v3 69/98 include/uapi/linux/netfilter/ipset/ip_set_list.h: include linux/netfilter/ipset/ip_set.h
In reply to Mikko RapeliFixes userspace compilation error:
error: ‘IPSET_ERR_TYPE_SPECIFIC’ undeclared here (not in a function)
IPSET_ERR_NAME = IPSET_ERR_TYPE_SPECIFIC,
--- include/uapi/linux/netfilter/ipset/ip_set_list.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/linux/netfilter/ipset/ip_set_list.h +2 -0
@@ -1,6 +1,8 @@#ifndef _UAPI__IP_SET_LIST_H#define _UAPI__IP_SET_LIST_H +#include <linux/netfilter/ipset/ip_set.h> +/* List type specific error codes */ enum { /* Set name to be added/deleted/tested does not exist. */
Signature · 1 line
2.1.4
PATCH v3 70/98 include/uapi/linux/netfilter/xt_HMARK.h: include linux/netfilter.h
In reply to Mikko RapeliFixes userspace compilation errors:
error: field ‘src_mask’ has incomplete type
union nf_inet_addr src_mask;
error: field ‘dst_mask’ has incomplete type
union nf_inet_addr dst_mask;
--- include/uapi/linux/netfilter/xt_HMARK.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/netfilter/xt_HMARK.h +1 -0
@@ -2,6 +2,7 @@#define XT_HMARK_H_ #include <linux/types.h> +#include <linux/netfilter.h> enum {XT_HMARK_SADDR_MASK ,
Signature · 1 line
2.1.4
PATCH v3 71/98 include/uapi/linux/netfilter/xt_TEE.h: include linux/netfilter.h
In reply to Mikko RapeliFixes userspace compilation error:
error: field ‘gw’ has incomplete type
union nf_inet_addr gw;
--- include/uapi/linux/netfilter/xt_TEE.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/linux/netfilter/xt_TEE.h +2 -0
@@ -1,6 +1,8 @@ #ifndef _XT_TEE_TARGET_H #define _XT_TEE_TARGET_H +#include <linux/netfilter.h> + struct xt_tee_tginfo { union nf_inet_addr gw; char oif[16];
Signature · 1 line
2.1.4
PATCH v3 72/98 include/uapi/linux/netfilter/xt_TPROXY.h: include linux/netfilter.h
In reply to Mikko RapeliFixes userspace compilation error:
error: field ‘laddr’ has incomplete type
union nf_inet_addr laddr;
--- include/uapi/linux/netfilter/xt_TPROXY.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/netfilter/xt_TPROXY.h +1 -0
@@ -2,6 +2,7 @@#define _XT_TPROXY_H#include <linux/types.h> +#include <linux/netfilter.h> /* TPROXY target is capable of marking the packet to perform * redirection. We can get rid of that whenever we get support for
Signature · 1 line
2.1.4
PATCH v3 73/98 include/uapi/linux/netfilter/xt_ipvs.h: include linux/netfilter.h
In reply to Mikko RapeliFixes userspace compilation errors:
error: field ‘vaddr’ has incomplete type
union nf_inet_addr vaddr, vmask;
error: field ‘vmask’ has incomplete type
union nf_inet_addr vaddr, vmask;
--- include/uapi/linux/netfilter/xt_ipvs.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/netfilter/xt_ipvs.h +1 -0
@@ -2,6 +2,7 @@#define _XT_IPVS_H#include <linux/types.h> +#include <linux/netfilter.h> enum {XT_IPVS_IPVS_PROPERTY =1 <<0 ,/* all other options imply this one */
Signature · 1 line
2.1.4
PATCH v3 74/98 include/uapi/linux/netfilter/xt_mac.h: include linux/if_ether.h
In reply to Mikko RapeliFixes userspace compilation error:
error: ‘ETH_ALEN’ undeclared here (not in a function)
unsigned char srcaddr[ETH_ALEN];
--- include/uapi/linux/netfilter/xt_mac.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/linux/netfilter/xt_mac.h +2 -0
@@ -1,6 +1,8 @@ #ifndef _XT_MAC_H #define _XT_MAC_H +#include <linux/if_ether.h> + struct xt_mac_info { unsigned char srcaddr[ETH_ALEN]; int invert;
Signature · 1 line
2.1.4
PATCH v3 75/98 include/uapi/linux/netfilter/xt_sctp.h: use _Bool type, 1 for true and 0 for false
In reply to Mikko RapeliFixes userspace compilation errors like:
error: unknown type name ‘bool’
static __inline__ bool
error: ‘false’ undeclared (first use in this function)
return false;
--- include/uapi/linux/netfilter/xt_sctp.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
include/uapi/linux/netfilter/xt_sctp.h +6 -6
@@ -66,26 +66,26 @@ struct xt_sctp_info {#define SCTP_CHUNKMAP_IS_CLEAR (chunkmap) \ __sctp_chunkmap_is_clear((chunkmap), ARRAY_SIZE(chunkmap)) -static inline bool +static inline _Bool __sctp_chunkmap_is_clear (const __u32 *chunkmap,unsigned int n) {unsigned int i;for (i =0 ; i < n; ++i)if (chunkmap[i]) -return false; -return true; +return 0 ; +return 1 ; }#define SCTP_CHUNKMAP_IS_ALL_SET (chunkmap) \ __sctp_chunkmap_is_all_set((chunkmap), ARRAY_SIZE(chunkmap)) -static inline bool +static inline _Bool __sctp_chunkmap_is_all_set (const __u32 *chunkmap,unsigned int n) {unsigned int i;for (i =0 ; i < n; ++i)if (chunkmap[i] != ~0U ) -return false; -return true; +return 0 ; +return 1 ; }#endif /* _XT_SCTP_H_ */
Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 76/98 include/uapi/linux/netfilter/xt_recent.h: include linux/netfilter.h
In reply to Mikko RapeliFixes userspace compilation error:
error: field ‘mask’ has incomplete type
union nf_inet_addr mask;
--- include/uapi/linux/netfilter/xt_recent.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/netfilter/xt_recent.h +1 -0
@@ -2,6 +2,7 @@#define _LINUX_NETFILTER_XT_RECENT_H 1#include <linux/types.h> +#include <linux/netfilter.h> enum {XT_RECENT_CHECK =1 <<0 ,
Signature · 1 line
2.1.4
PATCH v3 77/98 include/uapi/linux/errqueue.h: include linux/time.h
In reply to Mikko RapeliFixes userspace compilation error:
error: array type has incomplete element type
struct timespec ts[3];
--- include/uapi/linux/errqueue.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/errqueue.h +1 -0
@@ -2,6 +2,7 @@#define _UAPI_LINUX_ERRQUEUE_H#include <linux/types.h> +#include <linux/time.h> struct sock_extended_err {__u32 ee_errno;
Signature · 1 line
2.1.4
PATCH v3 78/98 include/uapi/asm-generic/ucontext.h: include asm/signal.h and asm/sigcontext.h
In reply to Mikko RapeliFixes userspace compiler errors:
error: unknown type name ‘stack_t’
error: field ‘uc_mcontext’ has incomplete type
struct sigcontext uc_mcontext;
error: unknown type name ‘sigset_t’
--- include/uapi/asm-generic/ucontext.h | 3 +++ 1 file changed, 3 insertions(+)
include/uapi/asm-generic/ucontext.h +3 -0
@@ -1,6 +1,9 @@ #ifndef __ASM_GENERIC_UCONTEXT_H #define __ASM_GENERIC_UCONTEXT_H +#include <asm/signal.h> +#include <asm/sigcontext.h> + struct ucontext { unsigned long uc_flags; struct ucontext *uc_link;
Signature · 1 line
2.1.4
PATCH v3 79/98 arch/x86/include/uapi/asm/signal.h: use __kernel_size_t instead of size_t
In reply to Mikko RapeliFixes userspace compilation error:
error: unknown type name ‘size_t’
--- arch/x86/include/uapi/asm/signal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/uapi/asm/signal.h +1 -1
@@ -127,7 +127,7 @@ struct sigaction {typedef struct sigaltstack {void __user *ss_sp;int ss_flags; -size_t ss_size; +__kernel_size_t ss_size; }stack_t ;#endif /* __ASSEMBLY__ */
Signature · 1 line
2.1.4
PATCH v3 80/98 include/uapi/linux/auto_fs.h: include linux/limits.h
In reply to Mikko RapeliFixes userspace compilation error:
error: ‘NAME_MAX’ undeclared here (not in a function)
--- include/uapi/linux/auto_fs.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/auto_fs.h +1 -0
@@ -15,6 +15,7 @@#define _UAPI_LINUX_AUTO_FS_H#include <linux/types.h> +#include <linux/limits.h> #ifndef __KERNEL__#include <sys/ioctl.h> #endif /* __KERNEL__ */
Signature · 1 line
2.1.4
PATCH v3 81/98 include/uapi/linux/openvswitch.h: use __u32 from linux/types.h
In reply to Mikko RapeliFixes userspace compiler error:
error: unknown type name ‘uint32_t’
--- include/uapi/linux/openvswitch.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/openvswitch.h +2 -2
@@ -586,8 +586,8 @@ enum ovs_hash_alg {* @hash_basis: basis used for computing hash. */ struct ovs_action_hash { -uint32_t hash_alg;/* One of ovs_hash_alg. */ -uint32_t hash_basis; +__u32 hash_alg;/* One of ovs_hash_alg. */ +__u32 hash_basis; };/**
Signature · 1 line
2.1.4
PATCH v3 82/98 include/uapi/linux/target_core_user.h: use __u8, __u16, __u32 and __u64 from linux/types.h
In reply to Mikko RapeliFixes userspace compilation errors like:
error: unknown type name ‘uint16_t’
--- include/uapi/linux/target_core_user.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
include/uapi/linux/target_core_user.h +11 -11
@@ -108,26 +108,26 @@ struct tcmu_cmd_entry {union {struct { -uint32_t iov_cnt; -uint32_t iov_bidi_cnt; -uint32_t iov_dif_cnt; -uint64_t cdb_off; -uint64_t __pad1; -uint64_t __pad2; +__u32 iov_cnt; +__u32 iov_bidi_cnt; +__u32 iov_dif_cnt; +__u64 cdb_off; +__u64 __pad1; +__u64 __pad2;struct iovec iov[0 ]; } req;struct { -uint8_t scsi_status; -uint8_t __pad1; -uint16_t __pad2; -uint32_t __pad3; +__u8 scsi_status; +__u8 __pad1; +__u16 __pad2; +__u32 __pad3;char sense_buffer[TCMU_SENSE_BUFFERSIZE ]; } rsp; }; } __packed; -#define TCMU_OP_ALIGN_SIZE sizeof(uint64_t) +#define TCMU_OP_ALIGN_SIZE sizeof(__u64)enum tcmu_genl_cmd {TCMU_CMD_UNSPEC ,
Signature · 1 line
2.1.4
PATCH v3 83/98 include/uapi/linux/omapfb.h: use __kernel_size_t instead of size_t
In reply to Mikko RapeliFixes userspace compilation error:
error: unknown type name ‘size_t’
--- include/uapi/linux/omapfb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/omapfb.h +1 -1
@@ -181,7 +181,7 @@ struct omapfb_memory_read {__u16 y;__u16 w;__u16 h; -size_t buffer_size; +__kernel_size_t buffer_size;void __user *buffer; };
Signature · 1 line
2.1.4
PATCH v3 84/98 include/uapi/linux/atm_zatm.h: include linux/time.h
In reply to Mikko RapeliFixes userspace compile error:
error: field ‘real’ has incomplete type
struct timeval real; /* real (wall-clock) time */
--- include/uapi/linux/atm_zatm.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/atm_zatm.h +1 -0
@@ -14,6 +14,7 @@#include <linux/atmapi.h> #include <linux/atmioc.h> +#include <linux/time.h> #define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc)/* get pool statistics */
Signature · 1 line
2.1.4
PATCH v3 85/98 include/uapi/linux/scc.h: include linux/sockios.h
In reply to Mikko RapeliFixes userspace compilation error:
error: ‘SIOCDEVPRIVATE’ undeclared here (not in a function)
SIOCSCCRESERVED = SIOCDEVPRIVATE
--- include/uapi/linux/scc.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/scc.h +1 -0
@@ -3,6 +3,7 @@#ifndef _UAPI_SCC_H#define _UAPI_SCC_H +#include <linux/sockios.h> /* selection of hardware types */
Signature · 1 line
2.1.4
PATCH v3 86/98 include/uapi/linux/btrfs.h: define NULL
In reply to Mikko RapeliCopied the NULL definition from include/linux/stddef.h which does not have it in userspace.
Fixes userspace compilation error:
error: ‘NULL’ undeclared (first use in this function)
return NULL;
--- include/uapi/linux/btrfs.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/uapi/linux/btrfs.h +6 -0
@@ -20,6 +20,12 @@#define _UAPI_LINUX_BTRFS_H#include <linux/types.h> #include <linux/ioctl.h> +#include <linux/stddef.h> + +/* for userspace where linux/stddef.h doesn't define this */ +#ifndef NULL +#define NULL ((void *)0) +#endif #define BTRFS_IOCTL_MAGIC 0x94#define BTRFS_VOL_NAME_MAX 255
Signature · 1 line
2.1.4
PATCH v3 87/98 include/uapi/linux/kexec.h: use __kernel_size_t instead of size_t
In reply to Mikko RapeliFixes userspace compilation error:
error: unknown type name ‘size_t’
size_t bufsz;
--- include/uapi/linux/kexec.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/kexec.h +2 -2
@@ -50,9 +50,9 @@*/ struct kexec_segment {const void *buf; -size_t bufsz; +__kernel_size_t bufsz;const void *mem; -size_t memsz; +__kernel_size_t memsz; };#endif /* __KERNEL__ */
Signature · 1 line
2.1.4
PATCH v3 88/98 include/uapi/linux/reiserfs_xattr.h: use __kernel_size_t instead of size_t
In reply to Mikko RapeliFixes userspace compilation error:
error: unknown type name ‘size_t’
size_t length;
--- include/uapi/linux/reiserfs_xattr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/reiserfs_xattr.h +1 -1
@@ -18,7 +18,7 @@ struct reiserfs_xattr_header {struct reiserfs_security_handle {const char *name;void *value; -size_t length; +__kernel_size_t length; };#endif /* _LINUX_REISERFS_XATTR_H */
Signature · 1 line
2.1.4
PATCH v3 89/98 include/uapi/linux/patchkey.h: change #error to #warning if file included directly
In reply to Mikko RapeliWould be nice to be able to compile all userspace header files also alone.
--- include/uapi/linux/patchkey.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/patchkey.h +1 -1
@@ -11,7 +11,7 @@*/ #ifndef _LINUX_PATCHKEY_H_INDIRECT -#error "patchkey.h included directly" +#warning "patchkey.h included directly"#endif #ifndef _UAPI_LINUX_PATCHKEY_H
Signature · 1 line
2.1.4
PATCH v3 90/98 include/uapi/linux/coda.h: use __kernel_pid_t and add u_short etc definitions for userspace
In reply to Mikko RapeliFixes userspace compilation errors about unknown pid_t, u_short etc types.
--- include/uapi/linux/coda.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
include/uapi/linux/coda.h +9 -2
@@ -100,7 +100,14 @@ typedef unsigned long long u_quad_t;#if defined(__linux__)#include <linux/time.h> #define cdev_t u_quad_t +typedef unsigned long u_long ; +typedef unsigned int u_int ; +typedef unsigned short u_short ; +typedef u_long ino_t ; +#ifndef __KERNEL__ +typedef u_long dev_t ; +typedef void *caddr_t ;#if !defined(_UQUAD_T_) && (!defined(__GLIBC__) || __GLIBC__ <2 )#define _UQUAD_T_ 1typedef unsigned long long u_quad_t ;
@@ -295,8 +302,8 @@ struct coda_statfs {struct coda_in_hdr {u_int32_t opcode;u_int32_t unique;/* Keep multiple outstanding msgs distinct */ -pid_t pid; -pid_t pgid; +__kernel_pid_t pid; +__kernel_pid_t pgid;vuid_t uid; };
Signature · 1 line
2.1.4
PATCH v3 91/98 include/uapi/linux/android/binder.h: use __kernel_pid_t and __kernel_uid_t
In reply to Mikko RapeliFixes userspace compilation errors:
error: unknown type name ‘pid_t’
pid_t sender_pid
error: unknown type name ‘uid_t’
uid_t sender_euid;
--- include/uapi/linux/android/binder.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/android/binder.h +2 -2
@@ -142,8 +142,8 @@ struct binder_transaction_data {/* General information about the transaction. */ __u32 flags; -pid_t sender_pid; -uid_t sender_euid; +__kernel_pid_t sender_pid; +__kernel_uid_t sender_euid;binder_size_t data_size;/* number of bytes of data */ binder_size_t offsets_size;/* number of bytes of offsets */
Signature · 1 line
2.1.4
PATCH v3 92/98 arch/x86/include/uapi/asm/sembuf.h: include linux/types.h and linux/ipc.h
In reply to Mikko RapeliFixes userspace compile errors like:
error: field ‘sem_perm’ has incomplete type
struct ipc64_perm sem_perm; /* permissions .. see ipc.h */
error: unknown type name ‘__kernel_time_t’
__kernel_time_t sem_otime; /* last semop time */
--- arch/x86/include/uapi/asm/sembuf.h | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/include/uapi/asm/sembuf.h +3 -0
@@ -1,6 +1,9 @@#ifndef _ASM_X86_SEMBUF_H#define _ASM_X86_SEMBUF_H +#include <linux/types.h> +#include <linux/ipc.h> +/* * The semid64_ds structure for x86 architecture. * Note extra padding because this structure is passed back and forth
Signature · 1 line
2.1.4
PATCH v3 93/98 include/uapi/linux/virtio_balloon.h: include linux/virtio_types.h
In reply to Mikko RapeliFixes userspace compilation error:
error: unknown type name ‘__virtio16’
__virtio16 tag;
--- include/uapi/linux/virtio_balloon.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/virtio_balloon.h +1 -0
@@ -26,6 +26,7 @@* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include <linux/types.h> +#include <linux/virtio_types.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h>
Signature · 1 line
2.1.4
PATCH v3 93/98 include/uapi/linux/virtio_balloon.h: include linux/virtio_types.h
In reply to Mikko RapeliFixes userspace compilation error:
error: unknown type name ‘__virtio16’
__virtio16 tag;
--- include/uapi/linux/virtio_balloon.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/virtio_balloon.h +1 -0
@@ -26,6 +26,7 @@* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include <linux/types.h> +#include <linux/virtio_types.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h>
Signature · 6 lines
2.1.4 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v3 94/98 HACK arch/x86/include/uapi/asm/sigcontext32.h: remove _fpx_sw_bytes from union
In reply to Mikko RapeliI have no idea what I'm doing but this fixes header file compilation in userspace:
error: field ‘sw_reserved’ has incomplete type
struct _fpx_sw_bytes sw_reserved;
--- arch/x86/include/uapi/asm/sigcontext32.h | 1 - 1 file changed, 1 deletion(-)
arch/x86/include/uapi/asm/sigcontext32.h +0 -1
@@ -45,7 +45,6 @@ struct _fpstate_ia32 {__u32 padding[44 ];union {__u32 padding2[12 ]; -struct _fpx_sw_bytes sw_reserved; }; };
Signature · 1 line
2.1.4
Re: [PATCH 94/98] HACK arch/x86/include/uapi/asm/sigcontext32.h: remove _fpx_sw_bytes from union
Hi Ingo, Thomas and Peter,
Do you have any pointers for me how arch/x86/include/uapi/asm/sigcontext32.h could be fixed to also compile in userspace? Is definition of _fpx_sw_bytes or _fpstate_ia32 even needed there?
Instructions to reproduce the userspace build failure are here:
https://lkml.org/lkml/2015/5/30/98
-Mikko
Quoted 26 lines · Mikko Rapeli
I have no idea what I'm doing but this fixes header file compilation in userspace:
error: field ‘sw_reserved’ has incomplete type
struct_fpx_sw_bytessw_reserved;Signed-off-by Mikko Rapeli <[email protected]>--- arch/x86/include/uapi/asm/sigcontext32.h | 1 - 1 file changed, 1 deletion(-)arch/x86/include/uapi/asm/sigcontext32.h +0
-1@@ -45,7 +45,6 @@ struct _fpstate_ia32 {__u32 padding[44 ];union {__u32 padding2[12 ]; -struct _fpx_sw_bytes sw_reserved; }; };Signature · 1 line
2.1.4
PATCH 1/1 x86/headers: Fix (old) header file dependency bug in uapi/asm/sigcontext32.h
Quoted 8 lines · Mikko Rapeli
Hi Ingo, Thomas and Peter,
Do you have any pointers for me how
arch/x86/include/uapi/asm/sigcontext32.hcould be fixed to also compile in userspace? Is definition of_fpx_sw_bytesor_fpstate_ia32even needed there?Instructions to reproduce the userspace build failure are here:
https://lkml.org/lkml/2015/5/30/98
Yeah, so this is a real bug in the headers, good find.
Also note that somewhat luckily your testcase is artificial, no real user-space code can contain that code at the moment because the header never built standalone in the past either AFAICS.
So it's an old header file dependency bug, to make it build in user-space you need to do this workaround:
#include <asm/sigcontext.h>
#include <asm/sigcontext32.h>
If you only include sigcontext32.h:
#include <asm/sigcontext32.h>
it will fail to build.
To fix the bug:
Quoted 9 lines
arch/x86/include/uapi/asm/sigcontext32.h struct _fpstate_ia32 { · line 49
Quoted 9 lines
arch/x86/include/uapi/asm/sigcontext32.h +0
-1@@ -45,7 +45,6 @@ struct _fpstate_ia32 {__u32 padding[44 ];union {__u32 padding2[12 ]; -struct _fpx_sw_bytes sw_reserved; }; };
No, those fields are real and compat sigframe handling user-space might be relying on them.
Does the fix below work for you?
Thanks,
Ingo
=========================>
Quoted 1 line
From
0bcdebb70e1ae246139df71acfa744ab1629d877Mon Sep 17 00:00:00 2001
From: Ingo Molnar <[email protected]>
Date: Thu, 3 Sep 2015 09:35:19 +0200
Subject: [PATCH] x86/headers: Fix (old) header file dependency bug in uapi/asm/sigcontext32.h
Mikko Rapeli reported that the following standalone user-space header does not compile:
#include <asm/sigcontext32.h>
Due to undefined 'struct __fpx_sw_bytes' which is defined in asm/sigcontext.h.
The following header order works:
#include <asm/sigcontext.h> #include <asm/sigcontext32.h>
and that's probably how everyone's been using these headers for the past decade or so, but it's a legit header file dependency bug, so include asm/sigcontext.h in sigcontext32.h to allow it to be built standlone.
--- arch/x86/include/uapi/asm/sigcontext32.h | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/include/uapi/asm/sigcontext32.h +2 -0
@@ -3,6 +3,8 @@#include <linux/types.h> +#include <asm/sigcontext.h> +/* signal context for 32bit programs. */ #define X86_FXSR_MAGIC 0x0000
Re: [PATCH] x86/headers: Fix (old) header file dependency bug in uapi/asm/sigcontext32.h
Quoted 45 lines · Ingo Molnar
Quoted 8 lines · Mikko Rapeli
Hi Ingo, Thomas and Peter,
Do you have any pointers for me how
arch/x86/include/uapi/asm/sigcontext32.hcould be fixed to also compile in userspace? Is definition of_fpx_sw_bytesor_fpstate_ia32even needed there?Instructions to reproduce the userspace build failure are here:
https://lkml.org/lkml/2015/5/30/98Yeah, so this is a real bug in the headers, good find.
Also note that somewhat luckily your testcase is artificial, no real user-space code can contain that code at the moment because the header never built standalone in the past either AFAICS.
So it's an old header file dependency bug, to make it build in user-space you need to do this workaround:
#include <
asm/sigcontext.h>
#include <asm/sigcontext32.h>If you only include
sigcontext32.h:#include <
asm/sigcontext32.h>it will fail to build.
To fix the bug:
Quoted 9 lines
arch/x86/include/uapi/asm/sigcontext32.h struct _fpstate_ia32 { · line 49
Quoted 9 lines
arch/x86/include/uapi/asm/sigcontext32.h +0
-1@@ -45,7 +45,6 @@ struct _fpstate_ia32 {__u32 padding[44 ];union {__u32 padding2[12 ]; -struct _fpx_sw_bytes sw_reserved; }; };No, those fields are real and compat sigframe handling user-space might be relying on them.
Quoted 1 line
Does the fix below work for you?
Unfortunately no:
cc -Wall -c -nostdinc -I /usr/lib/gcc/i586-linux-gnu/5/include -I /usr/lib/gcc/i 586-linux-gnu/5/include-fixed -I . -I ../headers_compile_test_include -I ../head ers_compile_test_include/i586-linux-gnu ./asm/sigcontext32.c
In file included from ./asm/sigcontext32.c:1:0:./asm/sigcontext32.h:12:8: error: redefinition of ‘struct _fpreg’
struct _fpreg {
^
In file included from ./asm/sigcontext32.h:6:0,
from ./asm/sigcontext32.c:1:
./asm/sigcontext.h:56:8: note: originally defined here
struct _fpreg {
^
In file included from ./asm/sigcontext32.c:1:0:
./asm/sigcontext32.h:17:8: error: redefinition of ‘struct _fpxreg’
struct _fpxreg {
^
In file included from ./asm/sigcontext32.h:6:0,
from ./asm/sigcontext32.c:1:
./asm/sigcontext.h:61:8: note: originally defined here
struct _fpxreg {
^
In file included from ./asm/sigcontext32.c:1:0:
./asm/sigcontext32.h:23:8: error: redefinition of ‘struct _xmmreg’
struct _xmmreg {
^
In file included from ./asm/sigcontext32.h:6:0,
from ./asm/sigcontext32.c:1:
./asm/sigcontext.h:67:8: note: originally defined here
struct _xmmreg {
^FAILED: ./asm/sigcontext32.h
I guess this was the reason why I ended with the hack.
-Mikko
Quoted 54 lines
Thanks,
Ingo
=========================>
Quoted 1 line
From
0bcdebb70e1ae246139df71acfa744ab1629d877Mon Sep 17 00:00:00 2001From: Ingo Molnar <[email protected]>
Date: Thu, 3 Sep 2015 09:35:19 +0200
Subject: [PATCH] x86/headers: Fix (old) header file dependency bug inuapi/asm/sigcontext32.hMikko Rapeli reported that the following standalone user-space header does not compile:
#include <asm/sigcontext32.h>Due to undefined 'struct
__fpx_sw_bytes' which is defined inasm/sigcontext.h.The following header order works:
#include <asm/sigcontext.h> #include <asm/sigcontext32.h>and that's probably how everyone's been using these headers for the past decade or so, but it's a legit header file dependency bug, so include
asm/sigcontext.hinsigcontext32.hto allow it to be built standlone.Reported-by Mikko Rapeli <[email protected]>Cc Andy Lutomirski <[email protected]>Cc Borislav Petkov <[email protected]>Cc Brian Gerst <[email protected]>Cc Denys Vlasenko <[email protected]>Cc H. Peter Anvin <[email protected]>Cc Linus Torvalds <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Thomas Gleixner <[email protected]>Signed-off-by Ingo Molnar <[email protected]>--- arch/x86/include/uapi/asm/sigcontext32.h | 2 ++ 1 file changed, 2 insertions(+)arch/x86/include/uapi/asm/sigcontext32.h +2
-0@@ -3,6 +3,8 @@#include <linux/types.h> +#include <asm/sigcontext.h> +/* signal context for 32bit programs. */ #define X86_FXSR_MAGIC 0x0000
Re: [PATCH] x86/headers: Fix (old) header file dependency bug in uapi/asm/sigcontext32.h
Quoted 80 lines · Mikko Rapeli
Quoted 45 lines · Ingo Molnar
Quoted 8 lines · Mikko Rapeli
Hi Ingo, Thomas and Peter,
Do you have any pointers for me how
arch/x86/include/uapi/asm/sigcontext32.hcould be fixed to also compile in userspace? Is definition of_fpx_sw_bytesor_fpstate_ia32even needed there?Instructions to reproduce the userspace build failure are here:
https://lkml.org/lkml/2015/5/30/98Yeah, so this is a real bug in the headers, good find.
Also note that somewhat luckily your testcase is artificial, no real user-space code can contain that code at the moment because the header never built standalone in the past either AFAICS.
So it's an old header file dependency bug, to make it build in user-space you need to do this workaround:
#include <
asm/sigcontext.h>
#include <asm/sigcontext32.h>If you only include
sigcontext32.h:#include <
asm/sigcontext32.h>it will fail to build.
To fix the bug:
Quoted 9 lines
arch/x86/include/uapi/asm/sigcontext32.h struct _fpstate_ia32 { · line 49
Quoted 9 lines
arch/x86/include/uapi/asm/sigcontext32.h +0
-1@@ -45,7 +45,6 @@ struct _fpstate_ia32 {__u32 padding[44 ];union {__u32 padding2[12 ]; -struct _fpx_sw_bytes sw_reserved; }; };No, those fields are real and compat sigframe handling user-space might be relying on them.
Quoted 1 line
Does the fix below work for you?
Unfortunately no:
cc -Wall -c -nostdinc -I
/usr/lib/gcc/i586-linux-gnu/5/include-I/usr/lib/gcc/i586-linux-gnu/5/include-fixed -I . -I ../headers_compile_test_include -I ../head ers_compile_test_include/i586-linux-gnu./asm/sigcontext32.c
In file included from./asm/sigcontext32.c:1:0:./asm/sigcontext32.h:12:8: error: redefinition of ‘struct _fpreg’struct _fpreg { ^ In file included from ./asm/sigcontext32.h:6:0, from ./asm/sigcontext32.c:1: ./asm/sigcontext.h:56:8: note: originally defined here struct _fpreg { ^ In file included from ./asm/sigcontext32.c:1:0: ./asm/sigcontext32.h:17:8: error: redefinition of ‘struct _fpxreg’ struct _fpxreg { ^ In file included from ./asm/sigcontext32.h:6:0, from ./asm/sigcontext32.c:1: ./asm/sigcontext.h:61:8: note: originally defined here struct _fpxreg { ^ In file included from ./asm/sigcontext32.c:1:0: ./asm/sigcontext32.h:23:8: error: redefinition of ‘struct _xmmreg’ struct _xmmreg { ^ In file included from ./asm/sigcontext32.h:6:0, from ./asm/sigcontext32.c:1: ./asm/sigcontext.h:67:8: note: originally defined here struct _xmmreg { ^
Quoted 3 lines
FAILED:
./asm/sigcontext32.hI guess this was the reason why I ended with the hack.
sigcontext32.h is a 64-bit only header (for compat functionality), and you are trying to build this on i386, right?
In theory we could unify them mostly, the two structures match mostly, except that '_fpstate_ia32::padding' is named 'padding1' in _fpstate, and there's also some legacy uglies wrt. user-space sigcontext definitions.
So this either gets cleaned up properly, with the legacy hacks/wrappers clearly isolated, or we could state that you shouldn't build 64-bit headers in 32-bit environments.
Thanks,
Ingo
Re: [PATCH] x86/headers: Fix (old) header file dependency bug in uapi/asm/sigcontext32.h
Quoted 85 lines · Ingo Molnar
Quoted 82 lines · Mikko Rapeli
Quoted 45 lines · Ingo Molnar
Quoted 8 lines · Mikko Rapeli
Hi Ingo, Thomas and Peter,
Do you have any pointers for me how
arch/x86/include/uapi/asm/sigcontext32.hcould be fixed to also compile in userspace? Is definition of_fpx_sw_bytesor_fpstate_ia32even needed there?Instructions to reproduce the userspace build failure are here:
https://lkml.org/lkml/2015/5/30/98Yeah, so this is a real bug in the headers, good find.
Also note that somewhat luckily your testcase is artificial, no real user-space code can contain that code at the moment because the header never built standalone in the past either AFAICS.
So it's an old header file dependency bug, to make it build in user-space you need to do this workaround:
#include <
asm/sigcontext.h>
#include <asm/sigcontext32.h>If you only include
sigcontext32.h:#include <
asm/sigcontext32.h>it will fail to build.
To fix the bug:
Quoted 9 lines
arch/x86/include/uapi/asm/sigcontext32.h struct _fpstate_ia32 { · line 49
Quoted 9 lines
arch/x86/include/uapi/asm/sigcontext32.h +0
-1@@ -45,7 +45,6 @@ struct _fpstate_ia32 {__u32 padding[44 ];union {__u32 padding2[12 ]; -struct _fpx_sw_bytes sw_reserved; }; };No, those fields are real and compat sigframe handling user-space might be relying on them.
Quoted 1 line
Does the fix below work for you?
Unfortunately no:
cc -Wall -c -nostdinc -I
/usr/lib/gcc/i586-linux-gnu/5/include-I/usr/lib/gcc/i586-linux-gnu/5/include-fixed -I . -I ../headers_compile_test_include -I ../head ers_compile_test_include/i586-linux-gnu./asm/sigcontext32.c
In file included from./asm/sigcontext32.c:1:0:./asm/sigcontext32.h:12:8: error: redefinition of ‘struct _fpreg’struct _fpreg { ^ In file included from ./asm/sigcontext32.h:6:0, from ./asm/sigcontext32.c:1: ./asm/sigcontext.h:56:8: note: originally defined here struct _fpreg { ^ In file included from ./asm/sigcontext32.c:1:0: ./asm/sigcontext32.h:17:8: error: redefinition of ‘struct _fpxreg’ struct _fpxreg { ^ In file included from ./asm/sigcontext32.h:6:0, from ./asm/sigcontext32.c:1: ./asm/sigcontext.h:61:8: note: originally defined here struct _fpxreg { ^ In file included from ./asm/sigcontext32.c:1:0: ./asm/sigcontext32.h:23:8: error: redefinition of ‘struct _xmmreg’ struct _xmmreg { ^ In file included from ./asm/sigcontext32.h:6:0, from ./asm/sigcontext32.c:1: ./asm/sigcontext.h:67:8: note: originally defined here struct _xmmreg { ^FAILED:
./asm/sigcontext32.h
Quoted 4 lines
Quoted 1 line
I guess this was the reason why I ended with the hack.
sigcontext32.his a 64-bit only header (for compat functionality), and you are trying to build this on i386, right?
Yes, i386 32bit.
Quoted 7 lines
In theory we could unify them mostly, the two structures match mostly, except that '
_fpstate_ia32::padding' is named 'padding1' in_fpstate, and there's also some legacy uglies wrt. user-space sigcontext definitions.So this either gets cleaned up properly, with the legacy hacks/wrappers clearly isolated, or we could state that you shouldn't build 64-bit headers in 32-bit environments.
Should the sigcontext32.h have some 32bit ifdefs maybe?
I assume that the exported header files should be the same for both 64 and 32 bit i386/x86
-Mikko
Re: [PATCH] x86/headers: Fix (old) header file dependency bug in uapi/asm/sigcontext32.h
Quoted 9 lines · Mikko Rapeli
Quoted 2 lines
sigcontext32.his a 64-bit only header (for compat functionality), and you are trying to build this on i386, right?Yes, i386 32bit.
Quoted 4 lines
In theory we could unify them mostly, the two structures match mostly, except that '
_fpstate_ia32::padding' is named 'padding1' in_fpstate, and there's also some legacy uglies wrt. user-space sigcontext definitions.
Quoted 5 lines
Quoted 3 lines
So this either gets cleaned up properly, with the legacy hacks/wrappers clearly isolated, or we could state that you shouldn't build 64-bit headers in 32-bit environments.
Should the
sigcontext32.hhave some 32bit ifdefs maybe?
That gets ugly pretty fast.
Quoted 2 lines
I assume that the exported header files should be the same for both 64 and 32 bit i386/x86
Yes. I have written a small series cleaning up all these header problems - I'll send it out in a few minutes.
Thanks,
Ingo
PATCH v3 95/98 HACK: fix include/uapi/xen/privcmd.h compilation in userspace
In reply to Mikko Rapeliprivcmd.h depends on xen/interface/xen.h which is now exported to userspace. xen/interface/xen.h then depends on asm/xen/interface.h which is now exported to userspace together with its dependencies asm/xen/interface_32.h, asm/xen/interface_64.h and asm/pvclock-abi.h on x86 architecture.
Then all of these headers were fixed to use __u8 etc from linux/types.h instead of custom types.
Then define uint64_t and uint32_t if needed.
After all these changes these header files now compile in userspace too on x86.
HACK since I have no idea if this is correct way to fix this.
--- arch/x86/include/asm/pvclock-abi.h | 41 +- arch/x86/include/asm/xen/interface.h | 185 +------ arch/x86/include/asm/xen/interface_32.h | 98 +--- arch/x86/include/asm/xen/interface_64.h | 144 +---- arch/x86/include/uapi/asm/Kbuild | 2 + arch/x86/include/uapi/asm/pvclock-abi.h | 47 ++ arch/x86/include/uapi/asm/xen/Kbuild | 5 + arch/x86/include/uapi/asm/xen/interface.h | 198 +++++++ arch/x86/include/uapi/asm/xen/interface_32.h | 103 ++++ arch/x86/include/uapi/asm/xen/interface_64.h | 150 ++++++ include/uapi/xen/Kbuild | 1 + include/uapi/xen/interface/Kbuild | 2 + include/uapi/xen/interface/xen.h | 759 +++++++++++++++++++++++++++ include/xen/interface/xen.h | 754 +------------------------- 14 files changed, 1272 insertions(+), 1217 deletions(-) create mode 100644 arch/x86/include/uapi/asm/pvclock-abi.h create mode 100644 arch/x86/include/uapi/asm/xen/Kbuild create mode 100644 arch/x86/include/uapi/asm/xen/interface.h create mode 100644 arch/x86/include/uapi/asm/xen/interface_32.h create mode 100644 arch/x86/include/uapi/asm/xen/interface_64.h create mode 100644 include/uapi/xen/interface/Kbuild create mode 100644 include/uapi/xen/interface/xen.h
arch/x86/include/asm/pvclock-abi.h +1 -40
@@ -1,45 +1,6 @@#ifndef _ASM_X86_PVCLOCK_ABI_H#define _ASM_X86_PVCLOCK_ABI_H -#ifndef __ASSEMBLY__ -/* -* These structs MUST NOT be changed. -* They are the ABI between hypervisor and guest OS. -* Both Xen and KVM are using this. -* -* pvclock_vcpu_time_info holds the system time and the tsc timestamp -* of the last update. So the guest can use the tsc delta to get a -* more precise system time. There is one per virtual cpu. -* -* pvclock_wall_clock references the point in time when the system -* time was zero (usually boot time), thus the guest calculates the -* current wall clock by adding the system time. -* -* Protocol for the "version" fields is: hypervisor raises it (making -* it uneven) before it starts updating the fields and raises it again -* (making it even) when it is done. Thus the guest can make sure the -* time values it got are consistent by checking the version before -* and after reading them. -*/ +#include <uapi/asm/pvclock-abi.h> -struct pvclock_vcpu_time_info { -u32 version; -u32 pad0; -u64 tsc_timestamp; -u64 system_time; -u32 tsc_to_system_mul; -s8 tsc_shift; -u8 flags; -u8 pad[2 ]; -} __attribute__((__packed__ ));/* 32 bytes */ - -struct pvclock_wall_clock { -u32 version; -u32 sec; -u32 nsec; -} __attribute__((__packed__ )); - -#define PVCLOCK_TSC_STABLE_BIT (1 << 0) -#define PVCLOCK_GUEST_STOPPED (1 << 1) -#endif /* __ASSEMBLY__ */ #endif /* _ASM_X86_PVCLOCK_ABI_H */
arch/x86/include/asm/xen/interface.h +1 -184
190 lines not on this page · raw message
arch/x86/include/asm/xen/interface_32.h +1 -97
103 lines not on this page · raw message
arch/x86/include/asm/xen/interface_64.h +1 -143
149 lines not on this page · raw message
arch/x86/include/uapi/asm/Kbuild +2 -0
@@ -41,6 +41,7 @@ header-y += prctl.h header-y += processor-flags.h header-y += ptrace-abi.h header-y += ptrace.h +header-y += pvclock-abi.h header-y += resource.h header-y += sembuf.h header-y += setup.h
@@ -63,3 +64,4 @@ header-y += unistd.h header-y += vm86.h header-y += vmx.h header-y += vsyscall.h +header-y += xen/
arch/x86/include/uapi/asm/pvclock-abi.h new file +47 -0
47 lines not on this page · raw message
arch/x86/include/uapi/asm/xen/Kbuild new file +5 -0
@@ -0,0 +1,5 @@ +# UAPI Header export list + +header-y += interface.h +header-y += interface_32.h +header-y += interface_64.h
arch/x86/include/uapi/asm/xen/interface.h new file +198 -0
198 lines not on this page · raw message
arch/x86/include/uapi/asm/xen/interface_32.h new file +103 -0
103 lines not on this page · raw message
arch/x86/include/uapi/asm/xen/interface_64.h new file +150 -0
150 lines not on this page · raw message
include/uapi/xen/Kbuild +1 -0
@@ -1,4 +1,5 @@ # UAPI Header export list +header-y += interface/ header-y += evtchn.h header-y += gntalloc.h header-y += gntdev.h
include/uapi/xen/interface/Kbuild new file +2 -0
@@ -0,0 +1,2 @@ +# UAPI Header export list +header-y += xen.h
include/uapi/xen/interface/xen.h new file +759 -0
759 lines not on this page · raw message
include/xen/interface/xen.h +1 -753
759 lines not on this page · raw message
Signature · 1 line
2.1.4
Re: [Xen-devel] [PATCH 95/98] HACK: fix include/uapi/xen/privcmd.h compilation in userspace
Quoted 8 lines · Mikko Rapeli
privcmd.hdepends onxen/interface/xen.hwhich is now exported to userspace.xen/interface/xen.hthen depends onasm/xen/interface.hwhich is now exported to userspace together with its dependenciesasm/xen/interface_32.h,asm/xen/interface_64.handasm/pvclock-abi.hon x86 architecture.Then all of these headers were fixed to use
__u8etc fromlinux/types.hinstead of custom types.
Quoted 8 lines
Then define
uint64_tanduint32_tif needed.After all these changes these header files now compile in userspace too on x86.
HACK since I have no idea if this is correct way to fix this.
Signed-off-by Mikko Rapeli <[email protected]>
Historical reasons expect xen/interface/xen.h to be a verbatim copy of the master version kept in the Xen repository.
The only things privcmd.h need from interface/xen.h are domid_t (uint16_t), and xen_pfn_t (unsigned long, or uint64_t in arm32 iirc), while the majority of the rest absolutely shouldn't be in Linux’s uapi.
It would probably be best to provide just these two types and nuke the "#include <xen/interface/xen.h>". Any user of privcmd needs to include the Xen interface themselves anyway, and will have a different copy which includes the toolstack half of the interface (missing from the kernel copy) which is the useful set of definitions for driving the privcmd ioctl()s.
~Andrew
Re: [Xen-devel] [PATCH 95/98] HACK: fix include/uapi/xen/privcmd.h compilation in userspace
Quoted 25 lines · Andrew Cooper
Quoted 8 lines · Mikko Rapeli
privcmd.hdepends onxen/interface/xen.hwhich is now exported to userspace.xen/interface/xen.hthen depends onasm/xen/interface.hwhich is now exported to userspace together with its dependenciesasm/xen/interface_32.h,asm/xen/interface_64.handasm/pvclock-abi.hon x86 architecture.Then all of these headers were fixed to use
__u8etc fromlinux/types.hinstead of custom types.Quoted 8 lines
Then define
uint64_tanduint32_tif needed.After all these changes these header files now compile in userspace too on x86.
HACK since I have no idea if this is correct way to fix this.
Signed-off-by Mikko Rapeli <[email protected]>Historical reasons expect
xen/interface/xen.hto be a verbatim copy of the master version kept in the Xen repository.The only things
privcmd.hneed frominterface/xen.haredomid_t(uint16_t), andxen_pfn_t(unsigned long, oruint64_tin arm32 iirc), while the majority of the rest absolutely shouldn't be in Linux’s uapi.
Quoted 6 lines
It would probably be best to provide just these two types and nuke the "#include <
xen/interface/xen.h>". Any user of privcmd needs to include the Xen interface themselves anyway, and will have a different copy which includes the toolstack half of the interface (missing from the kernel copy) which is the useful set of definitions for driving the privcmd ioctl()s.
Thanks! Doing this in the next series of the patches.
-Mikko
Re: [PATCH 95/98] HACK: fix include/uapi/xen/privcmd.h compilation in userspace
In reply to Andrew CooperQuoted 25 lines · Andrew Cooper
Quoted 8 lines · Mikko Rapeli
privcmd.hdepends onxen/interface/xen.hwhich is now exported to userspace.xen/interface/xen.hthen depends onasm/xen/interface.hwhich is now exported to userspace together with its dependenciesasm/xen/interface_32.h,asm/xen/interface_64.handasm/pvclock-abi.hon x86 architecture.Then all of these headers were fixed to use
__u8etc fromlinux/types.hinstead of custom types.Quoted 8 lines
Then define
uint64_tanduint32_tif needed.After all these changes these header files now compile in userspace too on x86.
HACK since I have no idea if this is correct way to fix this.
Signed-off-by Mikko Rapeli <[email protected]>Historical reasons expect
xen/interface/xen.hto be a verbatim copy of the master version kept in the Xen repository.The only things
privcmd.hneed frominterface/xen.haredomid_t(uint16_t), andxen_pfn_t(unsigned long, oruint64_tin arm32 iirc), while the majority of the rest absolutely shouldn't be in Linux’s uapi.
Quoted 6 lines
It would probably be best to provide just these two types and nuke the "#include <
xen/interface/xen.h>". Any user of privcmd needs to include the Xen interface themselves anyway, and will have a different copy which includes the toolstack half of the interface (missing from the kernel copy) which is the useful set of definitions for driving the privcmd ioctl()s.
Thanks! Doing this in the next series of the patches.
-Mikko
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Re: [PATCH 95/98] HACK: fix include/uapi/xen/privcmd.h compilation in userspace
In reply to Mikko RapeliQuoted 8 lines · Mikko Rapeli
privcmd.hdepends onxen/interface/xen.hwhich is now exported to userspace.xen/interface/xen.hthen depends onasm/xen/interface.hwhich is now exported to userspace together with its dependenciesasm/xen/interface_32.h,asm/xen/interface_64.handasm/pvclock-abi.hon x86 architecture.Then all of these headers were fixed to use
__u8etc fromlinux/types.hinstead of custom types.
Quoted 8 lines
Then define
uint64_tanduint32_tif needed.After all these changes these header files now compile in userspace too on x86.
HACK since I have no idea if this is correct way to fix this.
Signed-off-by Mikko Rapeli <[email protected]>
Historical reasons expect xen/interface/xen.h to be a verbatim copy of the master version kept in the Xen repository.
The only things privcmd.h need from interface/xen.h are domid_t (uint16_t), and xen_pfn_t (unsigned long, or uint64_t in arm32 iirc), while the majority of the rest absolutely shouldn't be in Linux’s uapi.
It would probably be best to provide just these two types and nuke the "#include <xen/interface/xen.h>". Any user of privcmd needs to include the Xen interface themselves anyway, and will have a different copy which includes the toolstack half of the interface (missing from the kernel copy) which is the useful set of definitions for driving the privcmd ioctl()s.
~Andrew
PATCH v3 95/98 HACK: fix include/uapi/xen/privcmd.h compilation in userspace
In reply to Mikko Rapeliprivcmd.h depends on xen/interface/xen.h which is now exported to userspace. xen/interface/xen.h then depends on asm/xen/interface.h which is now exported to userspace together with its dependencies asm/xen/interface_32.h, asm/xen/interface_64.h and asm/pvclock-abi.h on x86 architecture.
Then all of these headers were fixed to use __u8 etc from linux/types.h instead of custom types.
Then define uint64_t and uint32_t if needed.
After all these changes these header files now compile in userspace too on x86.
HACK since I have no idea if this is correct way to fix this.
--- arch/x86/include/asm/pvclock-abi.h | 41 +- arch/x86/include/asm/xen/interface.h | 185 +------ arch/x86/include/asm/xen/interface_32.h | 98 +--- arch/x86/include/asm/xen/interface_64.h | 144 +---- arch/x86/include/uapi/asm/Kbuild | 2 + arch/x86/include/uapi/asm/pvclock-abi.h | 47 ++ arch/x86/include/uapi/asm/xen/Kbuild | 5 + arch/x86/include/uapi/asm/xen/interface.h | 198 +++++++ arch/x86/include/uapi/asm/xen/interface_32.h | 103 ++++ arch/x86/include/uapi/asm/xen/interface_64.h | 150 ++++++ include/uapi/xen/Kbuild | 1 + include/uapi/xen/interface/Kbuild | 2 + include/uapi/xen/interface/xen.h | 759 +++++++++++++++++++++++++++ include/xen/interface/xen.h | 754 +------------------------- 14 files changed, 1272 insertions(+), 1217 deletions(-) create mode 100644 arch/x86/include/uapi/asm/pvclock-abi.h create mode 100644 arch/x86/include/uapi/asm/xen/Kbuild create mode 100644 arch/x86/include/uapi/asm/xen/interface.h create mode 100644 arch/x86/include/uapi/asm/xen/interface_32.h create mode 100644 arch/x86/include/uapi/asm/xen/interface_64.h create mode 100644 include/uapi/xen/interface/Kbuild create mode 100644 include/uapi/xen/interface/xen.h
arch/x86/include/asm/pvclock-abi.h +1 -40
@@ -1,45 +1,6 @@#ifndef _ASM_X86_PVCLOCK_ABI_H#define _ASM_X86_PVCLOCK_ABI_H -#ifndef __ASSEMBLY__ -/* -* These structs MUST NOT be changed. -* They are the ABI between hypervisor and guest OS. -* Both Xen and KVM are using this. -* -* pvclock_vcpu_time_info holds the system time and the tsc timestamp -* of the last update. So the guest can use the tsc delta to get a -* more precise system time. There is one per virtual cpu. -* -* pvclock_wall_clock references the point in time when the system -* time was zero (usually boot time), thus the guest calculates the -* current wall clock by adding the system time. -* -* Protocol for the "version" fields is: hypervisor raises it (making -* it uneven) before it starts updating the fields and raises it again -* (making it even) when it is done. Thus the guest can make sure the -* time values it got are consistent by checking the version before -* and after reading them. -*/ +#include <uapi/asm/pvclock-abi.h> -struct pvclock_vcpu_time_info { -u32 version; -u32 pad0; -u64 tsc_timestamp; -u64 system_time; -u32 tsc_to_system_mul; -s8 tsc_shift; -u8 flags; -u8 pad[2 ]; -} __attribute__((__packed__ ));/* 32 bytes */ - -struct pvclock_wall_clock { -u32 version; -u32 sec; -u32 nsec; -} __attribute__((__packed__ )); - -#define PVCLOCK_TSC_STABLE_BIT (1 << 0) -#define PVCLOCK_GUEST_STOPPED (1 << 1) -#endif /* __ASSEMBLY__ */ #endif /* _ASM_X86_PVCLOCK_ABI_H */
arch/x86/include/asm/xen/interface.h +1 -184
190 lines not on this page · raw message
arch/x86/include/asm/xen/interface_32.h +1 -97
103 lines not on this page · raw message
arch/x86/include/asm/xen/interface_64.h +1 -143
149 lines not on this page · raw message
arch/x86/include/uapi/asm/Kbuild +2 -0
@@ -41,6 +41,7 @@ header-y += prctl.h header-y += processor-flags.h header-y += ptrace-abi.h header-y += ptrace.h +header-y += pvclock-abi.h header-y += resource.h header-y += sembuf.h header-y += setup.h
@@ -63,3 +64,4 @@ header-y += unistd.h header-y += vm86.h header-y += vmx.h header-y += vsyscall.h +header-y += xen/
arch/x86/include/uapi/asm/pvclock-abi.h new file +47 -0
47 lines not on this page · raw message
arch/x86/include/uapi/asm/xen/Kbuild new file +5 -0
@@ -0,0 +1,5 @@ +# UAPI Header export list + +header-y += interface.h +header-y += interface_32.h +header-y += interface_64.h
arch/x86/include/uapi/asm/xen/interface.h new file +198 -0
198 lines not on this page · raw message
arch/x86/include/uapi/asm/xen/interface_32.h new file +103 -0
103 lines not on this page · raw message
arch/x86/include/uapi/asm/xen/interface_64.h new file +150 -0
150 lines not on this page · raw message
include/uapi/xen/Kbuild +1 -0
@@ -1,4 +1,5 @@ # UAPI Header export list +header-y += interface/ header-y += evtchn.h header-y += gntalloc.h header-y += gntdev.h
include/uapi/xen/interface/Kbuild new file +2 -0
@@ -0,0 +1,2 @@ +# UAPI Header export list +header-y += xen.h
include/uapi/xen/interface/xen.h new file +759 -0
759 lines not on this page · raw message
include/xen/interface/xen.h +1 -753
759 lines not on this page · raw message
Signature · 1 line
2.1.4
PATCH v3 96/98 HACK include/uapi/linux/coda_psdev.h: fix compilation in userspace
In reply to Mikko RapeliInclude linux/coda.h for caddr_t and use unsigned short type directly. Userspace headers do not have list_head and wait_queue_head_t so just ifdef them away which is a HACK. Any ideas how to fix this properly?
--- include/uapi/linux/coda_psdev.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
include/uapi/linux/coda_psdev.h +9 -4
@@ -2,6 +2,7 @@#define _UAPI__CODA_PSDEV_H#include <linux/magic.h> +#include <linux/coda.h> #define CODA_PSDEV_MAJOR 67#define MAX_CODADEVS 5/* how many do we allow */
@@ -9,14 +10,18 @@/* messages between coda filesystem in kernel and Venus */ struct upc_req { +#ifdef __KERNEL__struct list_head uc_chain; +#endif /* __KERNEL__ */ caddr_t uc_data; -u_short uc_flags; -u_short uc_inSize;/* Size is at most 5000 bytes */ -u_short uc_outSize; -u_short uc_opcode;/* copied from data to save lookup */ +unsigned short uc_flags; +unsigned short uc_inSize;/* Size is at most 5000 bytes */ +unsigned short uc_outSize; +unsigned short uc_opcode;/* copied from data to save lookup */ int uc_unique; +#ifdef __KERNEL__wait_queue_head_t uc_sleep;/* process' wait queue */ +#endif /* __KERNEL__ */ };#define CODA_REQ_ASYNC 0x1
Signature · 1 line
2.1.4
Jan Harkes
maintainerRe: [PATCH 96/98] HACK include/uapi/linux/coda_psdev.h: fix compilation in userspace
Quoted 3 lines · Mikko Rapeli
Include
linux/coda.hforcaddr_tand use unsigned short type directly. Userspace headers do not havelist_headandwait_queue_head_tso just ifdef them away which is a HACK. Any ideas how to fix this properly?
I grepped the Coda userspace sources and it doesn't look like this particular struct is used there anyway, it is only used by the kernel module to track which requests are waiting to be read by the Coda userspace application and after that which requests are waiting for a response.
I guess a proper fix would be to move this struct to a non-uapi header, or maybe even to the (probably) only C file in the kernel where it is used.
Jan
Re: [PATCH 96/98] HACK include/uapi/linux/coda_psdev.h: fix compilation in userspace
Quoted 11 lines · Jan Harkes
Quoted 3 lines · Mikko Rapeli
Include
linux/coda.hforcaddr_tand use unsigned short type directly. Userspace headers do not havelist_headandwait_queue_head_tso just ifdef them away which is a HACK. Any ideas how to fix this properly?I grepped the Coda userspace sources and it doesn't look like this particular struct is used there anyway, it is only used by the kernel module to track which requests are waiting to be read by the Coda userspace application and after that which requests are waiting for a response.
Quoted 3 lines
I guess a proper fix would be to move this struct to a non-uapi header, or maybe even to the (probably) only C file in the kernel where it is used.
Thanks! I'm moving upc_req definition to kernel side linux/coda_psdev.h in the next version of the patches.
-Mikko
PATCH v3 97/98 HACK include/uapi/linux/elfcore.h: use __kernel_pid_t and remove elf_greg_t stuff in userspace
In reply to Mikko Rapeli__kernel_pid_t change feels like right one. Commenting out elf_greg_t things in userspace does not but exporting x86/include/asm/elf.h and its dependencies to userspace does not feel right either. Hence HACK.
Fixes userspace compilation errors like:
error: unknown type name ‘elf_greg_t’
typedef elf_greg_t greg_t;
error: unknown type name ‘pid_t’
pid_t pr_pid;
--- include/uapi/linux/elfcore.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
include/uapi/linux/elfcore.h +9 -5
@@ -17,11 +17,13 @@ struct elf_siginfo#ifndef __KERNEL__ +#if 0 typedef elf_greg_t greg_t ;typedef elf_gregset_t gregset_t ;typedef elf_fpregset_t fpregset_t ;typedef elf_fpxregset_t fpxregset_t ;#define NGREG ELF_NGREG +#endif /* 0 */ #endif /*
@@ -48,10 +50,10 @@ struct elf_prstatusstruct sigaltstack pr_altstack;/* Alternate stack info */ struct sigaction pr_action;/* Signal action for current sig */ #endif -pid_t pr_pid; -pid_t pr_ppid; -pid_t pr_pgrp; -pid_t pr_sid; +__kernel_pid_t pr_pid; +__kernel_pid_t pr_ppid; +__kernel_pid_t pr_pgrp; +__kernel_pid_t pr_sid;struct timeval pr_utime;/* User time */ struct timeval pr_stime;/* System time */ struct timeval pr_cutime;/* Cumulative user time */
@@ -59,7 +61,9 @@ struct elf_prstatus#if 0 long pr_instr;/* Current instruction */ #endif +#ifdef __KERNEL__elf_gregset_t pr_reg;/* GP registers */ +#endif /* __KERNEL__ */ #ifdef CONFIG_BINFMT_ELF_FDPIC /* When using FDPIC, the loadmap addresses need to be communicated * to GDB in order for GDB to do the necessary relocations. The
@@ -84,7 +88,7 @@ struct elf_prpsinfounsigned long pr_flag;/* flags */ __kernel_uid_t pr_uid;__kernel_gid_t pr_gid; -pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid; +__kernel_pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid;/* Lots missing */ char pr_fname[16 ];/* filename of executable */ char pr_psargs[ELF_PRARGSZ ];/* initial part of arg list */
Signature · 1 line
2.1.4
Re: [PATCH 97/98] HACK include/uapi/linux/elfcore.h: use __kernel_pid_t and remove elf_greg_t stuff in userspace
Trying to find out what would be an acceptable fix for elfcore.h but..
Quoted 10 lines · Mikko Rapeli
__kernel_pid_tchange feels like right one. Commenting outelf_greg_tthings in userspace does not but exportingx86/include/asm/elf.hand its dependencies to userspace does not feel right either. Hence HACK.Fixes userspace compilation errors like:
error: unknown type name ‘elf_greg_t’
typedefelf_greg_tgreg_t;
error: unknown type name ‘pid_t’
pid_tpr_pid;
Ugh. This opens up a can of worms. And not just a single can. Every architecture supported by Linux has one, for every supported binary format.
So uapi has a number of headers for exporting process core dump related structs and defines to userspace. Sadly elfcore.h does not compile in userspace as is and practically depends on architecture specific defines for the elf file format and all the way done to some memory management details which are not part of uapi.
Since the headers are not exported to userspace, a grep with elf_greg_t definition in my /usr/include shows that gcc has its own modified version of these headers which have the details which gdb needs, in sys/procfs.h, sys/user.h and friends. Also linux-tools has it's own modified versions of these headers with comments like
"Make sure these layouts match the linux/elfcore.h native definitions."
Search on Debian source code tree shows that real users of linux/elfcore.h don't really exist and everyone has had to create their own copies with all relevant dependencies to make things work in user space.
On the long term would be nice if these header file worm cans were cleaned up but for the short term I'd like to get elfcore.h compiling so that I can continue fiddling with kernel header sanity tests and API and ABI compatibility checks. For this reason I'd like to propose this dumb solution for now which:
* removes typedef elf_greg_t greg_t and friends from userspace headers
* removes struct elf_prstatus from userspace headers
Comments?
include/uapi/linux/elfcore.h +7 -14
@@ -15,15 +15,7 @@ struct elf_siginfoint si_errno;/* errno */ }; - -#ifndef __KERNEL__ -typedef elf_greg_t greg_t ; -typedef elf_gregset_t gregset_t ; -typedef elf_fpregset_t fpregset_t ; -typedef elf_fpxregset_t fpxregset_t ; -#define NGREG ELF_NGREG -#endif - +#ifdef __KERNEL__/* * Definitions to generate Intel SVR4-like core files. * These mostly have the same names as the SVR4 types with "elf_"
@@ -48,10 +40,10 @@ struct elf_prstatusstruct sigaltstack pr_altstack;/* Alternate stack info */ struct sigaction pr_action;/* Signal action for current sig */ #endif -pid_t pr_pid; -pid_t pr_ppid; -pid_t pr_pgrp; -pid_t pr_sid; +__kernel_pid_t pr_pid; +__kernel_pid_t pr_ppid; +__kernel_pid_t pr_pgrp; +__kernel_pid_t pr_sid;struct timeval pr_utime;/* User time */ struct timeval pr_stime;/* System time */ struct timeval pr_cutime;/* Cumulative user time */
@@ -72,6 +64,7 @@ struct elf_prstatus#endif int pr_fpvalid; /* True if math co-processor being used. */ }; +#endif /* __KERNEL__ */ #define ELF_PRARGSZ (80)/* Number of chars for args */
@@ -84,7 +77,7 @@ struct elf_prpsinfounsigned long pr_flag;/* flags */ __kernel_uid_t pr_uid;__kernel_gid_t pr_gid; -pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid; +__kernel_pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid;/* Lots missing */ char pr_fname[16 ];/* filename of executable */ char pr_psargs[ELF_PRARGSZ ];/* initial part of arg list */
Quoted 59 lines
Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/linux/elfcore.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)include/uapi/linux/elfcore.h +9
-5@@ -17,11 +17,13 @@ struct elf_siginfo#ifndef __KERNEL__ +#if 0 typedef elf_greg_t greg_t ;typedef elf_gregset_t gregset_t ;typedef elf_fpregset_t fpregset_t ;typedef elf_fpxregset_t fpxregset_t ;#define NGREG ELF_NGREG +#endif /* 0 */ #endif /* @@ -48,10 +50,10 @@ struct elf_prstatusstruct sigaltstack pr_altstack;/* Alternate stack info */ struct sigaction pr_action;/* Signal action for current sig */ #endif -pid_t pr_pid; -pid_t pr_ppid; -pid_t pr_pgrp; -pid_t pr_sid; +__kernel_pid_t pr_pid; +__kernel_pid_t pr_ppid; +__kernel_pid_t pr_pgrp; +__kernel_pid_t pr_sid;struct timeval pr_utime;/* User time */ struct timeval pr_stime;/* System time */ struct timeval pr_cutime;/* Cumulative user time */ @@ -59,7 +61,9 @@ struct elf_prstatus#if 0 long pr_instr;/* Current instruction */ #endif +#ifdef __KERNEL__elf_gregset_t pr_reg;/* GP registers */ +#endif /* __KERNEL__ */ #ifdef CONFIG_BINFMT_ELF_FDPIC /* When using FDPIC, the loadmap addresses need to be communicated * to GDB in order for GDB to do the necessary relocations. The @@ -84,7 +88,7 @@ struct elf_prpsinfounsigned long pr_flag;/* flags */ __kernel_uid_t pr_uid;__kernel_gid_t pr_gid; -pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid; +__kernel_pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid;/* Lots missing */ char pr_fname[16 ];/* filename of executable */ char pr_psargs[ELF_PRARGSZ ];/* initial part of arg list */ Signature · 1 line
2.1.4
PATCH v3 98/98 HACK include/uapi/linux/errqueue.h: include time.h in userspace
In reply to Mikko Rapelilinux/time.h conflicts with userspace header time.h. Try to be compatible for kernel and userspace.
--- include/uapi/linux/errqueue.h | 5 +++++ 1 file changed, 5 insertions(+)
include/uapi/linux/errqueue.h +5 -0
@@ -2,7 +2,12 @@#define _UAPI_LINUX_ERRQUEUE_H#include <linux/types.h> + +#ifdef __KERNEL__#include <linux/time.h> +#else +#include <time.h> +#endif /* __KERNEL__ */ struct sock_extended_err {__u32 ee_errno;
Signature · 1 line
2.1.4
Re: [PATCH 98/98] HACK include/uapi/linux/errqueue.h: include time.h in userspace
Hi,
Quoted 2 lines · Mikko Rapeli
linux/time.hconflicts with userspace headertime.h. Try to be compatible for kernel and userspace.
Any comments about this change? I assume the <linux/time.h> and <time.h> incompatibility in userspace is a known thing and the resulting definitions are compatible.
-Mikko
Quoted 25 lines
Signed-off-by Mikko Rapeli <[email protected]>--- include/uapi/linux/errqueue.h | 5 +++++ 1 file changed, 5 insertions(+)include/uapi/linux/errqueue.h +5
-0@@ -2,7 +2,12 @@#define _UAPI_LINUX_ERRQUEUE_H#include <linux/types.h> + +#ifdef __KERNEL__#include <linux/time.h> +#else +#include <time.h> +#endif /* __KERNEL__ */ struct sock_extended_err {__u32 ee_errno;Signature · 1 line
2.1.4
Quoted 11 lines · Mikko Rapeli
v3:
tried to fix all v2 review findings
tried to guess how to fix a few more issue
with a few hacks, 0 files fail and 760 files pass the compile test on 32bit x86v2:
https://lkml.org/lkml/2015/2/16/521
added cross compiler support withCROSS_COMPILE,
detecting libc and GCC headers from compiler,
more header file fixes
Quoted 6 lines
v1:
https://lkml.org/lkml/2014/8/21/665Users of kernel header files would be happier if they did not contain kernel specific parts and would contain #include statements for all other header files that they depend on, and in general would compile.
Maybe this is a stupid question, but does that mean that many of our uapi headers never worked as expected and don't build at all?
Signature · 2 lines
Thanks, //richard
Quoted 15 lines · Richard Weinberger
Quoted 14 lines · Mikko Rapeli
v3:
tried to fix all v2 review findings
tried to guess how to fix a few more issue
with a few hacks, 0 files fail and 760 files pass the compile test on 32bit x86v2:
https://lkml.org/lkml/2015/2/16/521
added cross compiler support withCROSS_COMPILE,
detecting libc and GCC headers from compiler,
more header file fixes
Quoted 6 lines
Quoted 3 lines
Users of kernel header files would be happier if they did not contain kernel specific parts and would contain #include statements for all other header files that they depend on, and in general would compile.
Maybe this is a stupid question, but does that mean that many of our uapi headers never worked as expected and don't build at all?
Yes. Many uapi headers do not compile in userspace and users of those headers need to either copy stuff out or do other tricks when including them. See patch nr 0002 for stats, or https://lkml.org/lkml/2015/5/30/98
-Mikko