linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/4] xfs/093: make sure the scratch directory still exists after repair
@ 2019-01-29 16:17 Darrick J. Wong
  2019-01-29 16:17 ` [PATCH 2/4] xfs/138: format the scratch device before using it Darrick J. Wong
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Darrick J. Wong @ 2019-01-29 16:17 UTC (permalink / raw)
  To: guaneryu, darrick.wong; +Cc: linux-xfs, fstests

From: Darrick J. Wong <darrick.wong@oracle.com>

Make sure that we still have the scratch directory after repairing our
corrupted filesystem, because repair could have nuked it.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/093 |    1 +
 1 file changed, 1 insertion(+)


diff --git a/tests/xfs/093 b/tests/xfs/093
index 2b16020c..2dfad39d 100755
--- a/tests/xfs/093
+++ b/tests/xfs/093
@@ -97,6 +97,7 @@ $CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"
 
 echo "+ modify files (2)"
 broken=0
+mkdir -p "${TESTDIR}"
 for x in `seq 65 70`; do
 	touch "${TESTFILE}.${x}" || broken=1
 done

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 2/4] xfs/138: format the scratch device before using it
  2019-01-29 16:17 [PATCH 1/4] xfs/093: make sure the scratch directory still exists after repair Darrick J. Wong
@ 2019-01-29 16:17 ` Darrick J. Wong
  2019-01-29 16:17 ` [PATCH 3/4] common: fix kmemleak to work with sections Darrick J. Wong
  2019-01-29 16:17 ` [PATCH 4/4] generic: check for reasonable inode creation time Darrick J. Wong
  2 siblings, 0 replies; 8+ messages in thread
From: Darrick J. Wong @ 2019-01-29 16:17 UTC (permalink / raw)
  To: guaneryu, darrick.wong; +Cc: linux-xfs, fstests

From: Darrick J. Wong <darrick.wong@oracle.com>

Format the scratch device before using it, or else xfs_db will fail,
particularly if the previous test left a corrupt fs behind.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/138 |    1 +
 1 file changed, 1 insertion(+)


diff --git a/tests/xfs/138 b/tests/xfs/138
index 36490e6a..41988530 100755
--- a/tests/xfs/138
+++ b/tests/xfs/138
@@ -38,6 +38,7 @@ echo This is file B
 ENDL
 
 echo "Test with -c"
+_scratch_mkfs > $seqres.full 2>&1
 _scratch_xfs_db -c "sb 0" -c "p magicnum" -c "source $tmp.a" -c "p magicnum" | sed -e 's/0x58465342/XFS_MAGIC/g'
 
 echo "Test with interactive"

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 3/4] common: fix kmemleak to work with sections
  2019-01-29 16:17 [PATCH 1/4] xfs/093: make sure the scratch directory still exists after repair Darrick J. Wong
  2019-01-29 16:17 ` [PATCH 2/4] xfs/138: format the scratch device before using it Darrick J. Wong
@ 2019-01-29 16:17 ` Darrick J. Wong
  2019-02-03  9:10   ` Eryu Guan
  2019-01-29 16:17 ` [PATCH 4/4] generic: check for reasonable inode creation time Darrick J. Wong
  2 siblings, 1 reply; 8+ messages in thread
From: Darrick J. Wong @ 2019-01-29 16:17 UTC (permalink / raw)
  To: guaneryu, darrick.wong; +Cc: linux-xfs, fstests

From: Darrick J. Wong <darrick.wong@oracle.com>

Refactor the kmemleak code to work correctly with sections.  This
requires changing the report location to use RESULT_DIR instead of
RESULT_BASE, and clarifying which functions get used when.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 check     |    4 ++--
 common/rc |   32 ++++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 12 deletions(-)


diff --git a/check b/check
index c0eee0aa..b9eb86cb 100755
--- a/check
+++ b/check
@@ -509,7 +509,7 @@ _expunge_test()
 	return 0
 }
 
-_init_kmemleak
+_detect_kmemleak
 _prepare_test_list
 
 if $OPTIONS_HAVE_SECTIONS; then
@@ -793,8 +793,8 @@ for section in $HOST_OPTIONS_SECTIONS; do
 			# and log messages that shouldn't be there.
 			_check_filesystems
 			_check_dmesg || err=true
-			_check_kmemleak || err=true
 		fi
+		_check_kmemleak || err=true
 
 		# test ends after all checks are done.
 		$timestamp && _timestamp
diff --git a/common/rc b/common/rc
index 19e947df..75771f31 100644
--- a/common/rc
+++ b/common/rc
@@ -3514,7 +3514,7 @@ _check_dmesg()
 # capture the kmemleak report
 _capture_kmemleak()
 {
-	local kern_knob="${DEBUGFS_MNT}/kmemleak"
+	local kern_knob="$DEBUGFS_MNT/kmemleak"
 	local leak_file="$1"
 
 	# Tell the kernel to scan for memory leaks.  Apparently the write
@@ -3535,17 +3535,20 @@ ENDL
 	echo "clear" > "$kern_knob"
 }
 
-# set up kmemleak
-_init_kmemleak()
+# Figure out if the running kernel supports kmemleak; if it does, clear out
+# anything that leaked before we even started testing.  The leak checker only
+# needs to be primed like this once per ./check invocation.
+_detect_kmemleak()
 {
-	local kern_knob="${DEBUGFS_MNT}/kmemleak"
+	local kern_knob="$DEBUGFS_MNT/kmemleak"
+	KMEMLEAK_CHECK_FILE="/tmp/check_kmemleak"
 
 	# Since kernel v4.19-rc3, the kmemleak knob exists even if kmemleak is
 	# disabled, but returns EBUSY on write. So instead of relying on
 	# existance of writable knob file, we use a test file to indicate that
 	# _check_kmemleak() is enabled only if we actually managed to write to
 	# the knob file.
-	rm -f ${RESULT_BASE}/check_kmemleak
+	rm -f "$KMEMLEAK_CHECK_FILE"
 
 	if [ ! -w "$kern_knob" ]; then
 		return 0
@@ -3555,17 +3558,26 @@ _init_kmemleak()
 	# then dump all the leaks recorded so far.
 	if echo "scan=off" > "$kern_knob" 2>/dev/null; then
 		_capture_kmemleak /dev/null
-		touch ${RESULT_BASE}/check_kmemleak
+		touch "$KMEMLEAK_CHECK_FILE"
 	fi
 }
 
-# check kmemleak log
+# Kick the kmemleak checker to scan for leaks.  Background leak scan mode is
+# not enabled, so we must call the kernel to ask for a scan and deal with the
+# results appropriately.  This we do after every test completes, whether or not
+# it was successful.
 _check_kmemleak()
 {
-	local kern_knob="${DEBUGFS_MNT}/kmemleak"
-	local leak_file="${seqres}.kmemleak"
+	local kern_knob="$DEBUGFS_MNT/kmemleak"
+	local leak_file="$seqres.kmemleak"
 
-	if [ ! -f ${RESULT_BASE}/check_kmemleak ]; then
+	if [ ! -f "$KMEMLEAK_CHECK_FILE" ]; then
+		return 0
+	fi
+
+	# Not enabled, so discard any report of leaks found.
+	if [ "$USE_KMEMLEAK" != "yes" ]; then
+		_capture_kmemleak /dev/null
 		return 0
 	fi
 

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 4/4] generic: check for reasonable inode creation time
  2019-01-29 16:17 [PATCH 1/4] xfs/093: make sure the scratch directory still exists after repair Darrick J. Wong
  2019-01-29 16:17 ` [PATCH 2/4] xfs/138: format the scratch device before using it Darrick J. Wong
  2019-01-29 16:17 ` [PATCH 3/4] common: fix kmemleak to work with sections Darrick J. Wong
@ 2019-01-29 16:17 ` Darrick J. Wong
  2019-02-03  9:14   ` Eryu Guan
  2 siblings, 1 reply; 8+ messages in thread
From: Darrick J. Wong @ 2019-01-29 16:17 UTC (permalink / raw)
  To: guaneryu, darrick.wong; +Cc: linux-xfs, fstests

From: Darrick J. Wong <darrick.wong@oracle.com>

If statx returns inode creation time (aka btime), check it to make sure
that the filesystem is setting a creation time that's reasonably close
to when it creates a file.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/generic/709     |   61 +++++++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/709.out |    2 ++
 tests/generic/group   |    1 +
 3 files changed, 64 insertions(+)
 create mode 100755 tests/generic/709
 create mode 100644 tests/generic/709.out


diff --git a/tests/generic/709 b/tests/generic/709
new file mode 100755
index 00000000..724a16a8
--- /dev/null
+++ b/tests/generic/709
@@ -0,0 +1,61 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0+
+# Copyright (c) 2019 Oracle, Inc.  All Rights Reserved.
+#
+# FS QA Test No. 709
+#
+# Check that statx btime (aka creation time) is plausibly close to when
+# we created a file.  A bug caught during code review of xfs patches revealed
+# that there weren't any sanity checks of the btime values.
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+tmp=/tmp/$$
+status=1	# failure is the default!
+testfile=$TEST_DIR/$seq.txt
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+	cd /
+	rm -f $tmp.* $testfile
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/attr
+. ./common/filter
+
+# real QA test starts here
+_supported_fs generic
+_supported_os Linux
+_require_xfs_io_command "statx" "-r"
+
+rm -f $seqres.full
+rm -f $testfile
+
+# Create a file and the time we created it
+now=$(date +%s)
+touch $testfile
+
+# Does statx return results with the BTIME flag set in the result mask?
+STATX_BTIME=0x800
+$XFS_IO_PROG -c "statx -F -r -m $STATX_BTIME" $testfile > $tmp.statx
+cat $tmp.statx >> $seqres.full
+
+result_mask=$(grep 'stat.mask =' $tmp.statx | cut -d ' ' -f 3)
+test -n "$result_mask" || _notrun "did not see stat.mask in output"
+
+test "$(( result_mask & STATX_BTIME ))" -ne 0 || \
+	_notrun "statx did not return btime"
+
+# Make sure the reported btime is within 5 seconds of the time we recorded
+# just prior to creating the file.
+btime=$(grep 'stat.btime.tv_sec =' $tmp.statx | cut -d ' ' -f 3)
+test -n "$btime" || echo "error: did not see btime in output??"
+
+_within_tolerance "btime" "$btime" "$now" 0 5 -v
+
+status=0
+exit
diff --git a/tests/generic/709.out b/tests/generic/709.out
new file mode 100644
index 00000000..d8495ace
--- /dev/null
+++ b/tests/generic/709.out
@@ -0,0 +1,2 @@
+QA output created by 709
+btime is in range
diff --git a/tests/generic/group b/tests/generic/group
index 6f5f28d8..9ce608c0 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -527,3 +527,4 @@
 522 soak long_rw
 523 auto quick attr
 524 auto quick
+709 auto quick

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/4] common: fix kmemleak to work with sections
  2019-01-29 16:17 ` [PATCH 3/4] common: fix kmemleak to work with sections Darrick J. Wong
@ 2019-02-03  9:10   ` Eryu Guan
  2019-02-06 17:06     ` Darrick J. Wong
  0 siblings, 1 reply; 8+ messages in thread
From: Eryu Guan @ 2019-02-03  9:10 UTC (permalink / raw)
  To: Darrick J. Wong; +Cc: linux-xfs, fstests

On Tue, Jan 29, 2019 at 08:17:25AM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> Refactor the kmemleak code to work correctly with sections.  This

Thanks for the fix!

> requires changing the report location to use RESULT_DIR instead of
> RESULT_BASE, and clarifying which functions get used when.

But I didn't see any RESULT_DIR related changes in this patch.

> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>  check     |    4 ++--
>  common/rc |   32 ++++++++++++++++++++++----------
>  2 files changed, 24 insertions(+), 12 deletions(-)
> 
> 
> diff --git a/check b/check
> index c0eee0aa..b9eb86cb 100755
> --- a/check
> +++ b/check
> @@ -509,7 +509,7 @@ _expunge_test()
>  	return 0
>  }
>  
> -_init_kmemleak
> +_detect_kmemleak
>  _prepare_test_list
>  
>  if $OPTIONS_HAVE_SECTIONS; then
> @@ -793,8 +793,8 @@ for section in $HOST_OPTIONS_SECTIONS; do
>  			# and log messages that shouldn't be there.
>  			_check_filesystems
>  			_check_dmesg || err=true
> -			_check_kmemleak || err=true
>  		fi
> +		_check_kmemleak || err=true

So we check for kmemleak after each test even when the test already
failed, better to have some comments here to explain why this is
necessary.

>  
>  		# test ends after all checks are done.
>  		$timestamp && _timestamp
> diff --git a/common/rc b/common/rc
> index 19e947df..75771f31 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -3514,7 +3514,7 @@ _check_dmesg()
>  # capture the kmemleak report
>  _capture_kmemleak()
>  {
> -	local kern_knob="${DEBUGFS_MNT}/kmemleak"
> +	local kern_knob="$DEBUGFS_MNT/kmemleak"

Just wondering why the "{}" are removed in this patch?

>  	local leak_file="$1"
>  
>  	# Tell the kernel to scan for memory leaks.  Apparently the write
> @@ -3535,17 +3535,20 @@ ENDL
>  	echo "clear" > "$kern_knob"
>  }
>  
> -# set up kmemleak
> -_init_kmemleak()
> +# Figure out if the running kernel supports kmemleak; if it does, clear out
> +# anything that leaked before we even started testing.  The leak checker only
> +# needs to be primed like this once per ./check invocation.
> +_detect_kmemleak()
>  {
> -	local kern_knob="${DEBUGFS_MNT}/kmemleak"
> +	local kern_knob="$DEBUGFS_MNT/kmemleak"
> +	KMEMLEAK_CHECK_FILE="/tmp/check_kmemleak"

So we're checking the "/tmp/check_kmemleak" file instead of
${RESULT_BASE}/check_kmemleak now, but from the commit log it seems that
it should be ${RESULT_DIR}/check_kmemleak?

>  
>  	# Since kernel v4.19-rc3, the kmemleak knob exists even if kmemleak is
>  	# disabled, but returns EBUSY on write. So instead of relying on
>  	# existance of writable knob file, we use a test file to indicate that
>  	# _check_kmemleak() is enabled only if we actually managed to write to
>  	# the knob file.
> -	rm -f ${RESULT_BASE}/check_kmemleak
> +	rm -f "$KMEMLEAK_CHECK_FILE"
>  
>  	if [ ! -w "$kern_knob" ]; then
>  		return 0
> @@ -3555,17 +3558,26 @@ _init_kmemleak()
>  	# then dump all the leaks recorded so far.
>  	if echo "scan=off" > "$kern_knob" 2>/dev/null; then
>  		_capture_kmemleak /dev/null
> -		touch ${RESULT_BASE}/check_kmemleak
> +		touch "$KMEMLEAK_CHECK_FILE"
>  	fi
>  }
>  
> -# check kmemleak log
> +# Kick the kmemleak checker to scan for leaks.  Background leak scan mode is
> +# not enabled, so we must call the kernel to ask for a scan and deal with the
> +# results appropriately.  This we do after every test completes, whether or not
> +# it was successful.
>  _check_kmemleak()
>  {
> -	local kern_knob="${DEBUGFS_MNT}/kmemleak"
> -	local leak_file="${seqres}.kmemleak"
> +	local kern_knob="$DEBUGFS_MNT/kmemleak"
> +	local leak_file="$seqres.kmemleak"
>  
> -	if [ ! -f ${RESULT_BASE}/check_kmemleak ]; then
> +	if [ ! -f "$KMEMLEAK_CHECK_FILE" ]; then
> +		return 0
> +	fi
> +
> +	# Not enabled, so discard any report of leaks found.
> +	if [ "$USE_KMEMLEAK" != "yes" ]; then
> +		_capture_kmemleak /dev/null

New knob requires new documentation in README :)

Thanks,
Eryu

>  		return 0
>  	fi
>  
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 4/4] generic: check for reasonable inode creation time
  2019-01-29 16:17 ` [PATCH 4/4] generic: check for reasonable inode creation time Darrick J. Wong
@ 2019-02-03  9:14   ` Eryu Guan
  2019-02-06 16:41     ` Darrick J. Wong
  0 siblings, 1 reply; 8+ messages in thread
From: Eryu Guan @ 2019-02-03  9:14 UTC (permalink / raw)
  To: Darrick J. Wong; +Cc: linux-xfs, fstests

On Tue, Jan 29, 2019 at 08:17:31AM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> If statx returns inode creation time (aka btime), check it to make sure
> that the filesystem is setting a creation time that's reasonably close
> to when it creates a file.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>  tests/generic/709     |   61 +++++++++++++++++++++++++++++++++++++++++++++++++
>  tests/generic/709.out |    2 ++
>  tests/generic/group   |    1 +
>  3 files changed, 64 insertions(+)
>  create mode 100755 tests/generic/709
>  create mode 100644 tests/generic/709.out
> 
> 
> diff --git a/tests/generic/709 b/tests/generic/709
> new file mode 100755
> index 00000000..724a16a8
> --- /dev/null
> +++ b/tests/generic/709
> @@ -0,0 +1,61 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0+
> +# Copyright (c) 2019 Oracle, Inc.  All Rights Reserved.
> +#
> +# FS QA Test No. 709
> +#
> +# Check that statx btime (aka creation time) is plausibly close to when
> +# we created a file.  A bug caught during code review of xfs patches revealed
> +# that there weren't any sanity checks of the btime values.
> +#
> +seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> +echo "QA output created by $seq"
> +tmp=/tmp/$$
> +status=1	# failure is the default!
> +testfile=$TEST_DIR/$seq.txt
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +_cleanup()
> +{
> +	cd /
> +	rm -f $tmp.* $testfile
> +}
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +. ./common/attr
> +. ./common/filter
> +
> +# real QA test starts here
> +_supported_fs generic
> +_supported_os Linux
> +_require_xfs_io_command "statx" "-r"

testfile is in $TEST_DIR, needs _require_test here.

> +
> +rm -f $seqres.full
> +rm -f $testfile
> +
> +# Create a file and the time we created it
> +now=$(date +%s)
> +touch $testfile
> +
> +# Does statx return results with the BTIME flag set in the result mask?
> +STATX_BTIME=0x800
> +$XFS_IO_PROG -c "statx -F -r -m $STATX_BTIME" $testfile > $tmp.statx
> +cat $tmp.statx >> $seqres.full
> +
> +result_mask=$(grep 'stat.mask =' $tmp.statx | cut -d ' ' -f 3)
> +test -n "$result_mask" || _notrun "did not see stat.mask in output"
> +
> +test "$(( result_mask & STATX_BTIME ))" -ne 0 || \
> +	_notrun "statx did not return btime"

We have a _require_btime helper now, I think that's sufficient.

> +
> +# Make sure the reported btime is within 5 seconds of the time we recorded
> +# just prior to creating the file.
> +btime=$(grep 'stat.btime.tv_sec =' $tmp.statx | cut -d ' ' -f 3)

And the btime timestamp could be retrieved like

btime=$(date +%s -d "$($XFS_IO_PROG -c "statx -v" $testfile | grep btime | cut -d= -f2)"

so we don't have to check the statx masks?

Thanks,
Eryu

> +test -n "$btime" || echo "error: did not see btime in output??"
> +
> +_within_tolerance "btime" "$btime" "$now" 0 5 -v
> +
> +status=0
> +exit
> diff --git a/tests/generic/709.out b/tests/generic/709.out
> new file mode 100644
> index 00000000..d8495ace
> --- /dev/null
> +++ b/tests/generic/709.out
> @@ -0,0 +1,2 @@
> +QA output created by 709
> +btime is in range
> diff --git a/tests/generic/group b/tests/generic/group
> index 6f5f28d8..9ce608c0 100644
> --- a/tests/generic/group
> +++ b/tests/generic/group
> @@ -527,3 +527,4 @@
>  522 soak long_rw
>  523 auto quick attr
>  524 auto quick
> +709 auto quick
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 4/4] generic: check for reasonable inode creation time
  2019-02-03  9:14   ` Eryu Guan
@ 2019-02-06 16:41     ` Darrick J. Wong
  0 siblings, 0 replies; 8+ messages in thread
From: Darrick J. Wong @ 2019-02-06 16:41 UTC (permalink / raw)
  To: Eryu Guan; +Cc: linux-xfs, fstests

On Sun, Feb 03, 2019 at 05:14:55PM +0800, Eryu Guan wrote:
> On Tue, Jan 29, 2019 at 08:17:31AM -0800, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> > 
> > If statx returns inode creation time (aka btime), check it to make sure
> > that the filesystem is setting a creation time that's reasonably close
> > to when it creates a file.
> > 
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> >  tests/generic/709     |   61 +++++++++++++++++++++++++++++++++++++++++++++++++
> >  tests/generic/709.out |    2 ++
> >  tests/generic/group   |    1 +
> >  3 files changed, 64 insertions(+)
> >  create mode 100755 tests/generic/709
> >  create mode 100644 tests/generic/709.out
> > 
> > 
> > diff --git a/tests/generic/709 b/tests/generic/709
> > new file mode 100755
> > index 00000000..724a16a8
> > --- /dev/null
> > +++ b/tests/generic/709
> > @@ -0,0 +1,61 @@
> > +#! /bin/bash
> > +# SPDX-License-Identifier: GPL-2.0+
> > +# Copyright (c) 2019 Oracle, Inc.  All Rights Reserved.
> > +#
> > +# FS QA Test No. 709
> > +#
> > +# Check that statx btime (aka creation time) is plausibly close to when
> > +# we created a file.  A bug caught during code review of xfs patches revealed
> > +# that there weren't any sanity checks of the btime values.
> > +#
> > +seq=`basename $0`
> > +seqres=$RESULT_DIR/$seq
> > +echo "QA output created by $seq"
> > +tmp=/tmp/$$
> > +status=1	# failure is the default!
> > +testfile=$TEST_DIR/$seq.txt
> > +trap "_cleanup; exit \$status" 0 1 2 3 15
> > +
> > +_cleanup()
> > +{
> > +	cd /
> > +	rm -f $tmp.* $testfile
> > +}
> > +
> > +# get standard environment, filters and checks
> > +. ./common/rc
> > +. ./common/attr
> > +. ./common/filter
> > +
> > +# real QA test starts here
> > +_supported_fs generic
> > +_supported_os Linux
> > +_require_xfs_io_command "statx" "-r"
> 
> testfile is in $TEST_DIR, needs _require_test here.
> 
> > +
> > +rm -f $seqres.full
> > +rm -f $testfile
> > +
> > +# Create a file and the time we created it
> > +now=$(date +%s)
> > +touch $testfile
> > +
> > +# Does statx return results with the BTIME flag set in the result mask?
> > +STATX_BTIME=0x800
> > +$XFS_IO_PROG -c "statx -F -r -m $STATX_BTIME" $testfile > $tmp.statx
> > +cat $tmp.statx >> $seqres.full
> > +
> > +result_mask=$(grep 'stat.mask =' $tmp.statx | cut -d ' ' -f 3)
> > +test -n "$result_mask" || _notrun "did not see stat.mask in output"
> > +
> > +test "$(( result_mask & STATX_BTIME ))" -ne 0 || \
> > +	_notrun "statx did not return btime"
> 
> We have a _require_btime helper now, I think that's sufficient.

It almost is, except that filesystems aren't required to report btime
unless the caller passes in STATX_BTIME.  ext4 will report btime whenever
it's available, but XFS does not fill in extra information that wasn't
asked of it.

I think this is a fairly simple patch to _require_btime, so I'll fix it
up in v2 and change the test to use it instead of all this opencoded
detection stuff.

> > +
> > +# Make sure the reported btime is within 5 seconds of the time we recorded
> > +# just prior to creating the file.
> > +btime=$(grep 'stat.btime.tv_sec =' $tmp.statx | cut -d ' ' -f 3)
> 
> And the btime timestamp could be retrieved like
> 
> btime=$(date +%s -d "$($XFS_IO_PROG -c "statx -v" $testfile | grep btime | cut -d= -f2)"
> 
> so we don't have to check the statx masks?

Yes.

--D

> Thanks,
> Eryu
> 
> > +test -n "$btime" || echo "error: did not see btime in output??"
> > +
> > +_within_tolerance "btime" "$btime" "$now" 0 5 -v
> > +
> > +status=0
> > +exit
> > diff --git a/tests/generic/709.out b/tests/generic/709.out
> > new file mode 100644
> > index 00000000..d8495ace
> > --- /dev/null
> > +++ b/tests/generic/709.out
> > @@ -0,0 +1,2 @@
> > +QA output created by 709
> > +btime is in range
> > diff --git a/tests/generic/group b/tests/generic/group
> > index 6f5f28d8..9ce608c0 100644
> > --- a/tests/generic/group
> > +++ b/tests/generic/group
> > @@ -527,3 +527,4 @@
> >  522 soak long_rw
> >  523 auto quick attr
> >  524 auto quick
> > +709 auto quick
> > 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/4] common: fix kmemleak to work with sections
  2019-02-03  9:10   ` Eryu Guan
@ 2019-02-06 17:06     ` Darrick J. Wong
  0 siblings, 0 replies; 8+ messages in thread
From: Darrick J. Wong @ 2019-02-06 17:06 UTC (permalink / raw)
  To: Eryu Guan; +Cc: linux-xfs, fstests

On Sun, Feb 03, 2019 at 05:10:49PM +0800, Eryu Guan wrote:
> On Tue, Jan 29, 2019 at 08:17:25AM -0800, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> > 
> > Refactor the kmemleak code to work correctly with sections.  This
> 
> Thanks for the fix!
> 
> > requires changing the report location to use RESULT_DIR instead of
> > RESULT_BASE, and clarifying which functions get used when.
> 
> But I didn't see any RESULT_DIR related changes in this patch.

I forgot to update the commit log. :(

> > 
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> >  check     |    4 ++--
> >  common/rc |   32 ++++++++++++++++++++++----------
> >  2 files changed, 24 insertions(+), 12 deletions(-)
> > 
> > 
> > diff --git a/check b/check
> > index c0eee0aa..b9eb86cb 100755
> > --- a/check
> > +++ b/check
> > @@ -509,7 +509,7 @@ _expunge_test()
> >  	return 0
> >  }
> >  
> > -_init_kmemleak
> > +_detect_kmemleak
> >  _prepare_test_list
> >  
> >  if $OPTIONS_HAVE_SECTIONS; then
> > @@ -793,8 +793,8 @@ for section in $HOST_OPTIONS_SECTIONS; do
> >  			# and log messages that shouldn't be there.
> >  			_check_filesystems
> >  			_check_dmesg || err=true
> > -			_check_kmemleak || err=true
> >  		fi
> > +		_check_kmemleak || err=true
> 
> So we check for kmemleak after each test even when the test already
> failed, better to have some comments here to explain why this is
> necessary.

I'll add this in the next version:

	# Scan for memory leaks after every test so that associating
	# a leak to a particular test will be as accurate as possible.

> >  
> >  		# test ends after all checks are done.
> >  		$timestamp && _timestamp
> > diff --git a/common/rc b/common/rc
> > index 19e947df..75771f31 100644
> > --- a/common/rc
> > +++ b/common/rc
> > @@ -3514,7 +3514,7 @@ _check_dmesg()
> >  # capture the kmemleak report
> >  _capture_kmemleak()
> >  {
> > -	local kern_knob="${DEBUGFS_MNT}/kmemleak"
> > +	local kern_knob="$DEBUGFS_MNT/kmemleak"
> 
> Just wondering why the "{}" are removed in this patch?

Making the variable dereferencing consistent with the rest of fstests.

> >  	local leak_file="$1"
> >  
> >  	# Tell the kernel to scan for memory leaks.  Apparently the write
> > @@ -3535,17 +3535,20 @@ ENDL
> >  	echo "clear" > "$kern_knob"
> >  }
> >  
> > -# set up kmemleak
> > -_init_kmemleak()
> > +# Figure out if the running kernel supports kmemleak; if it does, clear out
> > +# anything that leaked before we even started testing.  The leak checker only
> > +# needs to be primed like this once per ./check invocation.
> > +_detect_kmemleak()
> >  {
> > -	local kern_knob="${DEBUGFS_MNT}/kmemleak"
> > +	local kern_knob="$DEBUGFS_MNT/kmemleak"
> > +	KMEMLEAK_CHECK_FILE="/tmp/check_kmemleak"
> 
> So we're checking the "/tmp/check_kmemleak" file instead of

Right.

> ${RESULT_BASE}/check_kmemleak now, but from the commit log it seems that
> it should be ${RESULT_DIR}/check_kmemleak?

Er... oops.  I'll update the changelog. :)

> >  
> >  	# Since kernel v4.19-rc3, the kmemleak knob exists even if kmemleak is
> >  	# disabled, but returns EBUSY on write. So instead of relying on
> >  	# existance of writable knob file, we use a test file to indicate that
> >  	# _check_kmemleak() is enabled only if we actually managed to write to
> >  	# the knob file.
> > -	rm -f ${RESULT_BASE}/check_kmemleak
> > +	rm -f "$KMEMLEAK_CHECK_FILE"
> >  
> >  	if [ ! -w "$kern_knob" ]; then
> >  		return 0
> > @@ -3555,17 +3558,26 @@ _init_kmemleak()
> >  	# then dump all the leaks recorded so far.
> >  	if echo "scan=off" > "$kern_knob" 2>/dev/null; then
> >  		_capture_kmemleak /dev/null
> > -		touch ${RESULT_BASE}/check_kmemleak
> > +		touch "$KMEMLEAK_CHECK_FILE"
> >  	fi
> >  }
> >  
> > -# check kmemleak log
> > +# Kick the kmemleak checker to scan for leaks.  Background leak scan mode is
> > +# not enabled, so we must call the kernel to ask for a scan and deal with the
> > +# results appropriately.  This we do after every test completes, whether or not
> > +# it was successful.
> >  _check_kmemleak()
> >  {
> > -	local kern_knob="${DEBUGFS_MNT}/kmemleak"
> > -	local leak_file="${seqres}.kmemleak"
> > +	local kern_knob="$DEBUGFS_MNT/kmemleak"
> > +	local leak_file="$seqres.kmemleak"
> >  
> > -	if [ ! -f ${RESULT_BASE}/check_kmemleak ]; then
> > +	if [ ! -f "$KMEMLEAK_CHECK_FILE" ]; then
> > +		return 0
> > +	fi
> > +
> > +	# Not enabled, so discard any report of leaks found.
> > +	if [ "$USE_KMEMLEAK" != "yes" ]; then
> > +		_capture_kmemleak /dev/null
> 
> New knob requires new documentation in README :)

Will do.  Happy New Year, by the way!

--D

> Thanks,
> Eryu
> 
> >  		return 0
> >  	fi
> >  
> > 

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2019-02-06 17:07 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-29 16:17 [PATCH 1/4] xfs/093: make sure the scratch directory still exists after repair Darrick J. Wong
2019-01-29 16:17 ` [PATCH 2/4] xfs/138: format the scratch device before using it Darrick J. Wong
2019-01-29 16:17 ` [PATCH 3/4] common: fix kmemleak to work with sections Darrick J. Wong
2019-02-03  9:10   ` Eryu Guan
2019-02-06 17:06     ` Darrick J. Wong
2019-01-29 16:17 ` [PATCH 4/4] generic: check for reasonable inode creation time Darrick J. Wong
2019-02-03  9:14   ` Eryu Guan
2019-02-06 16:41     ` Darrick J. Wong

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).