[PATCH 0/5] erofs-utils: tests: restructure test cases for xattr

[PATCH 0/5] erofs-utils: tests: restructure test cases for xattr

[Jingbo Xu]

This series restructures some existing test cases for xattr.

- patch 1/2: some generic helpers are extracted from erofs/019 [1]
- patch 3/4: the previous posted test case [2] checking xattrs in
  different layouts are split into two test cases, i.e. erofs/020 and
  erofs/021.
    - erofs/020 checks xattrs in different layouts and is independent on
      the "-b#" feature of mkfs.erofs
    - erofs/021 checks xattrs crossing block boundary.  It is dependent
      on the "-b#" feature of mkfs.erofs and will "notrun" if mkfs.erofs
      doesn't support this feature yet
- patch 5: it's the previous posted test case [3] checking long xattr
  name prefixes, except that it will "notrun" if mkfs.erofs doesn't
  support "--xattr-prefix" feature yet

[1] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/tests/erofs/019?h=experimental-tests
[2] https://lore.kernel.org/all/20230327123926.92934-1-jefflexu@linux.alibaba.com/
[3] https://lore.kernel.org/all/20230411103004.104064-1-jefflexu@linux.alibaba.com/

Huang Jianan (1):
  erofs-utils: tests: add test for xattrs

Jingbo Xu (4):
  erofs-utils: tests: add generic helper for xattrs
  erofs-utils: tests: add test for xattrs in different layouts
  erofs-utils: tests: add test for xattr crossing block boundary
  erofs-utils: tests: add test for long xattr name prefixes

 tests/Makefile.am   | 12 +++++++++
 tests/common/rc     | 44 ++++++++++++++++++++++++++++++
 tests/erofs/019     | 55 ++++++++++++++++++++++++++++++++++++++
 tests/erofs/019.out |  2 ++
 tests/erofs/020     | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/erofs/020.out |  2 ++
 tests/erofs/021     | 60 +++++++++++++++++++++++++++++++++++++++++
 tests/erofs/021.out |  2 ++
 tests/erofs/022     | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/erofs/022.out |  2 ++
 10 files changed, 333 insertions(+)
 create mode 100755 tests/erofs/019
 create mode 100644 tests/erofs/019.out
 create mode 100755 tests/erofs/020
 create mode 100644 tests/erofs/020.out
 create mode 100755 tests/erofs/021
 create mode 100644 tests/erofs/021.out
 create mode 100755 tests/erofs/022
 create mode 100644 tests/erofs/022.out

-- 
1.8.3.1

[PATCH 1/5] erofs-utils: tests: add generic helper for xattrs

[Jingbo Xu]

Add a helper checking if xattr progs are available.

Add helpers generating random strings which could be used as
key/value of xattr.

Add a helper checking if same named files under two directories have
same xattrs.

Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
---
 tests/common/rc | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/common/rc b/tests/common/rc
index a9ae369..293e556 100644
--- a/tests/common/rc
+++ b/tests/common/rc
@@ -86,6 +86,12 @@ _require_root()
 	[ "$(id -u)" = "0" ] || _notrun "must be run as root"
 }
 
+_require_xattr()
+{
+	which setfattr >/dev/null 2>&1 ||
+		_notrun "attr isn't installed, skipped."
+}
+
 # this test requires erofs kernel support
 _require_erofs()
 {
@@ -315,6 +321,32 @@ _require_fssum()
 	[ -x $FSSUM_PROG ] || _notrun "fssum not built"
 }
 
+# generate random string with maximum $1 length
+_random()
+{
+	head -20 /dev/urandom | base64 -w0 | head -c $1
+}
+
+# generate short random string
+_srandom()
+{
+	_random 16
+}
+
+# check xattrs of same files under two directories
+_check_xattrs()
+{
+	local dir1="$1"
+	local dir2="$2"
+	local dirs=`ls $dir1`
+
+	for d in $dirs; do
+		xattr1=`getfattr --absolute-names -d $dir1/$d | tail -n+2`
+		xattr2=`getfattr --absolute-names -d $dir2/$d | tail -n+2`
+		[ "x$xattr1" = "x$xattr2" ] || _fail "-->check xattrs FAILED"
+	done
+}
+
 _check_results()
 {
 	[ -z $srcdir ] && return 0
-- 
1.8.3.1

[PATCH 2/5] erofs-utils: tests: add test for xattrs

[Jingbo Xu]

From: Huang Jianan <huangjianan@oppo.com>

Add basic functional check for xattrs.

Signed-off-by: Huang Jianan <huangjianan@oppo.com>
Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
---
 tests/Makefile.am   |  3 +++
 tests/erofs/019     | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/erofs/019.out |  2 ++
 3 files changed, 60 insertions(+)
 create mode 100755 tests/erofs/019
 create mode 100644 tests/erofs/019.out

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3bd6ad5..b85ae89 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -88,6 +88,9 @@ TESTS += erofs/017
 # 018 - verify lzma compressed image
 TESTS += erofs/018
 
+# 019 - check extended attribute functionality
+TESTS += erofs/019
+
 EXTRA_DIST = common/rc erofs
 
 clean-local: clean-local-check
diff --git a/tests/erofs/019 b/tests/erofs/019
new file mode 100755
index 0000000..0b89b77
--- /dev/null
+++ b/tests/erofs/019
@@ -0,0 +1,55 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0+
+#
+# 019 - check extended attribute functionality
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$(echo $0 | awk '{print $((NF-1))"/"$NF}' FS="/")
+
+# get standard environment, filters and checks
+. "${srcdir}/common/rc"
+
+cleanup()
+{
+	cd /
+	rm -rf $tmp.*
+}
+
+_require_erofs
+_require_xattr
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+echo "QA output created by $seq"
+
+if [ -z $SCRATCH_DEV ]; then
+	SCRATCH_DEV=$tmp/erofs_$seq.img
+	rm -f SCRATCH_DEV
+fi
+
+localdir="$tmp/$seq"
+rm -rf $localdir
+mkdir -p $localdir
+
+# set random xattrs
+cp -nR ../ $localdir
+dirs=`ls $localdir`
+for d in $dirs; do
+	key=`head -20 /dev/urandom | cksum | cut -f1 -d " "`
+	val="0s"`head -3 /dev/urandom | base64 -w0`
+	setfattr -n user.$key -v $val $localdir/$d
+done
+
+_scratch_mkfs $localdir >> $seqres.full 2>&1 || _fail "failed to mkfs"
+_scratch_mount 2>>$seqres.full
+
+# check xattrs
+_check_xattrs $localdir $SCRATCH_MNT
+
+_scratch_unmount
+
+echo Silence is golden
+status=0
+exit 0
diff --git a/tests/erofs/019.out b/tests/erofs/019.out
new file mode 100644
index 0000000..163484b
--- /dev/null
+++ b/tests/erofs/019.out
@@ -0,0 +1,2 @@
+QA output created by 019
+Silence is golden
-- 
1.8.3.1

[PATCH 3/5] erofs-utils: tests: add test for xattrs in different layouts

[Jingbo Xu]

Test extended attributes in following layouts:

- multiple inline xattrs for one single file
- multiple share xattrs for one single file
- mixed inline and share xattrs for one single file

Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
---
 tests/Makefile.am   |  3 +++
 tests/erofs/020     | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/erofs/020.out |  2 ++
 3 files changed, 82 insertions(+)
 create mode 100755 tests/erofs/020
 create mode 100644 tests/erofs/020.out

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b85ae89..1d6ea5c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -91,6 +91,9 @@ TESTS += erofs/018
 # 019 - check extended attribute functionality
 TESTS += erofs/019
 
+# 020 - check extended attributes in different layouts
+TESTS += erofs/020
+
 EXTRA_DIST = common/rc erofs
 
 clean-local: clean-local-check
diff --git a/tests/erofs/020 b/tests/erofs/020
new file mode 100755
index 0000000..5f98be2
--- /dev/null
+++ b/tests/erofs/020
@@ -0,0 +1,77 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0+
+#
+# 020 - check extended attributes in different layouts
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$(echo $0 | awk '{print $((NF-1))"/"$NF}' FS="/")
+
+# get standard environment, filters and checks
+. "${srcdir}/common/rc"
+
+cleanup()
+{
+	cd /
+	rm -rf $tmp.*
+}
+
+_require_erofs
+_require_xattr
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+echo "QA output created by $seq"
+
+if [ -z $SCRATCH_DEV ]; then
+	SCRATCH_DEV=$tmp/erofs_$seq.img
+	rm -f SCRATCH_DEV
+fi
+
+localdir="$tmp/$seq"
+rm -rf $localdir
+mkdir -p $localdir
+
+# set random xattrs
+
+# preapre key/value of shared xattrs
+s_key_1=$(_srandom)
+s_key_2=$(_srandom)
+s_val=$(_srandom)
+
+# file1: one inline xattr
+touch $localdir/file1
+setfattr -n user.p$(_srandom) -v $(_srandom) $localdir/file1
+
+# file2: one share xattr
+touch $localdir/file2
+setfattr -n user.s$s_key_1 -v $s_val $localdir/file2
+
+# file3: multiple inline xattrs
+touch $localdir/file3
+setfattr -n user.p$(_srandom) -v $(_srandom) $localdir/file3
+setfattr -n user.p$(_srandom) -v $(_srandom) $localdir/file3
+
+# file4: multiple share xattrs
+touch $localdir/file4
+setfattr -n user.s$s_key_1 -v $s_val $localdir/file4
+setfattr -n user.s$s_key_2 -v $s_val $localdir/file4
+
+# file5: mixed inline and share xattrs
+touch $localdir/file5
+setfattr -n user.p$(_srandom) -v $(_srandom) $localdir/file5
+setfattr -n user.s$s_key_1 -v $s_val $localdir/file5
+
+MKFS_OPTIONS="$MKFS_OPTIONS -x1"
+_scratch_mkfs $localdir >> $seqres.full 2>&1 || _fail "failed to mkfs"
+_scratch_mount 2>>$seqres.full
+
+# check xattrs
+_check_xattrs $localdir $SCRATCH_MNT
+
+_scratch_unmount
+
+echo Silence is golden
+status=0
+exit 0
diff --git a/tests/erofs/020.out b/tests/erofs/020.out
new file mode 100644
index 0000000..20d7944
--- /dev/null
+++ b/tests/erofs/020.out
@@ -0,0 +1,2 @@
+QA output created by 020
+Silence is golden
-- 
1.8.3.1

[PATCH 4/5] erofs-utils: tests: add test for xattr crossing block boundary

[Jingbo Xu]

Test the extended attribute which crosses block boundary.

Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
---
 tests/Makefile.am   |  3 +++
 tests/common/rc     |  6 ++++++
 tests/erofs/021     | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/erofs/021.out |  2 ++
 4 files changed, 71 insertions(+)
 create mode 100755 tests/erofs/021
 create mode 100644 tests/erofs/021.out

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1d6ea5c..61bbb4d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -94,6 +94,9 @@ TESTS += erofs/019
 # 020 - check extended attributes in different layouts
 TESTS += erofs/020
 
+# 021 - check extended attributes crossing block boundary
+TESTS += erofs/021
+
 EXTRA_DIST = common/rc erofs
 
 clean-local: clean-local-check
diff --git a/tests/common/rc b/tests/common/rc
index 293e556..0361c68 100644
--- a/tests/common/rc
+++ b/tests/common/rc
@@ -92,6 +92,12 @@ _require_xattr()
 		_notrun "attr isn't installed, skipped."
 }
 
+_require_mkfs_blksize()
+{
+	"$MKFS_EROFS_PROG" --help 2>&1 | grep -q -- '-b#' ||
+		_notrun "-b# feature needed for mkfs.erofs"
+}
+
 # this test requires erofs kernel support
 _require_erofs()
 {
diff --git a/tests/erofs/021 b/tests/erofs/021
new file mode 100755
index 0000000..d36aa56
--- /dev/null
+++ b/tests/erofs/021
@@ -0,0 +1,60 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0+
+#
+# 021 - check extended attributes crossing block boundary
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$(echo $0 | awk '{print $((NF-1))"/"$NF}' FS="/")
+
+# get standard environment, filters and checks
+. "${srcdir}/common/rc"
+
+cleanup()
+{
+	cd /
+	rm -rf $tmp.*
+}
+
+_require_erofs
+_require_xattr
+_require_mkfs_blksize
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+echo "QA output created by $seq"
+
+if [ -z $SCRATCH_DEV ]; then
+	SCRATCH_DEV=$tmp/erofs_$seq.img
+	rm -f SCRATCH_DEV
+fi
+
+localdir="$tmp/$seq"
+rm -rf $localdir
+mkdir -p $localdir
+
+# set inline xattr (large name/value crossing block boundary)
+# given blksize will be set to 512 later, it is ensured that xattr values
+# cross the block boundary; besides set three xattrs to ensure at least
+# one xattr name crosses the block boundary
+touch $localdir/file1
+for i in {1..3}; do
+	setfattr -n user.p$(_random 249) -v $(_random 512) $localdir/file1 \
+		|| _notrun "no space for xattrs"
+done
+
+# specify 512 blocksize explicitly so that the large name/value of file1
+# could cross the block boundary
+MKFS_OPTIONS="$MKFS_OPTIONS -b512"
+_scratch_mkfs $localdir >> $seqres.full 2>&1 || _fail "failed to mkfs"
+_scratch_mount 2>>$seqres.full
+
+# check xattrs
+_check_xattrs $localdir $SCRATCH_MNT
+
+_scratch_unmount
+
+echo Silence is golden
+status=0
+exit 0
diff --git a/tests/erofs/021.out b/tests/erofs/021.out
new file mode 100644
index 0000000..09f4062
--- /dev/null
+++ b/tests/erofs/021.out
@@ -0,0 +1,2 @@
+QA output created by 021
+Silence is golden
-- 
1.8.3.1

[PATCH 5/5] erofs-utils: tests: add test for long xattr name prefixes

[Jingbo Xu]

mkfs.erofs supports user specified long xattr name prefix through
"--xattr_prefix" option.

Add test case for this feature.

Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
---
 tests/Makefile.am   |  3 +++
 tests/common/rc     |  6 +++++
 tests/erofs/022     | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/erofs/022.out |  2 ++
 4 files changed, 88 insertions(+)
 create mode 100755 tests/erofs/022
 create mode 100644 tests/erofs/022.out

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 61bbb4d..6295964 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -97,6 +97,9 @@ TESTS += erofs/020
 # 021 - check extended attributes crossing block boundary
 TESTS += erofs/021
 
+# 022 - check long extended attribute name prefixes
+TESTS += erofs/022
+
 EXTRA_DIST = common/rc erofs
 
 clean-local: clean-local-check
diff --git a/tests/common/rc b/tests/common/rc
index 0361c68..dcd63a9 100644
--- a/tests/common/rc
+++ b/tests/common/rc
@@ -98,6 +98,12 @@ _require_mkfs_blksize()
 		_notrun "-b# feature needed for mkfs.erofs"
 }
 
+_require_mkfs_long_prefix()
+{
+	"$MKFS_EROFS_PROG" --help 2>&1 | grep -q -- '--xattr-prefix' ||
+		_notrun "long name prefix feature needed for mkfs.erofs"
+}
+
 # this test requires erofs kernel support
 _require_erofs()
 {
diff --git a/tests/erofs/022 b/tests/erofs/022
new file mode 100755
index 0000000..0ca4785
--- /dev/null
+++ b/tests/erofs/022
@@ -0,0 +1,77 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0+
+#
+# 022 - check long extended attribute name prefixes
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$(echo $0 | awk '{print $((NF-1))"/"$NF}' FS="/")
+
+# get standard environment, filters and checks
+. "${srcdir}/common/rc"
+
+cleanup()
+{
+	cd /
+	rm -rf $tmp.*
+}
+
+_require_erofs
+_require_xattr
+_require_mkfs_long_prefix
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+echo "QA output created by $seq"
+
+if [ -z $SCRATCH_DEV ]; then
+	SCRATCH_DEV=$tmp/erofs_$seq.img
+	rm -f SCRATCH_DEV
+fi
+
+localdir="$tmp/$seq"
+rm -rf $localdir
+mkdir -p $localdir
+
+# set random xattrs (mix of normal xattrs and long prefix xattrs)
+
+# preapre key/value of shared xattrs
+s_key_1=$(_srandom)
+s_key_2=$(_srandom)
+s_val=$(_srandom)
+
+# file1: multiple inline xattrs
+touch $localdir/file1
+setfattr -n user.infix.p$(_srandom) -v $(_srandom) $localdir/file1
+setfattr -n user.infix.p$(_srandom) -v $(_srandom) $localdir/file1
+setfattr -n user.p$(_srandom) -v $(_srandom) $localdir/file1
+setfattr -n user.p$(_srandom) -v $(_srandom) $localdir/file1
+
+# file2: multiple share xattrs
+touch $localdir/file2
+setfattr -n user.infix.s$s_key_1 -v $s_val $localdir/file2
+setfattr -n user.infix.s$s_key_2 -v $s_val $localdir/file2
+setfattr -n user.s$s_key_1 -v $s_val $localdir/file2
+setfattr -n user.s$s_key_2 -v $s_val $localdir/file2
+
+# file3: mixed inline and share xattrs
+touch $localdir/file3
+setfattr -n user.infix.p$(_srandom) -v $(_srandom) $localdir/file3
+setfattr -n user.infix.s$s_key_1 -v $s_val $localdir/file3
+setfattr -n user.p$(_srandom) -v $(_srandom) $localdir/file3
+setfattr -n user.s$s_key_1 -v $s_val $localdir/file3
+
+# specify long xattr name prefix through "--xattr-prefix"
+MKFS_OPTIONS="$MKFS_OPTIONS -x1 --xattr-prefix=user.infix."
+_scratch_mkfs $localdir >> $seqres.full 2>&1 || _fail "failed to mkfs"
+_scratch_mount 2>>$seqres.full
+
+# check xattrs
+_check_xattrs $localdir $SCRATCH_MNT
+
+_scratch_unmount
+
+echo Silence is golden
+status=0
+exit 0
diff --git a/tests/erofs/022.out b/tests/erofs/022.out
new file mode 100644
index 0000000..394c6a7
--- /dev/null
+++ b/tests/erofs/022.out
@@ -0,0 +1,2 @@
+QA output created by 022
+Silence is golden
-- 
1.8.3.1