* [PATCH 1/2] fstests: btrfs: Make seed device test cases into their own group @ 2019-01-10 6:14 Qu Wenruo 2019-01-10 6:14 ` [PATCH 2/2] fstests: btrfs: Introduce stress test for deadlock between snapshot delete and other read-write operations Qu Wenruo 2019-01-10 6:17 ` [PATCH 1/2] fstests: btrfs: Make seed device test cases into their own group Anand Jain 0 siblings, 2 replies; 7+ messages in thread From: Qu Wenruo @ 2019-01-10 6:14 UTC (permalink / raw) To: linux-btrfs, fstests btrfs/16[123] are all seed device related test cases, make them into 'seed' group. Signed-off-by: Qu Wenruo <wqu@suse.com> --- tests/btrfs/group | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/btrfs/group b/tests/btrfs/group index b78ed37fd9f1..04c0254aa4bf 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -163,9 +163,9 @@ 158 auto quick raid scrub 159 auto quick punch log 160 auto quick -161 auto quick volume -162 auto quick volume -163 auto quick volume +161 auto quick volume seed +162 auto quick volume seed +163 auto quick volume seed 164 auto quick volume 165 auto quick subvol 166 auto quick qgroup -- 2.20.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] fstests: btrfs: Introduce stress test for deadlock between snapshot delete and other read-write operations 2019-01-10 6:14 [PATCH 1/2] fstests: btrfs: Make seed device test cases into their own group Qu Wenruo @ 2019-01-10 6:14 ` Qu Wenruo 2019-01-10 12:08 ` Filipe Manana 2019-01-10 6:17 ` [PATCH 1/2] fstests: btrfs: Make seed device test cases into their own group Anand Jain 1 sibling, 1 reply; 7+ messages in thread From: Qu Wenruo @ 2019-01-10 6:14 UTC (permalink / raw) To: linux-btrfs, fstests Commit fb235dc06fac ("btrfs: qgroup: Move half of the qgroup accounting time out of commit trans") could cause ABBA deadlock between backref lookup with write lock hold (subvolume deletion) and other read/write operations. It's going to be fixed by "btrfs: qgroup: Don't trigger backref walk at delayed ref insert time". This test will generate pwrite background workload, along with constantly subvolume creation and deletion to trigger the bug. It needs some time to generate enough files to bump the tree height to trigger the bug. In my test environment, with 'unsafe' cache mode for the VM, it triggers the bug at around 70~90 seconds. So I leave the default runtime to 120s to make sure the bug will be triggered. Signed-off-by: Qu Wenruo <wqu@suse.com> --- tests/btrfs/179 | 121 ++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/179.out | 2 + tests/btrfs/group | 1 + 3 files changed, 124 insertions(+) create mode 100755 tests/btrfs/179 create mode 100644 tests/btrfs/179.out diff --git a/tests/btrfs/179 b/tests/btrfs/179 new file mode 100755 index 000000000000..771d12fc49e3 --- /dev/null +++ b/tests/btrfs/179 @@ -0,0 +1,121 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2019 SUSE Linux Products GmbH. All Rights Reserved. +# +# FS QA Test 179 +# +# Test if btrfs will lockup at subvolume deletion. +# +# The bug is caused by commit fb235dc06fac ("btrfs: qgroup: Move half of the +# qgroup accounting time out of commit trans"). +# Backref lookup with write lock hold (subvolue deletion) could cause ABBA lock +# with normal top-down tree locking sequence. +# +# This bug deadlock is going to be fixed by "btrfs: qgroup: Don't trigger +# backref walk at delayed ref insert time" which reverts above commit. +# +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 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# 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 + +# Modify as appropriate. +_supported_fs btrfs +_supported_os Linux +_require_scratch + +# default sleep interval +sleep_time=1 + +# stress test runtime +runtime=120 + +_scratch_mkfs > /dev/null 2>&1 +_scratch_mount + +mkdir -p "$SCRATCH_MNT/snapshots" +$BTRFS_UTIL_PROG subvolume create "$SCRATCH_MNT/src" > /dev/null +$BTRFS_UTIL_PROG quota enable "$SCRATCH_MNT" > /dev/null +$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" > /dev/null + +fill_workload() +{ + local i=0 + while true; do + _pwrite_byte 0xcd 0 8K "$SCRATCH_MNT/src/large_$i" > /dev/null + _pwrite_byte 0xcd 0 2K "$SCRATCH_MNT/src/inline_$i" > /dev/null + + # Randomly remove some files for every 5 loop + if [ $(( $i % 5 )) -eq 0 ]; then + victim=$(ls "$SCRATCH_MNT/src" | sort -R | head -n1) + rm "$SCRATCH_MNT/src/$victim" + fi + i=$((i + 1)) + done +} + +snapshot_workload() +{ + local i=0 + while true; do + sleep $sleep_time + $BTRFS_UTIL_PROG subvolume snapshot "$SCRATCH_MNT/src" \ + "$SCRATCH_MNT/snapshots/$i" > /dev/null + i=$((i + 1)) + done +} + +delete_workload() +{ + while true; do + sleep $((sleep_time * 2)) + victim=$(ls "$SCRATCH_MNT/snapshots" | sort -R | head -n1) + $BTRFS_UTIL_PROG subvolume delete \ + "$SCRATCH_MNT/snapshots/$victim" > /dev/null + done +} + +fill_workload & +fill_pid=$! + +sleep $((sleep_time * 2)) +snapshot_workload & +snapshot_pid=$! +delete_workload & +delete_pid=$! + +sleep $runtime +kill $fill_pid +wait $fill_pid +kill $snapshot_pid +wait $snapshot_pid +kill $delete_pid +wait $delete_pid + +# Workaround to handle killed workload with unreturned syscall +sync + +# success, all done +echo "Silence is golden" + +status=0 +exit diff --git a/tests/btrfs/179.out b/tests/btrfs/179.out new file mode 100644 index 000000000000..cb9eba3d34b1 --- /dev/null +++ b/tests/btrfs/179.out @@ -0,0 +1,2 @@ +QA output created by 179 +Silence is golden diff --git a/tests/btrfs/group b/tests/btrfs/group index 04c0254aa4bf..46dd3c9523c2 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -181,3 +181,4 @@ 176 auto quick swap volume 177 auto quick swap balance 178 auto quick send +179 auto qgroup dangerous -- 2.20.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] fstests: btrfs: Introduce stress test for deadlock between snapshot delete and other read-write operations 2019-01-10 6:14 ` [PATCH 2/2] fstests: btrfs: Introduce stress test for deadlock between snapshot delete and other read-write operations Qu Wenruo @ 2019-01-10 12:08 ` Filipe Manana 2019-01-10 13:49 ` Qu Wenruo 0 siblings, 1 reply; 7+ messages in thread From: Filipe Manana @ 2019-01-10 12:08 UTC (permalink / raw) To: Qu Wenruo; +Cc: linux-btrfs, fstests On Thu, Jan 10, 2019 at 6:15 AM Qu Wenruo <wqu@suse.com> wrote: > > Commit fb235dc06fac ("btrfs: qgroup: Move half of the qgroup accounting > time out of commit trans") could cause ABBA deadlock between backref > lookup with write lock hold (subvolume deletion) and other read/write > operations. > > It's going to be fixed by "btrfs: qgroup: Don't trigger backref walk at > delayed ref insert time". > > This test will generate pwrite background workload, along with > constantly subvolume creation and deletion to trigger the bug. constantly -> constant > > It needs some time to generate enough files to bump the tree height to > trigger the bug. > In my test environment, with 'unsafe' cache mode for the VM, it triggers > the bug at around 70~90 seconds. So I leave the default runtime to 120s > to make sure the bug will be triggered. > > Signed-off-by: Qu Wenruo <wqu@suse.com> > --- > tests/btrfs/179 | 121 ++++++++++++++++++++++++++++++++++++++++++++ > tests/btrfs/179.out | 2 + > tests/btrfs/group | 1 + > 3 files changed, 124 insertions(+) > create mode 100755 tests/btrfs/179 > create mode 100644 tests/btrfs/179.out > > diff --git a/tests/btrfs/179 b/tests/btrfs/179 > new file mode 100755 > index 000000000000..771d12fc49e3 > --- /dev/null > +++ b/tests/btrfs/179 > @@ -0,0 +1,121 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (C) 2019 SUSE Linux Products GmbH. All Rights Reserved. > +# > +# FS QA Test 179 > +# > +# Test if btrfs will lockup at subvolume deletion. Misses the most important part in the short description: "... when qgroups are enabled." > +# > +# The bug is caused by commit fb235dc06fac ("btrfs: qgroup: Move half of the > +# qgroup accounting time out of commit trans"). > +# Backref lookup with write lock hold (subvolue deletion) could cause ABBA lock > +# with normal top-down tree locking sequence. I would omit this. Relevant information on how and why the bug happens is in the kernel patch, QA people only need to know the test's purpose. > +# > +# This bug deadlock is going to be fixed by "btrfs: qgroup: Don't trigger "This bug is going ... by a patch for the kernel titled ..." > +# backref walk at delayed ref insert time" which reverts above commit. > +# > +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 > + > +_cleanup() > +{ > + cd / > + rm -f $tmp.* > +} > + > +# 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 > + > +# Modify as appropriate. > +_supported_fs btrfs > +_supported_os Linux > +_require_scratch > + > +# default sleep interval > +sleep_time=1 > + > +# stress test runtime > +runtime=120 > + > +_scratch_mkfs > /dev/null 2>&1 > +_scratch_mount > + > +mkdir -p "$SCRATCH_MNT/snapshots" > +$BTRFS_UTIL_PROG subvolume create "$SCRATCH_MNT/src" > /dev/null > +$BTRFS_UTIL_PROG quota enable "$SCRATCH_MNT" > /dev/null > +$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" > /dev/null > + > +fill_workload() > +{ > + local i=0 > + while true; do > + _pwrite_byte 0xcd 0 8K "$SCRATCH_MNT/src/large_$i" > /dev/null > + _pwrite_byte 0xcd 0 2K "$SCRATCH_MNT/src/inline_$i" > /dev/null > + > + # Randomly remove some files for every 5 loop > + if [ $(( $i % 5 )) -eq 0 ]; then > + victim=$(ls "$SCRATCH_MNT/src" | sort -R | head -n1) > + rm "$SCRATCH_MNT/src/$victim" > + fi > + i=$((i + 1)) > + done > +} > + > +snapshot_workload() > +{ > + local i=0 > + while true; do > + sleep $sleep_time > + $BTRFS_UTIL_PROG subvolume snapshot "$SCRATCH_MNT/src" \ > + "$SCRATCH_MNT/snapshots/$i" > /dev/null > + i=$((i + 1)) > + done > +} > + > +delete_workload() > +{ > + while true; do > + sleep $((sleep_time * 2)) > + victim=$(ls "$SCRATCH_MNT/snapshots" | sort -R | head -n1) > + $BTRFS_UTIL_PROG subvolume delete \ > + "$SCRATCH_MNT/snapshots/$victim" > /dev/null > + done > +} > + > +fill_workload & > +fill_pid=$! > + > +sleep $((sleep_time * 2)) > +snapshot_workload & > +snapshot_pid=$! > +delete_workload & > +delete_pid=$! > + > +sleep $runtime > +kill $fill_pid > +wait $fill_pid > +kill $snapshot_pid > +wait $snapshot_pid > +kill $delete_pid > +wait $delete_pid > + > +# Workaround to handle killed workload with unreturned syscall > +sync I can't understand that comment, nor why the call to sync (probably most readers won't either). What do you mean by "unreturned syscall"? It hangs, blocked? Because of the deadlock? How does the sync makes it "return"? When you say killed workload, you mean though the kill commands above? For all pids or just some in particular? > + > +# success, all done > +echo "Silence is golden" > + > +status=0 > +exit > diff --git a/tests/btrfs/179.out b/tests/btrfs/179.out > new file mode 100644 > index 000000000000..cb9eba3d34b1 > --- /dev/null > +++ b/tests/btrfs/179.out > @@ -0,0 +1,2 @@ > +QA output created by 179 > +Silence is golden > diff --git a/tests/btrfs/group b/tests/btrfs/group > index 04c0254aa4bf..46dd3c9523c2 100644 > --- a/tests/btrfs/group > +++ b/tests/btrfs/group > @@ -181,3 +181,4 @@ > 176 auto quick swap volume > 177 auto quick swap balance > 178 auto quick send > +179 auto qgroup dangerous > -- > 2.20.1 > -- Filipe David Manana, “Whether you think you can, or you think you can't — you're right.” ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] fstests: btrfs: Introduce stress test for deadlock between snapshot delete and other read-write operations 2019-01-10 12:08 ` Filipe Manana @ 2019-01-10 13:49 ` Qu Wenruo 2019-01-10 13:53 ` Filipe Manana 0 siblings, 1 reply; 7+ messages in thread From: Qu Wenruo @ 2019-01-10 13:49 UTC (permalink / raw) To: fdmanana, Qu Wenruo; +Cc: linux-btrfs, fstests [-- Attachment #1.1: Type: text/plain, Size: 6722 bytes --] On 2019/1/10 下午8:08, Filipe Manana wrote: > On Thu, Jan 10, 2019 at 6:15 AM Qu Wenruo <wqu@suse.com> wrote: >> >> Commit fb235dc06fac ("btrfs: qgroup: Move half of the qgroup accounting >> time out of commit trans") could cause ABBA deadlock between backref >> lookup with write lock hold (subvolume deletion) and other read/write >> operations. >> >> It's going to be fixed by "btrfs: qgroup: Don't trigger backref walk at >> delayed ref insert time". >> >> This test will generate pwrite background workload, along with >> constantly subvolume creation and deletion to trigger the bug. > > constantly -> constant >> >> It needs some time to generate enough files to bump the tree height to >> trigger the bug. >> In my test environment, with 'unsafe' cache mode for the VM, it triggers >> the bug at around 70~90 seconds. So I leave the default runtime to 120s >> to make sure the bug will be triggered. >> >> Signed-off-by: Qu Wenruo <wqu@suse.com> >> --- >> tests/btrfs/179 | 121 ++++++++++++++++++++++++++++++++++++++++++++ >> tests/btrfs/179.out | 2 + >> tests/btrfs/group | 1 + >> 3 files changed, 124 insertions(+) >> create mode 100755 tests/btrfs/179 >> create mode 100644 tests/btrfs/179.out >> >> diff --git a/tests/btrfs/179 b/tests/btrfs/179 >> new file mode 100755 >> index 000000000000..771d12fc49e3 >> --- /dev/null >> +++ b/tests/btrfs/179 >> @@ -0,0 +1,121 @@ >> +#! /bin/bash >> +# SPDX-License-Identifier: GPL-2.0 >> +# Copyright (C) 2019 SUSE Linux Products GmbH. All Rights Reserved. >> +# >> +# FS QA Test 179 >> +# >> +# Test if btrfs will lockup at subvolume deletion. > > Misses the most important part in the short description: "... when > qgroups are enabled." > >> +# >> +# The bug is caused by commit fb235dc06fac ("btrfs: qgroup: Move half of the >> +# qgroup accounting time out of commit trans"). >> +# Backref lookup with write lock hold (subvolue deletion) could cause ABBA lock >> +# with normal top-down tree locking sequence. > > I would omit this. Relevant information on how and why the bug happens > is in the kernel patch, QA > people only need to know the test's purpose. > >> +# >> +# This bug deadlock is going to be fixed by "btrfs: qgroup: Don't trigger > > "This bug is going ... by a patch for the kernel titled ..." > >> +# backref walk at delayed ref insert time" which reverts above commit. >> +# >> +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 >> + >> +_cleanup() >> +{ >> + cd / >> + rm -f $tmp.* >> +} >> + >> +# 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 >> + >> +# Modify as appropriate. >> +_supported_fs btrfs >> +_supported_os Linux >> +_require_scratch >> + >> +# default sleep interval >> +sleep_time=1 >> + >> +# stress test runtime >> +runtime=120 >> + >> +_scratch_mkfs > /dev/null 2>&1 >> +_scratch_mount >> + >> +mkdir -p "$SCRATCH_MNT/snapshots" >> +$BTRFS_UTIL_PROG subvolume create "$SCRATCH_MNT/src" > /dev/null >> +$BTRFS_UTIL_PROG quota enable "$SCRATCH_MNT" > /dev/null >> +$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" > /dev/null >> + >> +fill_workload() >> +{ >> + local i=0 >> + while true; do >> + _pwrite_byte 0xcd 0 8K "$SCRATCH_MNT/src/large_$i" > /dev/null >> + _pwrite_byte 0xcd 0 2K "$SCRATCH_MNT/src/inline_$i" > /dev/null >> + >> + # Randomly remove some files for every 5 loop >> + if [ $(( $i % 5 )) -eq 0 ]; then >> + victim=$(ls "$SCRATCH_MNT/src" | sort -R | head -n1) >> + rm "$SCRATCH_MNT/src/$victim" >> + fi >> + i=$((i + 1)) >> + done >> +} >> + >> +snapshot_workload() >> +{ >> + local i=0 >> + while true; do >> + sleep $sleep_time >> + $BTRFS_UTIL_PROG subvolume snapshot "$SCRATCH_MNT/src" \ >> + "$SCRATCH_MNT/snapshots/$i" > /dev/null >> + i=$((i + 1)) >> + done >> +} >> + >> +delete_workload() >> +{ >> + while true; do >> + sleep $((sleep_time * 2)) >> + victim=$(ls "$SCRATCH_MNT/snapshots" | sort -R | head -n1) >> + $BTRFS_UTIL_PROG subvolume delete \ >> + "$SCRATCH_MNT/snapshots/$victim" > /dev/null >> + done >> +} >> + >> +fill_workload & >> +fill_pid=$! >> + >> +sleep $((sleep_time * 2)) >> +snapshot_workload & >> +snapshot_pid=$! >> +delete_workload & >> +delete_pid=$! >> + >> +sleep $runtime >> +kill $fill_pid >> +wait $fill_pid >> +kill $snapshot_pid >> +wait $snapshot_pid >> +kill $delete_pid >> +wait $delete_pid >> + >> +# Workaround to handle killed workload with unreturned syscall >> +sync > > I can't understand that comment, nor why the call to sync (probably > most readers won't either). > What do you mean by "unreturned syscall"? It hangs, blocked? Because > of the deadlock? How does the sync makes it "return"? I mean normal "btrfs subvolume create/delete" ioctl syscalls. > > When you say killed workload, you mean though the kill commands above? > For all pids or just some in particular? For the workload, it will be a forked bash process, and then executing "btrfs" program. While "btrfs subvolume create/delete" could call ioctl and fall into kernel space, kill/wait for the bash process could return before the ioctl returned. So here we try to call sync which will commit current transaction, more or less wait for unfinished "btrfs" ioctls to return. Or should I change to the more common loop of check "btrfs" process and wait? Thanks, Qu > >> + >> +# success, all done >> +echo "Silence is golden" >> + >> +status=0 >> +exit >> diff --git a/tests/btrfs/179.out b/tests/btrfs/179.out >> new file mode 100644 >> index 000000000000..cb9eba3d34b1 >> --- /dev/null >> +++ b/tests/btrfs/179.out >> @@ -0,0 +1,2 @@ >> +QA output created by 179 >> +Silence is golden >> diff --git a/tests/btrfs/group b/tests/btrfs/group >> index 04c0254aa4bf..46dd3c9523c2 100644 >> --- a/tests/btrfs/group >> +++ b/tests/btrfs/group >> @@ -181,3 +181,4 @@ >> 176 auto quick swap volume >> 177 auto quick swap balance >> 178 auto quick send >> +179 auto qgroup dangerous >> -- >> 2.20.1 >> > > [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] fstests: btrfs: Introduce stress test for deadlock between snapshot delete and other read-write operations 2019-01-10 13:49 ` Qu Wenruo @ 2019-01-10 13:53 ` Filipe Manana 2019-01-10 13:59 ` Qu Wenruo 0 siblings, 1 reply; 7+ messages in thread From: Filipe Manana @ 2019-01-10 13:53 UTC (permalink / raw) To: Qu Wenruo; +Cc: Qu Wenruo, linux-btrfs, fstests On Thu, Jan 10, 2019 at 1:49 PM Qu Wenruo <quwenruo.btrfs@gmx.com> wrote: > > > > On 2019/1/10 下午8:08, Filipe Manana wrote: > > On Thu, Jan 10, 2019 at 6:15 AM Qu Wenruo <wqu@suse.com> wrote: > >> > >> Commit fb235dc06fac ("btrfs: qgroup: Move half of the qgroup accounting > >> time out of commit trans") could cause ABBA deadlock between backref > >> lookup with write lock hold (subvolume deletion) and other read/write > >> operations. > >> > >> It's going to be fixed by "btrfs: qgroup: Don't trigger backref walk at > >> delayed ref insert time". > >> > >> This test will generate pwrite background workload, along with > >> constantly subvolume creation and deletion to trigger the bug. > > > > constantly -> constant > >> > >> It needs some time to generate enough files to bump the tree height to > >> trigger the bug. > >> In my test environment, with 'unsafe' cache mode for the VM, it triggers > >> the bug at around 70~90 seconds. So I leave the default runtime to 120s > >> to make sure the bug will be triggered. > >> > >> Signed-off-by: Qu Wenruo <wqu@suse.com> > >> --- > >> tests/btrfs/179 | 121 ++++++++++++++++++++++++++++++++++++++++++++ > >> tests/btrfs/179.out | 2 + > >> tests/btrfs/group | 1 + > >> 3 files changed, 124 insertions(+) > >> create mode 100755 tests/btrfs/179 > >> create mode 100644 tests/btrfs/179.out > >> > >> diff --git a/tests/btrfs/179 b/tests/btrfs/179 > >> new file mode 100755 > >> index 000000000000..771d12fc49e3 > >> --- /dev/null > >> +++ b/tests/btrfs/179 > >> @@ -0,0 +1,121 @@ > >> +#! /bin/bash > >> +# SPDX-License-Identifier: GPL-2.0 > >> +# Copyright (C) 2019 SUSE Linux Products GmbH. All Rights Reserved. > >> +# > >> +# FS QA Test 179 > >> +# > >> +# Test if btrfs will lockup at subvolume deletion. > > > > Misses the most important part in the short description: "... when > > qgroups are enabled." > > > >> +# > >> +# The bug is caused by commit fb235dc06fac ("btrfs: qgroup: Move half of the > >> +# qgroup accounting time out of commit trans"). > >> +# Backref lookup with write lock hold (subvolue deletion) could cause ABBA lock > >> +# with normal top-down tree locking sequence. > > > > I would omit this. Relevant information on how and why the bug happens > > is in the kernel patch, QA > > people only need to know the test's purpose. > > > >> +# > >> +# This bug deadlock is going to be fixed by "btrfs: qgroup: Don't trigger > > > > "This bug is going ... by a patch for the kernel titled ..." > > > >> +# backref walk at delayed ref insert time" which reverts above commit. > >> +# > >> +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 > >> + > >> +_cleanup() > >> +{ > >> + cd / > >> + rm -f $tmp.* > >> +} > >> + > >> +# 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 > >> + > >> +# Modify as appropriate. > >> +_supported_fs btrfs > >> +_supported_os Linux > >> +_require_scratch > >> + > >> +# default sleep interval > >> +sleep_time=1 > >> + > >> +# stress test runtime > >> +runtime=120 > >> + > >> +_scratch_mkfs > /dev/null 2>&1 > >> +_scratch_mount > >> + > >> +mkdir -p "$SCRATCH_MNT/snapshots" > >> +$BTRFS_UTIL_PROG subvolume create "$SCRATCH_MNT/src" > /dev/null > >> +$BTRFS_UTIL_PROG quota enable "$SCRATCH_MNT" > /dev/null > >> +$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" > /dev/null > >> + > >> +fill_workload() > >> +{ > >> + local i=0 > >> + while true; do > >> + _pwrite_byte 0xcd 0 8K "$SCRATCH_MNT/src/large_$i" > /dev/null > >> + _pwrite_byte 0xcd 0 2K "$SCRATCH_MNT/src/inline_$i" > /dev/null > >> + > >> + # Randomly remove some files for every 5 loop > >> + if [ $(( $i % 5 )) -eq 0 ]; then > >> + victim=$(ls "$SCRATCH_MNT/src" | sort -R | head -n1) > >> + rm "$SCRATCH_MNT/src/$victim" > >> + fi > >> + i=$((i + 1)) > >> + done > >> +} > >> + > >> +snapshot_workload() > >> +{ > >> + local i=0 > >> + while true; do > >> + sleep $sleep_time > >> + $BTRFS_UTIL_PROG subvolume snapshot "$SCRATCH_MNT/src" \ > >> + "$SCRATCH_MNT/snapshots/$i" > /dev/null > >> + i=$((i + 1)) > >> + done > >> +} > >> + > >> +delete_workload() > >> +{ > >> + while true; do > >> + sleep $((sleep_time * 2)) > >> + victim=$(ls "$SCRATCH_MNT/snapshots" | sort -R | head -n1) > >> + $BTRFS_UTIL_PROG subvolume delete \ > >> + "$SCRATCH_MNT/snapshots/$victim" > /dev/null > >> + done > >> +} > >> + > >> +fill_workload & > >> +fill_pid=$! > >> + > >> +sleep $((sleep_time * 2)) > >> +snapshot_workload & > >> +snapshot_pid=$! > >> +delete_workload & > >> +delete_pid=$! > >> + > >> +sleep $runtime > >> +kill $fill_pid > >> +wait $fill_pid > >> +kill $snapshot_pid > >> +wait $snapshot_pid > >> +kill $delete_pid > >> +wait $delete_pid > >> + > >> +# Workaround to handle killed workload with unreturned syscall > >> +sync > > > > I can't understand that comment, nor why the call to sync (probably > > most readers won't either). > > What do you mean by "unreturned syscall"? It hangs, blocked? Because > > of the deadlock? How does the sync makes it "return"? > > I mean normal "btrfs subvolume create/delete" ioctl syscalls. > > > > > When you say killed workload, you mean though the kill commands above? > > For all pids or just some in particular? > > For the workload, it will be a forked bash process, and then executing > "btrfs" program. > While "btrfs subvolume create/delete" could call ioctl and fall into > kernel space, kill/wait for the bash process could return before the > ioctl returned. > > So here we try to call sync which will commit current transaction, more > or less wait for unfinished "btrfs" ioctls to return. > > Or should I change to the more common loop of check "btrfs" process and > wait? Doing something like the following seems to be what you need: https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/commit/?id=d0ec5f5af9479137526b73b8b4f48ef028444ffc > > Thanks, > Qu > > > > >> + > >> +# success, all done > >> +echo "Silence is golden" > >> + > >> +status=0 > >> +exit > >> diff --git a/tests/btrfs/179.out b/tests/btrfs/179.out > >> new file mode 100644 > >> index 000000000000..cb9eba3d34b1 > >> --- /dev/null > >> +++ b/tests/btrfs/179.out > >> @@ -0,0 +1,2 @@ > >> +QA output created by 179 > >> +Silence is golden > >> diff --git a/tests/btrfs/group b/tests/btrfs/group > >> index 04c0254aa4bf..46dd3c9523c2 100644 > >> --- a/tests/btrfs/group > >> +++ b/tests/btrfs/group > >> @@ -181,3 +181,4 @@ > >> 176 auto quick swap volume > >> 177 auto quick swap balance > >> 178 auto quick send > >> +179 auto qgroup dangerous > >> -- > >> 2.20.1 > >> > > > > > -- Filipe David Manana, “Whether you think you can, or you think you can't — you're right.” ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] fstests: btrfs: Introduce stress test for deadlock between snapshot delete and other read-write operations 2019-01-10 13:53 ` Filipe Manana @ 2019-01-10 13:59 ` Qu Wenruo 0 siblings, 0 replies; 7+ messages in thread From: Qu Wenruo @ 2019-01-10 13:59 UTC (permalink / raw) To: fdmanana, Qu Wenruo; +Cc: fstests, linux-btrfs [-- Attachment #1.1: Type: text/plain, Size: 2167 bytes --] On 2019/1/10 下午9:53, Filipe Manana wrote: [snip] >>>> +# Workaround to handle killed workload with unreturned syscall >>>> +sync >>> >>> I can't understand that comment, nor why the call to sync (probably >>> most readers won't either). >>> What do you mean by "unreturned syscall"? It hangs, blocked? Because >>> of the deadlock? How does the sync makes it "return"? >> >> I mean normal "btrfs subvolume create/delete" ioctl syscalls. >> >>> >>> When you say killed workload, you mean though the kill commands above? >>> For all pids or just some in particular? >> >> For the workload, it will be a forked bash process, and then executing >> "btrfs" program. >> While "btrfs subvolume create/delete" could call ioctl and fall into >> kernel space, kill/wait for the bash process could return before the >> ioctl returned. >> >> So here we try to call sync which will commit current transaction, more >> or less wait for unfinished "btrfs" ioctls to return. >> >> Or should I change to the more common loop of check "btrfs" process and >> wait? > > Doing something like the following seems to be what you need: > > https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/commit/?id=d0ec5f5af9479137526b73b8b4f48ef028444ffc Thanks a lot! It's much better than my ugly workaround. I'll update the patch to address all your comment. Thanks, Qu > > >> >> Thanks, >> Qu >> >>> >>>> + >>>> +# success, all done >>>> +echo "Silence is golden" >>>> + >>>> +status=0 >>>> +exit >>>> diff --git a/tests/btrfs/179.out b/tests/btrfs/179.out >>>> new file mode 100644 >>>> index 000000000000..cb9eba3d34b1 >>>> --- /dev/null >>>> +++ b/tests/btrfs/179.out >>>> @@ -0,0 +1,2 @@ >>>> +QA output created by 179 >>>> +Silence is golden >>>> diff --git a/tests/btrfs/group b/tests/btrfs/group >>>> index 04c0254aa4bf..46dd3c9523c2 100644 >>>> --- a/tests/btrfs/group >>>> +++ b/tests/btrfs/group >>>> @@ -181,3 +181,4 @@ >>>> 176 auto quick swap volume >>>> 177 auto quick swap balance >>>> 178 auto quick send >>>> +179 auto qgroup dangerous >>>> -- >>>> 2.20.1 >>>> >>> >>> >> > > [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] fstests: btrfs: Make seed device test cases into their own group 2019-01-10 6:14 [PATCH 1/2] fstests: btrfs: Make seed device test cases into their own group Qu Wenruo 2019-01-10 6:14 ` [PATCH 2/2] fstests: btrfs: Introduce stress test for deadlock between snapshot delete and other read-write operations Qu Wenruo @ 2019-01-10 6:17 ` Anand Jain 1 sibling, 0 replies; 7+ messages in thread From: Anand Jain @ 2019-01-10 6:17 UTC (permalink / raw) To: Qu Wenruo, linux-btrfs, fstests On 01/10/2019 02:14 PM, Qu Wenruo wrote: > btrfs/16[123] are all seed device related test cases, make them into > 'seed' group. > > Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: Anand Jain <anand.jain@oracle.com> > --- > tests/btrfs/group | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/btrfs/group b/tests/btrfs/group > index b78ed37fd9f1..04c0254aa4bf 100644 > --- a/tests/btrfs/group > +++ b/tests/btrfs/group > @@ -163,9 +163,9 @@ > 158 auto quick raid scrub > 159 auto quick punch log > 160 auto quick > -161 auto quick volume > -162 auto quick volume > -163 auto quick volume > +161 auto quick volume seed > +162 auto quick volume seed > +163 auto quick volume seed > 164 auto quick volume > 165 auto quick subvol > 166 auto quick qgroup > ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-01-10 13:59 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-01-10 6:14 [PATCH 1/2] fstests: btrfs: Make seed device test cases into their own group Qu Wenruo 2019-01-10 6:14 ` [PATCH 2/2] fstests: btrfs: Introduce stress test for deadlock between snapshot delete and other read-write operations Qu Wenruo 2019-01-10 12:08 ` Filipe Manana 2019-01-10 13:49 ` Qu Wenruo 2019-01-10 13:53 ` Filipe Manana 2019-01-10 13:59 ` Qu Wenruo 2019-01-10 6:17 ` [PATCH 1/2] fstests: btrfs: Make seed device test cases into their own group Anand Jain
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).