From patchwork Thu Jun 17 11:50:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 43872 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 5E5423894430 for ; Thu, 17 Jun 2021 12:01:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5E5423894430 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1623931272; bh=puhkguV8tZOD+G1wJgKdrfkp4sXAC1/UC5UDljsmiHU=; 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=skAWsjLWMUX1ikeCEQhRMsNzOiWahkJX5sOt2dT+u15gx0EcRFSYlHmLDoio45zBZ jWYKlKDVOysv9R+OR/f+9mP0bw7DNUbULeU1tY53vC1XDjXCrFFftg5hWz95ujl2mz lzdw/Md+XSqnpzQN74cmA+Q9Qj9/fiOWmdlhJN1Y= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) by sourceware.org (Postfix) with ESMTPS id 32BFF3894412 for ; Thu, 17 Jun 2021 11:51:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 32BFF3894412 Received: by mail-qv1-xf29.google.com with SMTP id c10so1458124qvo.9 for ; Thu, 17 Jun 2021 04:51:28 -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=puhkguV8tZOD+G1wJgKdrfkp4sXAC1/UC5UDljsmiHU=; b=hG1qUE34Zx64ewis1V86gi+yk+T/VgZSIE2aVz3NexOm6kz+yIzBKs+n7Pe/X7lxcu 4m5qO8TLFQPEf01FzjgteqgR07iLNaiwBppJmd4AxFy5OE0gbxKcazUMPBItUMLhFXEw p3vnoNg1+Fa31jfP/NV1A1ou0W6KERY3f6/5cwGE8cRhQERZ4oYPfkkR6Mos5GOVTTr5 zCzTu6ElQjLPP+Djpli86qQGRb+0HMNJSKJYIvKYWYfkWtspgtirLOdqVRjrSBPvmqax UH9zGKq8HKuxyNm1xlT/beDBTUjPHqaLNCJRJPBdwGqgaoZkothY/jdYC7EviTMRmPmJ bf9Q== X-Gm-Message-State: AOAM530j0Bqe4YSDdcO9pYFZCFiE8OwQUrxqjqOYIPa0GP0iHrInluOC bs5YJlJ8Mjqj6mAftfdG7MmaQiVlZAaXoA== X-Google-Smtp-Source: ABdhPJwbNFEZQT+mknVQouhPmsN+m5Qz0nvCMOnMjw22gsynmCJZmzLcwSQavUmku7bDsIdWdefe7A== X-Received: by 2002:ad4:50c6:: with SMTP id e6mr5580622qvq.6.1623930687644; Thu, 17 Jun 2021 04:51:27 -0700 (PDT) Received: from birita.. ([177.194.59.218]) by smtp.googlemail.com with ESMTPSA id p12sm3016435qtw.61.2021.06.17.04.51.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:51:27 -0700 (PDT) To: libc-alpha@sourceware.org, Lukasz Majewski , Carlos O'Donell Subject: [PATCH 11/18] linux: Only use 64-bit syscall if required for semtimedop Date: Thu, 17 Jun 2021 08:50:57 -0300 Message-Id: <20210617115104.1359598-12-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210617115104.1359598-1-adhemerval.zanella@linaro.org> References: <20210617115104.1359598-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" For !__ASSUME_TIME64_SYSCALLS there is no need to issue a 64-bit syscall if the provided timeout fits in a 32-bit one. The 64-bit usage should be rare since the timeout is a relative one. Checked on i686-linux-gnu on a 4.15 kernel and on a 5.11 kernel (with and without --enable-kernel=5.1) and on x86_64-linux-gnu. Reviewed-by: Lukasz Majewski --- sysdeps/unix/sysv/linux/semtimedop.c | 54 ++++++++++++++++------------ sysvipc/Makefile | 9 +++++ sysvipc/test-sysvsem.c | 22 +++++++++--- 3 files changed, 57 insertions(+), 28 deletions(-) diff --git a/sysdeps/unix/sysv/linux/semtimedop.c b/sysdeps/unix/sysv/linux/semtimedop.c index b732b6db48..65a8c080f7 100644 --- a/sysdeps/unix/sysv/linux/semtimedop.c +++ b/sysdeps/unix/sysv/linux/semtimedop.c @@ -21,44 +21,52 @@ #include #include +static int +semtimedop_syscall (int semid, struct sembuf *sops, size_t nsops, + const struct __timespec64 *timeout) +{ +#ifdef __NR_semtimedop_time64 + return INLINE_SYSCALL_CALL (semtimedop_time64, semid, sops, nsops, timeout); +#elif defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS && defined __NR_semtimedop + return INLINE_SYSCALL_CALL (semtimedop, semid, sops, nsops, timeout); +#else + return INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid, + SEMTIMEDOP_IPC_ARGS (nsops, sops, timeout)); +#endif +} + /* Perform user-defined atomical operation of array of semaphores. */ int __semtimedop64 (int semid, struct sembuf *sops, size_t nsops, const struct __timespec64 *timeout) { - int r; -#if defined __NR_semtimedop_time64 - r = INLINE_SYSCALL_CALL (semtimedop_time64, semid, sops, nsops, timeout); -#elif defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS && defined __NR_semtimedop - r = INLINE_SYSCALL_CALL (semtimedop, semid, sops, nsops, timeout); +#ifdef __ASSUME_TIME64_SYSCALLS + return semtimedop_syscall (semid, sops, nsops, timeout); #else - r = INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid, - SEMTIMEDOP_IPC_ARGS (nsops, sops, timeout)); -#endif - -#ifndef __ASSUME_TIME64_SYSCALLS - if (r == 0 || errno != ENOSYS) - return r; + bool is32bit = timeout != NULL + ? in_time_t_range (timeout->tv_sec) : true; + if (!is32bit) + { + int r = semtimedop_syscall (semid, sops, nsops, timeout); + if (r == 0 || errno != ENOSYS) + return r; + __set_errno (EOVERFLOW); + return -1; + } 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; } -# if defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS - r = INLINE_SYSCALL_CALL (semtimedop, semid, sops, nsops, pts32); +# ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS + return INLINE_SYSCALL_CALL (semtimedop, semid, sops, nsops, pts32); # else - r = INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid, - SEMTIMEDOP_IPC_ARGS (nsops, sops, pts32)); + return INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid, + SEMTIMEDOP_IPC_ARGS (nsops, sops, pts32)); # endif -#endif /* __ASSUME_TIME64_SYSCALLS */ - return r; +#endif } #if __TIMESIZE != 64 libc_hidden_def (__semtimedop64) diff --git a/sysvipc/Makefile b/sysvipc/Makefile index 86911803b5..d2acb6a70b 100644 --- a/sysvipc/Makefile +++ b/sysvipc/Makefile @@ -38,3 +38,12 @@ include ../Rules CFLAGS-msgrcv.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-msgsnd.c += -fexceptions -fasynchronous-unwind-tables + +ifeq (yes,$(build-shared)) +librt = $(common-objpfx)rt/librt.so +else +librt = $(common-objpfx)rt/librt.a +endif + +$(objpfx)test-sysvsem: $(librt) +$(objpfx)test-sysvsem-time64: $(librt) diff --git a/sysvipc/test-sysvsem.c b/sysvipc/test-sysvsem.c index 092418205d..d9034c3dae 100644 --- a/sysvipc/test-sysvsem.c +++ b/sysvipc/test-sysvsem.c @@ -16,6 +16,7 @@ License along with the GNU C Library; if not, see . */ +#include #include #include #include @@ -30,6 +31,8 @@ #include #include #include +#include +#include /* These are for the temporary file we generate. */ static char *name; @@ -112,11 +115,20 @@ do_test (void) #ifdef _GNU_SOURCE /* Set a time for half a second. The semaphore operation should timeout with EAGAIN. */ - struct timespec ts = { 0 /* sec */, 500000000 /* nsec */ }; - if (semtimedop (semid, &sb2, 1, &ts) != -1 - || (errno != EAGAIN && errno != ENOSYS)) - FAIL_EXIT1 ("semtimedop succeed or returned errno != {EAGAIN,ENOSYS} " - "(errno=%i)", errno); + { + struct timespec ts = { 0 /* sec */, 500000000 /* nsec */ }; + if (semtimedop (semid, &sb2, 1, &ts) != -1 + || (errno != EAGAIN && errno != ENOSYS)) + FAIL_EXIT1 ("semtimedop succeed or returned errno != {EAGAIN,ENOSYS} " + "(errno=%i)", errno); + } + + { + support_create_timer (0, 100000000, false, NULL); + struct timespec ts = { TYPE_MAXIMUM (time_t), 0 }; + TEST_COMPARE (semtimedop (semid, &sb2, 1, &ts), -1); + TEST_VERIFY (errno == EINTR || errno == EOVERFLOW); + } #endif /* Finally free up the semnaphore resource. */