From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by sourceware.org (Postfix) with ESMTPS id 362A53858D34 for ; Wed, 8 Jul 2020 17:08:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 362A53858D34 Received: by mail-qk1-x741.google.com with SMTP id k18so42233518qke.4 for ; Wed, 08 Jul 2020 10:08:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:references:from:autocrypt:subject:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=c60fvXzCJgEG/z+acmoIvZ1L4qxd2Cv28GkP4Ia7lZc=; b=Fb/UdGtLd8FrNEFBGtnmPWaZwlmLLCrc/CQ1t1IhGlbzLdrfJP0/4ojjorLkdjKj6C eHkseULIsjzInAK7wpsuMqQoBRWu1TaNdE9xejpVPVHl6zTJIuYMUW5SpMEakZXiJbEM yrXy9ASzjfJ263NF94JXnX8UkBUVsM1HxSH2OivFbnVh4pgZn8PAxvo8f/8aVhBPMvCK wVFWMJZi2gYATml25I6Fc+b6JbcaqsueSyfj35CJHfCNm2ES0sffeoqUs2LqJL93YykT 0U1hMjsA+LF89GYzTMHnx0G3/XlEh4ZUIIC5cr9qpvF5YAVqMcE/VHzSKl2VGP88EYNT TXqA== X-Gm-Message-State: AOAM531g6j8E03bXFRHUYePv4LRQyq9DeENrQjj7okdEH5sG4a3WhsVl 5J9YdMz0ZWEpSYeONpnPSjEjz0l7I1M= X-Google-Smtp-Source: ABdhPJwgts2PRsfkgp1FdqvqiM5EMnltPsrLTQnSX1HOzA/SGRh1Ngt8pCncuTB96UtMmcDlCfz1zw== X-Received: by 2002:a37:9201:: with SMTP id u1mr30847012qkd.40.1594228086765; Wed, 08 Jul 2020 10:08:06 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id 2sm453251qka.42.2020.07.08.10.08.05 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 08 Jul 2020 10:08:06 -0700 (PDT) To: libc-alpha@sourceware.org References: <56ade7ab382535b83feb14058df9a84aad0dcaac.1591201405.git.alistair.francis@wdc.com> From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Subject: Re: [PATCH v2 02/18] RISC-V: Define __NR_* as __NR_*_time64/64 for 32-bit Message-ID: Date: Wed, 8 Jul 2020 14:08:04 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.4 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-List-Received-Date: Wed, 08 Jul 2020 17:08:09 -0000 On 07/07/2020 21:09, Maciej W. Rozycki via Libc-alpha wrote: > Alistair, > > I think the change heading is too cryptic and does not express the intent > of the change well enough. How about: > > RISC-V: Use 64-bit-time syscall numbers with the 32-bit port > > and then maybe explain in a little more details in the change description. > > On Wed, 3 Jun 2020, Alistair Francis via Libc-alpha wrote: > >> diff --git a/sysdeps/unix/sysv/linux/riscv/sysdep.h b/sysdeps/unix/sysv/linux/riscv/sysdep.h >> index 83e4adf6a2..aa61e8b04d 100644 >> --- a/sysdeps/unix/sysv/linux/riscv/sysdep.h >> +++ b/sysdeps/unix/sysv/linux/riscv/sysdep.h >> @@ -116,6 +116,67 @@ >> >> #include > > This file is weird, as it includes twice, first > time indirectly via at the top, > and then second time here. So I think this second inclusion can be > removed (along with the preceding inclusion of , as it does not > appear to change anything), and the following conditional moved to the > top, just after the inclusion of . Oddly > has not been protected against multiple inclusion, but its contents do not > trigger compilation warnings if processed more than once. This multiple inclusion is done internally in some places so the file that wants to override a definition would first include the generic definitions and then #undef/#define the new one (kernel-features.h still does it). I think this is kind of confusing, but this is how sysdep.h is currently organized. We have been changing bit per bit, but there is a lot of place where inclusing is done without guards. > > The two #ifdef/#ifndef __ASSEMBLER__ conditionals will then become > adjacent and can be merged into a single #ifdef/#else one. > > This clean-up would probably better be made as a separate preceding > change. > >> +#if __riscv_xlen == 32 > > I think using __WORDSIZE here would be more consistent with the rest of > our code (we do use `__riscv_xlen' in a couple of places, but I think they > ought to be cleaned up). > >> +/* Define the __NR_futex as __NR_futex64 as RV32 doesn't have a >> + * __NR_futex syscall. >> + */ >> +# ifndef __NR_futex >> +# define __NR_futex __NR_futex_time64 >> +# endif > > The comment does not match the code. > > I think it makes no sense to comment on individual entries as they all > repeat the same pattern and the same purpose, so an introductory comment > covering them all at the beginning of the conditional would be better > instead. I suppose you can then reuse it for the change description too. > >> +# ifndef __NR_clock_adjtime >> +# define __NR_clock_adjtime __NR_clock_adjtime64 >> +# endif >> +#endif /* __riscv_xlen == 32 */ > > Since you have multiple inner conditionals separated by an empty line > each I think it will make sense to have an empty line as well between the > final one and the closing of the outer conditional. Likewise at the > beginning. I think the correct way to how ARC port is doing which is: 1. Add any required syscall suppression for 32-bit off_t/time_t on fixup-asm-unistd.h so arch-syscall.h will have only the required definitions. This might be the case for riscv32 since its kernel ABI only supports 64-bit off_t/time_t. 2. Regenerate arch-syscall.h if it were the case. 3. On sysdep.h redefine only the syscall where the generic implementation still does not have actual 64-bit time_t support: /* "workarounds" for generic code needing to handle 64-bit time_t. */ /* Fix sysdeps/unix/sysv/linux/clock_getcpuclockid.c. */ #define __NR_clock_getres __NR_clock_getres_time64 /* Fix sysdeps/nptl/lowlevellock-futex.h. */ #define __NR_futex __NR_futex_time64 [...] (with proper guards it should require the #ifndef/#define) 4. Add a comment it is a workaround to handle 64-bit time_t and on each #define comment for which implementation it intends to.