From patchwork Fri Mar 25 13:56:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 64488 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp185967lbc; Fri, 25 Mar 2016 06:57:46 -0700 (PDT) X-Received: by 10.98.74.17 with SMTP id x17mr21408766pfa.14.1458914266162; Fri, 25 Mar 2016 06:57:46 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id n63si19734573pfj.185.2016.03.25.06.57.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Mar 2016 06:57:46 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-68355-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org; spf=pass (google.com: domain of libc-alpha-return-68355-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-68355-patch=linaro.org@sourceware.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=bR/xV2UDqLb/f2ux47oNGGEGgUOSduX DsM17JzQQZq5ph7u5Cc5n16Z2SosaWyp35+SZncRUaqHQRH7Rf4sY0kjDrbhsEyf rmSZ+AQw6dZsr3OH6pqFQ9tPdnmMveSQP210MeT9nyF4lOK11FdxjYboGPZf5Paj HCZQkfQSQd+Y= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=FuRvrKdCkt4ccRNHJEPZnhob5Pg=; b=TdHNn caXmvQOWJlF1Qy4xvA7Bn+vNdXz9a5Ycuf6ppkr5TT6tR1v3rzdYlUfur+Cp3UGZ VN8h9l+UXX5ik8X2X6Nt5A6mGWRzt9Q//n/jdM6yvMOVEaBeeO86W+0rKDU7j4DH kt0rq/Csml5LDT6fwQUn2fdGia41GY6gGyqeoI= Received: (qmail 109202 invoked by alias); 25 Mar 2016 13:57:26 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 109098 invoked by uid 89); 25 Mar 2016 13:57:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=enosys, ENOSYS, 8410, tmo X-HELO: mail-qg0-f50.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=FVc6INoZYUGGgzwYmnqYxPmvvXx9u53lunqZ8r4kqoU=; b=Au4M69vWfKRDuCXYURs3mnXjI0Q/KU6wtKCdGk9m9BzuODbyT5iOE//BJr1//lENjk m9tlgCjr495PQ0kBXugkpDptCrhM4whOpzNnnbXurXyggbyHhgN3aCnJrV84r9tsjUwW wNoccKoypQbWPg10jpycK5tQn+qFNjATMv2X+lPTZlrygaLECgFYAn1aejxGjeu5U3sq GN6BzFqGOb33AuKHrFk2pLuQ2qgSlQRVgyJqyazuP9vWaUrVNuu9GwWPjnwz2ZFPfEz8 HfQYiiy/0hNRe/gZ/exQT4pFNfRxZamWDFiFRIlK1A10rK9YlhjhT6MOaIRPv5lgOorm uDAA== X-Gm-Message-State: AD7BkJLgELZXI1f2+1HTgr1ua8dxCTn1l6HLBKZ6iBcTUEhG/2HLs6D5Yy4dh8eLLiYr1nL3 X-Received: by 10.140.20.183 with SMTP id 52mr17633094qgj.38.1458914226357; Fri, 25 Mar 2016 06:57:06 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 3/3] network: recvmmsg and sendmmsg standard compliance (BZ#16919) Date: Fri, 25 Mar 2016 10:56:54 -0300 Message-Id: <1458914214-16908-4-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1458914214-16908-1-git-send-email-adhemerval.zanella@linaro.org> References: <1458914214-16908-1-git-send-email-adhemerval.zanella@linaro.org> POSIX specifies that both msghdr::msg_iovlen and msghdr::msg_controllen to be of size int and socklen_t respectively, however Linux implements it as a size_t. So for 64-bits architecture where sizeof of size_t is larger than socklen_t, both sendmmsg and recvmmsg need to adjust the mmsghdr::msg_hdr internal fields before issuing the syscall itself. This patch fixes it by operating on the padding if it the case. For recvmmsg, the most straightfoward case, only zero padding the fields is suffice. However, for sendmmsg, where adjusting the buffer is out of the contract (since it may point to a read-only data), the function is rewritten to use sendmsg instead (which from previous patch allocates a temporary msghdr to operate on). Also for 64-bit ports that requires it, a new recvmmsg and sendmmsg compat version is created (which uses size_t for both cmsghdr::cmsg_len and internal Tested on x86_64, i686, aarch64, armhf, and powerpc64le. * sysdeps/unix/sysv/linux/Makefile [$(subdir) = socket] (sysdep_routines): Add oldrecvmmsg and oldsendmmsg. * sysdeps/unix/sysv/linux/aarch64/libc.abilist: Add recvmmsg and sendmmsg. * sysdeps/unix/sysv/linux/alpha/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/ia64/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist: Likewise. * sysdeps/sysv/linux/powerpc/powerpc64/libc-le.abilist: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/x86_64/64/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/oldrecvmmsg.c: New file. * sysdeps/unix/sysv/linux/oldsendmmsg.c: Likewise. * sysdeps/unix/sysv/linux/recvmmsg.c (__recvmmsg): Adjust msghdr iovlen and controllen fields to adjust to POSIX specification. * sysdeps/unix/sysv/linux/sendmmsg.c (__sendmmsg): Likewise. --- ChangeLog | 21 ++++++ sysdeps/unix/sysv/linux/Makefile | 3 +- sysdeps/unix/sysv/linux/aarch64/libc.abilist | 2 + sysdeps/unix/sysv/linux/alpha/libc.abilist | 2 + sysdeps/unix/sysv/linux/ia64/libc.abilist | 2 + .../unix/sysv/linux/mips/mips64/n64/libc.abilist | 2 + sysdeps/unix/sysv/linux/oldrecvmmsg.c | 75 ++++++++++++++++++++++ sysdeps/unix/sysv/linux/oldsendmmsg.c | 75 ++++++++++++++++++++++ .../sysv/linux/powerpc/powerpc64/libc-le.abilist | 2 + .../unix/sysv/linux/powerpc/powerpc64/libc.abilist | 2 + sysdeps/unix/sysv/linux/recvmmsg.c | 61 +++++++++++------- sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist | 2 + sysdeps/unix/sysv/linux/sendmmsg.c | 72 +++++++++++++++------ sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist | 2 + .../sysv/linux/tile/tilegx/tilegx64/libc.abilist | 2 + sysdeps/unix/sysv/linux/x86_64/64/libc.abilist | 2 + 16 files changed, 283 insertions(+), 44 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/oldrecvmmsg.c create mode 100644 sysdeps/unix/sysv/linux/oldsendmmsg.c -- 1.9.1 diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index af8e13a..6d556dc 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -124,7 +124,8 @@ ifeq ($(subdir),socket) sysdep_headers += net/if_ppp.h net/ppp-comp.h \ net/ppp_defs.h net/if_arp.h net/route.h net/ethernet.h \ net/if_slip.h net/if_packet.h net/if_shaper.h -sysdep_routines += cmsg_nxthdr oldrecvmsg oldsendmsg +sysdep_routines += cmsg_nxthdr oldrecvmsg oldsendmsg \ + oldrecvmmsg oldsendmmsg CFLAGS-recvmsg.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-sendmsg.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-oldrecvmsg.c = -fexceptions -fasynchronous-unwind-tables diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index c3f2346..7981817 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -2088,5 +2088,7 @@ GLIBC_2.23 fts64_open F GLIBC_2.23 fts64_read F GLIBC_2.23 fts64_set F GLIBC_2.24 GLIBC_2.24 A +GLIBC_2.24 recvmmsg F GLIBC_2.24 recvmsg F +GLIBC_2.24 sendmmsg F GLIBC_2.24 sendmsg F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 7822242..0c1e1ac 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -1999,7 +1999,9 @@ GLIBC_2.23 fts64_open F GLIBC_2.23 fts64_read F GLIBC_2.23 fts64_set F GLIBC_2.24 GLIBC_2.24 A +GLIBC_2.24 recvmmsg F GLIBC_2.24 recvmsg F +GLIBC_2.24 sendmmsg F GLIBC_2.24 sendmsg F GLIBC_2.3 GLIBC_2.3 A GLIBC_2.3 __ctype_b_loc F diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist index f5739b4..b1388d1 100644 --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist @@ -1875,7 +1875,9 @@ GLIBC_2.23 fts64_open F GLIBC_2.23 fts64_read F GLIBC_2.23 fts64_set F GLIBC_2.24 GLIBC_2.24 A +GLIBC_2.24 recvmmsg F GLIBC_2.24 recvmsg F +GLIBC_2.24 sendmmsg F GLIBC_2.24 sendmsg F GLIBC_2.3 GLIBC_2.3 A GLIBC_2.3 __ctype_b_loc F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist index 6722f90..0e2ff75 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist @@ -1933,7 +1933,9 @@ GLIBC_2.23 fts64_open F GLIBC_2.23 fts64_read F GLIBC_2.23 fts64_set F GLIBC_2.24 GLIBC_2.24 A +GLIBC_2.24 recvmmsg F GLIBC_2.24 recvmsg F +GLIBC_2.24 sendmmsg F GLIBC_2.24 sendmsg F GLIBC_2.3 GLIBC_2.3 A GLIBC_2.3 __ctype_b_loc F diff --git a/sysdeps/unix/sysv/linux/oldrecvmmsg.c b/sysdeps/unix/sysv/linux/oldrecvmmsg.c new file mode 100644 index 0000000..31fbb2d --- /dev/null +++ b/sysdeps/unix/sysv/linux/oldrecvmmsg.c @@ -0,0 +1,75 @@ +/* Compatibility version of recvmsg. + Copyright (C) 2010-2016 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 + . */ + +#include +#include +#include +#include + +#if __WORDSIZE == 64 +# if SHLIB_COMPAT (libc, GLIBC_2_12, GLIBC_2_24) + +int +__old_recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, + int flags, struct timespec *tmo) +{ +# ifdef __ASSUME_RECVMMSG_SYSCALL + return SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo); +# elif defined __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL + return SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo); +# elif defined __ASSUME_SOCKETCALL + static int have_recvmmsg; + if (__glibc_likely (have_recvmmsg >= 0)) + { + int ret = SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, + tmo); + /* 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_recvmmsg == 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 = SOCKETCALL_CANCEL (invalid, -1); + if (errno == EINVAL) + { + have_recvmmsg = -1; + __set_errno (ENOSYS); + } + else + { + have_recvmmsg = 1; + __set_errno (EINVAL); + } + return -1; + } + return ret; + } + __set_errno (ENOSYS); + return -1; +# else + __set_errno (ENOSYS); + return -1; +# endif +} +compat_symbol (libc, __old_recvmmsg, recvmmsg, GLIBC_2_12); +# endif /* SHLIB_COMPAT (libc, GLIBC_2_12, GLIBC_2_24) */ +#endif /* __WORDSIZE == 64 */ diff --git a/sysdeps/unix/sysv/linux/oldsendmmsg.c b/sysdeps/unix/sysv/linux/oldsendmmsg.c new file mode 100644 index 0000000..59c18e8 --- /dev/null +++ b/sysdeps/unix/sysv/linux/oldsendmmsg.c @@ -0,0 +1,75 @@ +/* Compatibility implementation of sendmmsg. + Copyright (C) 2016 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 + . */ + +#include +#include +#include +#include + +#if __WORDSIZE == 64 +# if SHLIB_COMPAT (libc, GLIBC_2_14, GLIBC_2_24) + +int +__old_sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, + int flags) +{ +# ifdef __ASSUME_SENDMMSG_SYSCALL + return SYSCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags); +# elif defined __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL + return SOCKETCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags); +# elif defined __ASSUME_SOCKETCALL + static int have_sendmmsg; + if (__glibc_likely (have_sendmmsg >= 0)) + { + int ret = SOCKETCALL_CANCEL (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 = SOCKETCALL_CANCEL (invalid, -1); + 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; +# else + __set_errno (ENOSYS); + return -1; +# endif +} + +compat_symbol (libc, __old_sendmmsg, sendmmsg, GLIBC_2_14); +# endif /* SHLIB_COMPAT (libc, GLIBC_2_14, GLIBC_2_24) */ +#endif /* __WORDSIZE == 64 */ diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist index 7839b5a..85286c4 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist @@ -2176,5 +2176,7 @@ GLIBC_2.23 fts64_open F GLIBC_2.23 fts64_read F GLIBC_2.23 fts64_set F GLIBC_2.24 GLIBC_2.24 A +GLIBC_2.24 recvmmsg F GLIBC_2.24 recvmsg F +GLIBC_2.24 sendmmsg F GLIBC_2.24 sendmsg F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist index 20d5a19..0abd098 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist @@ -90,7 +90,9 @@ GLIBC_2.23 fts64_open F GLIBC_2.23 fts64_read F GLIBC_2.23 fts64_set F GLIBC_2.24 GLIBC_2.24 A +GLIBC_2.24 recvmmsg F GLIBC_2.24 recvmsg F +GLIBC_2.24 sendmmsg F GLIBC_2.24 sendmsg F GLIBC_2.3 GLIBC_2.3 A GLIBC_2.3 _Exit F diff --git a/sysdeps/unix/sysv/linux/recvmmsg.c b/sysdeps/unix/sysv/linux/recvmmsg.c index bf18260..08b89ba 100644 --- a/sysdeps/unix/sysv/linux/recvmmsg.c +++ b/sysdeps/unix/sysv/linux/recvmmsg.c @@ -16,12 +16,10 @@ License along with the GNU C Library; if not, see . */ -#include #include - +#include #include -#include -#include +#include /* Do not use the recvmmsg syscall on socketcall architectures unless it was added at the same time as the socketcall support or can be @@ -32,31 +30,39 @@ # undef __NR_recvmmsg #endif -#ifdef __NR_recvmmsg +static inline void +adjust_mmsghdr (struct mmsghdr *vmessages, unsigned int vlen) +{ +#if __WORDSIZE == 64 + /* POSIX specifies that both msghdr::msg_iovlen and msghdr::msg_controllen + to be int and socklen_t respectively. However Linux defines it as + both size_t. So for 64-bit it requires some adjustments by zeroing + the pad fields. */ + struct mmsghdr *vmhdr = vmessages; + for (unsigned int i = 0; i != 0; i--, vmhdr++) + { + vmhdr->msg_hdr.__glibc_reserved1 = 0; + vmhdr->msg_hdr.__glibc_reserved2 = 0; + } +#endif +} + int -recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags, - struct timespec *tmo) +__recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, + int flags, struct timespec *tmo) { +#ifdef __NR_recvmmsg + adjust_mmsghdr (vmessages, vlen); return SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo); -} #elif defined __NR_socketcall -# include # ifdef __ASSUME_RECVMMSG_SOCKETCALL -int -recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags, - struct timespec *tmo) -{ + adjust_mmsghdr (vmessages, vlen); return SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo); -} # else -static int have_recvmmsg; - -int -recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags, - struct timespec *tmo) -{ + static int have_recvmmsg; if (__glibc_likely (have_recvmmsg >= 0)) { + adjust_mmsghdr (vmessages, vlen); int ret = SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo); /* The kernel returns -EINVAL for unknown socket operations. @@ -86,8 +92,19 @@ recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags, } __set_errno (ENOSYS); return -1; -} # endif /* __ASSUME_RECVMMSG_SOCKETCALL */ #else -# include +# define STUB 1 + __set_errno (ENOSYS); + return -1; +#endif +} +#ifdef STUB +stub_warning (recvmmsg) +#endif + +#if __WORDSIZE == 64 +versioned_symbol (libc, __recvmmsg, recvmmsg, GLIBC_2_24); +#else +weak_alias (__recvmmsg, recvmmsg) #endif diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist index 5892fcd..03a9b97 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist @@ -1872,7 +1872,9 @@ GLIBC_2.23 fts64_open F GLIBC_2.23 fts64_read F GLIBC_2.23 fts64_set F GLIBC_2.24 GLIBC_2.24 A +GLIBC_2.24 recvmmsg F GLIBC_2.24 recvmsg F +GLIBC_2.24 sendmmsg F GLIBC_2.24 sendmsg F GLIBC_2.3 GLIBC_2.3 A GLIBC_2.3 __ctype_b_loc F diff --git a/sysdeps/unix/sysv/linux/sendmmsg.c b/sysdeps/unix/sysv/linux/sendmmsg.c index 6e0d46b..9b19343 100644 --- a/sysdeps/unix/sysv/linux/sendmmsg.c +++ b/sysdeps/unix/sysv/linux/sendmmsg.c @@ -16,12 +16,10 @@ License along with the GNU C Library; if not, see . */ -#include #include - +#include #include -#include -#include +#include /* Do not use the sendmmsg syscall on socketcall architectures unless it was added at the same time as the socketcall support or can be @@ -32,31 +30,53 @@ # undef __NR_sendmmsg #endif -#ifdef __NR_sendmmsg +#if __WORDSIZE == 64 +static inline int +send_mmsghdr (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) +{ + /* Emulate kernel interface for vlen size. */ + if (vlen > IOV_MAX) + vlen = IOV_MAX; + if (vlen == 0) + return 0; + /* POSIX specifies that both msghdr::msg_iovlen and msghdr::msg_controllen + to be int and socklen_t respectively, however Linux defines it as both + size_t. So for 64-bit it requires some adjustments by copying to + temporary header and zeroing the pad fields. + The problem is sendmmsg's msghdr may points to an already-filled control + buffer and modifying it is not part of sendmmsg contract (the data may + be in ro map). So interact over the msghdr calling the sendmsg that + adjust the header using a temporary buffer. */ + for (unsigned int i = 0; i < vlen; i++) + { + ssize_t ret = __sendmsg (fd, &vmessages[i].msg_hdr, flags); + if (ret < 0) + return -1; + vmessages[i].msg_len = ret; + } + return 1; +} +#endif + int __sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) { +#if __WORDSIZE == 64 + return send_mmsghdr (fd, vmessages, vlen, flags); +#elif defined __NR_sendmmsg return SYSCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags); -} -libc_hidden_def (__sendmmsg) -weak_alias (__sendmmsg, sendmmsg) #elif defined __NR_socketcall -# include # ifdef __ASSUME_SENDMMSG_SOCKETCALL -int -__sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) -{ return SOCKETCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags); -} # else -static int have_sendmmsg; - -int -__sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) -{ + static int have_sendmmsg; if (__glibc_likely (have_sendmmsg >= 0)) { +# if __WORDSIZE == 64 + int ret = send_mmsghdr (fd, vmessages, vlen, flags); +# else int ret = SOCKETCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags); +# endif /* The kernel returns -EINVAL for unknown socket operations. We need to convert that error to an ENOSYS error. */ if (__builtin_expect (ret < 0, 0) @@ -84,10 +104,20 @@ __sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) } __set_errno (ENOSYS); return -1; -} # endif /* __ASSUME_SENDMMSG_SOCKETCALL */ +#else /* defined __NR_socketcall */ +# define STUB 1 + __set_errno (ENOSYS); + return -1; +#endif +} +#ifdef STUB +stub_warning (sendmmsg) +#endif + libc_hidden_def (__sendmmsg) -weak_alias (__sendmmsg, sendmmsg) +#if __WORDSIZE == 64 +versioned_symbol (libc, __sendmmsg, sendmmsg, GLIBC_2_24); #else -# include +weak_alias (__sendmmsg, sendmmsg) #endif diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist index 015a2f1..38b976f 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist @@ -1901,7 +1901,9 @@ GLIBC_2.23 fts64_open F GLIBC_2.23 fts64_read F GLIBC_2.23 fts64_set F GLIBC_2.24 GLIBC_2.24 A +GLIBC_2.24 recvmmsg F GLIBC_2.24 recvmsg F +GLIBC_2.24 sendmmsg F GLIBC_2.24 sendmsg F GLIBC_2.3 GLIBC_2.3 A GLIBC_2.3 __ctype_b_loc F diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist b/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist index 1e160bd..07b1332 100644 --- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist +++ b/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist @@ -2095,5 +2095,7 @@ GLIBC_2.23 fts64_open F GLIBC_2.23 fts64_read F GLIBC_2.23 fts64_set F GLIBC_2.24 GLIBC_2.24 A +GLIBC_2.24 recvmmsg F GLIBC_2.24 recvmsg F +GLIBC_2.24 sendmmsg F GLIBC_2.24 sendmsg F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist index 175339e..baea1f5 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist @@ -1852,7 +1852,9 @@ GLIBC_2.23 fts64_open F GLIBC_2.23 fts64_read F GLIBC_2.23 fts64_set F GLIBC_2.24 GLIBC_2.24 A +GLIBC_2.24 recvmmsg F GLIBC_2.24 recvmsg F +GLIBC_2.24 sendmmsg F GLIBC_2.24 sendmsg F GLIBC_2.3 GLIBC_2.3 A GLIBC_2.3 __ctype_b_loc F