Skip to contentSkip to conversation

fstests: transport two ext4 tests from LTP

PATCH Superseded Sun Yong 1 participant 3 messages Nov 1, 2019 – Nov 13, 2019

v1 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Sun Yong

author
#0 lore raw

PATCH 1/1 fstests: transport two ext4 tests from LTP

Recently LTP upstream removed some ext4 tests[1]. And two of them is still valid to keep. So I transport those two tests here.

ext4-nsec-timestamps, which is used to test nanosec timestamps of ext4, rewrite into ext4/043 and 044.
ext4-subdir-limit, which is used to test subdirectory limit of ext4, rewrite into ext4/045.

[1] https://marc.info/?l=linux-fsdevel&m=157190623919681&w=2

---

src/Makefile +2 -1
index ce6d8610..387293d1 100644
@@ -16,7 +16,8 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \
     holetest t_truncate_self t_mmap_dio af_unix t_mmap_stale_pmd \
     t_mmap_cow_race t_mmap_fallocate fsync-err t_mmap_write_ro \
     t_ext4_dax_journal_corruption t_ext4_dax_inline_corruption \
-    t_ofd_locks t_locks_execve t_mmap_collision mmap-write-concurrent
+    t_ofd_locks t_locks_execve t_mmap_collision mmap-write-concurrent \
+    t_ext4_file_time t_create_short_dirs t_create_long_dirs
 
 LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
     preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \
src/t_create_long_dirs.c new file +136 -0

136 lines not on this page · raw message

src/t_create_short_dirs.c new file +15 -0
new file mode 100644
index 00000000..2725a1f0
@@ -0,0 +1,139 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2019 SUSE Linux Products GmbH. All Rights Reserved.
+
+#define _POSIX_C_SOURCE 200809L
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include "config.h"
+
+/* valid characters for a directory name */
+char chars[] =

"0123456789qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM"; +
+/* to store the generated directory name */
+char name[10];
+int names;
+int parent_fd;
+
+/* NCHARS = 10 + 26 + 26 = 62 */
+#define NCHARS 62

+#define MAX_LEN1    62
+#define MAX_LEN2    (62 * 62)
+#define MAX_LEN3    (62 * 62 * 62)

+#define MAX_NAMES (MAX_LEN1 + MAX_LEN2 + MAX_LEN3)
+
+void create_dir(void)
+{
+ if (mkdirat(parent_fd, name, S_IRWXU)) {
+ perror("mkdir");
+ exit(1);
+ }
+}
+
+/*
+ * create_1 - create length-1 directory names
+ * @n: how name names to be created
+ */
+void create_1(int n)
+{
+ int i;
+
+ name[1] = '\0';
+ for (i = 0; i < NCHARS; i++) {

+        name[0] = chars[i];
+        create_dir();
+        if (--n == 0)

+ return;
+ }
+}
+
+/*
+ * create_2 - generate length-2 directory names
+ * @n: how many names to be created
+ */
+void create_2(int n)
+{
+ int i, j;
+
+ name[2] = '\0';
+ for (i = 0; i < NCHARS; i++) {
+ name[0] = chars[i];
+ for (j = 0; j < NCHARS; j++) {

+            name[1] = chars[j];
+            create_dir();
+            if (--n == 0)

+ return;
+ }
+ }
+}
+
+/*
+ * create_3 - generate length-3 directory names
+ * @n: how many names to be created
+ */
+void create_3(int n)
+{
+ int i, j, k;
+
+ name[3] = '\0';
+ for (i = 0; i < NCHARS; i++) {
+ name[0] = chars[i];
+ for (j = 0; j < NCHARS; j++) {
+ name[1] = chars[j];
+ for (k = 0; k < NCHARS; k++) {

+                name[2] = chars[k];
+                create_dir();
+                if (--n == 0)

+ return;
+ }
+ }
+ }
+}
+
+void usage()
+{
+ fprintf(stderr, "Usage: create_short_dirs nr_dirs parent_dir\n");
+}
+
+/*
+ * Create short-name directoriess
+ * @argv[1]: director number
+ * @argv[2]: the parent directory
+ */
+int main(int argc, char *argv[])
+{
+ if (argc != 3) {
+ usage();
+ return 1;
+ }
+
+ names = atoi(argv[1]);
+ if (names > MAX_NAMES || names <= 0) {
+ usage();
+ return 1;
+ }
+
+ parent_fd = open(argv[2], O_RDONLY);
+ if (parent_fd == -1) {
+ perror("open parent dir");
+ return 1;
+ }
+
+ create_1(names);
+ if (names <= MAX_LEN1)
+ return 0;
+

+    names -= MAX_LEN1;
+    create_2(names);
+    if (names <= MAX_LEN2)

+ return 0;
+
+ names -= MAX_LEN2;
+ create_3(names);
+
+ return 0;
+}

src/t_ext4_file_time.c new file +50 -0

50 lines not on this page · raw message

tests/ext4/043 new file +43 -0

43 lines not on this page · raw message

$SCRATCH_DEV" >$seqres.full
+_scratch_mkfs_ext4 -I 128 >> $seqres.full 2>&1
+tune2fs -O extents $SCRATCH_DEV >>$seqres.full 2>&1 +_scratch_mount
+
+touch "${SCRATCH_MNT}/tmp_file"
+
+atime=$here/src/t_ext4_file_time $SCRATCH_MNT/tmp_file atime nsec +mtime=$here/src/t_ext4_file_time $SCRATCH_MNT/tmp_file mtime nsec +ctime=$here/src/t_ext4_file_time $SCRATCH_MNT/tmp_file ctime nsec +
+if [ $atime -ne 0 -o $mtime -ne 0 -o $ctime -ne 0 ]; then
+ echo "Timestamp is not second(atime: $atime, mtime: $mtime,
ctime: $ctime)" >> $seqres.full
+ _scratch_unmount >> $seqres.full 2>&1
+ exit
+fi
+echo "Ext4 nanosecond timestamps test with 128 inode size pass" >> $seqres.full +_scratch_unmount >> $seqres.full 2>&1
+
+# no BUG_ON, all done
+status=0
+exit

tests/ext4/043.out new file +2 -0
new file mode 100644
index 00000000..f90f0a57
@@ -0,0 +1,2 @@
+QA output created by 043
+Silence is golden
tests/ext4/044 new file +41 -0

41 lines not on this page · raw message

Quoted 1 line

$seqres.full

+_scratch_mkfs_ext4 -t ext3 -I 256 >> $seqres.full 2>&1 +_scratch_mount
+
+# Create file
+touch "${SCRATCH_MNT}/tmp_file"
+sleep 1
+
+# Change atime, ctime and mtime of the file
+touch "${SCRATCH_MNT}/tmp_file"
+
+cur_time=date '+%s %N'
+sec=echo $cur_time | awk {'print $1'}
+nsec=echo $cur_time | awk {'print $2'}
+
+sec_atime=$here/src/t_ext4_file_time $SCRATCH_MNT/tmp_file atime sec +sec_mtime=$here/src/t_ext4_file_time $SCRATCH_MNT/tmp_file mtime sec +sec_ctime=$here/src/t_ext4_file_time $SCRATCH_MNT/tmp_file ctime sec +nsec_atime=$here/src/t_ext4_file_time $SCRATCH_MNT/tmp_file atime nsec +nsec_mtime=$here/src/t_ext4_file_time $SCRATCH_MNT/tmp_file mtime nsec +nsec_ctime=$here/src/t_ext4_file_time $SCRATCH_MNT/tmp_file ctime nsec +
+# Test nanosecond
+if [ $nsec_atime -eq 0 -a $nsec_mtime -eq 0 -a $nsec_ctime -eq 0 ]; then
+ echo "The timestamp is not nanosecond(nsec_atime: $nsec_atime, \
+ nsec_mtime: $nsec_mtime, nsec_ctime: $nsec_ctime)" >>
$seqres.full
+ _scratch_unmount >> $seqres.full 2>&1
+ exit
+fi
+
+diff1=$(( $sec_atime - $sec ))
+diff2=$(( $sec_mtime - $sec ))
+diff3=$(( $sec_ctime - $sec ))
+
+# Test difference between file time and current time
+if [ $diff1 -gt 1 -o $diff2 -gt 1 -o $diff2 -gt 1 ]; then
+ echo "The timestamp is wrong, it must be earlier than the
current time we got. \
+ (sec_atime: $sec_atime, sec_mtime: $sec_mtime,
sec_ctime: $sec_ctime, \
+ cur_time[s]: $sec)" >> $seqres.full
+ _scratch_unmount >> $seqres.full 2>&1
+ exit
+fi
+_scratch_unmount >> $seqres.full 2>&1
+
+# Test mount to ext3 and then mount back to ext4
+mount -t ext3 $SCRATCH_DEV $SCRATCH_MNT
+if [ $? -ne 0 ]; then

+        echo "$SCRATCH_DEV fail in mounting to ext3" >> $seqres.full
+        _scratch_unmount >> $seqres.full 2>&1
+        exit

+fi
+_scratch_unmount >> $seqres.full 2>&1
+_scratch_mount
+
+nsec_atime2=$here/src/t_ext4_file_time $SCRATCH_MNT/tmp_file atime nsec +nsec_mtime2=$here/src/t_ext4_file_time $SCRATCH_MNT/tmp_file mtime nsec +nsec_ctime2=$here/src/t_ext4_file_time $SCRATCH_MNT/tmp_file ctime nsec +
+if [ $nsec_atime -ne $nsec_atime2 -o $nsec_ctime -ne $nsec_ctime2 -o \
+ $nsec_mtime -ne $nsec_mtime2 ]; then
+ echo "File nanosecond timestamp has changed \

+                        unexpected. Before[atime mtime ctime]: $nsec_atime \
+                        nsec_mtime $nsec_ctime, After[atime mtime ctime]: \
+                        $nsec_atime2 $nsec_mtime2 $nsec_ctime2)" >>

$seqres.full
+ _scratch_unmount >> $seqres.full 2>&1
+ exit
+fi
+_scratch_unmount >> $seqres.full 2>&1
+
+# no BUG_ON, all done
+status=0
+exit

tests/ext4/044.out new file +2 -0
new file mode 100644
index 00000000..12a61dc4
@@ -0,0 +1,2 @@
+QA output created by 044
+Silence is golden
tests/ext4/045 new file +7 -0
new file mode 100755
index 00000000..c70baa97
@@ -0,0 +1,148 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2019 SUSE Linux Products GmbH.  All Rights Reserved.
+#
+# FS QA Test No. 045
+#
+# Transfer from

ltp/testcases/kernel/fs/ext4-new-features/ext4_subdir_limit_test +#
+# Test subdirectory limit of ext4.
+# We create more than 32000 subdirectorys on the ext4 filesystem. +#
+seq=basename $0
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=pwd
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+SHORT_DIR=1
+LONG_DIR=2
+FAIL=1
+PASS=0
+prev_block_size=0
+prev_result=$FAIL
+
+_cleanup()
+{

+    cd /
+    rm -f $tmp.*
+    _scratch_cleanup_files

+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+_supported_fs ext4
+_supported_os Linux
+
+_require_scratch
+_require_test_program "t_create_short_dirs"
+_require_test_program "t_create_long_dirs"
+_require_command "$TUNE2FS_PROG" tune2fs
+_require_command "$E2FSCK_PROG" e2fsck
+_require_dumpe2fs
+
+echo "Silence is golden"
+
+# Run a test case
+# $1: Number of directories to create
+# $2: create short dir or long dir
+# $3: parent directory
+# $4: filesystem block size
+_workout()
+{
+ local dir_name_len=
+ if [ $2 -eq $SHORT_DIR ]; then
+ dir_name_len="short name"
+ else
+ dir_name_len="long name"
+ fi
+
+ echo "Num of dirs to create: $1, Dir name len: $dir_name_len, " \
+ "Parent dir: $3, Block size: $4" >> $seqres.full 2>&1
+
+ # Only mkfs if block size has been changed, or previous case failed
+ if [ $prev_result -ne $PASS -o $4 -ne $prev_block_size ]; then

+        $MKFS_EXT4_PROG -F -b $4 -I 256 $SCRATCH_DEV >> $seqres.full 2>&1
+        prev_block_size=$4
+        tune2fs -O extents $SCRATCH_DEV >> $seqres.full 2>&1

+ fi
+ prev_result=$FAIL
+
+ _scratch_mount
+
+ # create directories
+ mkdir -p $3 2> /dev/null
+
+ if [ $2 -eq $SHORT_DIR ]; then
+ $here/src/t_create_short_dirs $1 $3
+ else
+ $here/src/t_create_long_dirs $1 $3
+ fi
+
+ if [ $? -ne 0 ]; then

+        nr_dirs=`ls $3 | wc -l`
+        echo "Failed to create directories - $nr_dirs"
+        _scratch_unmount
+        return
+    fi
+
+    # delete directories
+    cd $3
+    ls | xargs rmdir
+    if [ $? -ne 0 ]; then
+        echo "Failed to remove directories in $3"
+        cd - > /dev/null
+        _scratch_unmount
+        return
+    fi
+    cd - > /dev/null
+    _scratch_unmount

+
+ # check dir_nlink is set
+ dumpe2fs $SCRATCH_DEV 2> /dev/null | grep '^Filesystem features'
| grep -q dir_nlink
+ if [ $? -ne 0 ]; then
+ echo "Feature dir_nlink is not set, please check $seqres.full
for detail"
+ return
+ fi
+

+    # run fsck to make sure the filesystem has no errors
+    $E2FSCK_PROG -fy $SCRATCH_DEV >> $seqres.full 2>&1
+    if [ $? -ne 0 ]; then

+ echo "fsck: the filesystem has errors, please check
$seqres.full for detail"
+ return
+ fi
+
+ prev_result=$PASS
+}
+
+# main
+DIR_LEN=( $SHORT_DIR $LONG_DIR )
+PARENT_DIR=( "$SCRATCH_MNT" "$SCRATCH_MNT/sub" )
+BLOCK_SIZE=( 1024 2048 4096 )
+
+for ((i = 0; i < 3; i++)); do
+ for ((j = 0; j < 2; j++)); do
+ for ((k = 0; k < 2; k++)); do
+ if [ ${DIR_LEN[$k]} -eq $LONG_DIR -a \
+ ${BLOCK_SIZE[$i]} -eq 1024 ]; then
+ continue
+ fi
+ _workout 65537 ${DIR_LEN[$k]} ${PARENT_DIR[$j]} ${BLOCK_SIZE[$i]}
+ done
+ done
+done
+
+_scratch_unmount >> $seqres.full 2>&1
+
+# no BUG_ON, all done
+status=0
+exit

tests/ext4/045.out new file +2 -0
new file mode 100644
index 00000000..66276cfa
@@ -0,0 +1,2 @@
+QA output created by 045
+Silence is golden
tests/ext4/group +3 -0
index 9dfc0d35..8419cdea 100644
@@ -45,6 +45,9 @@
 040 dangerous_fuzzers
 041 dangerous_fuzzers
 042 auto quick
+043 auto quick
+044 auto quick
+045 auto
 271 auto rw quick
 301 aio auto ioctl rw stress defrag
 302 aio auto ioctl rw stress defrag
author
#1 lore raw

PATCH v3 1/1 fstests: transport two ext4 tests from LTP

Recently LTP upstream removed some ext4 tests[1].
And two of them is still valid to keep. So I transport those two tests here. ext4-nsec-timestamps, which is used to test nanosec timestamps of ext4, rewrite into ext4/043 and 044. ext4-subdir-limit, which is used to test subdirectory limit of ext4, rewrite into ext4/045.

[1] https://marc.info/?l=linux-fsdevel&m=157190623919681&w=2

---
v2: Correct copyright information
v3: Correct white-space damage

---
 src/Makefile              |   3 +-
 src/t_create_long_dirs.c  | 155 +++++++++++++++++++++++++++++++++++++
 src/t_create_short_dirs.c | 158 ++++++++++++++++++++++++++++++++++++++
 tests/ext4/043            |  64 +++++++++++++++
 tests/ext4/043.out        |   2 +
 tests/ext4/044            | 112 +++++++++++++++++++++++++++
 tests/ext4/044.out        |   2 +
 tests/ext4/045            | 148 +++++++++++++++++++++++++++++++++++
 tests/ext4/045.out        |   2 +
 tests/ext4/group          |   3 +
 10 files changed, 648 insertions(+), 1 deletion(-)
 create mode 100644 src/t_create_long_dirs.c
 create mode 100644 src/t_create_short_dirs.c
 create mode 100755 tests/ext4/043
 create mode 100644 tests/ext4/043.out
 create mode 100755 tests/ext4/044
 create mode 100644 tests/ext4/044.out
 create mode 100755 tests/ext4/045
 create mode 100644 tests/ext4/045.out
src/Makefile +2 -1
index ce6d8610..387293d1 100644
@@ -16,7 +16,8 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \
 	holetest t_truncate_self t_mmap_dio af_unix t_mmap_stale_pmd \
 	t_mmap_cow_race t_mmap_fallocate fsync-err t_mmap_write_ro \
 	t_ext4_dax_journal_corruption t_ext4_dax_inline_corruption \
-	t_ofd_locks t_locks_execve t_mmap_collision mmap-write-concurrent
+	t_ofd_locks t_locks_execve t_mmap_collision mmap-write-concurrent \
+    t_ext4_file_time t_create_short_dirs t_create_long_dirs
 
 LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
 	preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \
src/t_create_long_dirs.c new file +155 -0

155 lines not on this page · raw message

src/t_create_short_dirs.c new file +158 -0

158 lines not on this page · raw message

tests/ext4/043 new file +64 -0

64 lines not on this page · raw message

tests/ext4/043.out new file +2 -0
new file mode 100644
index 00000000..f90f0a57
@@ -0,0 +1,2 @@
+QA output created by 043
+Silence is golden
tests/ext4/044 new file +112 -0

112 lines not on this page · raw message

tests/ext4/044.out new file +2 -0
new file mode 100644
index 00000000..12a61dc4
@@ -0,0 +1,2 @@
+QA output created by 044
+Silence is golden
tests/ext4/045 new file +148 -0

148 lines not on this page · raw message

tests/ext4/045.out new file +2 -0
new file mode 100644
index 00000000..66276cfa
@@ -0,0 +1,2 @@
+QA output created by 045
+Silence is golden
tests/ext4/group +3 -0
index 9dfc0d35..8419cdea 100644
@@ -45,6 +45,9 @@
 040 dangerous_fuzzers
 041 dangerous_fuzzers
 042 auto quick
+043 auto quick
+044 auto quick
+045 auto
 271 auto rw quick
 301 aio auto ioctl rw stress defrag
 302 aio auto ioctl rw stress defrag
Signature · 1 line
2.21.0
author
#2 lore raw

PATCH v4 1/1 fstests: transport two ext4 tests from LTP

In reply to Sun Yong

Recently LTP upstream removed some ext4 tests[1].
And two of them is still valid to keep. So I transport those two tests here. ext4-nsec-timestamps, which is used to test nanosec timestamps of ext4, rewrite into ext4/043 and 044. ext4-subdir-limit, which is used to test subdirectory limit of ext4, rewrite into ext4/045.

[1] https://marc.info/?l=linux-fsdevel&m=157190623919681&w=2

---
v2: Correct copyright information
v3: Correct white-space damage
v4: Add a missing file

---
 src/Makefile              |   3 +-
 src/t_create_long_dirs.c  | 155 +++++++++++++++++++++++++++++++++++++
 src/t_create_short_dirs.c | 158 ++++++++++++++++++++++++++++++++++++++
 src/t_ext4_file_time.c    |  69 +++++++++++++++++
 tests/ext4/043            |  64 +++++++++++++++
 tests/ext4/043.out        |   2 +
 tests/ext4/044            | 112 +++++++++++++++++++++++++++
 tests/ext4/044.out        |   2 +
 tests/ext4/045            | 148 +++++++++++++++++++++++++++++++++++
 tests/ext4/045.out        |   2 +
 tests/ext4/group          |   3 +
 11 files changed, 717 insertions(+), 1 deletion(-)
 create mode 100644 src/t_create_long_dirs.c
 create mode 100644 src/t_create_short_dirs.c
 create mode 100644 src/t_ext4_file_time.c
 create mode 100755 tests/ext4/043
 create mode 100644 tests/ext4/043.out
 create mode 100755 tests/ext4/044
 create mode 100644 tests/ext4/044.out
 create mode 100755 tests/ext4/045
 create mode 100644 tests/ext4/045.out
src/Makefile +2 -1
index ce6d8610..387293d1 100644
@@ -16,7 +16,8 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \
 	holetest t_truncate_self t_mmap_dio af_unix t_mmap_stale_pmd \
 	t_mmap_cow_race t_mmap_fallocate fsync-err t_mmap_write_ro \
 	t_ext4_dax_journal_corruption t_ext4_dax_inline_corruption \
-	t_ofd_locks t_locks_execve t_mmap_collision mmap-write-concurrent
+	t_ofd_locks t_locks_execve t_mmap_collision mmap-write-concurrent \
+    t_ext4_file_time t_create_short_dirs t_create_long_dirs
 
 LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
 	preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \
src/t_create_long_dirs.c new file +155 -0

155 lines not on this page · raw message

src/t_create_short_dirs.c new file +158 -0

158 lines not on this page · raw message

src/t_ext4_file_time.c new file +69 -0

69 lines not on this page · raw message

tests/ext4/043 new file +64 -0

64 lines not on this page · raw message

tests/ext4/043.out new file +2 -0
new file mode 100644
index 00000000..f90f0a57
@@ -0,0 +1,2 @@
+QA output created by 043
+Silence is golden
tests/ext4/044 new file +112 -0

112 lines not on this page · raw message

tests/ext4/044.out new file +2 -0
new file mode 100644
index 00000000..12a61dc4
@@ -0,0 +1,2 @@
+QA output created by 044
+Silence is golden
tests/ext4/045 new file +148 -0

148 lines not on this page · raw message

tests/ext4/045.out new file +2 -0
new file mode 100644
index 00000000..66276cfa
@@ -0,0 +1,2 @@
+QA output created by 045
+Silence is golden
tests/ext4/group +3 -0
index 9dfc0d35..8419cdea 100644
@@ -45,6 +45,9 @@
 040 dangerous_fuzzers
 041 dangerous_fuzzers
 042 auto quick
+043 auto quick
+044 auto quick
+045 auto
 271 auto rw quick
 301 aio auto ioctl rw stress defrag
 302 aio auto ioctl rw stress defrag
Signature · 1 line
2.21.0