From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd41.google.com (mail-io1-xd41.google.com [IPv6:2607:f8b0:4864:20::d41]) by sourceware.org (Postfix) with ESMTPS id AFFEA397280C for ; Thu, 10 Sep 2020 19:34:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AFFEA397280C Received: by mail-io1-xd41.google.com with SMTP id g128so8436740iof.11 for ; Thu, 10 Sep 2020 12:34:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=hZXGY8jP0yf29zc2tWfXOvFNYo9e9fFf1t70+OCBmPw=; b=E0yvDg+EzLF/r0p74g9iYJaxjPwWItl1CTa5IM92zdUwFs7m7YELaSnOkBwAQAJrgm hYpD6ZRsRfLrTOmcg7gDIZuq5uu2xtI1/yrokCl8Rc5kqMRL4YVUJ04oq0PDD9uDDBZe 5ixer0doy1ViKiF8YRqyCE//9FTfOzjlFmLYYxH+BPH6g4Oa/hcwkYDGxOcKjAJ7S5s5 7bR4nNhW9A63kEZd52E8vto14P+5OCjGZ/P354mddpA6WGPZakEnWsKOL/YVmla49kvV H5VEfhl6VEYC+G+bKq5ZOM1mARy5TKzcj/th4dXdxcI48BzSolYAsLVorC1Ah38lnOk2 lbOw== X-Gm-Message-State: AOAM530nao1FIh8m6oIUXFO1bWIHI1yn2LNYHIYmwHeEOTzDXYtb8Rl8 RtMH7x4TpQhl4ShkGfEVld0RwmGB7jYPEK/KFgQ= X-Google-Smtp-Source: ABdhPJxaurFKOGWDp9eXWLQb0d9qtmuk15C/0RolX6t5E0qcIuYBVKtYrYmuLPWBE2yLrFuancWBVJ1B7wOI2FEBucM= X-Received: by 2002:a05:6602:2245:: with SMTP id o5mr9134570ioo.105.1599766478191; Thu, 10 Sep 2020 12:34:38 -0700 (PDT) MIME-Version: 1.0 References: <20200908145738.640039-1-adhemerval.zanella@linaro.org> <20200908145738.640039-3-adhemerval.zanella@linaro.org> In-Reply-To: <20200908145738.640039-3-adhemerval.zanella@linaro.org> From: Alistair Francis Date: Thu, 10 Sep 2020 12:23:36 -0700 Message-ID: Subject: Re: [PATCH v2 03/14] linux: Add time64 semtimedop support To: Adhemerval Zanella Cc: GNU C Library Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, 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-List-Received-Date: Thu, 10 Sep 2020 19:34:40 -0000 On Tue, Sep 8, 2020 at 7:58 AM Adhemerval Zanella via Libc-alpha wrote: > > 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). Reviewed-by: Alistair Francis Alistair > --- > 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..56121fb0bf 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 != NULL) > + { > + ts64 = valid_timespec_to_timespec64 (*timeout); > + pts64 = &ts64; > + } > + return __semtimedop64 (semid, sops, nsops, pts64); > } > +#endif > weak_alias (__semtimedop, semtimedop) > -- > 2.25.1 >