From patchwork Tue Sep 8 14:57:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40378 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 57D4F3952517; Tue, 8 Sep 2020 14:58:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 57D4F3952517 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1599577083; bh=EHsguGR8P9+0Y2TaO3iX2v/qiKUD7DL3dcMqx9FA9ww=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=sGgLUau7H6oIZLDqmT7VDDP+QFyRJQ3W7ZFoeadFgz35p4d+z/HOqMzMrPaSZ0Cdm w8UmCRWCQVE+Yj0/ZQ95GLEb2D6bpRRTNzcCe2DmB4FbKLrgB5tD5YY4m+T2YWXrl6 ir6T7yK4PURUIUBiDxTOnLlYjs/6BAIwIKQ0uTT8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) by sourceware.org (Postfix) with ESMTPS id 373673951C4D for ; Tue, 8 Sep 2020 14:58:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 373673951C4D Received: by mail-qt1-x843.google.com with SMTP id y11so6020503qtn.9 for ; Tue, 08 Sep 2020 07:58:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EHsguGR8P9+0Y2TaO3iX2v/qiKUD7DL3dcMqx9FA9ww=; b=nNxoe3KiGP8sGYgQoWCVhvQVJwOrRq39zth72p2hgjSMQlfKfByP6VjXsmG+167S50 XcIPIe0+mogtN/s3sW4VAHvEWzrgyIw1n3ZnIaWgB6ZrFRpDPX2t71+BYaiRPVJEREiH TXLz1Vux0PhxznYLthF4MRlo6ye5AWrEmTrcUZhm8FANpg2wA55RB3SkdXa50CdrBY+4 n/7L6TPnu7c651oduE5Q6VMzB89jQF/QcLngriKtQqN8v8Mm/EQd+fsmg6PclOl8ZzBZ QylDo6PPOHpq6UrhhzoTLM8iyG508UfjfeEX+4nDJ1V6Pusk1bCWgegAWu2rL3ctPZy/ xDCA== X-Gm-Message-State: AOAM531BXlLdSdWp/udC+Izj/6AWkfWNi5Yp++pOsK3BIw/G4QbHscXd pK3X6WsBm5Mqecj/rfm3w04szc/jWoHCvw== X-Google-Smtp-Source: ABdhPJyHu9/LCm+kkmSFX3KBh3HYzpGxF+qqP1ZwuZRq8K9pEzmyXtl5NQGpVYyHxWH4YJ3Ywaudtw== X-Received: by 2002:aed:398a:: with SMTP id m10mr438468qte.143.1599577079282; Tue, 08 Sep 2020 07:57:59 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id e188sm10800748qkd.55.2020.09.08.07.57.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 07:57:58 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 11/14] linux: Add time64 recvmmsg support Date: Tue, 8 Sep 2020 11:57:35 -0300 Message-Id: <20200908145738.640039-11-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200908145738.640039-1-adhemerval.zanella@linaro.org> References: <20200908145738.640039-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The wire-up syscall __NR_recvmmsg_time64 (for 32-bit) or __NR_recvmmsg (for 64-bit) is used as default. The 32-bit fallback is used iff __ASSUME_TIME64_SYSCALLS is not defined, which assumes the kernel ABI provides either __NR_socketcall or __NR_recvmmsg (32-bit time_t). It does not handle the timestamps on ancillary data (SCM_TIMESTAMPING records). Checked on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Alistair Francis --- include/sys/socket.h | 8 ++++ sysdeps/unix/sysv/linux/recvmmsg.c | 63 ++++++++++++++++++++++++------ 2 files changed, 60 insertions(+), 11 deletions(-) diff --git a/include/sys/socket.h b/include/sys/socket.h index 26db0e0d77..0e39dd2a3a 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -104,6 +104,14 @@ extern ssize_t __libc_recvmsg (int __fd, struct msghdr *__message, int __flags); extern ssize_t __recvmsg (int __fd, struct msghdr *__message, int __flags) attribute_hidden; +#if __TIMESIZE == 64 +# define __recvmmsg64 __recvmmsg +#else +extern int __recvmmsg64 (int __fd, struct mmsghdr *vmessages, + unsigned int vlen, int flags, + struct __timespec64 *timeout); +libc_hidden_proto (__recvmmsg64) +#endif /* Set socket FD's option OPTNAME at protocol level LEVEL to *OPTVAL (which is OPTLEN bytes long). diff --git a/sysdeps/unix/sysv/linux/recvmmsg.c b/sysdeps/unix/sysv/linux/recvmmsg.c index 42c80c59c3..a29c91fb76 100644 --- a/sysdeps/unix/sysv/linux/recvmmsg.c +++ b/sysdeps/unix/sysv/linux/recvmmsg.c @@ -16,21 +16,62 @@ License along with the GNU C Library; if not, see . */ -#include #include - -#include -#include +#include #include -#include int -recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags, - struct timespec *tmo) +__recvmmsg64 (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags, + struct __timespec64 *timeout) { -#ifdef __ASSUME_RECVMMSG_SYSCALL - return SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo); -#else - return SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo); +#ifndef __NR_recvmmsg_time64 +# define __NR_recvmmsg_time64 __NR_recvmmsg #endif + int r = SYSCALL_CANCEL (recvmmsg_time64, fd, vmessages, vlen, flags, + timeout); +#ifndef __ASSUME_TIME64_SYSCALLS + if (r >= 0 || errno != ENOSYS) + return r; + + struct timespec ts32, *pts32 = NULL; + if (timeout != NULL) + { + if (! in_time_t_range (timeout->tv_sec)) + { + __set_errno (EINVAL); + return -1; + } + ts32 = valid_timespec64_to_timespec (*timeout); + pts32 = &ts32; + } +# ifdef __ASSUME_RECVMMSG_SYSCALL + r = SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, pts32); +# else + r = SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, pts32); +# endif + if (r >= 0 && timeout != NULL) + *timeout = valid_timespec_to_timespec64 (ts32); +#endif /* __ASSUME_TIME64_SYSCALLS */ + return r; } +#if __TIMESIZE != 64 +libc_hidden_def (__recvmmsg64) + +int +__recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags, + struct timespec *timeout) +{ + struct __timespec64 ts64, *pts64 = NULL; + if (timeout != NULL) + { + ts64 = valid_timespec_to_timespec64 (*timeout); + pts64 = &ts64; + } + int r = __recvmmsg64 (fd, vmessages, vlen, flags, pts64); + if (r >= 0) + /* The remanining timeout will be always less the input TIMEOUT. */ + *timeout = valid_timespec64_to_timespec (ts64); + return r; +} +#endif +weak_alias (__recvmmsg, recvmmsg)