From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id E19E6385781A for ; Wed, 17 Mar 2021 13:04:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E19E6385781A Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 12HD49Xg090465; Wed, 17 Mar 2021 09:04:12 -0400 Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0b-001b2d01.pphosted.com with ESMTP id 37bj5rgaa3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 09:04:11 -0400 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.0.43/8.16.0.43) with SMTP id 12HD25Q0032175; Wed, 17 Mar 2021 13:04:00 GMT Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by ppma03ams.nl.ibm.com with ESMTP id 378n18ktq4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 13:04:00 +0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 12HD3vHD40632772 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Mar 2021 13:03:57 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 64E5242049; Wed, 17 Mar 2021 13:03:57 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4540642059; Wed, 17 Mar 2021 13:03:57 +0000 (GMT) Received: from t3560005.lnxne.boe (unknown [9.152.108.100]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 17 Mar 2021 13:03:57 +0000 (GMT) From: Stefan Liebler To: libc-alpha@sourceware.org Cc: adhemerval.zanella@linaro.org, Stefan Liebler Subject: [PATCH] S390: Don't test nanoseconds in io/tst-stat.c Date: Wed, 17 Mar 2021 14:03:52 +0100 Message-Id: <20210317130352.1782897-1-stli@linux.ibm.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369, 18.0.761 definitions=2021-03-17_07:2021-03-17, 2021-03-17 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 mlxscore=0 suspectscore=0 mlxlogscore=999 impostorscore=0 clxscore=1015 phishscore=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103170094 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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, 17 Mar 2021 13:04:15 -0000 Both new tests io/tst-stat and io/tst-stat-lfs (_FILE_OFFSET_BITS=64) are comparing the nanosecond fields with the statx result. Unfortunately on s390(31bit) those fields are always zero if old KABI with non-LFS support is used. With _FILE_OFFSET_BITS=64 stat is using statx internally. As suggested by Adhemerval this patch disables the nanosecond check for s390(31bit). --- io/tst-stat.c | 7 +++++-- support/Makefile | 1 + support/support.h | 3 +++ support/support_stat_nanoseconds.c | 31 ++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 support/support_stat_nanoseconds.c diff --git a/io/tst-stat.c b/io/tst-stat.c index 445ac4176c..397d480ecc 100644 --- a/io/tst-stat.c +++ b/io/tst-stat.c @@ -91,9 +91,12 @@ do_test (void) TEST_COMPARE (stx.stx_blocks, st.st_blocks); TEST_COMPARE (stx.stx_ctime.tv_sec, st.st_ctim.tv_sec); - TEST_COMPARE (stx.stx_ctime.tv_nsec, st.st_ctim.tv_nsec); TEST_COMPARE (stx.stx_mtime.tv_sec, st.st_mtim.tv_sec); - TEST_COMPARE (stx.stx_mtime.tv_nsec, st.st_mtim.tv_nsec); + if (support_stat_nanoseconds ()) + { + TEST_COMPARE (stx.stx_ctime.tv_nsec, st.st_ctim.tv_nsec); + TEST_COMPARE (stx.stx_mtime.tv_nsec, st.st_mtim.tv_nsec); + } } return 0; diff --git a/support/Makefile b/support/Makefile index fc9f4936a8..900e17f94f 100644 --- a/support/Makefile +++ b/support/Makefile @@ -71,6 +71,7 @@ libsupport-routines = \ support_set_small_thread_stack_size \ support_shared_allocate \ support_small_stack_thread_attribute \ + support_stat_nanoseconds \ support_subprocess \ support_test_compare_blob \ support_test_compare_failure \ diff --git a/support/support.h b/support/support.h index 2e477c9e7c..90f3ff9d1a 100644 --- a/support/support.h +++ b/support/support.h @@ -134,6 +134,9 @@ extern ssize_t support_copy_file_range (int, off64_t *, int, off64_t *, operations (such as fstatat or utimensat). */ extern bool support_path_support_time64 (const char *path); +/* Return true if stat supports nanoseconds resolution. */ +extern bool support_stat_nanoseconds (void); + __END_DECLS #endif /* SUPPORT_H */ diff --git a/support/support_stat_nanoseconds.c b/support/support_stat_nanoseconds.c new file mode 100644 index 0000000000..c0d5b2c3a9 --- /dev/null +++ b/support/support_stat_nanoseconds.c @@ -0,0 +1,31 @@ +/* Check if stat supports nanosecond resolution. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +bool +support_stat_nanoseconds (void) +{ + /* s390 stat64 compat symbol does not support nanoseconds resolution + and it used on non-LFS [f,l]stat[at] implementations. */ +#if defined __linux__ && !defined __s390x__ && defined __s390__ + return false; +#else + return true; +#endif +} -- 2.28.0