From: Petr Vorel <pvorel@suse.cz>
To: ltp@lists.linux.it
Cc: Petr Vorel <pvorel@suse.cz>,
Tim.Bird@sony.com, linux-xfs@vger.kernel.org,
"Darrick J . Wong" <djwong@kernel.org>,
Eric Sandeen <sandeen@redhat.com>
Subject: [PATCH 1/1] df01.sh: Use own fsfreeze implementation for XFS
Date: Tue, 4 Oct 2022 11:08:10 +0200 [thread overview]
Message-ID: <20221004090810.9023-1-pvorel@suse.cz> (raw)
df01.sh started to fail on XFS on certain configuration since mkfs.xfs
and kernel 5.19. Implement fsfreeze instead of introducing external
dependency. NOTE: implementation could fail on other filesystems
(EOPNOTSUPP on exfat, ntfs, vfat).
Suggested-by: Darrick J. Wong <djwong@kernel.org>
Suggested-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Hi,
FYI the background of this issue:
https://lore.kernel.org/ltp/Yv5oaxsX6z2qxxF3@magnolia/
https://lore.kernel.org/ltp/974cc110-d47e-5fae-af5f-e2e610720e2d@redhat.com/
@LTP developers: not sure if the consensus is to avoid LTP API
completely (even use it just with TST_NO_DEFAULT_MAIN), if required I
can rewrite to use it just to get SAFE_*() macros (like
testcases/lib/tst_checkpoint.c) or even with tst_test workarounds
(testcases/lib/tst_get_free_pids.c).
Kind regards,
Petr
testcases/commands/df/Makefile | 4 +-
testcases/commands/df/df01.sh | 3 ++
testcases/commands/df/df01_fsfreeze.c | 55 +++++++++++++++++++++++++++
3 files changed, 61 insertions(+), 1 deletion(-)
create mode 100644 testcases/commands/df/df01_fsfreeze.c
diff --git a/testcases/commands/df/Makefile b/testcases/commands/df/Makefile
index 2787bb43a..1e0b4283a 100644
--- a/testcases/commands/df/Makefile
+++ b/testcases/commands/df/Makefile
@@ -1,11 +1,13 @@
# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) Linux Test Project, 2021-2022
# Copyright (c) 2015 Fujitsu Ltd.
-# Author:Zhang Jin <jy_zhangjin@cn.fujitsu.com>
+# Author: Zhang Jin <jy_zhangjin@cn.fujitsu.com>
top_srcdir ?= ../../..
include $(top_srcdir)/include/mk/env_pre.mk
INSTALL_TARGETS := df01.sh
+MAKE_TARGETS := df01_fsfreeze
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/commands/df/df01.sh b/testcases/commands/df/df01.sh
index ae0449c3c..c59d2a01d 100755
--- a/testcases/commands/df/df01.sh
+++ b/testcases/commands/df/df01.sh
@@ -46,6 +46,9 @@ df_test()
ROD_SILENT rm -rf $TST_MNTPOINT/testimg
+ # ensure free space change can be seen by statfs
+ [ "$fs" = "xfs" ] && ROD_SILENT df01_fsfreeze $TST_MNTPOINT
+
# flush file system buffers, then we can get the actual sizes.
sync
}
diff --git a/testcases/commands/df/df01_fsfreeze.c b/testcases/commands/df/df01_fsfreeze.c
new file mode 100644
index 000000000..d47e1b01a
--- /dev/null
+++ b/testcases/commands/df/df01_fsfreeze.c
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2010 Hajime Taira <htaira@redhat.com>
+ * Copyright (c) 2010 Masatake Yamato <yamato@redhat.com>
+ * Copyright (c) 2022 Petr Vorel <pvorel@suse.cz>
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <linux/fs.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#define err_exit(...) ({ \
+ fprintf(stderr, __VA_ARGS__); \
+ if (errno) \
+ fprintf(stderr, ": %s (%d)", strerror(errno), errno); \
+ fprintf(stderr, "\n"); \
+ exit(EXIT_FAILURE); \
+})
+
+int main(int argc, char *argv[])
+{
+ int fd;
+ struct stat sb;
+
+ if (argc < 2)
+ err_exit("USAGE: df01_fsfreeze <mountpoint>");
+
+ fd = open(argv[1], O_RDONLY);
+ if (fd < 0)
+ err_exit("open '%s' failed", argv[1]);
+
+ if (fstat(fd, &sb) == -1)
+ err_exit("stat of '%s' failed", argv[1]);
+
+ if (!S_ISDIR(sb.st_mode))
+ err_exit("%s: is not a directory", argv[1]);
+
+ if (ioctl(fd, FIFREEZE, 0) < 0)
+ err_exit("ioctl FIFREEZE on '%s' failed", argv[1]);
+
+ usleep(100);
+
+ if (ioctl(fd, FITHAW, 0) < 0)
+ err_exit("ioctl FITHAW on '%s' failed", argv[1]);
+
+ close(fd);
+
+ return EXIT_SUCCESS;
+}
--
2.37.3
next reply other threads:[~2022-10-04 9:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 9:08 Petr Vorel [this message]
2022-10-04 16:13 ` [PATCH 1/1] df01.sh: Use own fsfreeze implementation for XFS Darrick J. Wong
2022-10-05 6:23 ` Petr Vorel
2022-10-17 14:20 ` [LTP] " Richard Palethorpe
2022-10-17 15:11 ` Petr Vorel
2022-10-18 8:19 ` Richard Palethorpe
2022-10-18 8:41 ` Petr Vorel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221004090810.9023-1-pvorel@suse.cz \
--to=pvorel@suse.cz \
--cc=Tim.Bird@sony.com \
--cc=djwong@kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=ltp@lists.linux.it \
--cc=sandeen@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).