mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-27 04:41:02 +08:00
bc688c1029
Similar to the issues for accept4 and recvmmsg, __ASSUME_SENDMMSG is also confused about whether it relates to function availability or socketcall operation availability, and the conditions for the definition are always wrong (sendmmsg appeared in Linux kernel 3.0, not 2.6.39); this is now bug 16611. This patch splits the macro into separate macros like those for accept4 and recvmmsg, defining them for appropriate kernel versions. Tested x86_64, including that disassembly of the installed shared libraries is unchanged by this patch. [BZ #16611] * sysdeps/unix/sysv/linux/kernel-features.h [__LINUX_KERNEL_VERSION >= 0x030000 && __ASSUME_SOCKETCALL] (__ASSUME_SENDMMSG_SOCKETCALL): Define. [__LINUX_KERNEL_VERSION >= 0x030000 && (__i386__ || __x86_64__ || __powerpc__ || __sh__ || __sparc__)] (__ASSUME_SENDMMSG_SYSCALL): Likewise. [__i386__ || __powerpc__ || __sh__ || __sparc__] (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise. [__ASSUME_SENDMMSG_SOCKETCALL || __ASSUME_SENDMMSG_SYSCALL] (__ASSUME_SENDMMSG): Define instead of using previous [__LINUX_KERNEL_VERSION >= 0x020627] condition. * sysdeps/unix/sysv/linux/aarch64/kernel-features.h (__ASSUME_SENDMMSG_SYSCALL): Define. * sysdeps/unix/sysv/linux/alpha/kernel-features.h [__LINUX_KERNEL_VERSION >= 0x030200] (__ASSUME_SENDMMSG_SYSCALL): Likewise. * sysdeps/unix/sysv/linux/arm/kernel-features.h [__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL): Likewise. * sysdeps/unix/sysv/linux/ia64/kernel-features.h [__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL): Likewise. * sysdeps/unix/sysv/linux/internal_sendmmsg.S [__ASSUME_SOCKETCALL && !__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL && !__ASSUME_SENDMMSG_SYSCALL] (__NR_sendmmsg): Undefine. [__ASSUME_SENDMMSG]: Change conditionals to [__ASSUME_SENDMMSG_SOCKETCALL]. * sysdeps/unix/sysv/linux/microblaze/kernel-features.h [__LINUX_KERNEL_VERSION >= 0x030300] (__ASSUME_SENDMMSG_SYSCALL): Define. * sysdeps/unix/sysv/linux/mips/kernel-features.h [__LINUX_KERNEL_VERSION >= 0x030100] (__ASSUME_SENDMMSG_SYSCALL): Likewise. * sysdeps/unix/sysv/linux/sendmmsg.c [__ASSUME_SOCKETCALL && !__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL && !__ASSUME_SENDMMSG_SYSCALL] (__NR_sendmmsg): Undefine. [!__ASSUME_SENDMMSG]: Change conditional to [!__ASSUME_SENDMMSG_SOCKETCALL]. * sysdeps/unix/sysv/linux/tile/kernel-features.h [__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL): Define. * sysdeps/unix/sysv/linux/hppa/kernel-features.h [__LINUX_KERNEL_VERSION >= 0x030100] (__ASSUME_SENDMMSG_SYSCALL): Define.
103 lines
3.0 KiB
C
103 lines
3.0 KiB
C
/* Copyright (C) 2011-2014 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <sys/socket.h>
|
|
|
|
#include <sysdep-cancel.h>
|
|
#include <sys/syscall.h>
|
|
#include <kernel-features.h>
|
|
|
|
/* Do not use the sendmmsg 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_SENDMMSG_SYSCALL_WITH_SOCKETCALL \
|
|
&& !defined __ASSUME_SENDMMSG_SYSCALL
|
|
# undef __NR_sendmmsg
|
|
#endif
|
|
|
|
#ifdef __NR_sendmmsg
|
|
int
|
|
__sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags)
|
|
{
|
|
if (SINGLE_THREAD_P)
|
|
return INLINE_SYSCALL (sendmmsg, 4, fd, vmessages, vlen, flags);
|
|
|
|
int oldtype = LIBC_CANCEL_ASYNC ();
|
|
|
|
int result = INLINE_SYSCALL (sendmmsg, 4, fd, vmessages, vlen, flags);
|
|
|
|
LIBC_CANCEL_RESET (oldtype);
|
|
|
|
return result;
|
|
}
|
|
libc_hidden_def (__sendmmsg)
|
|
weak_alias (__sendmmsg, sendmmsg)
|
|
#elif defined __NR_socketcall
|
|
# ifndef __ASSUME_SENDMMSG_SOCKETCALL
|
|
extern int __internal_sendmmsg (int fd, struct mmsghdr *vmessages,
|
|
unsigned int vlen, int flags)
|
|
attribute_hidden;
|
|
|
|
static int have_sendmmsg;
|
|
|
|
int
|
|
__sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags)
|
|
{
|
|
if (__glibc_likely (have_sendmmsg >= 0))
|
|
{
|
|
int ret = __internal_sendmmsg (fd, vmessages, vlen, flags);
|
|
/* The kernel returns -EINVAL for unknown socket operations.
|
|
We need to convert that error to an ENOSYS error. */
|
|
if (__builtin_expect (ret < 0, 0)
|
|
&& have_sendmmsg == 0
|
|
&& errno == EINVAL)
|
|
{
|
|
/* Try another call, this time with an invalid file
|
|
descriptor and all other parameters cleared. This call
|
|
will not cause any harm and it will return
|
|
immediately. */
|
|
ret = __internal_sendmmsg (-1, 0, 0, 0);
|
|
if (errno == EINVAL)
|
|
{
|
|
have_sendmmsg = -1;
|
|
__set_errno (ENOSYS);
|
|
}
|
|
else
|
|
{
|
|
have_sendmmsg = 1;
|
|
__set_errno (EINVAL);
|
|
}
|
|
return -1;
|
|
}
|
|
return ret;
|
|
}
|
|
__set_errno (ENOSYS);
|
|
return -1;
|
|
}
|
|
libc_hidden_def (__sendmmsg)
|
|
weak_alias (__sendmmsg, sendmmsg)
|
|
# else
|
|
/* When __ASSUME_SENDMMSG_SOCKETCALL sendmmsg is defined in
|
|
internal_sendmmsg.S. */
|
|
# endif
|
|
#else
|
|
# include <socket/sendmmsg.c>
|
|
#endif
|