Split "general" into a few different modules. (#65)

Split out "net", "io_uring", "prctl", and "system" modules from the
main "general" module. More splitting is possible; this is a starting
point.

Author: sunfishcode

Cargo.toml

@@ -28,8 +28,12 @@ targets = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"]
 [features]
 errno = []
 general = []
+io_uring = []
 ioctl = []
+net = []
 netlink = []
+prctl = []
+system = []
 default = ["std", "general", "errno"]
 std = []
 no_std = []

gen/modules/general.h

@@ -13,32 +13,21 @@
 #include <linux/fcntl.h>
 #include <linux/fs.h>
 #include <linux/futex.h>
-#include <linux/in.h>
 #include <linux/inotify.h>
-#include <linux/ip.h>
-#include <linux/in6.h>
-#include <linux/ipv6.h>
 #include <linux/limits.h>
 #include <linux/magic.h>
 #include <linux/mman.h>
-#include <linux/net.h>
 #include <linux/poll.h>
-#include <linux/prctl.h>
 #include <linux/random.h>
 #include <linux/resource.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
-#include <linux/socket.h>
 #include <linux/stat.h>
-#include <linux/sysinfo.h>
-#include <linux/tcp.h>
 #include <linux/termios.h>
 #include <linux/time.h>
 #include <linux/types.h>
 #include <linux/uio.h>
-#include <linux/un.h>
 #include <linux/unistd.h>
-#include <linux/utsname.h>
 #include <linux/wait.h>
 #include <linux/xattr.h>
 
@@ -62,47 +51,6 @@
 #include <linux/userfaultfd.h>
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0)
-#include <linux/io_uring.h>
-#endif
-
-// Miscellaneous definitions which don't appear to be defined in Linux's public
-// headers, but which are nonetheless part of the ABI, and necessary for
-// interoperability.
-//
-// When adding definitions here, please only include content needed for
-// interoperability with Linux's public ABI, and please only include types
-// and constants.
-//
-// In particular, please don't copy comments from other sources. And please
-// don't include any functions or function-style macros, as bindgen isn't
-// able to generate bindings for them.
-//
-// Also, please be aware that libc implementations (and thus the Rust libc
-// crate as well) sometimes define types and constants with similar names but
-// which are ABI-incompatible with the Linux kernel ABI. This file should
-// only describe the kernel ABI.
-
-struct sockaddr {
-    struct __kernel_sockaddr_storage __storage;
-};
-#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,32)
-typedef uint16_t __kernel_sa_family_t;
-#endif
-
-struct linger {
-    int l_onoff;
-    int l_linger;
-};
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(4,4,0)
-typedef long long __kernel_time64_t;
-struct __kernel_timespec {
-    __kernel_time64_t tv_sec;
-    long long         tv_nsec;
-};
-#endif
-
 #define DT_UNKNOWN 0
 #define DT_FIFO    1
 #define DT_CHR     2
@@ -112,13 +60,6 @@ struct __kernel_timespec {
 #define DT_LNK    10
 #define DT_SOCK   12
 
-#define WEXITSTATUS(status) (((status) & 0xff00) >> 8)
-#define WIFEXITED(status)   (((status) & 0x7f) == 0)
-
-#define SHUT_RD   0
-#define SHUT_WR   1
-#define SHUT_RDWR 2
-
 struct linux_dirent64 {
     __UINT64_TYPE__ d_ino;
     __INT64_TYPE__  d_off;
@@ -127,8 +68,6 @@ struct linux_dirent64 {
     char            d_name[];
 };
 
-typedef __UINT32_TYPE__ socklen_t;
-
 // Obtain the definitions of structs stat/stat64 and statfs/statfs64.
 #include <asm/stat.h>
 #include <asm/statfs.h>
@@ -143,17 +82,6 @@ typedef long __fsword_t;
 typedef __statfs_word __fsword_t;
 #endif
 
-#if defined(__mips__) || defined(__mips64__)
-#define SOCK_STREAM    2
-#define SOCK_DGRAM     1
-#else
-#define SOCK_STREAM    1
-#define SOCK_DGRAM     2
-#endif
-#define SOCK_RAW       3
-#define SOCK_RDM       4
-#define SOCK_SEQPACKET 5
-
 #define F_OK 0
 #define R_OK 4
 #define W_OK 2
@@ -162,62 +90,37 @@ typedef __statfs_word __fsword_t;
 #define UTIME_NOW 0x3fffffff
 #define UTIME_OMIT 0x3ffffffe
 
-#define MSG_DONTWAIT 0x40
-
-#define AF_UNSPEC     0
-#define AF_UNIX       1
-#define AF_INET       2
-#define AF_AX25       3
-#define AF_IPX        4
-#define AF_APPLETALK  5
-#define AF_NETROM     6
-#define AF_BRIDGE     7
-#define AF_ATMPVC     8
-#define AF_X25        9
-#define AF_INET6      10
-#define AF_ROSE       11
-#define AF_DECnet     12
-#define AF_NETBEUI    13
-#define AF_SECURITY   14
-#define AF_KEY        15
-#define AF_NETLINK    16
-#define AF_PACKET     17
-#define AF_ASH        18
-#define AF_ECONET     19
-#define AF_ATMSVC     20
-#define AF_RDS        21
-#define AF_SNA        22
-#define AF_IRDA       23
-#define AF_PPPOX      24
-#define AF_WANPIPE    25
-#define AF_LLC        26
-#define AF_CAN        29
-#define AF_TIPC       30
-#define AF_BLUETOOTH  31
-#define AF_IUCV       32
-#define AF_RXRPC      33
-#define AF_ISDN       34
-#define AF_PHONET     35
-#define AF_IEEE802154 36
-#define AF_MAX        37
-
-#define MSG_OOB          0x1
-#define MSG_PEEK         0x2
-#define MSG_DONTROUTE    0x4
-#define MSG_CTRUNC       0x8
-#define MSG_PROBE        0x10
-#define MSG_TRUNC        0x20
-#define MSG_DONTWAIT     0x40
-#define MSG_EOR          0x80
-#define MSG_WAITALL      0x100
-#define MSG_FIN          0x200
-#define MSG_SYN          0x400
-#define MSG_CONFIRM      0x800
-#define MSG_RST          0x1000
-#define MSG_ERRQUEUE     0x2000
-#define MSG_NOSIGNAL     0x4000
-#define MSG_MORE         0x8000
-#define MSG_CMSG_CLOEXEC 0x40000000
+#define MNT_FORCE       0x1
+#define MNT_DETACH      0x2
+#define MNT_EXPIRE      0x4
+#define UMOUNT_NOFOLLOW 0x8
+#define UMOUNT_UNUSED   0x80000000// Miscellaneous definitions which don't appear to be defined in Linux's public
+// headers, but which are nonetheless part of the ABI, and necessary for
+// interoperability.
+//
+// When adding definitions here, please only include content needed for
+// interoperability with Linux's public ABI, and please only include types
+// and constants.
+//
+// In particular, please don't copy comments from other sources. And please
+// don't include any functions or function-style macros, as bindgen isn't
+// able to generate bindings for them.
+//
+// Also, please be aware that libc implementations (and thus the Rust libc
+// crate as well) sometimes define types and constants with similar names but
+// which are ABI-incompatible with the Linux kernel ABI. This file should
+// only describe the kernel ABI.
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(4,4,0)
+typedef long long __kernel_time64_t;
+struct __kernel_timespec {
+    __kernel_time64_t tv_sec;
+    long long         tv_nsec;
+};
+#endif
+
+#define WEXITSTATUS(status) (((status) & 0xff00) >> 8)
+#define WIFEXITED(status)   (((status) & 0x7f) == 0)
 
 #define STDIN_FILENO  0
 #define STDOUT_FILENO 1
@@ -293,38 +196,6 @@ struct user_desc {
 #define ARCH_SET_FS 0x1002
 #endif
 
-struct msghdr {
-    void         *msg_name;
-    int           msg_namelen;
-    struct iovec *msg_iov;
-    size_t        msg_iovlen;
-    void         *msg_control;
-    size_t        msg_controllen;
-    unsigned int  msg_flags;
-};
-
-struct cmsghdr {
-    size_t cmsg_len;
-    int    cmsg_level;
-    int    cmsg_type;
-};
-
-
-#define SCM_RIGHTS      0x01
-#define SCM_CREDENTIALS 0x02
-#define SCM_SECURITY    0x03
-
-struct ucred {
-    __u32 pid;
-    __u32 uid;
-    __u32 gid;
-};
-
-struct mmsghdr {
-    struct msghdr msg_hdr;
-    unsigned int  msg_len;
-};
-
 #define UFFD_API 0xAA
 
 #define UFFDIO_REGISTER_MODE_MISSING  0x1
@@ -352,12 +223,6 @@ struct mmsghdr {
 #define SPLICE_F_MORE      4
 #define SPLICE_F_GIFT      8
 
-#define MNT_FORCE       0x1
-#define MNT_DETACH      0x2
-#define MNT_EXPIRE      0x4
-#define UMOUNT_NOFOLLOW 0x8
-#define UMOUNT_UNUSED   0x80000000
-
 // Linux's public headers provide public `NSIG`, `sigset_t` and `sigaction`
 // definitions which "cater to libcs that poke about in kernel headers", but
 // they're not usable in libcs because, for example, `SYS_rt_sigaction` insists

gen/modules/io_uring.h

@@ -0,0 +1,27 @@
+// This file includes selected Linux header files, and supplementary
+// definitions, needed for io_uring code.
+
+#include "support.h"
+
+// Selected Linux headers.
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0)
+#include <linux/io_uring.h>
+#endif
+
+// Miscellaneous definitions which don't appear to be defined in Linux's public
+// headers, but which are nonetheless part of the ABI, and necessary for
+// interoperability.
+//
+// When adding definitions here, please only include content needed for
+// interoperability with Linux's public ABI, and please only include types
+// and constants.
+//
+// In particular, please don't copy comments from other sources. And please
+// don't include any functions or function-style macros, as bindgen isn't
+// able to generate bindings for them.
+//
+// Also, please be aware that libc implementations (and thus the Rust libc
+// crate as well) sometimes define types and constants with similar names but
+// which are ABI-incompatible with the Linux kernel ABI. This file should
+// only describe the kernel ABI.