From patchwork Tue Mar 23 04:20:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 12156831 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F31F5C433E5 for ; Tue, 23 Mar 2021 04:21:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A2B83619B3 for ; Tue, 23 Mar 2021 04:21:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229482AbhCWEU3 (ORCPT ); Tue, 23 Mar 2021 00:20:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:46280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229504AbhCWEUG (ORCPT ); Tue, 23 Mar 2021 00:20:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6BE1161990; Tue, 23 Mar 2021 04:20:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616473206; bh=CS4SH8KgPIx8OVy4L/LLCrTlKjbpVjHmTpCCMJgbQ2g=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=GE/LtvsADoXRaMj1ZK1nYJ+40klLwl7VJNNmt2ZYsQhjLbRNm6+j68ThR90jkV1aD pv4HVdnnxkXjfSupZEDsuYbt8ARVkvvr+Y7XWWQgJ7xoQ+ZdvW4uCxKyksjtXuwX3R lO/aHp4s0fMMEVwnxFAh4ylxkO/W0tMTivO7tz1jkb2Gpiwq/1MwhFbrsDyG2C1JqG wHwESmbUgJbuBoeSSxsTX2tAYNqz0zSn3wbE+MR+m6eswyYbszR2BSOug0pc8t4PoI z8LsRaH+yEwsxnJ10Om2fHGjjIAKG4q3w1II06+wMOuacKv7l6puGuIBE2baAxf8FE +jg3mYKCyqCAA== Subject: [PATCH 1/3] xfs: test rtalloc alignment and math errors From: "Darrick J. Wong" To: djwong@kernel.org, guaneryu@gmail.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me Date: Mon, 22 Mar 2021 21:20:06 -0700 Message-ID: <161647320615.3430465.16963127280244500558.stgit@magnolia> In-Reply-To: <161647320063.3430465.17720673716578854275.stgit@magnolia> References: <161647320063.3430465.17720673716578854275.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Darrick J. Wong Add a couple of regression tests for "xfs: make sure the rt allocator doesn't run off the end" and "xfs: ensure that fpunch, fcollapse, and finsert operations are aligned to rt extent size". Signed-off-by: Darrick J. Wong Reviewed-by: Chandan Babu R --- tests/xfs/759 | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/759.out | 2 + tests/xfs/760 | 68 +++++++++++++++++++++++++++++++++++ tests/xfs/760.out | 9 +++++ tests/xfs/group | 2 + 5 files changed, 183 insertions(+) create mode 100755 tests/xfs/759 create mode 100644 tests/xfs/759.out create mode 100755 tests/xfs/760 create mode 100644 tests/xfs/760.out diff --git a/tests/xfs/759 b/tests/xfs/759 new file mode 100755 index 00000000..d9031808 --- /dev/null +++ b/tests/xfs/759 @@ -0,0 +1,102 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2021 Oracle. All Rights Reserved. +# +# FS QA Test No. 759 +# +# This is a regression test for commit 2a6ca4baed62 ("xfs: make sure the rt +# allocator doesn't run off the end") which fixes an overflow error in the +# _near realtime allocator. If the rt bitmap ends exactly at the end of a +# block and the number of rt extents is large enough to allow an allocation +# request larger than the maximum extent size, it's possible that during a +# large allocation request, the allocator will fail to constrain maxlen on the +# second run through the loop, and the rt bitmap range check will run right off +# the end of the rtbitmap file. When this happens, xfs triggers a verifier +# error and returns EFSCORRUPTED. + +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 + +# real QA test starts here +_supported_fs xfs +_require_scratch +_require_realtime +_require_test_program "punch-alternating" + +rm -f $seqres.full + +# Format filesystem to get the block size +_scratch_mkfs > $seqres.full +_scratch_mount >> $seqres.full + +blksz=$(_get_block_size $SCRATCH_MNT) +rextsize=$($XFS_INFO_PROG $SCRATCH_MNT | grep realtime.*extsz | sed -e 's/^.*extsz=\([0-9]*\).*$/\1/g') +rextblks=$((rextsize / blksz)) + +echo "blksz $blksz rextsize $rextsize rextblks $rextblks" >> $seqres.full + +_scratch_unmount + +# Format filesystem with a realtime volume whose size fits the following: +# 1. Longer than (XFS MAXEXTLEN * blocksize) bytes so that a large fallocate +# request can create a maximally sized data fork extent mapping and then +# ask the allocator for even more blocks. +# 2. Exactly a multiple of (NBBY * blksz * rextsize) bytes. + +rtsize1=$((2097151 * blksz)) +rtsize2=$((8 * blksz * rextsize)) +rtsize=$(( $(blockdev --getsz $SCRATCH_RTDEV) * 512 )) + +echo "rtsize1 $rtsize1 rtsize2 $rtsize2 rtsize $rtsize" >> $seqres.full + +test $rtsize -gt $rtsize1 || \ + _notrun "scratch rt device too small, need $rtsize1 bytes" +test $rtsize -gt $rtsize2 || \ + _notrun "scratch rt device too small, need $rtsize2 bytes" + +rtsize=$((rtsize - (rtsize % rtsize2))) + +echo "rt size will be $rtsize" >> $seqres.full + +_scratch_mkfs -r size=$rtsize >> $seqres.full +_scratch_mount >> $seqres.full + +# Make sure the root directory has rtinherit set so our test file will too +$XFS_IO_PROG -c 'chattr +t' $SCRATCH_MNT + +# Allocate some stuff at the start, to force the first falloc of the ouch file +# to happen somewhere in the middle of the rt volume +$XFS_IO_PROG -f -c 'falloc 0 64m' "$SCRATCH_MNT/b" +$here/src/punch-alternating -i $((rextblks * 2)) -s $((rextblks)) "$SCRATCH_MNT/b" + +avail="$(df -P "$SCRATCH_MNT" | awk 'END {print $4}')"1 +toobig="$((avail * 2))" + +# falloc the ouch file in the middle of the rt extent to exercise the near +# allocator in the last step. +$XFS_IO_PROG -f -c 'falloc 0 1g' "$SCRATCH_MNT/ouch" + +# Try to get the near allocator to overflow on an allocation that matches +# exactly one of the rtsummary size levels. This should return ENOSPC and +# not EFSCORRUPTED. +$XFS_IO_PROG -f -c "falloc 0 ${toobig}k" "$SCRATCH_MNT/ouch" + +# success, all done +status=0 +exit diff --git a/tests/xfs/759.out b/tests/xfs/759.out new file mode 100644 index 00000000..df693d50 --- /dev/null +++ b/tests/xfs/759.out @@ -0,0 +1,2 @@ +QA output created by 759 +fallocate: No space left on device diff --git a/tests/xfs/760 b/tests/xfs/760 new file mode 100755 index 00000000..7f2b52d4 --- /dev/null +++ b/tests/xfs/760 @@ -0,0 +1,68 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2021 Oracle. All Rights Reserved. +# +# FS QA Test No. 760 +# +# Make sure we validate realtime extent size alignment for fallocate modes. +# This is a regression test for fe341eb151ec ("xfs: ensure that fpunch, +# fcollapse, and finsert operations are aligned to rt extent size") + +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 + +# real QA test starts here +_supported_fs xfs +_require_scratch +_require_realtime +_require_xfs_io_command "fcollapse" +_require_xfs_io_command "finsert" +_require_xfs_io_command "funshare" +_require_xfs_io_command "fzero" +_require_xfs_io_command "falloc" + +rm -f $seqres.full + +# Format filesystem with a 256k realtime extent size +_scratch_mkfs -r extsize=256k > $seqres.full +_scratch_mount >> $seqres.full + +blksz=$(_get_block_size $SCRATCH_MNT) +rextsize=$($XFS_INFO_PROG $SCRATCH_MNT | grep realtime.*extsz | sed -e 's/^.*extsz=\([0-9]*\).*$/\1/g') +rextblks=$((rextsize / blksz)) + +echo "blksz $blksz rextsize $rextsize rextblks $rextblks" >> $seqres.full + +# Make sure the root directory has rtinherit set so our test file will too +$XFS_IO_PROG -c 'chattr +t' $SCRATCH_MNT + +sz=$((rextsize * 100)) +range="$((blksz * 3)) $blksz" + +for verb in fpunch finsert fcollapse fzero funshare falloc; do + echo "test $verb" + $XFS_IO_PROG -f -c "falloc 0 $sz" "$SCRATCH_MNT/b" + $XFS_IO_PROG -f -c "$verb $range" "$SCRATCH_MNT/b" + rm -f "$SCRATCH_MNT/b" + _scratch_cycle_mount +done + +# success, all done +status=0 +exit diff --git a/tests/xfs/760.out b/tests/xfs/760.out new file mode 100644 index 00000000..3d73c6fa --- /dev/null +++ b/tests/xfs/760.out @@ -0,0 +1,9 @@ +QA output created by 760 +test fpunch +test finsert +fallocate: Invalid argument +test fcollapse +fallocate: Invalid argument +test fzero +test funshare +test falloc diff --git a/tests/xfs/group b/tests/xfs/group index 219a4cfe..eebe7dde 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -515,3 +515,5 @@ 536 auto quick reflink 537 auto quick 538 auto stress +759 auto quick rw realtime +760 auto quick rw realtime collapse insert unshare zero prealloc From patchwork Tue Mar 23 04:20:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 12156829 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC471C433E3 for ; Tue, 23 Mar 2021 04:21:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 89A4E619AD for ; Tue, 23 Mar 2021 04:21:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229631AbhCWEU3 (ORCPT ); Tue, 23 Mar 2021 00:20:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:46366 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229537AbhCWEUM (ORCPT ); Tue, 23 Mar 2021 00:20:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E68516198E; Tue, 23 Mar 2021 04:20:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616473212; bh=tRC13KnW6gVz+tG0e7295KnDi/f6AV6qIEH0fcVUMEk=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=uTxoeDDIAhgWiuL4m4+ASJpkC4nn45KK+Hvi2hN0vdtJfrPNXuMomSm2k+xcJEJHW Kahy5Fk9VBluPU9n06rVpayW0v9gPBzwPi8Jl1XZzb5ZcWtHO3dEKqeLbL/UsAsGPh g5cxZc4JbfvshlsN/M2xXJ7JxM9oInQICVvG8aAcktPJHl7axuZmIQZNTCSQoKa4Pu +zA1HpEfhbSILspx74XVunSdpJT6HTag0ukbX3ws+DG9zrviqs5UzMxZocdgebkdaA lHY6x3WWxzePkfR/i99Z6rtuTKzI53s54FktnnRolkt2JjSrfZCeEU5/q8TT0AyCi3 ikIIU3/8HykGQ== Subject: [PATCH 2/3] common/rc: refactor _require_{ext2,tmpfs} helpers From: "Darrick J. Wong" To: djwong@kernel.org, guaneryu@gmail.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me Date: Mon, 22 Mar 2021 21:20:11 -0700 Message-ID: <161647321164.3430465.14482552330781743925.stgit@magnolia> In-Reply-To: <161647320063.3430465.17720673716578854275.stgit@magnolia> References: <161647320063.3430465.17720673716578854275.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Darrick J. Wong Combine these two helpers into a single generic function so that we can use it in the next patch to test a regression when running overlayfs atop xfs. Signed-off-by: Darrick J. Wong --- common/rc | 23 +++++------------------ tests/overlay/025 | 2 +- tests/overlay/106 | 2 +- tests/overlay/107 | 2 +- tests/overlay/108 | 2 +- tests/overlay/109 | 2 +- tests/xfs/049 | 2 +- 7 files changed, 11 insertions(+), 24 deletions(-) diff --git a/common/rc b/common/rc index 6d1757da..434cd583 100644 --- a/common/rc +++ b/common/rc @@ -1766,26 +1766,13 @@ _require_loop() fi } -# this test requires ext2 filesystem support +# this test requires kernel support for a secondary filesystem # -_require_ext2() +_require_extra_fs() { - modprobe ext2 >/dev/null 2>&1 - if grep ext2 /proc/filesystems >/dev/null 2>&1 - then - : - else - _notrun "This test requires ext2 filesystem support" - fi -} - -# this test requires tmpfs filesystem support -# -_require_tmpfs() -{ - modprobe tmpfs >/dev/null 2>&1 - grep -q tmpfs /proc/filesystems || - _notrun "this test requires tmpfs support" + modprobe "$1" >/dev/null 2>&1 + grep -q -w "$1" /proc/filesystems || + _notrun "this test requires $1 support" } # this test requires that (large) loopback device files are not in use diff --git a/tests/overlay/025 b/tests/overlay/025 index 979bd98e..c5f328c8 100755 --- a/tests/overlay/025 +++ b/tests/overlay/025 @@ -42,7 +42,7 @@ rm -f $seqres.full # Modify as appropriate. _supported_fs overlay _require_user -_require_tmpfs +_require_extra_fs tmpfs # create a tmpfs in $TEST_DIR tmpfsdir=$TEST_DIR/tmpfs diff --git a/tests/overlay/106 b/tests/overlay/106 index 28e9a819..0b3e0c98 100755 --- a/tests/overlay/106 +++ b/tests/overlay/106 @@ -27,7 +27,7 @@ rm -f $seqres.full # real QA test starts here _supported_fs overlay -_require_tmpfs +_require_extra_fs tmpfs _require_test _require_scratch _require_unionmount_testsuite diff --git a/tests/overlay/107 b/tests/overlay/107 index 733a5556..89fde9de 100755 --- a/tests/overlay/107 +++ b/tests/overlay/107 @@ -27,7 +27,7 @@ rm -f $seqres.full # real QA test starts here _supported_fs overlay -_require_tmpfs +_require_extra_fs tmpfs _require_test _require_scratch _require_unionmount_testsuite diff --git a/tests/overlay/108 b/tests/overlay/108 index e757e0e4..ae367a5c 100755 --- a/tests/overlay/108 +++ b/tests/overlay/108 @@ -27,7 +27,7 @@ rm -f $seqres.full # real QA test starts here _supported_fs overlay -_require_tmpfs +_require_extra_fs tmpfs _require_test _require_scratch _require_unionmount_testsuite diff --git a/tests/overlay/109 b/tests/overlay/109 index d49080be..df036616 100755 --- a/tests/overlay/109 +++ b/tests/overlay/109 @@ -27,7 +27,7 @@ rm -f $seqres.full # real QA test starts here _supported_fs overlay -_require_tmpfs +_require_extra_fs tmpfs _require_test _require_scratch _require_unionmount_testsuite diff --git a/tests/xfs/049 b/tests/xfs/049 index 67739265..16bc788d 100755 --- a/tests/xfs/049 +++ b/tests/xfs/049 @@ -46,7 +46,7 @@ _require_nonexternal _require_scratch_nocheck _require_no_large_scratch_dev _require_loop -_require_ext2 +_require_extra_fs ext2 rm -f $seqres.full From patchwork Tue Mar 23 04:20:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 12156827 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56948C433E1 for ; Tue, 23 Mar 2021 04:21:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 212A9619B4 for ; Tue, 23 Mar 2021 04:21:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229537AbhCWEUa (ORCPT ); Tue, 23 Mar 2021 00:20:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:46438 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbhCWEUS (ORCPT ); Tue, 23 Mar 2021 00:20:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6ADB16198E; Tue, 23 Mar 2021 04:20:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616473217; bh=x22GvVKe8UTy75QQIydlyKHZM9XuVQ/JixLaObs6nSc=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=h+FOaQHaSZKM8wHNAnWxcdZkCPbPn/2kDu+7QTuP0LrGy+d9kf5SkZM6QA6LWUmo+ x8gj2id5ycDU5wjbNLxtiwRZrxirvkXNKYQps4m9Z+I68TK0Taw2yjx7MpnUXxDT4Q TrbeU0w74jH9rIBp9xteGnjdpaimScgMqMBj8SFNxeotZQqlOE0p3jG6ktYc8u9o1M /3Gt08MFlqDwsnpfKYluu/UCAuU2Dh4S6G0ENjqc+1yhXDZxKsbzNP4S30JnYGKfB9 O3WnJLGNGuDjDdxAoxmgOBPtueghV7CBLl3PCb8l0ojoc4jhEFSKEBIC2c0hvH0Xrb axVCFGrS9bbuA== Subject: [PATCH 3/3] generic: test a deadlock in xfs_rename when whiteing out files From: "Darrick J. Wong" To: djwong@kernel.org, guaneryu@gmail.com Cc: wenli xie , linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me Date: Mon, 22 Mar 2021 21:20:17 -0700 Message-ID: <161647321713.3430465.7471073572970182852.stgit@magnolia> In-Reply-To: <161647320063.3430465.17720673716578854275.stgit@magnolia> References: <161647320063.3430465.17720673716578854275.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Darrick J. Wong wenli xie reported a buffer cache deadlock when an overlayfs is mounted atop xfs and overlayfs tries to replace a single-nlink file with a whiteout file. This test reproduces that deadlock. Reported-by: wenli xie Signed-off-by: Darrick J. Wong --- tests/generic/1300 | 108 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/1300.out | 2 + tests/generic/group | 1 3 files changed, 111 insertions(+) create mode 100755 tests/generic/1300 create mode 100644 tests/generic/1300.out diff --git a/tests/generic/1300 b/tests/generic/1300 new file mode 100755 index 00000000..7c47e732 --- /dev/null +++ b/tests/generic/1300 @@ -0,0 +1,108 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2021 Oracle. All Rights Reserved. +# +# FS QA Test No. 1300 +# +# Reproducer for a deadlock in xfs_rename reported by Wenli Xie. +# +# When overlayfs is running on top of xfs and the user unlinks a file in the +# overlay, overlayfs will create a whiteout inode and ask us to "rename" the +# whiteout file atop the one being unlinked. If the file being unlinked loses +# its one nlink, we then have to put the inode on the unlinked list. +# +# This requires us to grab the AGI buffer of the whiteout inode to take it +# off the unlinked list (which is where whiteouts are created) and to grab +# the AGI buffer of the file being deleted. If the whiteout was created in +# a higher numbered AG than the file being deleted, we'll lock the AGIs in +# the wrong order and deadlock. +# +# Note that this test doesn't do anything xfs-specific so it's a generic test. +# This is a regression test for commit 6da1b4b1ab36 ("xfs: fix an ABBA deadlock +# in xfs_rename"). + +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() +{ + stop_workers + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc + +# real QA test starts here +_supported_fs generic +_require_scratch +test "$FSTYP" = "overlay" && _notrun "Test does not apply to overlayfs." +_require_extra_fs overlay + +rm -f $seqres.full + +_scratch_mkfs >> $seqres.full +_scratch_mount +_supports_filetype $SCRATCH_MNT || _notrun "overlayfs test requires d_type" + +mkdir $SCRATCH_MNT/lowerdir +mkdir $SCRATCH_MNT/lowerdir1 +mkdir $SCRATCH_MNT/lowerdir/etc +mkdir $SCRATCH_MNT/workers +echo salts > $SCRATCH_MNT/lowerdir/etc/access.conf +touch $SCRATCH_MNT/running + +stop_workers() { + test -e $SCRATCH_MNT/running || return + rm -f $SCRATCH_MNT/running + + while [ "$(ls $SCRATCH_MNT/workers/ | wc -l)" -gt 0 ]; do + wait + done +} + +worker() { + local tag="$1" + local mergedir="$SCRATCH_MNT/merged$tag" + local l="lowerdir=$SCRATCH_MNT/lowerdir:$SCRATCH_MNT/lowerdir1" + local u="upperdir=$SCRATCH_MNT/upperdir$tag" + local w="workdir=$SCRATCH_MNT/workdir$tag" + local i="index=off,nfs_export=off" + + touch $SCRATCH_MNT/workers/$tag + while test -e $SCRATCH_MNT/running; do + rm -rf $SCRATCH_MNT/merged$tag + rm -rf $SCRATCH_MNT/upperdir$tag + rm -rf $SCRATCH_MNT/workdir$tag + mkdir $SCRATCH_MNT/merged$tag + mkdir $SCRATCH_MNT/workdir$tag + mkdir $SCRATCH_MNT/upperdir$tag + + mount -t overlay overlay -o "$l,$u,$w,$i" $mergedir + mv $mergedir/etc/access.conf $mergedir/etc/access.conf.bak + touch $mergedir/etc/access.conf + mv $mergedir/etc/access.conf $mergedir/etc/access.conf.bak + touch $mergedir/etc/access.conf + umount $mergedir + done + rm -f $SCRATCH_MNT/workers/$tag +} + +for i in $(seq 0 $((4 + LOAD_FACTOR)) ); do + worker $i & +done + +sleep $((30 * TIME_FACTOR)) +stop_workers + +echo Silence is golden. +# success, all done +status=0 +exit diff --git a/tests/generic/1300.out b/tests/generic/1300.out new file mode 100644 index 00000000..5805d30d --- /dev/null +++ b/tests/generic/1300.out @@ -0,0 +1,2 @@ +QA output created by 1300 +Silence is golden. diff --git a/tests/generic/group b/tests/generic/group index 7c7531d1..9e126b8c 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -633,3 +633,4 @@ 628 auto quick rw clone 629 auto quick rw copy_range 630 auto quick rw dedupe clone +1300 auto rw overlay rename