From patchwork Mon Feb 24 18:23:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vineet Gupta X-Patchwork-Id: 1243390 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-110045-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=synopsys.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha1 header.s=default header.b=A6eZYB0P; dkim=pass (2048-bit key; unprotected) header.d=synopsys.com header.i=@synopsys.com header.a=rsa-sha256 header.s=mail header.b=gdn3vL62; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48R9Rk3g4Vz9sQt for ; Tue, 25 Feb 2020 05:23:25 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; q=dns; s=default; b=poV W9InMFLn6kBQMKxBxzGpYvq0RriFDhpvFABXg8CJrTqaDI2TOzgtwSegCDu9Qfau S+oQJoV23EnPjD0QGn51rSlpa9kH0ZMrlSOjJNhSRKUaZnxh47WGh1KRoWegp45s gMNN3ePlpRXJDbPYeQfLwR20No0Bh50duG8Zdw8Y= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; s=default; bh=+VsZVFS/q SA7vcGrxS6aYiepIn8=; b=A6eZYB0PF6m3mVtUq7FDFbtqOp/gPLMYLmwuWIK8F f0BoyPk192HLg+Xbnx5ZF0J+njTHxQ9MxD9RAJAHkzXT9j2E/yzO1Dp/MyPgj2MJ IAC+BhG2AmqI1WQS6xbQTt+Btd9eM19vrPsZ9Ekbq7J5/s7c9CcWWrkSY0r6VJKN xU= Received: (qmail 35937 invoked by alias); 24 Feb 2020 18:23:19 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 35929 invoked by uid 89); 24 Feb 2020 18:23:19 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, SPF_PASS autolearn=ham version=3.3.1 spammy=Vineet, vineet, Gupta, gupta X-HELO: smtprelay-out1.synopsys.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1582568595; bh=R6N92sCSOTxoo7IJxc7Xf3Hxi3uw0Q9D8RbjHSITWjU=; h=From:To:Cc:Subject:Date:From; b=gdn3vL625KIbATwKLyIus9MqTgnUjHMtsKXzzSE7G+k97tZ38QzOqqZR1UbNDpFEQ eG+SJkesS/S204e09V8AoL9C2xHmHrehErlo6FKzYMzwX430iDf9ztP6bCF6wtTb20 VciAh3//Q1aW8QgRkqlongG21N6/7FDESyuq4Q5zVIpyjYM9sagQEPhrGq1SeGk6+u z++d6ucacwWql5wZXeNO3H3rrvn2wfJrh1sr1OpdBDbUVQjVXU1ed0FRTbtW67d7T2 NxJ8eZ5epAw5J07WHYN3h8t5HsXhSlsOyvMHBTXmjvqLOyY1IBbz+hARPq+dlXDIAF X0/1Sn+NquuKQ== From: Vineet Gupta To: libc-alpha@sourceware.org, arnd@arndb.de Cc: linux-snps-arc@lists.infradead.org, alistair23@gmail.com, lukma@denx.de, Vineet Gupta Subject: [PATCH] asm-generic ABI: Allow statx syscall despite fstatat64, fstat64 Date: Mon, 24 Feb 2020 10:23:05 -0800 Message-Id: <20200224182305.28027-1-vgupta@synopsys.com> MIME-Version: 1.0 An old version of asm-generic syscall ABI (e.g. ARC 2013) provided fstat[at]64 syscalls for implementing the stat family. These sycalls are passthru (no interworking/itemized-copy needed between kernel and user structs since they are binary comaptible). However with switch to 64-bit time_t the compatibily goes away so we need explicit interworking. Luckily such code already exists albeit it uses the statx syscall. So this patch reworks the asm-generic based stat functions to use the statx code-path if the arch so desires. It essentially reworks the commit 6bbfc5c09fc5b5e3 ("Add statx conditionals for wordsize-32 *xstat.c") This will be used by ARC port for 64-bit time_t. But it has no real bearing on 64-bit and can just be independently opted-in by an arch port provided the ABI supports it. Signed-off-by: Vineet Gupta --- sysdeps/unix/sysv/linux/fxstat64.c | 8 ++++---- sysdeps/unix/sysv/linux/fxstatat64.c | 6 +++--- sysdeps/unix/sysv/linux/generic/kernel_stat.h | 7 +++++++ sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c | 6 +++--- sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c | 6 +++--- sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat.c | 10 +++++----- sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat64.c | 8 ++++---- sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c | 6 +++--- sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c | 6 +++--- sysdeps/unix/sysv/linux/statx_cp.c | 2 +- 10 files changed, 36 insertions(+), 29 deletions(-) diff --git a/sysdeps/unix/sysv/linux/fxstat64.c b/sysdeps/unix/sysv/linux/fxstat64.c index 9133a0a29b8e..d4da85f7949c 100644 --- a/sysdeps/unix/sysv/linux/fxstat64.c +++ b/sysdeps/unix/sysv/linux/fxstat64.c @@ -33,15 +33,15 @@ int ___fxstat64 (int vers, int fd, struct stat64 *buf) { int result; -#ifdef __NR_fstat64 - result = INLINE_SYSCALL (fstat64, 2, fd, buf); -#else +# if defined(STAT64_IS_NOT_KERNEL_STAT64) || !defined(__NR_fstat64) struct statx tmp; result = INLINE_SYSCALL (statx, 5, fd, "", AT_EMPTY_PATH, STATX_BASIC_STATS, &tmp); if (result == 0) __cp_stat64_statx (buf, &tmp); -#endif +# else + result = INLINE_SYSCALL (fstat64, 2, fd, buf); +# endif return result; } diff --git a/sysdeps/unix/sysv/linux/fxstatat64.c b/sysdeps/unix/sysv/linux/fxstatat64.c index e24b456604ff..eb59c8be845f 100644 --- a/sysdeps/unix/sysv/linux/fxstatat64.c +++ b/sysdeps/unix/sysv/linux/fxstatat64.c @@ -38,15 +38,15 @@ __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) int result; -#ifdef __NR_fstatat64 - result = INTERNAL_SYSCALL_CALL (fstatat64, fd, file, st, flag); -#else +# if defined(STAT64_IS_NOT_KERNEL_STAT64) || !defined(__NR_fstatat64) struct statx tmp; result = INTERNAL_SYSCALL_CALL (statx, fd, file, AT_NO_AUTOMOUNT | flag, STATX_BASIC_STATS, &tmp); if (result == 0) __cp_stat64_statx (st, &tmp); +#else + result = INTERNAL_SYSCALL_CALL (fstatat64, fd, file, st, flag); #endif if (!__glibc_likely (INTERNAL_SYSCALL_ERROR_P (result))) return 0; diff --git a/sysdeps/unix/sysv/linux/generic/kernel_stat.h b/sysdeps/unix/sysv/linux/generic/kernel_stat.h index 2eed3596c0ed..916deb7ed8c1 100644 --- a/sysdeps/unix/sysv/linux/generic/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/generic/kernel_stat.h @@ -28,3 +28,10 @@ #endif #define STATFS_IS_STATFS64 0 + +/* Ports define to 1 when glibc struct stat64 is not compatible with + kernel stat64. This forces use of statx syscall (and explicit interworking) + even when fstat64 syscall is available. For asm-generic ABI this happened + with switch to 64-bit time_t. */ + +# undef STAT64_IS_NOT_KERNEL_STAT64 diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c index 850450e1e8a1..8ab11c62d1b3 100644 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c @@ -36,14 +36,14 @@ __fxstat (int vers, int fd, struct stat *buf) { if (vers == _STAT_VER_KERNEL) { -# ifdef __NR_fstat64 - int rc = INLINE_SYSCALL (fstat64, 2, fd, buf); -# else +# if defined(STAT64_IS_NOT_KERNEL_STAT64) || !defined(__NR_fstat64) struct statx tmp; int rc = INLINE_SYSCALL (statx, 5, fd, "", AT_EMPTY_PATH, STATX_BASIC_STATS, &tmp); if (rc == 0) __cp_stat64_statx ((struct stat64 *)buf, &tmp); +# else + int rc = INLINE_SYSCALL (fstat64, 2, fd, buf); # endif return rc ?: stat_overflow (buf); } diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c index 8df65ebea084..19446a6cd917 100644 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c @@ -36,15 +36,15 @@ __fxstatat (int vers, int fd, const char *file, struct stat *buf, int flag) { if (vers == _STAT_VER_KERNEL) { -# ifdef __NR_fstatat64 - int rc = INLINE_SYSCALL (fstatat64, 4, fd, file, buf, flag); -# else +# if defined(STAT64_IS_NOT_KERNEL_STAT64) || !defined(__NR_fstat64) struct statx tmp; int rc = INLINE_SYSCALL (statx, 5, fd, file, AT_NO_AUTOMOUNT | flag, STATX_BASIC_STATS, &tmp); if (rc == 0) __cp_stat64_statx ((struct stat64 *)buf, &tmp); +# else + int rc = INLINE_SYSCALL (fstatat64, 4, fd, file, buf, flag); # endif return rc ?: stat_overflow (buf); } diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat.c index bd02631d68cd..63fba924d14e 100644 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat.c +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat.c @@ -35,17 +35,17 @@ __lxstat (int vers, const char *name, struct stat *buf) { if (vers == _STAT_VER_KERNEL) { -#ifdef __NR_fstatat64 - int rc = INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf, - AT_SYMLINK_NOFOLLOW); -#else +# if defined(STAT64_IS_NOT_KERNEL_STAT64) || !defined(__NR_fstat64) struct statx tmp; int rc = INLINE_SYSCALL (statx, 5, AT_FDCWD, name, AT_NO_AUTOMOUNT | AT_SYMLINK_NOFOLLOW, STATX_BASIC_STATS, &tmp); if (rc == 0) __cp_stat64_statx ((struct stat64 *)buf, &tmp); -#endif +# else + int rc = INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf, + AT_SYMLINK_NOFOLLOW); +# endif return rc ?: stat_overflow (buf); } errno = EINVAL; diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat64.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat64.c index 3eab0a184751..5f8361361e04 100644 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat64.c +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat64.c @@ -40,10 +40,7 @@ __lxstat64 (int vers, const char *name, struct stat64 *buf) { if (vers == _STAT_VER_KERNEL) { -#ifdef __NR_fstatat64 - return INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf, - AT_SYMLINK_NOFOLLOW); -#else +# if defined(STAT64_IS_NOT_KERNEL_STAT64) || !defined(__NR_fstat64) struct statx tmp; int rc = INLINE_SYSCALL (statx, 5, AT_FDCWD, name, AT_NO_AUTOMOUNT | AT_SYMLINK_NOFOLLOW, @@ -51,6 +48,9 @@ __lxstat64 (int vers, const char *name, struct stat64 *buf) if (rc == 0) __cp_stat64_statx (buf, &tmp); return rc; +#else + return INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf, + AT_SYMLINK_NOFOLLOW); #endif } diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c index a4a921c1ea6c..43b3e0b7b638 100644 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c @@ -35,14 +35,14 @@ __xstat (int vers, const char *name, struct stat *buf) { if (vers == _STAT_VER_KERNEL) { -# ifdef __NR_fstatat64 - int rc = INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf, 0); -# else +# if defined(STAT64_IS_NOT_KERNEL_STAT64) || !defined(__NR_fstat64) struct statx tmp; int rc = INLINE_SYSCALL (statx, 5, AT_FDCWD, name, AT_NO_AUTOMOUNT, STATX_BASIC_STATS, &tmp); if (rc == 0) __cp_stat64_statx ((struct stat64 *)buf, &tmp); +# else + int rc = INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf, 0); # endif return rc ?: stat_overflow (buf); } diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c index 0848b5a4b4b1..e999bd2ffad5 100644 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c @@ -40,15 +40,15 @@ __xstat64 (int vers, const char *name, struct stat64 *buf) { if (vers == _STAT_VER_KERNEL) { -#ifdef __NR_fstatat64 - return INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf, 0); -#else +# if defined(STAT64_IS_NOT_KERNEL_STAT64) || !defined(__NR_fstat64) struct statx tmp; int rc = INLINE_SYSCALL (statx, 5, AT_FDCWD, name, AT_NO_AUTOMOUNT, STATX_BASIC_STATS, &tmp); if (rc == 0) __cp_stat64_statx (buf, &tmp); return rc; +#else + return INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf, 0); #endif } errno = EINVAL; diff --git a/sysdeps/unix/sysv/linux/statx_cp.c b/sysdeps/unix/sysv/linux/statx_cp.c index cc6e17929ea0..faba286d963c 100644 --- a/sysdeps/unix/sysv/linux/statx_cp.c +++ b/sysdeps/unix/sysv/linux/statx_cp.c @@ -22,7 +22,7 @@ #include -#if !defined(__NR_fstat64) || !defined(__NR_fstatat64) +#if !defined(__NR_fstat64) || !defined(__NR_fstatat64) || defined(STAT64_IS_NOT_KERNEL_STAT64) void __cp_stat64_statx (struct stat64 *to, struct statx *from) {