From patchwork Tue Sep 8 14:57:29 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: 40372 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 0724B3951C2B; Tue, 8 Sep 2020 14:57:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0724B3951C2B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1599577073; bh=GXfIdWCisx/P/S9weYcpCal1w6ZzXbI23/kTE4UmWNA=; 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=m325LQ8MCv81Ce83eWKYRUJcUSyuz4ubXOV6aIUL5cnNEYE5gsFIivY9u1fTtlg1g S51pn1DbMwJdz9ft6RmVvjZKZqZInn8bFNgBePKHyB1jzLZMafSrJqnm9YwMYsHVBb VKOX987xh8jNaq6LdK66zdOrLlyjIxwsUBlsw8jk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) by sourceware.org (Postfix) with ESMTPS id 7DB1E39518B8 for ; Tue, 8 Sep 2020 14:57:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7DB1E39518B8 Received: by mail-qk1-x742.google.com with SMTP id d20so15563412qka.5 for ; Tue, 08 Sep 2020 07:57:49 -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=GXfIdWCisx/P/S9weYcpCal1w6ZzXbI23/kTE4UmWNA=; b=PaVgXrSKkUPz8CQkpY0vfLD8+75bBMCwzvdxqeyXMKVPNsOdFzrrcz7kYXMxyy7cMM aidoRe75Dah5P6qYfDyEsQbV85zvk4AJJVqkxg7T/1d/gDxQu4VGqEPOoY0K9UvbHHsO ggNb1Knm+9AFhzJ98fghcOyj9b3A+kIZ/oeRTTk87V3dQuy4ZAoqX8WVypeO4UZry5LM zYQrsayYw6IzY50Bfr1327Bnl5UIorLjJwnWcLNhzavb0iY/uqlPytb7LymlGpKMgfVc HMExfZBHOH8GJRlXuSsJIeD61wLZZ2J38wQ2890g6udk5wLNT+MZqsqQ0OaSZYGXA3o4 sFCw== X-Gm-Message-State: AOAM533kCKnYcw9b9G7mQyaoihteact2wUqtGQcurPVfSwn5PTvhyUnp 1gCQQs+Vok9w7V4aphNAB8pBWpvsAy7QoA== X-Google-Smtp-Source: ABdhPJz+46dX+5BaF4EpOBMGwRyJNjZaXc/vqQuwdZaWj27QixjSjOT1p9yu36GKXTPPZHGp0M8aTQ== X-Received: by 2002:ae9:d882:: with SMTP id u124mr430059qkf.93.1599577068699; Tue, 08 Sep 2020 07:57:48 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id e188sm10800748qkd.55.2020.09.08.07.57.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 07:57:48 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 05/14] linux: Add time64 select support Date: Tue, 8 Sep 2020 11:57:29 -0300 Message-Id: <20200908145738.640039-5-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, 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 syscall __NR_pselect6_time64 (32-bit) or __NR_pselect6 (64-bit) is used as default. For architectures with __ASSUME_TIME64_SYSCALLS the 32-bit fallback uses __NR_select/__NR__newselect or __NR_pselect6 (it should cover the microblaze case where older kernels do not provide __NR_pselect6). Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). Reviewed-by: Alistair Francis --- include/sys/select.h | 8 +++ include/time.h | 6 +++ sysdeps/unix/sysv/linux/select.c | 92 ++++++++++++++++++++++++-------- 3 files changed, 83 insertions(+), 23 deletions(-) diff --git a/include/sys/select.h b/include/sys/select.h index b5ae9af861..ec073deeba 100644 --- a/include/sys/select.h +++ b/include/sys/select.h @@ -5,8 +5,11 @@ /* Now define the internal interfaces. */ # if __TIMESIZE == 64 # define __pselect64 __pselect +# define __select64 __select #else # include +# include + extern int __pselect64 (int __nfds, fd_set *__readfds, fd_set *__writefds, fd_set *__exceptfds, const struct __timespec64 *__timeout, @@ -18,6 +21,11 @@ extern int __pselect32 (int __nfds, fd_set *__readfds, const struct __timespec64 *__timeout, const __sigset_t *__sigmask) attribute_hidden; + +extern int __select64 (int __nfds, fd_set *__readfds, + fd_set *__writefds, fd_set *__exceptfds, + struct __timeval64 *__timeout); +libc_hidden_proto (__select64) #endif extern int __pselect (int __nfds, fd_set *__readfds, fd_set *__writefds, fd_set *__exceptfds, diff --git a/include/time.h b/include/time.h index fe4da9ca10..936486e206 100644 --- a/include/time.h +++ b/include/time.h @@ -464,6 +464,12 @@ valid_timespec_to_timeval32 (const struct timespec ts) return (struct __timeval32) { (time_t) ts.tv_sec, ts.tv_nsec / 1000 }; } +static inline struct __timeval64 +valid_timespec_to_timeval64 (const struct timespec ts) +{ + return (struct __timeval64) { (time_t) ts.tv_sec, ts.tv_nsec / 1000 }; +} + /* Check if a value is in the valid nanoseconds range. Return true if it is, false otherwise. */ static inline bool diff --git a/sysdeps/unix/sysv/linux/select.c b/sysdeps/unix/sysv/linux/select.c index 54c50edba2..bed52fbda2 100644 --- a/sysdeps/unix/sysv/linux/select.c +++ b/sysdeps/unix/sysv/linux/select.c @@ -21,6 +21,7 @@ #include #include #include +#include /* Check the first NFDS descriptors each in READFDS (if not NULL) for read readiness, in WRITEFDS (if not NULL) for write readiness, and in EXCEPTFDS @@ -28,43 +29,88 @@ after waiting the interval specified therein. Returns the number of ready descriptors, or -1 for errors. */ -#ifdef __NR__newselect -# undef __NR_select -# define __NR_select __NR__newselect -#endif - int -__select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, - struct timeval *timeout) +__select64 (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, + struct __timeval64 *timeout) { -#ifdef __NR_select - return SYSCALL_CANCEL (select, nfds, readfds, writefds, exceptfds, - timeout); -#else - int result; - struct timespec ts, *tsp = NULL; - - if (timeout) + struct __timespec64 ts64, *pts64 = NULL; + if (timeout != NULL) { - TIMEVAL_TO_TIMESPEC (timeout, &ts); - tsp = &ts; + ts64 = timeval64_to_timespec64 (*timeout); + pts64 = &ts64; } - result = SYSCALL_CANCEL (pselect6, nfds, readfds, writefds, exceptfds, tsp, - NULL); - - if (timeout) +#ifndef __NR_pselect6_time64 +# define __NR_pselect6_time64 __NR_pselect6 +#endif + int r; + if (supports_time64 ()) { + r = SYSCALL_CANCEL (pselect6_time64, nfds, readfds, writefds, exceptfds, + pts64, NULL); /* Linux by default will update the timeout after a pselect6 syscall (though the pselect() glibc call suppresses this behavior). Since select() on Linux has the same behavior as the pselect6 syscall, we update the timeout here. */ - TIMESPEC_TO_TIMEVAL (timeout, &ts); + if (r == 0 || errno != ENOSYS) + { + if (timeout != NULL) + TIMEVAL_TO_TIMESPEC (timeout, &ts64); + return r; + } + + mark_time64_unsupported (); } - return result; +#ifndef __ASSUME_TIME64_SYSCALLS + 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 (ts64); + pts32 = &ts32; + } +# ifndef __ASSUME_PSELECT +# ifdef __NR__newselect +# undef __NR_select +# define __NR_select __NR__newselect +# endif + r = SYSCALL_CANCEL (select, nfds, readfds, writefds, exceptfds, pts32); +# else + r = SYSCALL_CANCEL (pselect6, nfds, readfds, writefds, exceptfds, pts32, + NULL); +# endif + if (r >= 0 && timeout != NULL) + *timeout = valid_timespec_to_timeval64 (ts32); #endif + + return r; } + +#if __TIMESIZE != 64 +libc_hidden_def (__select64) + +int +__select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, + struct timeval *timeout) +{ + struct __timeval64 tv64, *ptv64 = NULL; + if (timeout != NULL) + { + tv64 = valid_timeval_to_timeval64 (*timeout); + ptv64 = &tv64; + } + int r = __select64 (nfds, readfds, writefds, exceptfds, ptv64); + if (r >= 0 && timeout != NULL) + /* The remanining timeout will be always less the input TIMEOUT. */ + *timeout = valid_timeval64_to_timeval (tv64); + return r; +} +#endif libc_hidden_def (__select) weak_alias (__select, select)