From patchwork Thu Apr 6 05:40:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yang Xu \\(Fujitsu\\)" X-Patchwork-Id: 1765850 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=fujitsu.com header.i=@fujitsu.com header.a=rsa-sha256 header.s=170520fj header.b=TwxOYJYo; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PsVhw5XwXz1yYy for ; Thu, 6 Apr 2023 15:40:48 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 289A63CC728 for ; Thu, 6 Apr 2023 07:40:46 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [217.194.8.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 3B6003C00D1 for ; Thu, 6 Apr 2023 07:40:41 +0200 (CEST) Received: from mail1.bemta37.messagelabs.com (mail1.bemta37.messagelabs.com [85.158.142.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-2.smtp.seeweb.it (Postfix) with ESMTPS id C11CE600293 for ; Thu, 6 Apr 2023 07:40:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1680759639; i=@fujitsu.com; bh=1zDDHoHRWZ52YpOYo2y4lpFGnJPl+f5zhyE+0mnRdj8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TwxOYJYomGoW7uW9sMWcBc52YrmpdFtV+nTe0N81AVJqMMC3A1vUk4YSaEjIW3Avf NepKc/0WkXydattW2uLm08uHNeG+ustztol41y1Y9gGLJvO1ZEx04IMMr20QMYGHUA STnF9SqTzJ6bDjE7X2f2fNEadiTBL9vZMigPkOKekiQWUZLXbYuZaP+anXqbm1Evdk Wbmxvc2qIl4sBIoKrWj36lnn36IXod/akebs8M6DqAOiuyq6Ocw5phN7mOZbVqIcwn OWaGD+pe6H1GiOs+L5m24Kmu4ooSNhptmT3H6ID8pqK8ns30Jw6GD2sdKKTAfqG0p0 PWAhGYRob5srQ== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrIIsWRWlGSWpSXmKPExsViZ8ORqBsWrZd icKHBxGLtnj/MFiu+72B0YPLYtKqTzWPf73WsAUxRrJl5SfkVCawZrbcPsBW8YqvYtmIZcwPj M9YuRi4OIYEtjBIt87dCOcuZJNb/PM0I4exhlHi/7hmQw8nBJqAp8axzATOILSIgIdHR8JYdx GYWsJO4s7gJLC4s4CVxsu8kmM0ioAJU844JxOYV8JA4s/wFC4gtIaAgMeXhe7AaTgETiVPtd8 FqhASMJT7f+csKUS8ocXLmExaI+RISB1+8YIboVZJoa73CCmFXSDROP8QEYatJXD23iXkCo+A sJO2zkLQvYGRaxWhWnFpUllqka6GXVJSZnlGSm5iZo5dYpZuol1qqm5dfVJKha6iXWF6sl1pc rFdcmZuck6KXl1qyiREY0inFyT92MO7q+6t3iFGSg0lJlHeuik6KEF9SfkplRmJxRnxRaU5q8 SFGGQ4OJQneXVF6KUKCRanpqRVpmTnA+IJJS3DwKInwLvQDSvMWFyTmFmemQ6ROMSpKifNagv QJgCQySvPg2mAxfYlRVkqYl5GBgUGIpyC1KDezBFX+FaM4B6OSMO+JSKApPJl5JXDTXwEtZgJ abOuvA7K4JBEhJdXAlF1xctnPVb++rn0utnbXW4Mvr08yyccZCf3pmCwYFh9f9Yvj8gL1otN7 r83vWVW3sH+zXuOx53p2LOIvPco+XHy+9pbj3JUMc+KKe1/Ur+wxnit8v2DasUsNy58YHrU5q ZG/0aNk8eWt9yt8Nkeas+546M2bdmvTzC+LPFmcTurdfVd3/bz0peBzS4+a/I0tX9Ty6djDlv 0LliWmnTzrcvXz2lkuu/cVqhgzibc8jjB8snnOnMPeBlGb7hkEPVh63tVAJ1BdT8N21e7eL57 3F93elOVTy2cfx3zzFsuuSdvaZpr2qMkf9Y3ND5q+ePUeo/XRL6+diPXgerh+91UDF7Ec3wTt i0cDPZ77392yws1SiaU4I9FQi7moOBEAfs8mrWQDAAA= X-Env-Sender: xuyang2018.jy@fujitsu.com X-Msg-Ref: server-9.tower-728.messagelabs.com!1680759638!1188272!1 X-Originating-IP: [62.60.8.97] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.104.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 530 invoked from network); 6 Apr 2023 05:40:38 -0000 Received: from unknown (HELO n03ukasimr01.n03.fujitsu.local) (62.60.8.97) by server-9.tower-728.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 6 Apr 2023 05:40:38 -0000 Received: from n03ukasimr01.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr01.n03.fujitsu.local (Postfix) with ESMTP id 496FC10019C; Thu, 6 Apr 2023 06:40:38 +0100 (BST) Received: from R01UKEXCASM121.r01.fujitsu.local (R01UKEXCASM121 [10.183.43.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr01.n03.fujitsu.local (Postfix) with ESMTPS id 3CDDB10019A; Thu, 6 Apr 2023 06:40:38 +0100 (BST) Received: from localhost.localdomain (10.167.215.131) by R01UKEXCASM121.r01.fujitsu.local (10.183.43.173) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 6 Apr 2023 06:40:36 +0100 From: Yang Xu To: Date: Thu, 6 Apr 2023 13:40:19 +0800 Message-ID: <1680759622-8738-1-git-send-email-xuyang2018.jy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <20230404215918.GA1893@sol.localdomain> References: <20230404215918.GA1893@sol.localdomain> MIME-Version: 1.0 X-Originating-IP: [10.167.215.131] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM121.r01.fujitsu.local (10.183.43.173) X-Virus-Scanned: clamav-milter 0.102.4 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH v4 1/4] lapi/stat.h: Add STATX_DIOALIGN related definition X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Also add missing stx_mnt_id. Signed-off-by: Yang Xu --- include/lapi/stat.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/lapi/stat.h b/include/lapi/stat.h index ce1f2b678..c2db8a589 100644 --- a/include/lapi/stat.h +++ b/include/lapi/stat.h @@ -97,7 +97,11 @@ struct statx { uint32_t stx_dev_major; uint32_t stx_dev_minor; /* 0x90 */ - uint64_t __spare2[14]; + uint64_t stx_mnt_id; + uint32_t stx_dio_mem_align; + uint32_t stx_dio_offset_align; + /* 0xa0 */ + uint64_t __spare1[12]; /* 0x100 */ }; #endif @@ -180,6 +184,10 @@ static inline int statx(int dirfd, const char *pathname, unsigned int flags, # define STATX_MNT_ID 0x00001000U #endif +#ifndef STATX_DIOALIGN +# define STATX_DIOALIGN 0x00002000U +#endif + #ifndef STATX_ALL # define STATX_ALL 0x00000fffU #endif From patchwork Thu Apr 6 05:40:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yang Xu \\(Fujitsu\\)" X-Patchwork-Id: 1765851 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=fujitsu.com header.i=@fujitsu.com header.a=rsa-sha256 header.s=170520fj header.b=MpmKtLwQ; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PsVj65YS7z1yYy for ; Thu, 6 Apr 2023 15:40:58 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 96DDC3CC735 for ; Thu, 6 Apr 2023 07:40:56 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-3.smtp.seeweb.it (in-3.smtp.seeweb.it [217.194.8.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id A6A293CC73A for ; Thu, 6 Apr 2023 07:40:45 +0200 (CEST) Received: from mail3.bemta32.messagelabs.com (mail3.bemta32.messagelabs.com [195.245.230.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-3.smtp.seeweb.it (Postfix) with ESMTPS id D4C001A0011C for ; Thu, 6 Apr 2023 07:40:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1680759643; i=@fujitsu.com; bh=YySCXM2t9brf/a+txxca03p69QXDLX0yfQpuMiHlTHw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MpmKtLwQe0SX4gmANCBnyE+74s9IgT+FOy3NCGk0a+I7o5E8v89FTleARElSB+3UH kyPbqL5dd0sINCnjaTgGLsbcldvdfaBD3gr58ogNmSwbIwFbgJqsMRIVTWJ3dIDzTY MGK9q2p0oRC8XoLYSh6cKGZE1udx05fLa5leeBKMVe+AJRm42el3145lMVSmrVKvGH iKA7sJKV5z4et6k2XOg8DLOBFQkeHPTc8/iEUX06IOQ3pf5BiQzDwFs7llDIruSijv JItmdtWtLtc17K+OuZLB9tuqvBMzpMlFs2Fssr11Zm+nvrt0x4GFDj2BJZTSt5U6ni y3pDs9lIA3DFg== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrHIsWRWlGSWpSXmKPExsViZ8ORpBsdrZd isKaB32Ltnj/MFiu+72B0YPLYtKqTzWPf73WsAUxRrJl5SfkVCawZh968YCv4olJxeOZ89gbG i/JdjFwcQgIbGSVaPm1ng3CWMEl0froJ5HACOXsYJd5sKASx2QQ0JZ51LmAGsUUEJCQ6Gt6yg 9jMAnYSdxY3gcWFBaIlmn6tYwKxWQRUJL5t2QBWwyvgIbHyyUawGgkBBYkpD98D2RwcnAKeEt /elkOsKpR4teMRM0S5oMTJmU9YIMZLSBx88QKqVUmirfUKK4RdIdE4/RAThK0mcfXcJuYJjIK zkLTPQtK+gJFpFaNpcWpRWWqRrqleUlFmekZJbmJmjl5ilW6iXmqpbnlqcYmuoV5iebFeanGx XnFlbnJOil5easkmRmAwpxSzmO1gbO/7q3eIUZKDSUmUd66KTooQX1J+SmVGYnFGfFFpTmrxI UYZDg4lCd5dUXopQoJFqempFWmZOcDIgklLcPAoifAu9ANK8xYXJOYWZ6ZDpE4xKkqJ814G6R MASWSU5sG1waL5EqOslDAvIwMDgxBPQWpRbmYJqvwrRnEORiVh3mqQKTyZeSVw018BLWYCWmz rrwOyuCQRISXVwMQqo/6vynzn5SW39Is3qlWnfenKfDhj4Tqv22xPTrNLcBkIsqj/yviaLbN0 am7ZXeYf+kd3s1451BC94zS77NINVSty3Jw/qnlavg3VlvgaPH3+mqi5K/KeGjZMuXM3wdv2y o3rUmoRzAZzpUr0l557NU3istjvMrlcnd75Nx+sMPrc/sqx4JXDukLW/VJs6xPvv/ZyLHPZ7M TxRWKbrumz6pUrbMQ1u/Wyi7ujo/cyq9kJGHZtecdpb14szy2b7nLjtdZnHedNOQrcpmXFi64 H/HrOZ2N9ys1BYG7d41ezXI5O7NIKf7B6XrOHRNYvnRmf90XVHnxgc9uFSdCWv+C0veJc14OX FG3e89ybrsRSnJFoqMVcVJwIAC9Pc3phAwAA X-Env-Sender: xuyang2018.jy@fujitsu.com X-Msg-Ref: server-13.tower-585.messagelabs.com!1680759643!122478!1 X-Originating-IP: [62.60.8.98] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.104.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20451 invoked from network); 6 Apr 2023 05:40:43 -0000 Received: from unknown (HELO n03ukasimr03.n03.fujitsu.local) (62.60.8.98) by server-13.tower-585.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 6 Apr 2023 05:40:43 -0000 Received: from n03ukasimr03.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr03.n03.fujitsu.local (Postfix) with ESMTP id CFFE11C1; Thu, 6 Apr 2023 06:40:42 +0100 (BST) Received: from R01UKEXCASM121.r01.fujitsu.local (R01UKEXCASM121 [10.183.43.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr03.n03.fujitsu.local (Postfix) with ESMTPS id C47561BF; Thu, 6 Apr 2023 06:40:42 +0100 (BST) Received: from localhost.localdomain (10.167.215.131) by R01UKEXCASM121.r01.fujitsu.local (10.183.43.173) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 6 Apr 2023 06:40:40 +0100 From: Yang Xu To: Date: Thu, 6 Apr 2023 13:40:20 +0800 Message-ID: <1680759622-8738-2-git-send-email-xuyang2018.jy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1680759622-8738-1-git-send-email-xuyang2018.jy@fujitsu.com> References: <20230404215918.GA1893@sol.localdomain> <1680759622-8738-1-git-send-email-xuyang2018.jy@fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.215.131] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM121.r01.fujitsu.local (10.183.43.173) X-Virus-Scanned: clamav-milter 0.102.4 at in-3.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-3.smtp.seeweb.it Subject: [LTP] [PATCH v4 2/4] syscalls/statx10: Add basic test for STATX_DIOALIGN on regular file X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" STATX_DIOALIGN is used to get stx_dio_mem_align and stx_dio_offset_align for files on fs that support direct io. We just check whether these value are nonzero on ext4 and xfs. On ext4, files that use certain filesystem features (data journalling, encryption, and verity) fall back to buffered I/O. But ltp doesn't use these features by default, So I think dio should not fall back to buffered I/O. For struct statx member check, we only check stx_dio_mem_align because these two member is introduced toger in separate commit in kernel, so it is safe. Signed-off-by: Yang Xu --- configure.ac | 2 +- runtest/syscalls | 1 + testcases/kernel/syscalls/statx/.gitignore | 1 + testcases/kernel/syscalls/statx/statx10.c | 84 ++++++++++++++++++++++ 4 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 testcases/kernel/syscalls/statx/statx10.c diff --git a/configure.ac b/configure.ac index 4c8763376..548288310 100644 --- a/configure.ac +++ b/configure.ac @@ -158,7 +158,7 @@ AC_CHECK_FUNCS(mkdtemp,[],AC_MSG_ERROR(mkdtemp() not found!)) AC_CHECK_MEMBERS([struct fanotify_event_info_fid.fsid.__val],,,[#include ]) AC_CHECK_MEMBERS([struct perf_event_mmap_page.aux_head],,,[#include ]) AC_CHECK_MEMBERS([struct sigaction.sa_sigaction],[],[],[#include ]) -AC_CHECK_MEMBERS([struct statx.stx_mnt_id],,,[ +AC_CHECK_MEMBERS([struct statx.stx_mnt_id, struct statx.stx_dio_mem_align],,,[ #define _GNU_SOURCE #include ]) diff --git a/runtest/syscalls b/runtest/syscalls index 8b002e989..92123772c 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -1769,6 +1769,7 @@ statx06 statx06 statx07 statx07 statx08 statx08 statx09 statx09 +statx10 statx10 membarrier01 membarrier01 diff --git a/testcases/kernel/syscalls/statx/.gitignore b/testcases/kernel/syscalls/statx/.gitignore index 1cea43c0d..67341ff2d 100644 --- a/testcases/kernel/syscalls/statx/.gitignore +++ b/testcases/kernel/syscalls/statx/.gitignore @@ -7,3 +7,4 @@ /statx07 /statx08 /statx09 +/statx10 diff --git a/testcases/kernel/syscalls/statx/statx10.c b/testcases/kernel/syscalls/statx/statx10.c new file mode 100644 index 000000000..59e0c06e4 --- /dev/null +++ b/testcases/kernel/syscalls/statx/statx10.c @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2023 FUJITSU LIMITED. All rights reserved. + * Author: Yang Xu + */ + +/*\ + * [Description] + * + * It is a basic test for STATX_DIOALIGN mask on ext4 and xfs filesystem. + * + * - STATX_DIOALIGN Want stx_dio_mem_align and stx_dio_offset_align value + * + * Check these two values are nonzero under dio situation when STATX_DIOALIGN + * in the request mask. + * + * On ext4, files that use certain filesystem features (data journaling, + * encryption, and verity) fall back to buffered I/O. But ltp doesn't use these + * features by default, So I think dio should not fall back to buffered I/O. + * + * Minimum Linux version required is v6.1. + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include "tst_test.h" +#include "lapi/stat.h" + +#define MNTPOINT "mnt_point" +#define TESTFILE MNTPOINT"/testfile" + +static void verify_statx(void) +{ + struct statx buf; + + TST_EXP_PASS_SILENT(statx(AT_FDCWD, TESTFILE, 0, STATX_DIOALIGN, &buf), + "statx(AT_FDCWD, %s, 0, STATX_DIOALIGN, &buf)", TESTFILE); + + if (!(buf.stx_mask & STATX_DIOALIGN)) { + tst_res(TCONF, "STATX_DIOALIGN is not supported until linux 6.1"); + return; + } + +#ifdef HAVE_STRUCT_STATX_STX_DIO_MEM_ALIGN + if (buf.stx_dio_mem_align != 0) + tst_res(TPASS, "stx_dio_mem_align: %u", buf.stx_dio_mem_align); + else + tst_res(TFAIL, "don't get stx_dio_mem_align on supported dio fs"); + + if (buf.stx_dio_offset_align != 0) + tst_res(TPASS, "stx_dio_offset_align: %u", buf.stx_dio_offset_align); + else + tst_res(TFAIL, "don't get stx_dio_offset_align on supported dio fs"); +#endif +} + +static void setup(void) +{ + int fd = -1; + + if (strcmp(tst_device->fs_type, "xfs") && strcmp(tst_device->fs_type, "ext4")) + tst_brk(TCONF, "This test only supports ext4 and xfs"); + + SAFE_FILE_PRINTF(TESTFILE, "AAAA"); + fd = open(TESTFILE, O_RDWR | O_DIRECT); + if (fd == -1 && errno == EINVAL) { + SAFE_CLOSE(fd); + tst_brk(TCONF, "The regular file is not on a filesystem that support DIO"); + } + SAFE_CLOSE(fd); +} + +static struct tst_test test = { + .test_all = verify_statx, + .setup = setup, + .needs_root = 1, + .mntpoint = MNTPOINT, + .mount_device = 1, + .all_filesystems = 1, +}; From patchwork Thu Apr 6 05:40:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yang Xu \\(Fujitsu\\)" X-Patchwork-Id: 1765852 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=fujitsu.com header.i=@fujitsu.com header.a=rsa-sha256 header.s=170520fj header.b=bV7sU/ew; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PsVjY4gCZz1yYy for ; Thu, 6 Apr 2023 15:41:21 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id B730C3CC728 for ; Thu, 6 Apr 2023 07:41:19 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [IPv6:2001:4b78:1:20::5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id F00FB3C00D1 for ; Thu, 6 Apr 2023 07:41:17 +0200 (CEST) Received: from mail3.bemta32.messagelabs.com (mail3.bemta32.messagelabs.com [195.245.230.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id BF0D1600A98 for ; Thu, 6 Apr 2023 07:41:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1680759675; i=@fujitsu.com; bh=epWHlYv50wpoFndzgQfN7674IfHfiEeub75uuZVrPdo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bV7sU/ewPRO75XKM2pwSiKYic3r+/HCLqV+iH3RFBZKozc63W7rZfQCA4mheBhuvi AZ6vJNiZbnCS+615ZDJcJZpMrE/MB2XiGET6bsGr0cn+rEuJlxSEE2fFSa2CPx2tm0 rBG3/AgARxJNskGbaqO1oj3V/O14JZNmOe48IOxnbOObQuyIMjcii0JAQXUzwjoFy8 nEz1dmxGVCGiWgaDHXl9IciqshgfJg5aM42ZaPqk1Up67JQp7Uja2t1yCdqluDOZbk fSDcu55M3UxGoNJfXnUcDEW+Pjeb2laUVAS9x62YYjARBmJp/JlQHDuyxL0qT4UzV0 AEsk/3acTOgdQ== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPIsWRWlGSWpSXmKPExsViZ8ORpFsdrZd i0N8hbLF2zx9mixXfdzA6MHlsWtXJ5rHv9zrWAKYo1sy8pPyKBNaMCU+OMBVska+4OesHUwPj P6kuRi4OIYGNjBKzD21kgXCWMEnMOL2aCcLZwyixae1h1i5GTg42AU2JZ50LmEFsEQEJiY6Gt +wgNrOAncSdxU1gcWGBaIl3v9eCxVkEVCR2H+0As3kFPCTm3v4NZksIKEhMefgeqJ6Dg1PAU+ Lb23KQsJBAocSrHY+YIcoFJU7OfMICMV5C4uCLF8wQrUoSba1XWCHsConG6YeYIGw1iavnNjF PYBSchaR9FpL2BYxMqxhNi1OLylKLdM30kooy0zNKchMzc/QSq3QT9VJLdctTi0t0DfUSy4v1 UouL9Yorc5NzUvTyUks2MQLDOaWY4cYOxjl9f/UOMUpyMCmJ8s5V0UkR4kvKT6nMSCzOiC8qz UktPsQow8GhJMG7K0ovRUiwKDU9tSItMwcYWzBpCQ4eJRHehX5Aad7igsTc4sx0iNQpRkUpcd 7LIH0CIImM0jy4Nlg8X2KUlRLmZWRgYBDiKUgtys0sQZV/xSjOwagkzFsNMoUnM68EbvoroMV MQItt/XVAFpckIqSkGpiaXjsLP+QQ7Yizkvoz88OkIK20gF0LahKP3N+hFcKyPNw5V8nvN8+H tU6vWA5o+m+ft+mN1jk3trBGpsdyU18Ubl93+KvQszOTs6Zffxh24vQJTYb5RTm7VrnVXK+V3 r757t5JUyY3Vahk+XlXvbD+9ouTn8X7ZcLymZk391qwHTLdvE38yLezfd1es9MmF4lbNp53P9 imNmOR2ddWJ4GZmzdv6le9umqxRu2ipppPEw+3Me2Y2d9ZlX518en6yg7n75ZiIkEcjuve8jb IfhF8+TN4qv+vbTWb55xx19736t/WBRH/vkgx33M595FhTvezBWufX636X7VkZ+Hau9kbllSm /aqd0nJsR5iQu2GvghJLcUaioRZzUXEiAOGIcJliAwAA X-Env-Sender: xuyang2018.jy@fujitsu.com X-Msg-Ref: server-6.tower-585.messagelabs.com!1680759675!122723!1 X-Originating-IP: [62.60.8.98] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.104.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23417 invoked from network); 6 Apr 2023 05:41:15 -0000 Received: from unknown (HELO n03ukasimr03.n03.fujitsu.local) (62.60.8.98) by server-6.tower-585.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 6 Apr 2023 05:41:15 -0000 Received: from n03ukasimr03.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr03.n03.fujitsu.local (Postfix) with ESMTP id E0B981C1; Thu, 6 Apr 2023 06:41:14 +0100 (BST) Received: from R01UKEXCASM121.r01.fujitsu.local (R01UKEXCASM121 [10.183.43.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr03.n03.fujitsu.local (Postfix) with ESMTPS id D4F5F1BF; Thu, 6 Apr 2023 06:41:14 +0100 (BST) Received: from localhost.localdomain (10.167.215.131) by R01UKEXCASM121.r01.fujitsu.local (10.183.43.173) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 6 Apr 2023 06:41:13 +0100 From: Yang Xu To: Date: Thu, 6 Apr 2023 13:40:21 +0800 Message-ID: <1680759622-8738-3-git-send-email-xuyang2018.jy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1680759622-8738-1-git-send-email-xuyang2018.jy@fujitsu.com> References: <20230404215918.GA1893@sol.localdomain> <1680759622-8738-1-git-send-email-xuyang2018.jy@fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.215.131] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM121.r01.fujitsu.local (10.183.43.173) X-Virus-Scanned: clamav-milter 0.102.4 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH v4 3/4] syscalls/statx11: Add basic test for STATX_DIOALIGN on block device X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Since STATX_DIOLAIGN is only supported on regular file and block device, so this case is used to test the latter. This test is tightly coupled to the kernel's current DIO restrictions on block devices. These changed in v6.0, and they are subject to further change in the future. It is fine for now because STATX_DIOALIGN is only in v6.1 and later anyway. Signed-off-by: Yang Xu --- runtest/syscalls | 1 + testcases/kernel/syscalls/statx/.gitignore | 1 + testcases/kernel/syscalls/statx/statx11.c | 81 ++++++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 testcases/kernel/syscalls/statx/statx11.c diff --git a/runtest/syscalls b/runtest/syscalls index 92123772c..de5f0be35 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -1770,6 +1770,7 @@ statx07 statx07 statx08 statx08 statx09 statx09 statx10 statx10 +statx11 statx11 membarrier01 membarrier01 diff --git a/testcases/kernel/syscalls/statx/.gitignore b/testcases/kernel/syscalls/statx/.gitignore index 67341ff2d..48ac4078b 100644 --- a/testcases/kernel/syscalls/statx/.gitignore +++ b/testcases/kernel/syscalls/statx/.gitignore @@ -8,3 +8,4 @@ /statx08 /statx09 /statx10 +/statx11 diff --git a/testcases/kernel/syscalls/statx/statx11.c b/testcases/kernel/syscalls/statx/statx11.c new file mode 100644 index 000000000..02449888a --- /dev/null +++ b/testcases/kernel/syscalls/statx/statx11.c @@ -0,0 +1,81 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2023 FUJITSU LIMITED. All rights reserved. + * Author: Yang Xu + */ + +/*\ + * [Description] + * + * It is a basic test for STATX_DIOALIGN mask on block device. + * + * - STATX_DIOALIGN Want stx_dio_mem_align and stx_dio_offset_align value + * + * These two values are tightly coupled to the kernel's current DIO + * restrictions on block devices. + * + * Minimum Linux version required is v6.1. + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include "tst_test.h" +#include "lapi/stat.h" + +static char sys_bdev_dma_path[1024], sys_bdev_logical_path[1024]; + +static void verify_statx(void) +{ + struct statx buf; + + memset(&buf, 0, sizeof(buf)); + TST_EXP_PASS_SILENT(statx(AT_FDCWD, tst_device->dev, 0, STATX_DIOALIGN, &buf), + "statx(AT_FDCWD, %s, 0, STATX_DIOALIGN, &buf)", tst_device->dev); + + if (!(buf.stx_mask & STATX_DIOALIGN)) { + tst_res(TCONF, "STATX_DIOALIGN is not supported until linux 6.1"); + return; + } + +#ifdef HAVE_STRUCT_STATX_STX_DIO_MEM_ALIGN + /* + * This test is tightly coupled to the kernel's current DIO restrictions + * on block devices. The general rule of DIO needing to be aligned to the + * block device's logical block size was relaxed to allow user buffers + * (but not file offsets) aligned to the DMA alignment instead. See v6.0 + * commit bf8d08532bc1 ("iomap: add support for dma aligned direct-io") and + * they are subject to further change in the future. + * Also can see commit 2d985f8c6b9 ("vfs: support STATX_DIOALIGN on block devices). + */ + TST_ASSERT_ULONG(sys_bdev_dma_path, buf.stx_dio_mem_align - 1); + TST_ASSERT_ULONG(sys_bdev_logical_path, buf.stx_dio_offset_align); +#endif +} + +static void setup(void) +{ + char *dev_name; + + dev_name = basename((char *)tst_device->dev); + sprintf(sys_bdev_logical_path, "/sys/block/%s/queue/logical_block_size", dev_name); + while (access(sys_bdev_logical_path, F_OK) != 0) { + dev_name[strlen(dev_name)-1] = '\0'; + sprintf(sys_bdev_logical_path, "/sys/block/%s/queue/logical_block_size", dev_name); + } + + sprintf(sys_bdev_dma_path, "/sys/block/%s/queue/dma_alignment", dev_name); + if (access(sys_bdev_dma_path, F_OK) != 0) + tst_brk(TCONF, "dma_alignment sysfs file doesn't exist"); +} + +static struct tst_test test = { + .test_all = verify_statx, + .setup = setup, + .needs_device = 1, + .needs_root = 1, +}; From patchwork Thu Apr 6 05:40:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yang Xu \\(Fujitsu\\)" X-Patchwork-Id: 1765853 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=fujitsu.com header.i=@fujitsu.com header.a=rsa-sha256 header.s=170520fj header.b=TCE0AJgH; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PsVjm22cnz1yYy for ; Thu, 6 Apr 2023 15:41:32 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 2C4FA3CC732 for ; Thu, 6 Apr 2023 07:41:30 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 531973CC72F for ; Thu, 6 Apr 2023 07:41:21 +0200 (CEST) Received: from mail1.bemta32.messagelabs.com (mail1.bemta32.messagelabs.com [195.245.230.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id A0800200340 for ; Thu, 6 Apr 2023 07:41:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1680759679; i=@fujitsu.com; bh=9DxWK2tbYyu5/brN8GelV3mERG5UOKb+6PysFuVVIj4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TCE0AJgH7N2MaapyXJGFx9c2RDAfK+uLMwXrGr/zgA07Y8lLWbvbbGdCbGbmL8mZ2 VKHphTEch1PEXL360Cs9ir/Yy3u9NyANDJ6QFdf12kAvTEQmTuWunZ72NBSoNKWndT hv696gg4DqJPIetiAFAfCDT2iJip3DicVoaAreZwCU983CpWpmiVRhaGZwzu+UNxu4 5hNmSBjjpFyKq8EB5SZ3zYZtRx9G7GJvX4lWcLImSA+SD+E9Y38ZuSjhmHUHj1+RC/ pjOOMb/3HuFR0p6XGXAMSgwKNR+cI1Z9Dxlj9eIrXebSt45rCzjJIR7/gx6eSv04ys IUiX3ZpSanPPg== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrHIsWRWlGSWpSXmKPExsViZ8MxSbcuWi/ F4PVeRYu1e/4wW6z4voPRgclj06pONo99v9exBjBFsWbmJeVXJLBm9H67y1ZwR7hifs9d5gbG /wJdjFwcQgJbGCUe3X3JDuEsZ5L4OOczI4Szh1HiyL9LTF2MnBxsApoSzzoXMIPYIgISEh0Nb 9lBbGYBO4k7i5uA4hwcwgJuEnunuIGEWQRUJHbOOcwKYvMKeEhsPP0KrFxCQEFiysP3YOWcAp 4S396Wg4SFBAolXu14xAxRLihxcuYTFojpEhIHX7xghmhVkmhrvcIKYVdINE4/xARhq0lcPbe JeQKj4Cwk7bOQtC9gZFrFaFqcWlSWWqRrppdUlJmeUZKbmJmjl1ilm6iXWqpbnlpcomuol1he rJdaXKxXXJmbnJOil5dasokRGMwpxQw3djDO6furd4hRkoNJSZR3ropOihBfUn5KZUZicUZ8U WlOavEhRhkODiUJ3l1ReilCgkWp6akVaZk5wMiCSUtw8CiJ8C70A0rzFhck5hZnpkOkTjEqSo nzXgbpEwBJZJTmwbXBovkSo6yUMC8jAwODEE9BalFuZgmq/CtGcQ5GJWHeapApPJl5JXDTXwE tZgJabOuvA7K4JBEhJdXAxH3ZMmTFluXtzZ7vt2l+uMRyy5b/8peC6qPzrfTPSv07Gt13NPa2 Z6zb+1dxG1QUYxPWiDF91G81qtu6kTfCr0PTw9VZn7VLJ+b+wnMNdYXuh/s77Ra/D1+ySTRRS iU8tV5mh3bpPsnmC01TX+0Jam5ICzyWtyD757oD0ruWx1us2sdZ0LYjV7HT2NqqzK+0TflSSr 2DpvKcnxuWJ/67dvHa6/CX0zKlyzVFPz9/0jE5LbB7oZ3KatsY8Y+9PtlKiXMTObrsPLy1Lj7 5cyhlk8gUlxXP0+5sMFw+9+U5PtOWXb9s3iWW9t34p1Uwt8at4Fq8bmiHjsfDZo98ptSr3nfT AqqNVl7+Pr288L8SS3FGoqEWc1FxIgBX+KgBYQMAAA== X-Env-Sender: xuyang2018.jy@fujitsu.com X-Msg-Ref: server-11.tower-591.messagelabs.com!1680759678!124118!1 X-Originating-IP: [62.60.8.146] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.104.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12261 invoked from network); 6 Apr 2023 05:41:18 -0000 Received: from unknown (HELO n03ukasimr02.n03.fujitsu.local) (62.60.8.146) by server-11.tower-591.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 6 Apr 2023 05:41:18 -0000 Received: from n03ukasimr02.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr02.n03.fujitsu.local (Postfix) with ESMTP id 2A47F10034F; Thu, 6 Apr 2023 06:41:18 +0100 (BST) Received: from R01UKEXCASM121.r01.fujitsu.local (R01UKEXCASM121 [10.183.43.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr02.n03.fujitsu.local (Postfix) with ESMTPS id 1DB141000D7; Thu, 6 Apr 2023 06:41:18 +0100 (BST) Received: from localhost.localdomain (10.167.215.131) by R01UKEXCASM121.r01.fujitsu.local (10.183.43.173) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 6 Apr 2023 06:41:16 +0100 From: Yang Xu To: Date: Thu, 6 Apr 2023 13:40:22 +0800 Message-ID: <1680759622-8738-4-git-send-email-xuyang2018.jy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1680759622-8738-1-git-send-email-xuyang2018.jy@fujitsu.com> References: <20230404215918.GA1893@sol.localdomain> <1680759622-8738-1-git-send-email-xuyang2018.jy@fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.215.131] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM121.r01.fujitsu.local (10.183.43.173) X-Virus-Scanned: clamav-milter 0.102.4 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH v4 4/4] lapi/stat.h: Remove deprecated STATX_ALL macro X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Since kernel 5.10-rc1 commit 581701b7efd6 ("uapi: deprecate STATX_ALL"), this flag has been mark as deprecated. Kernel should keep this macro for compatibility, but ltp doesn't think about it. So remove it. Signed-off-by: Yang Xu --- include/lapi/stat.h | 4 ---- testcases/kernel/syscalls/statx/statx06.c | 4 ++-- testcases/kernel/syscalls/statx/statx07.c | 6 +++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/include/lapi/stat.h b/include/lapi/stat.h index c2db8a589..7c9a7a00c 100644 --- a/include/lapi/stat.h +++ b/include/lapi/stat.h @@ -188,10 +188,6 @@ static inline int statx(int dirfd, const char *pathname, unsigned int flags, # define STATX_DIOALIGN 0x00002000U #endif -#ifndef STATX_ALL -# define STATX_ALL 0x00000fffU -#endif - #ifndef STATX__RESERVED # define STATX__RESERVED 0x80000000U #endif diff --git a/testcases/kernel/syscalls/statx/statx06.c b/testcases/kernel/syscalls/statx/statx06.c index ce82b905b..60e736c5a 100644 --- a/testcases/kernel/syscalls/statx/statx06.c +++ b/testcases/kernel/syscalls/statx/statx06.c @@ -111,10 +111,10 @@ static void test_statx(unsigned int test_nr) clock_wait_tick(); SAFE_CLOCK_GETTIME(CLOCK_REALTIME_COARSE, &after_time); - TEST(statx(AT_FDCWD, TEST_FILE, 0, STATX_ALL, &buff)); + TEST(statx(AT_FDCWD, TEST_FILE, 0, STATX_BASIC_STATS | STATX_BTIME, &buff)); if (TST_RET != 0) { tst_brk(TFAIL | TTERRNO, - "statx(AT_FDCWD, %s, 0, STATX_ALL, &buff)", + "statx(AT_FDCWD, %s, 0, STATX_BASIC_STATS | STATX_BTIME, &buff)", TEST_FILE); } diff --git a/testcases/kernel/syscalls/statx/statx07.c b/testcases/kernel/syscalls/statx/statx07.c index b13c11f72..c798c7a10 100644 --- a/testcases/kernel/syscalls/statx/statx07.c +++ b/testcases/kernel/syscalls/statx/statx07.c @@ -62,15 +62,15 @@ static int get_mode(char *file_name, int flag_type, char *flag_name) { struct statx buf; - TEST(statx(AT_FDCWD, file_name, flag_type, STATX_ALL, &buf)); + TEST(statx(AT_FDCWD, file_name, flag_type, STATX_BASIC_STATS | STATX_BTIME, &buf)); if (TST_RET == -1) { tst_brk(TFAIL | TST_ERR, - "statx(AT_FDCWD, %s, %s, STATX_ALL, &buf)", + "statx(AT_FDCWD, %s, %s, STATX_BASIC_STATS | STATX_BTIME, &buf)", file_name, flag_name); } - tst_res(TINFO, "statx(AT_FDCWD, %s, %s, STATX_ALL, &buf) = %o", + tst_res(TINFO, "statx(AT_FDCWD, %s, %s, STATX_BASIC_STATS | STATX_BTIME, &buf) = %o", file_name, flag_name, buf.stx_mode); return buf.stx_mode;