From: Glenn Washburn <development@efficientek.com>
To: Yifan Zhao <zhaoyifan@sjtu.edu.cn>
Cc: dkiper@net-space.pl, grub-devel@gnu.org, hsiangkao@linux.alibaba.com
Subject: Re: [PATCH v5 2/2] fs/erofs: Add tests for EROFS in grub-fs-tester
Date: Thu, 18 Apr 2024 03:19:01 -0500 [thread overview]
Message-ID: <20240418031901.1dd8badf@crass-HP-ZBook-15-G2> (raw)
In-Reply-To: <20240303171558.800691-3-zhaoyifan@sjtu.edu.cn>
On Mon, 4 Mar 2024 01:15:55 +0800
Yifan Zhao <zhaoyifan@sjtu.edu.cn> wrote:
> In this patch, three tests of EROFS are introduced and they cover
> compact, extended and chunk-based inodes, respectively.
>
> Signed-off-by: Yifan Zhao <zhaoyifan@sjtu.edu.cn>
Reviewed-by: Glenn Washburn <development@efficientek.com>
Glenn
> ---
> .gitignore | 1 +
> Makefile.util.def | 6 ++++++
> tests/erofs_test.in | 20 ++++++++++++++++++++
> tests/util/grub-fs-tester.in | 32 +++++++++++++++++++++++++-------
> 4 files changed, 52 insertions(+), 7 deletions(-)
> create mode 100644 tests/erofs_test.in
>
> diff --git a/.gitignore b/.gitignore
> index 4d0dfb700..9e8730471 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -105,6 +105,7 @@ widthspec.bin
> /docs/version-dev.texi
> /docs/version.texi
> /ehci_test
> +/erofs_test
> /example_grub_script_test
> /example_scripted_test
> /example_unit_test
> diff --git a/Makefile.util.def b/Makefile.util.def
> index 8d3bc107f..0f74a1680 100644
> --- a/Makefile.util.def
> +++ b/Makefile.util.def
> @@ -764,6 +764,12 @@ script = {
> dependencies = 'garbage-gen$(BUILD_EXEEXT)';
> };
>
> +script = {
> + testcase = native;
> + name = erofs_test;
> + common = tests/erofs_test.in;
> +};
> +
> script = {
> testcase = native;
> name = ext234_test;
> diff --git a/tests/erofs_test.in b/tests/erofs_test.in
> new file mode 100644
> index 000000000..51111627a
> --- /dev/null
> +++ b/tests/erofs_test.in
> @@ -0,0 +1,20 @@
> +#!@BUILD_SHEBANG@
> +
> +set -e
> +
> +if [ "x$EUID" = "x" ] ; then
> + EUID=`id -u`
> +fi
> +
> +if [ "$EUID" != 0 ] ; then
> + exit 99
> +fi
> +
> +if ! which mkfs.erofs >/dev/null 2>&1; then
> + echo "mkfs.erofs not installed; cannot test erofs."
> + exit 99
> +fi
> +
> +"@builddir@/grub-fs-tester" erofs_compact
> +"@builddir@/grub-fs-tester" erofs_extended
> +"@builddir@/grub-fs-tester" erofs_chunk
> diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
> index ea8b2d1f6..df5dc7542 100644
> --- a/tests/util/grub-fs-tester.in
> +++ b/tests/util/grub-fs-tester.in
> @@ -227,6 +227,10 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
> xsquash*)
> MINBLKSIZE=4096
> MAXBLKSIZE=1048576;;
> + x"erofs_"*)
> + MINBLKSIZE=4096
> + MAXBLKSIZE=4096
> + ;;
> xxfs|xf2fs)
> MINBLKSIZE=$SECSIZE
> # OS Limitation: GNU/Linux doesn't accept > 4096
> @@ -382,8 +386,8 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
> FSLABEL="g;/_é䏌䐓䏕䎛䎾䏴кит u"
> #FSLABEL="g;/_é莭莽😁кит u"
> ;;
> - # FS LIMITATION: reiserfs, extN and jfs label is at most 16 UTF-8 characters
> - x"reiserfs_old" | x"reiserfs" | x"ext"* | x"lvm"* | x"luks"* | x"mdraid"* | x"jfs" | x"jfs_caseins")
> + # FS LIMITATION: reiserfs, extN, jfs and erofs label is at most 16 UTF-8 characters
> + x"reiserfs_old" | x"reiserfs" | x"ext"* | x"lvm"* | x"luks"* | x"mdraid"* | x"jfs" | x"jfs_caseins" | x"erofs_"*)
> FSLABEL="g;/éт 莭😁";;
> # FS LIMITATION: No underscore, space, semicolon, slash or international characters in UFS* in label. Limited to 32 UTF-8 characters
> x"ufs1" | x"ufs1_sun" | x"ufs2")
> @@ -661,7 +665,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
> x"tarfs" | x"cpio_"*| x"ziso9660" | x"romfs" | x"squash4_"*\
> | x"iso9660" | xjoliet | xrockridge | xrockridge_joliet \
> | x"iso9660_1999" | xjoliet_1999 | xrockridge_1999 \
> - | xrockridge_joliet_1999)
> + | xrockridge_joliet_1999 | x"erofs_"*)
> MNTPOINTRW="$MASTER"
> MNTPOINTRO="$MASTER"
> mkdir -p "$MASTER";;
> @@ -805,7 +809,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
> sleep 1
> "zfs" create "$FSLABEL"/"grub fs"
> sleep 1;;
> - x"tarfs" | x"cpio_"* | x"iso9660" | xjoliet | xrockridge | xrockridge_joliet | x"iso9660_1999" | xjoliet_1999 | xrockridge_1999 | xrockridge_joliet_1999 | x"ziso9660" | x"romfs" | x"squash4_"*)
> + x"tarfs" | x"cpio_"* | x"iso9660" | xjoliet | xrockridge | xrockridge_joliet | x"iso9660_1999" | xjoliet_1999 | xrockridge_1999 | xrockridge_joliet_1999 | x"ziso9660" | x"romfs" | x"squash4_"* | x"erofs_"*)
> INSTDEVICE=/dev/null;;
> x"reiserfs")
> "mkfs.reiserfs" --format=3.6 -b $BLKSIZE -l "$FSLABEL" -q "${MOUNTDEVICE}" ;;
> @@ -990,7 +994,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
> x"zfs"*)
> OSDIR="grub fs/"
> GRUBDIR="($GRUBDEVICE)/grub fs@";;
> - x"tarfs" | x"cpio_"* | x"iso9660" | xjoliet | xrockridge | xrockridge_joliet | x"iso9660_1999" | xjoliet_1999 | xrockridge_1999 | xrockridge_joliet_1999 | x"ziso9660" | x"romfs" | x"squash4_"* | xafs)
> + x"tarfs" | x"cpio_"* | x"iso9660" | xjoliet | xrockridge | xrockridge_joliet | x"iso9660_1999" | xjoliet_1999 | xrockridge_1999 | xrockridge_joliet_1999 | x"ziso9660" | x"romfs" | x"squash4_"* | xafs | x"erofs_"*)
> ;;
> *)
> if ! mount -t "$MOUNTFS" "${MOUNTDEVICE}" "$MNTPOINTRW" -o ${MOUNTOPTS}${SELINUXOPTS}rw ; then
> @@ -1116,6 +1120,18 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
> xsquash4_*)
> echo mksquashfs "$MASTER" "${FSIMAGEP}0.img" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE
> mksquashfs "$MASTER" "${FSIMAGEP}0.img" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE ;;
> + x"erofs_compact")
> + echo mkfs.erofs -Eforce-inode-compact -L "$FSLABEL" "${FSIMAGEP}0.img" "$MNTPOINTRW"
> + mkfs.erofs -Eforce-inode-compact -L "$FSLABEL" "${FSIMAGEP}0.img" "$MNTPOINTRW"
> + ;;
> + x"erofs_extended")
> + echo mkfs.erofs -Eforce-inode-extended -L "$FSLABEL" "${FSIMAGEP}0.img" "$MNTPOINTRW"
> + mkfs.erofs -Eforce-inode-extended -L "$FSLABEL" "${FSIMAGEP}0.img" "$MNTPOINTRW"
> + ;;
> + x"erofs_chunk")
> + echo mkfs.erofs --chunksize=1048576 -L "$FSLABEL" "${FSIMAGEP}0.img" "$MNTPOINTRW"
> + mkfs.erofs --chunksize=1048576 -L "$FSLABEL" "${FSIMAGEP}0.img" "$MNTPOINTRW"
> + ;;
> x"bfs")
> sleep 1
> fusermount -u "$MNTPOINTRW"
> @@ -1187,6 +1203,8 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
> ;;
> xsquash4_*)
> ;;
> + x"erofs_"*)
> + ;;
> xlvm*)
> vgchange -a y grub_test
> sleep 1
> @@ -1624,7 +1642,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
> sleep 1;
> done
> sleep 5;;
> - x"tarfs" | x"cpio_"* | xrockridge | xjoliet | xrockridge_joliet | x"ziso9660" | x"romfs" | x"squash4_"* | xiso9660 | xiso9660_1999 | xrockridge_1999 | xjoliet_1999 | xrockridge_joliet_1999)
> + x"tarfs" | x"cpio_"* | xrockridge | xjoliet | xrockridge_joliet | x"ziso9660" | x"romfs" | x"squash4_"* | xiso9660 | xiso9660_1999 | xrockridge_1999 | xjoliet_1999 | xrockridge_joliet_1999 | x"erofs_"*)
> rm -rf "$MNTPOINTRW";;
> x"afs")
> rm -rf "$MNTPOINTRO"
> @@ -1651,7 +1669,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
> ;;
> esac
> case x"$fs" in
> - x"tarfs" | x"cpio_"* | x"iso9660" | xrockridge | xjoliet | xrockridge_joliet | x"ziso9660" | x"romfs" | x"squash4_"* | x"iso9660_1999" | xrockridge_1999 | xjoliet_1999 | xrockridge_joliet_1999) ;;
> + x"tarfs" | x"cpio_"* | x"iso9660" | xrockridge | xjoliet | xrockridge_joliet | x"ziso9660" | x"romfs" | x"squash4_"* | x"iso9660_1999" | xrockridge_1999 | xjoliet_1999 | xrockridge_joliet_1999 | x"erofs_"*) ;;
> *)
> for lodev in $LODEVICES; do
> while ! losetup -d "$lodev"; do
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
next prev parent reply other threads:[~2024-04-18 8:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-03 17:15 [PATCH v5 0/2] Introduce EROFS support Yifan Zhao
2024-03-03 17:15 ` [PATCH v5 1/2] fs/erofs: Add support for EROFS Yifan Zhao
2024-03-06 2:18 ` Gao Xiang
2024-04-04 20:56 ` Daniel Kiper
2024-04-10 11:23 ` Gao Xiang
2024-04-18 8:16 ` Glenn Washburn
2024-04-18 17:12 ` Yifan Zhao
2024-04-22 3:15 ` Glenn Washburn
2024-04-22 3:35 ` Yifan Zhao
2024-04-22 4:20 ` Yifan Zhao
2024-04-27 6:42 ` Glenn Washburn
2024-03-03 17:15 ` [PATCH v5 2/2] fs/erofs: Add tests for EROFS in grub-fs-tester Yifan Zhao
2024-04-18 8:19 ` Glenn Washburn [this message]
2024-03-03 17:17 ` [PATCH v4~v2 Interdiff] Introduce EROFS support Yifan Zhao
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=20240418031901.1dd8badf@crass-HP-ZBook-15-G2 \
--to=development@efficientek.com \
--cc=dkiper@net-space.pl \
--cc=grub-devel@gnu.org \
--cc=hsiangkao@linux.alibaba.com \
--cc=zhaoyifan@sjtu.edu.cn \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.