From patchwork Tue Sep 8 14:57:30 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: 40373 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 8B5723951C39; Tue, 8 Sep 2020 14:57:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8B5723951C39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1599577073; bh=QFLcOWO69A1E4S627h/imyAYzsuj7wHJvfusRrdgECg=; 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=t5PuQ2z0w1fPcCze6mSuZTkXCZY4Y8IfoEAQjPHY+p4E+PbyVYo62Om9v25X6/KAA f/rIIRNRBgoI4+ZfbjS/cdTAF05TWlpMS8wLqkusv9yQAu5qREGObFXJz8Lc0bsvkn Zb+EAMMnn+mRol8uSOokxg3qLqtX3skhOP/ImYtY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf43.google.com (mail-qv1-xf43.google.com [IPv6:2607:f8b0:4864:20::f43]) by sourceware.org (Postfix) with ESMTPS id 0F10639518B8 for ; Tue, 8 Sep 2020 14:57:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0F10639518B8 Received: by mail-qv1-xf43.google.com with SMTP id z18so4408966qvp.6 for ; Tue, 08 Sep 2020 07:57:51 -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=QFLcOWO69A1E4S627h/imyAYzsuj7wHJvfusRrdgECg=; b=XLAhAnH4jr6XUI514ZEK6RjUGAQQ8b/2rWyGHhq+idQilumLNT+ephh3LrjabF5v+l PJkL/szMYodz0eVanDBgk7OKUClZ2tICGYXvO7yfV+pFGmy4l4aIu7Ff7q9JzBCc1XMM PTJ0anZjkQzJ9rQYBg3XWC7WgeZ07MmCziQuDdrKuxb5zxydb8BnEZsnl0rPJI1ycAw+ qZfKRW7/V2shOuAN17CDQJmSWCAVmQg/96L/jbrFu6Wy4Lo/Mz5ZvPVOI88g4r1J91dI fCrMrKdXhX17qGnrXXZUWNQnSI5QHFvlLCp2Wi5YvmHRTiO8PwSGhR/TlnlVdhrwpl9B 6lRg== X-Gm-Message-State: AOAM530T/XMUFoXTi21PsRd1brlGIWNy4Jw2w2JY1NF1ljF3MqZBknL+ Fqj0BNza4lx/PyDSjsFA0QE5K63qZyY/pA== X-Google-Smtp-Source: ABdhPJwaELg0hW7eUcuNUmxGyAId6pnHimwFSoYlMwWpKl3WLzOE2fUrl9Q5ZsAWjjDqlkGGyfEKWw== X-Received: by 2002:a0c:f946:: with SMTP id i6mr520589qvo.2.1599577070411; Tue, 08 Sep 2020 07:57:50 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id e188sm10800748qkd.55.2020.09.08.07.57.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 07:57:49 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 06/14] linux: Add time64 sigtimedwait support Date: Tue, 8 Sep 2020 11:57:30 -0300 Message-Id: <20200908145738.640039-6-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 syscall __NR_sigtimedwait_time64 (for 32-bit) or __NR_sigtimedwait (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_rt_sigtimedwait (32-bit time_t). Checked on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Alistair Francis --- include/signal.h | 8 +++++ sysdeps/unix/sysv/linux/sigtimedwait.c | 50 +++++++++++++++++++++----- 2 files changed, 50 insertions(+), 8 deletions(-) diff --git a/include/signal.h b/include/signal.h index b4ee02d153..544d701bce 100644 --- a/include/signal.h +++ b/include/signal.h @@ -38,6 +38,14 @@ extern int __sigwait (const sigset_t *__set, int *__sig); libc_hidden_proto (__sigwait) extern int __sigwaitinfo (const sigset_t *__set, siginfo_t *__info); libc_hidden_proto (__sigwaitinfo) +#if __TIMESIZE == 64 +# define __sigtimedwait64 __sigtimedwait +#else +# include +extern int __sigtimedwait64 (const sigset_t *__set, siginfo_t *__info, + const struct __timespec64 *__timeout); +libc_hidden_proto (__sigtimedwait64) +#endif extern int __sigtimedwait (const sigset_t *__set, siginfo_t *__info, const struct timespec *__timeout); libc_hidden_proto (__sigtimedwait) diff --git a/sysdeps/unix/sysv/linux/sigtimedwait.c b/sysdeps/unix/sysv/linux/sigtimedwait.c index f2ef3aad45..4405606571 100644 --- a/sysdeps/unix/sysv/linux/sigtimedwait.c +++ b/sysdeps/unix/sysv/linux/sigtimedwait.c @@ -15,20 +15,38 @@ License along with the GNU C Library; if not, see . */ -#include #include -#include -#include +#include int -__sigtimedwait (const sigset_t *set, siginfo_t *info, - const struct timespec *timeout) +__sigtimedwait64 (const sigset_t *set, siginfo_t *info, + const struct __timespec64 *timeout) { - /* XXX The size argument hopefully will have to be changed to the - real size of the user-level sigset_t. */ - int result = SYSCALL_CANCEL (rt_sigtimedwait, set, info, timeout, +#ifndef __NR_rt_sigtimedwait_time64 +# define __NR_rt_sigtimedwait_time64 __NR_rt_sigtimedwait +#endif + int result = SYSCALL_CANCEL (rt_sigtimedwait_time64, set, info, timeout, __NSIG_BYTES); +#ifndef __ASSUME_TIME64_SYSCALLS + if (result != 0 && errno == ENOSYS) + { + 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; + } + result = SYSCALL_CANCEL (rt_sigtimedwait, set, info, pts32, + __NSIG_BYTES); + } +#endif + /* The kernel generates a SI_TKILL code in si_code in case tkill is used. tkill is transparently used in raise(). Since having SI_TKILL as a code is useful in general we fold the results @@ -38,5 +56,21 @@ __sigtimedwait (const sigset_t *set, siginfo_t *info, return result; } +#if __TIMESIZE != 64 +libc_hidden_def (__sigtimedwait64) + +int +__sigtimedwait (const sigset_t *set, siginfo_t *info, + const struct timespec *timeout) +{ + struct __timespec64 ts64, *pts64 = NULL; + if (timeout != NULL) + { + ts64 = valid_timespec_to_timespec64 (*timeout); + pts64 = &ts64; + } + return __sigtimedwait64 (set, info, pts64); +} +#endif libc_hidden_def (__sigtimedwait) weak_alias (__sigtimedwait, sigtimedwait)