From patchwork Wed Feb 19 18:19:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 13982632 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A5AC8468; Wed, 19 Feb 2025 18:19:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739989172; cv=none; b=BfP0hO89/kIGvXSuI5PKlUtwms/UckjFU0+tvJm1AD7gjKd4VXpbd3z7TRFQhfZVe4KSaz/KPxaTBbp7WLdZpKtA/vHzVI5SH4pbyDI36AJtJbQ2N6G/9gvgyuNbHZVNcAKXhLPhbJQV2GNnExRO1QCzS/v9UNUkWaViYbn4oHM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739989172; c=relaxed/simple; bh=nLx32WVgspgyqkguAoJe240rymvvIEipMeDDKkWhRrQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aPevawxjg29k3wYtQzLFKcFNP2QAcAV/0gJSgukDJJV145Z5f+YfOOfG6bt4mHis3a0gr/pYl5h2iPCF0uXioc8D1RgwtHeDL1u52Y1Fh8ZvH0PJLFPF1iVMtGFX45kh7vHoMN7JgaKF/Mzt9cjw66+yu3Hwq2ZBflrFYDOoWRk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZtJOXbH4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZtJOXbH4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F15E2C4CEDD; Wed, 19 Feb 2025 18:19:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739989171; bh=nLx32WVgspgyqkguAoJe240rymvvIEipMeDDKkWhRrQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZtJOXbH47oCbeqlgezg18fej939lk2qo6S14auyRV8Fya9VZ9UTvs9io/+AvRrFFr RaFB+LDZmmWE8sXZ9O3f8FWjyYCnkwTxsTu8IIVMxBg/VIC3cCbUvaYGxwdXO73bwd 3wekWN4/vKWCnYtosyDFLBcoPIA5k4Ece/z6sYf2j3AjrdIY2Tu2THqvLgKp7bDkm6 0oLUPTF9woI9sbVbM66l7MpNbMbwKfQhv1GwUcQWxYF5wbj32lD6eZd3ed/4k69W1S rqLW2Yf2Gn9fmNmkPoxBNFWDj/X3m1LqDk4uySSyRwVki6o0qEgxrZHnBnrXnTZmOB MsURB0zuUD+DA== From: fdmanana@kernel.org To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Filipe Manana Subject: [PATCH 1/2] btrfs/254: don't leave mount on test fs in case of failure/interruption Date: Wed, 19 Feb 2025 18:19:14 +0000 Message-ID: <9aa6c8318d11b2fd1c2e208d85b2f83ea81ff88d.1739989076.git.fdmanana@suse.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Filipe Manana If the test fails or is interrupted after mounting $scratch_dev3 inside the test filesystem and before unmounting at test_add_device(), we leave without being unable to unmount the test filesystem since it has a mount inside it. This results in the need to manually unmount $scratch_dev3, otherwise a subsequent run of fstests fails since the unmount of the test device fails with -EBUSY. Fix this by unmounting $scratch_dev3 ($seq_mnt) in the _cleanup() function. Signed-off-by: Filipe Manana Reviewed-by: Anand Jain --- tests/btrfs/254 | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/btrfs/254 b/tests/btrfs/254 index d9c9eea9..6523389b 100755 --- a/tests/btrfs/254 +++ b/tests/btrfs/254 @@ -21,6 +21,7 @@ _cleanup() { cd / rm -f $tmp.* + $UMOUNT_PROG $seq_mnt > /dev/null 2>&1 rm -rf $seq_mnt > /dev/null 2>&1 cleanup_dmdev } From patchwork Wed Feb 19 18:19:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 13982633 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDECA8468; Wed, 19 Feb 2025 18:19:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739989173; cv=none; b=blYsLwr7wbtLEfHCradRAlUjzNWKFy7uKm5+YDVEyDusSYoY+Hi7Z/bMx9vBCFqG+XlGQJngiCLQc2+6gJ8bF4JqsLonC54fT3BV0xhgPsB+OCWPusrw2tazZVr6Kk9gjsDhLvqO6X2gBIYAmohjc12fBfQX+ezLouuwZXCrhbk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739989173; c=relaxed/simple; bh=joYUR36Uz5HVkFMN+b28bsbD+JBbgJXnANUJNwj9Opo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MytQp9N83UJpfqWTJwkRI3tpv0fwdwE4amVkNZwPl5AjOdhBJUBOGu5OyCHy6oBHo5ohtfvXePPY7HHwwgLzOw1baLwispF//ZbBmGmqSSvVP5SW5xf2VX1S2UE2+brvtc+VHgWTf4aUHXrr6GwyT5V4oJYrkq+DA9N8EnkPsuc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rkwAkU1t; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rkwAkU1t" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 607FCC4CEE0; Wed, 19 Feb 2025 18:19:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739989173; bh=joYUR36Uz5HVkFMN+b28bsbD+JBbgJXnANUJNwj9Opo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rkwAkU1tCi0lIM7h5S9jeYilQWbSs2EELHOOFipETXTsgLnK/63AfrHPuUshof7lz XJMwbEkuvqRdXFidek/Go+zlVE+YSCGQ9VrvRyZGz4XvAbVVvTmIQxAWhMOtTF5PcW 9LSrT0QTKLmEOcopCfWGJRCaQ1s94gtr5nCRJbC88JskUhcnrOcc5nM1vvsqJcy0Ov 9GilqimQ3iitET7DwmuG/bvAmOePOoEeRqZRkbO8gfSt1WNfZK/GOnsXgOtGSEVamD /KQ0fOFeu5FyjGzKju819tFlgyEqhD4yyLGt9M7g0BlamgQT1ZAUlqrumLtBCTdV4L 55dVRFl12RMBw== From: fdmanana@kernel.org To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Filipe Manana Subject: [PATCH 2/2] btrfs/254: fix test failure in case scratch devices are larger than 50G Date: Wed, 19 Feb 2025 18:19:15 +0000 Message-ID: <27997253fd18428b2eb24d3f5ddd19885f058259.1739989076.git.fdmanana@suse.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Filipe Manana If the devices in the scratch pool have a size larger than 50G, then the test fails due to chunk allocation failure when attempting to create a multidevice filesystem on $lvdev and $scratch_dev2. This happens because the $lvdev device has a size of 1G and metadata chunks have a size of 1G for filesystems with a size greater than 50G, so mkfs fails when it attempts to allocate chunks since it needs to allocate a 1G metadata chunk plus a system chunk and a data chunk. $ ./check btrfs/254 FSTYP -- btrfs PLATFORM -- Linux/x86_64 debian0 6.14.0-rc3-btrfs-next-187+ #1 SMP PREEMPT_DYNAMIC Tue Feb 18 10:53:23 WET 2025 MKFS_OPTIONS -- /dev/sdc MOUNT_OPTIONS -- /dev/sdc /home/fdmanana/btrfs-tests/scratch_1 btrfs/254 2s ... [failed, exit status 1]- output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/254.out.bad) --- tests/btrfs/254.out 2024-10-07 12:36:15.532225987 +0100 +++ /home/fdmanana/git/hub/xfstests/results//btrfs/254.out.bad 2025-02-19 18:07:06.479812229 +0000 @@ -1,5 +1,13 @@ QA output created by 254 -Label: none uuid: - Total devices FS bytes used - devid size used path SCRATCH_DEV - *** Some devices missing +ERROR: not enough free space to allocate chunk +btrfs-progs v6.13 ... (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/254.out /home/fdmanana/git/hub/xfstests/results//btrfs/254.out.bad' to see the entire diff) HINT: You _MAY_ be missing kernel fix: 770c79fb6550 btrfs: harden identification of a stale device Ran: btrfs/254 Failures: btrfs/254 Failed 1 of 1 tests Fix this by creating a 2G $lvdev device instead of 1G. Signed-off-by: Filipe Manana Reviewed-by: Anand Jain --- tests/btrfs/254 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/btrfs/254 b/tests/btrfs/254 index 6523389b..ec303e24 100755 --- a/tests/btrfs/254 +++ b/tests/btrfs/254 @@ -44,8 +44,11 @@ _scratch_dev_pool_get 3 setup_dmdev() { - # Some small size. - size=$((1024 * 1024 * 1024)) + # On filesystems up to 50G the metadata chunk size if 256M, but on + # larger ones it's 1G, so use 2G to ensure the test doesn't fail with + # -ENOSPC when running mkfs against $lvdev and $scratch_dev2 in case + # the device at $scratch_dev2 has more capacity than 50G. + size=$((2 * 1024 * 1024 * 1024)) size_in_sector=$((size / 512)) table="0 $size_in_sector linear $SCRATCH_DEV 0"