From patchwork Mon Jul 13 17:10:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 40080 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 6C68F3892445; Mon, 13 Jul 2020 17:10:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6C68F3892445 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1594660255; bh=LGrvA7OMvGsXOGVf8yGnX1YJDxmfrEwV8zv5awOhtc0=; 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=QkUSJam9HLbi7LLm5OtC2dntHYgmDA7wgds4DKrBaZl/p7FuuM7X0v9gNsEtRW4tM 3v1TwpcaDB4emtUZvhXlyfMP+BO/u7azRHvnRv5OklEJVbrfRWU7ycrd/dpk9NXlLB MndvMC/odtzuUq8dS7CPipfQGJsJVanXQF84Xwh4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by sourceware.org (Postfix) with ESMTPS id B28083890425 for ; Mon, 13 Jul 2020 17:10:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B28083890425 Received: by mail-qk1-x744.google.com with SMTP id z63so12903295qkb.8 for ; Mon, 13 Jul 2020 10:10:52 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LGrvA7OMvGsXOGVf8yGnX1YJDxmfrEwV8zv5awOhtc0=; b=IWlmMKTLE5LJWkt3w8XD3RTDgkvN00L6yvWSOyjJOGC/jtNnMDvzAndH7CYJgsgtcs +ZBscDBPTbcABdf5/tArNPFbguirFyxO0Id/HG+41FKKAu+s7CHtga0CWLchEJWtM3VI J5sHg5OR5g9x8U/BSNhLF0gZgwVDS2mWQyQvVt+syyFc4QvVd1c/EVDHfeNGqNf+41Fg QBiRrGP4bD5v0OlkxhoUWSceMnfy852FsmcVX97/4wVATmtis9J9crSYrullX2luQQfo AzTg0eTorNB4RBNbeO8JkKEbkSZIUw2OF3A2Leq90qI3YA7BVODxiD80uZaWgcFKRYOx ZVcA== X-Gm-Message-State: AOAM5336hAEdoh/3PhTFw/eiE2wMCJyB0jlNHaTxGp9+IYrrcgJpGre6 oUfqG9eb+naKgOwjMgyL0S4B5hTOhiY= X-Google-Smtp-Source: ABdhPJwDsqMsAbdmh1FJaS7jILEVRbMLA3FeJFJa8CVEGQ61F3rsHDnosT9rbNU3HmEb1bBvI+PNTQ== X-Received: by 2002:a37:9dc5:: with SMTP id g188mr509540qke.427.1594660252069; Mon, 13 Jul 2020 10:10:52 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id v10sm19767919qtk.14.2020.07.13.10.10.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 10:10:51 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 15/23] linux: Add time64 semtimedop support Date: Mon, 13 Jul 2020 14:10:17 -0300 Message-Id: <20200713171025.3661832-15-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200713171025.3661832-1-adhemerval.zanella@linaro.org> References: <20200713171025.3661832-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-14.1 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Either the __NR_semtimedop_time64 (for 32-bit) or the __NR_semtimedop (for 64-bit) syscall 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_ipc or __NR_semtimeop (for 32-bit time_t). Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). --- sysdeps/unix/sysv/linux/include/sys/sem.h | 6 +++ sysdeps/unix/sysv/linux/semtimedop.c | 57 +++++++++++++++++++---- 2 files changed, 55 insertions(+), 8 deletions(-) diff --git a/sysdeps/unix/sysv/linux/include/sys/sem.h b/sysdeps/unix/sysv/linux/include/sys/sem.h index a9151e057d..f369c6b6d3 100644 --- a/sysdeps/unix/sysv/linux/include/sys/sem.h +++ b/sysdeps/unix/sysv/linux/include/sys/sem.h @@ -7,9 +7,15 @@ __typeof__ (semtimedop) __semtimedop attribute_hidden; #if __TIMESIZE == 64 # define __semctl64 __semctl +# define __semtimedop64 __semtimedop #else +# include + extern int __semctl64 (int semid, int semnum, int cmd, ...); libc_hidden_proto (__semctl64); +extern int __semtimedop64 (int semid, struct sembuf *sops, size_t nsops, + const struct __timespec64 *tmo); +libc_hidden_proto (__semtimedop64); #endif # endif diff --git a/sysdeps/unix/sysv/linux/semtimedop.c b/sysdeps/unix/sysv/linux/semtimedop.c index 6fdde09bad..d755a820d8 100644 --- a/sysdeps/unix/sysv/linux/semtimedop.c +++ b/sysdeps/unix/sysv/linux/semtimedop.c @@ -22,18 +22,59 @@ #include /* Perform user-defined atomical operation of array of semaphores. */ +int +__semtimedop64 (int semid, struct sembuf *sops, size_t nsops, + const struct __timespec64 *timeout) +{ +#if defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS +# ifndef __NR_semtimedop_time64 +# define __NR_semtimedop_time64 __NR_semtimedop +# endif + int r = INLINE_SYSCALL_CALL (semtimedop_time64, semid, sops, nsops, + timeout); +#else + int 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; + + 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); +# else + r = INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid, + SEMTIMEDOP_IPC_ARGS (nsops, sops, pts32)); +# endif +#endif /* __ASSUME_TIME64_SYSCALLS */ + return r; +} +#if __TIMESIZE != 64 +libc_hidden_def (__semtimedop64) int __semtimedop (int semid, struct sembuf *sops, size_t nsops, const struct timespec *timeout) { - /* semtimedop wire-up syscall is not exported for 32-bit ABIs (they have - semtimedop_time64 instead with uses a 64-bit time_t). */ -#if 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 + struct __timespec64 ts64, *pts64 = NULL; + if (timeout != 0) + { + ts64 = valid_timespec_to_timespec64 (*timeout); + pts64 = &ts64; + } + return __semtimedop64 (semid, sops, nsops, pts64); } +#endif weak_alias (__semtimedop, semtimedop)