From patchwork Fri Mar 19 18:31:17 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: 42700 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 784D13842400; Fri, 19 Mar 2021 18:31:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 784D13842400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1616178690; bh=WFcqp9W19NBB0qgfk2DUmMGyQp3blEps8+OX7WUKDT8=; 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=fOE3DEyReqqinHAZ+VglELP2ltmH/fp1TPwFeu2Swx6qYTHq9vkdt+1mqNPdm8HR/ SZnsPd6ak93MZ7x0cG/Trllk/EWqzgZEzB1nLJYOfUB7tFgqQhO0q/BtFxlnDNYK8O okUha1PKa1T5jXHwN7gjvp8Xi95pjcCHc45ewhjE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) by sourceware.org (Postfix) with ESMTPS id 6639D3857C7F for ; Fri, 19 Mar 2021 18:31:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6639D3857C7F Received: by mail-qk1-x72e.google.com with SMTP id z10so3932746qkz.13 for ; Fri, 19 Mar 2021 11:31: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=WFcqp9W19NBB0qgfk2DUmMGyQp3blEps8+OX7WUKDT8=; b=DQmzqEPd2YkRrbDo521k/cNWLi4khTR/hejuiFG4253Kqcw2KuV22CzEJoiFE20gy+ hytxGW1D+oSwqMystGuK6ektD34S73c6sWfzpDGMPoXpHjuMkchWes3RRPvtAa5zcdbF C4RBB+H0WXMWDudWNNkun9i+txkwg7pbMb5+18nRsNAdYHJ8avTzftrKVLnxPPBNk6B+ ojRGu4S6cKzZWoqgOZHd4v8+wgKi10YMniPJxVpConrt3wWFDl7N8MMdsRuVQCRKQ0+b Ekj7LS1RIA2ZdJnfhojwfJrqUngzOn6x0CugjqpOmieYTprwoaUjBhZhvv3UDgr4Dkon aYYw== X-Gm-Message-State: AOAM53346Qdfj989nXxmjUW/Ivh8R622paGafy5T8ixWDF8/PS4gCZ7T sW5YhhysYiuQgRvnF0vIAc2tkYIwPbtHzKW/ X-Google-Smtp-Source: ABdhPJyaDXNrambtgrBeIDRbQ6s/kyvkTsmj5aLhluKFc8ox9ZuZboZpfnMTRpNjPAHsp4JxGo9p+w== X-Received: by 2002:a05:620a:c11:: with SMTP id l17mr10882217qki.487.1616178687711; Fri, 19 Mar 2021 11:31:27 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id z11sm5205747qkg.52.2021.03.19.11.31.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 11:31:27 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 1/5] linux: Implement fstatat with __fstatat64_time64 Date: Fri, 19 Mar 2021 15:31:17 -0300 Message-Id: <20210319183121.2252064-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210319183121.2252064-1-adhemerval.zanella@linaro.org> References: <20210319183121.2252064-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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" It makes fstatat use __NR_statx, which fix the s390 issue with missing nanoxsecond support on compat stat syscalls (at least on recent kernels) and limits the statx call to only one function (which simplifies the __ASSUME_STATX support). Checked on i686-linux-gnu and on powerpc-linux-gnu. --- sysdeps/unix/sysv/linux/fstatat.c | 52 +++++++------------------------ 1 file changed, 11 insertions(+), 41 deletions(-) diff --git a/sysdeps/unix/sysv/linux/fstatat.c b/sysdeps/unix/sysv/linux/fstatat.c index 59efff615f..618c254d6f 100644 --- a/sysdeps/unix/sysv/linux/fstatat.c +++ b/sysdeps/unix/sysv/linux/fstatat.c @@ -26,33 +26,19 @@ int __fstatat (int fd, const char *file, struct stat *buf, int flag) { - int r; - -# if STAT_IS_KERNEL_STAT - /* New kABIs which uses generic pre 64-bit time Linux ABI, e.g. - csky, nios2 */ - r = INTERNAL_SYSCALL_CALL (fstatat64, fd, file, buf, flag); - if (r == 0 && (buf->__st_ino_pad != 0 - || buf->__st_size_pad != 0 - || buf->__st_blocks_pad != 0)) - return INLINE_SYSCALL_ERROR_RETURN_VALUE (EOVERFLOW); -# else -# ifdef __NR_fstatat64 - /* Old KABIs with old non-LFS support, e.g. arm, i386, hppa, m68k, mips32, - microblaze, s390, sh, powerpc, and sparc. */ - struct stat64 st64; - r = INTERNAL_SYSCALL_CALL (fstatat64, fd, file, &st64, flag); + struct __stat64_t64 st64; + int r = __fstatat64_time64 (fd, file, &st64, flag); if (r == 0) { if (! in_ino_t_range (st64.st_ino) || ! in_off_t_range (st64.st_size) - || ! in_blkcnt_t_range (st64.st_blocks)) + || ! in_blkcnt_t_range (st64.st_blocks) + || ! in_time_t_range (st64.st_atim.tv_sec) + || ! in_time_t_range (st64.st_mtim.tv_sec) + || ! in_time_t_range (st64.st_ctim.tv_sec)) return INLINE_SYSCALL_ERROR_RETURN_VALUE (EOVERFLOW); - /* Clear internal pad and reserved fields. */ - memset (buf, 0, sizeof (*buf)); - - buf->st_dev = st64.st_dev, + buf->st_dev = st64.st_dev; buf->st_ino = st64.st_ino; buf->st_mode = st64.st_mode; buf->st_nlink = st64.st_nlink; @@ -62,27 +48,11 @@ __fstatat (int fd, const char *file, struct stat *buf, int flag) buf->st_size = st64.st_size; buf->st_blksize = st64.st_blksize; buf->st_blocks = st64.st_blocks; - buf->st_atim.tv_sec = st64.st_atim.tv_sec; - buf->st_atim.tv_nsec = st64.st_atim.tv_nsec; - buf->st_mtim.tv_sec = st64.st_mtim.tv_sec; - buf->st_mtim.tv_nsec = st64.st_mtim.tv_nsec; - buf->st_ctim.tv_sec = st64.st_ctim.tv_sec; - buf->st_ctim.tv_nsec = st64.st_ctim.tv_nsec; - - return 0; + buf->st_atim = valid_timespec64_to_timespec (st64.st_atim); + buf->st_mtim = valid_timespec64_to_timespec (st64.st_mtim); + buf->st_ctim = valid_timespec64_to_timespec (st64.st_ctim); } -# else - /* 64-bit kabi outlier, e.g. mips64 and mips64-n32. */ - struct kernel_stat kst; - r = INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); - if (r == 0) - r = __cp_kstat_stat (&kst, buf); -# endif /* __nr_fstatat64 */ -# endif /* STAT_IS_KERNEL_STAT */ - - return INTERNAL_SYSCALL_ERROR_P (r) - ? INLINE_SYSCALL_ERROR_RETURN_VALUE (-r) - : 0; + return r; } weak_alias (__fstatat, fstatat)