aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix/sysv/linux')
-rw-r--r--sysdeps/unix/sysv/linux/aarch64/kernel-features.h1
-rw-r--r--sysdeps/unix/sysv/linux/alpha/kernel-features.h5
-rw-r--r--sysdeps/unix/sysv/linux/arm/kernel-features.h5
-rw-r--r--sysdeps/unix/sysv/linux/ia64/kernel-features.h5
-rw-r--r--sysdeps/unix/sysv/linux/internal_recvmmsg.S12
-rw-r--r--sysdeps/unix/sysv/linux/kernel-features.h21
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/kernel-features.h4
-rw-r--r--sysdeps/unix/sysv/linux/mips/kernel-features.h5
-rw-r--r--sysdeps/unix/sysv/linux/recvmmsg.c13
-rw-r--r--sysdeps/unix/sysv/linux/tile/kernel-features.h1
10 files changed, 66 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/aarch64/kernel-features.h b/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
index 222b61c02c..3f9cd049e9 100644
--- a/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
@@ -30,6 +30,7 @@
#define __ASSUME_IN_NONBLOCK 1
#define __ASSUME_O_CLOEXEC 1
#define __ASSUME_PIPE2 1
+#define __ASSUME_RECVMMSG_SYSCALL 1
#define __ASSUME_SIGNALFD4 1
#define __ASSUME_SOCK_CLOEXEC 1
#define __ASSUME_UTIMES 1
diff --git a/sysdeps/unix/sysv/linux/alpha/kernel-features.h b/sysdeps/unix/sysv/linux/alpha/kernel-features.h
index 8cceb34592..6e4a515749 100644
--- a/sysdeps/unix/sysv/linux/alpha/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/alpha/kernel-features.h
@@ -42,6 +42,11 @@
# define __ASSUME_SIGNALFD4 1
#endif
+/* Support for recvmmsg was added for alpha in 2.6.33. */
+#if __LINUX_KERNEL_VERSION >= 0x020621
+# define __ASSUME_RECVMMSG_SYSCALL 1
+#endif
+
/* Support for accept4 was added for alpha in 3.2. */
#if __LINUX_KERNEL_VERSION >= 0x030200
# define __ASSUME_ACCEPT4_SYSCALL 1
diff --git a/sysdeps/unix/sysv/linux/arm/kernel-features.h b/sysdeps/unix/sysv/linux/arm/kernel-features.h
index 304f88d4a6..7b43e365e6 100644
--- a/sysdeps/unix/sysv/linux/arm/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/arm/kernel-features.h
@@ -31,6 +31,11 @@
# define __ASSUME_SIGNALFD4 1
#endif
+/* Support for the recvmmsg syscall was added in 2.6.33. */
+#if __LINUX_KERNEL_VERSION >= 0x020621
+# define __ASSUME_RECVMMSG_SYSCALL 1
+#endif
+
/* Support for the accept4 syscall was added in 2.6.36. */
#if __LINUX_KERNEL_VERSION >= 0x020624
# define __ASSUME_ACCEPT4_SYSCALL 1
diff --git a/sysdeps/unix/sysv/linux/ia64/kernel-features.h b/sysdeps/unix/sysv/linux/ia64/kernel-features.h
index 5c7c4eb8a5..b4955d9b1d 100644
--- a/sysdeps/unix/sysv/linux/ia64/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/ia64/kernel-features.h
@@ -47,6 +47,11 @@
# define __ASSUME_DUP3 1
#endif
+/* Support for the recvmmsg syscall was added in 2.6.33. */
+#if __LINUX_KERNEL_VERSION >= 0x020621
+# define __ASSUME_RECVMMSG_SYSCALL 1
+#endif
+
/* Support for the accept4 syscall was added in 3.3. */
#if __LINUX_KERNEL_VERSION >= 0x030300
# define __ASSUME_ACCEPT4_SYSCALL 1
diff --git a/sysdeps/unix/sysv/linux/internal_recvmmsg.S b/sysdeps/unix/sysv/linux/internal_recvmmsg.S
index 66c1357940..6b776b9d6a 100644
--- a/sysdeps/unix/sysv/linux/internal_recvmmsg.S
+++ b/sysdeps/unix/sysv/linux/internal_recvmmsg.S
@@ -1,8 +1,18 @@
#include <kernel-features.h>
#include <sys/syscall.h>
+
+/* Do not use the recvmmsg syscall on socketcall architectures unless
+ it was added at the same time as the socketcall support or can be
+ assumed to be present. */
+#if defined __ASSUME_SOCKETCALL \
+ && !defined __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL \
+ && !defined __ASSUME_RECVMMSG_SYSCALL
+# undef __NR_recvmmsg
+#endif
+
#if !defined __NR_recvmmsg && defined __NR_socketcall
# define socket recvmmsg
-# ifdef __ASSUME_RECVMMSG
+# ifdef __ASSUME_RECVMMSG_SOCKETCALL
# define __socket recvmmsg
# else
# define __socket __internal_recvmmsg
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index b6d7714073..034257edfa 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -233,8 +233,25 @@
# define __ASSUME_F_GETOWN_EX 1
#endif
-/* Support for the recvmmsg syscall was added in 2.6.33. */
-#if __LINUX_KERNEL_VERSION >= 0x020621
+/* Support for recvmmsg functionality was added in 2.6.33. The macros
+ defined correspond to those for accept4. */
+#if __LINUX_KERNEL_VERSION >= 0x020621 && defined __ASSUME_SOCKETCALL
+# define __ASSUME_RECVMMSG_SOCKETCALL 1
+#endif
+
+/* The recvmmsg syscall was added for i386, x86_64 and SPARC in
+ 2.6.33, and for PowerPC and SH in 2.6.37. */
+#if (__LINUX_KERNEL_VERSION >= 0x020621 \
+ && (defined __i386__ || defined __x86_64__ || defined __sparc__)) \
+ || (__LINUX_KERNEL_VERSION >= 0x020625 \
+ && (defined __powerpc__ || defined __sh__))
+# define __ASSUME_RECVMMSG_SYSCALL 1
+#endif
+#if defined __i386__ || defined __sparc__
+# define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1
+#endif
+
+#if defined __ASSUME_RECVMMSG_SOCKETCALL || defined __ASSUME_RECVMMSG_SYSCALL
# define __ASSUME_RECVMMSG 1
#endif
diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
index 413b4a0b90..7266e96495 100644
--- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
@@ -29,9 +29,11 @@
#define __ASSUME_SIGNALFD4 1
#define __ASSUME_DUP3 1
-/* Support for the accept4 syscall was added in 2.6.33. */
+/* Support for the accept4 and recvmmsg syscalls was added in 2.6.33. */
#if __LINUX_KERNEL_VERSION >= 0x020621
# define __ASSUME_ACCEPT4_SYSCALL 1
+# define __ASSUME_RECVMMSG_SYSCALL 1
#endif
+#define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1
#include_next <kernel-features.h>
diff --git a/sysdeps/unix/sysv/linux/mips/kernel-features.h b/sysdeps/unix/sysv/linux/mips/kernel-features.h
index 94deaf9205..22064d9bd3 100644
--- a/sysdeps/unix/sysv/linux/mips/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/mips/kernel-features.h
@@ -36,6 +36,11 @@
# define __ASSUME_ACCEPT4_SYSCALL 1
#endif
+/* Support for the recvmmsg syscall was added in 2.6.33. */
+#if __LINUX_KERNEL_VERSION >= 0x020621
+# define __ASSUME_RECVMMSG_SYSCALL 1
+#endif
+
#include_next <kernel-features.h>
/* The n32 syscall ABI did not have a getdents64 syscall until
diff --git a/sysdeps/unix/sysv/linux/recvmmsg.c b/sysdeps/unix/sysv/linux/recvmmsg.c
index 04ff42ee72..57ddf3152a 100644
--- a/sysdeps/unix/sysv/linux/recvmmsg.c
+++ b/sysdeps/unix/sysv/linux/recvmmsg.c
@@ -23,6 +23,14 @@
#include <sys/syscall.h>
#include <kernel-features.h>
+/* Do not use the recvmmsg syscall on socketcall architectures unless
+ it was added at the same time as the socketcall support or can be
+ assumed to be present. */
+#if defined __ASSUME_SOCKETCALL \
+ && !defined __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL \
+ && !defined __ASSUME_RECVMMSG_SYSCALL
+# undef __NR_recvmmsg
+#endif
#ifdef __NR_recvmmsg
int
@@ -41,7 +49,7 @@ recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags,
return result;
}
#elif defined __NR_socketcall
-# ifndef __ASSUME_RECVMMSG
+# ifndef __ASSUME_RECVMMSG_SOCKETCALL
extern int __internal_recvmmsg (int fd, struct mmsghdr *vmessages,
unsigned int vlen, int flags,
const struct timespec *tmo)
@@ -85,7 +93,8 @@ recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags,
return -1;
}
# else
-/* When __ASSUME_RECVMMSG recvmmsg is defined in internal_recvmmsg.S. */
+/* When __ASSUME_RECVMMSG_SOCKETCALL recvmmsg is defined in
+ internal_recvmmsg.S. */
# endif
#else
# include <socket/recvmmsg.c>
diff --git a/sysdeps/unix/sysv/linux/tile/kernel-features.h b/sysdeps/unix/sysv/linux/tile/kernel-features.h
index e339e7a5b2..b415d8f10f 100644
--- a/sysdeps/unix/sysv/linux/tile/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/tile/kernel-features.h
@@ -27,6 +27,7 @@
#define __ASSUME_SIGNALFD4 1
#define __ASSUME_ACCEPT4_SYSCALL 1
#define __ASSUME_DUP3 1
+#define __ASSUME_RECVMMSG_SYSCALL 1
#include_next <kernel-features.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-11 20:32:34 +0000