Skip to contentSkip to conversation

btrfs: add test for enable/disable quota and create/destroy qgroup repeatedly

PATCH In review Sidong Yang 3 participants 3 messages Mar 2, 2022 – Mar 3, 2022 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 btrfs: add test for enable/disable quota and create/destroy qgroup repeatedly

Test enable/disable quota and create/destroy qgroup repeatedly in parallel and confirm it does not cause kernel hang. It only happens in kernel staring with kernel 5.17-rc3. This is a regression test for the problem reported to linux-btrfs list [1].

The hang was recreated using the test case and fixed by kernel patch titled

btrfs: qgroup: fix deadlock between rescan worker and remove qgroup

[1] https://lore.kernel.org/linux-btrfs/[email protected]/

---
v2 : fix changelog, comments, no wait pids argument

---
 tests/btrfs/262     | 40 ++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/262.out |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100755 tests/btrfs/262
 create mode 100644 tests/btrfs/262.out
tests/btrfs/262 new file +40 -0
new file mode 100755
index 00000000..8953a28e
@@ -0,0 +1,40 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2022 Sidong Yang.  All Rights Reserved.
+#
+# FS QA Test 262
+#
+# Test that running qgroup enable, create, destroy, and disable commands in
+# parallel doesn't result in a deadlock, a crash or any filesystem
+# inconsistency.
+#
+. ./common/preamble
+_begin_fstest auto quick qgroup
+
+# Import common functions.
+. ./common/filter
+
+# real QA test starts here
+
+_supported_fs btrfs
+
+_require_scratch
+
+_scratch_mkfs > /dev/null 2>&1
+_scratch_mount
+
+for ((i = 0; i < 200; i++)); do
+	$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT 2>> $seqres.full &
+	$BTRFS_UTIL_PROG qgroup create 1/0 $SCRATCH_MNT 2>> $seqres.full &
+	$BTRFS_UTIL_PROG qgroup destroy 1/0 $SCRATCH_MNT 2>> $seqres.full &
+	$BTRFS_UTIL_PROG quota disable $SCRATCH_MNT 2>> $seqres.full &
+done
+
+wait
+
+_scratch_unmount
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
tests/btrfs/262.out new file +2 -0
new file mode 100644
index 00000000..404badc3
@@ -0,0 +1,2 @@
+QA output created by 262
+Silence is golden
Signature · 1 line
2.25.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 53 lines · Sidong Yang

Test enable/disable quota and create/destroy qgroup repeatedly in parallel and confirm it does not cause kernel hang. It only happens in kernel staring with kernel 5.17-rc3. This is a regression test for the problem reported to linux-btrfs list [1].

The hang was recreated using the test case and fixed by kernel patch titled

btrfs: qgroup: fix deadlock between rescan worker and remove qgroup

[1] https://lore.kernel.org/linux-btrfs/[email protected]/

---
v2 : fix changelog, comments, no wait pids argument

---
 tests/btrfs/262     | 40 ++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/262.out |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100755 tests/btrfs/262
 create mode 100644 tests/btrfs/262.out
tests/btrfs/262 new file +25 -0
new file mode 100755
index 00000000..8953a28e
@@ -0,0 +1,40 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2022 Sidong Yang.  All Rights Reserved.
+#
+# FS QA Test 262
+#
+# Test that running qgroup enable, create, destroy, and disable commands in
+# parallel doesn't result in a deadlock, a crash or any filesystem
+# inconsistency.
+#
+. ./common/preamble
+_begin_fstest auto quick qgroup
+
+# Import common functions.
+. ./common/filter
+
+# real QA test starts here
+
+_supported_fs btrfs
+
+_require_scratch
+
+_scratch_mkfs > /dev/null 2>&1
+_scratch_mount
+

tests/btrfs/262 line 35

Quoted 10 lines
tests/btrfs/262 new file +10 -0
+for ((i = 0; i < 200; i++)); do
+	$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT 2>> $seqres.full &
+	$BTRFS_UTIL_PROG qgroup create 1/0 $SCRATCH_MNT 2>> $seqres.full &
+	$BTRFS_UTIL_PROG qgroup destroy 1/0 $SCRATCH_MNT 2>> $seqres.full &
+	$BTRFS_UTIL_PROG quota disable $SCRATCH_MNT 2>> $seqres.full &
+done
+
+wait
+
+_scratch_unmount

The fstests framework will also do the unmount, so this can be removed. You don't need to send a new patch version just to remove that, Eryu can probably amend the patch when he picks it up.

Anyway, it looks good and it works as expected.

Thanks for making the test case.

Quoted 16 lines
tests/btrfs/262 new file +5 -0
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
tests/btrfs/262.out new file +2 -0
new file mode 100644
index 00000000..404badc3
@@ -0,0 +1,2 @@
+QA output created by 262
+Silence is golden
Signature · 1 line
2.25.1
Reviewed-by on v2 1/1
#2 lore raw
In reply to Sidong Yang
Quoted 5 lines · Sidong Yang

Test enable/disable quota and create/destroy qgroup repeatedly in parallel and confirm it does not cause kernel hang. It only happens in kernel staring with kernel 5.17-rc3. This is a regression test for the problem reported to linux-btrfs list [1].

Quoted 8 lines

The hang was recreated using the test case and fixed by kernel patch titled

btrfs: qgroup: fix deadlock between rescan worker and remove qgroup

[1] https://lore.kernel.org/linux-btrfs/[email protected]/

As Filipe noted, _scratch_unmount can be removed. Other than that, it looks good to me. Thanks again for catching this!

Signature · 2 lines
Best Regards,
Shin'ichiro Kawasaki
Quoted 66 lines

---
v2 : fix changelog, comments, no wait pids argument

---
 tests/btrfs/262     | 40 ++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/262.out |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100755 tests/btrfs/262
 create mode 100644 tests/btrfs/262.out
tests/btrfs/262 new file +40 -0
new file mode 100755
index 00000000..8953a28e
@@ -0,0 +1,40 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2022 Sidong Yang.  All Rights Reserved.
+#
+# FS QA Test 262
+#
+# Test that running qgroup enable, create, destroy, and disable commands in
+# parallel doesn't result in a deadlock, a crash or any filesystem
+# inconsistency.
+#
+. ./common/preamble
+_begin_fstest auto quick qgroup
+
+# Import common functions.
+. ./common/filter
+
+# real QA test starts here
+
+_supported_fs btrfs
+
+_require_scratch
+
+_scratch_mkfs > /dev/null 2>&1
+_scratch_mount
+
+for ((i = 0; i < 200; i++)); do
+	$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT 2>> $seqres.full &
+	$BTRFS_UTIL_PROG qgroup create 1/0 $SCRATCH_MNT 2>> $seqres.full &
+	$BTRFS_UTIL_PROG qgroup destroy 1/0 $SCRATCH_MNT 2>> $seqres.full &
+	$BTRFS_UTIL_PROG quota disable $SCRATCH_MNT 2>> $seqres.full &
+done
+
+wait
+
+_scratch_unmount
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
tests/btrfs/262.out new file +2 -0
new file mode 100644
index 00000000..404badc3
@@ -0,0 +1,2 @@
+QA output created by 262
+Silence is golden
Signature · 1 line
2.25.1