Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B68A9C433F5 for ; Tue, 25 Jan 2022 07:27:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1445126AbiAYH07 (ORCPT ); Tue, 25 Jan 2022 02:26:59 -0500 Received: from smtp-out1.suse.de ([195.135.220.28]:60994 "EHLO smtp-out1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1444891AbiAYHYT (ORCPT ); Tue, 25 Jan 2022 02:24:19 -0500 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 3EA502113D for ; Tue, 25 Jan 2022 07:24:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1643095452; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=CeYx1THkrQgbnyg60qUQfJSZLGzz2QHoKujULExruxc=; b=jbyAqGNAXmNYxsH+kA09I6XaN+brYOoHGdF4JL8bMnaO/J/G+81Qjqwya7pxchddMMLyOn 8n6x6G21DEeaZ23AbjSpBxc8F3Q33fuTdX4oAl9rFfXp9hoKo0S9YqEyCXFto1LdY2COK4 nmfFSJ+p56OxDDSATWlZ8Jv+MLueqaE= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 8F31513D84 for ; Tue, 25 Jan 2022 07:24:11 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id xmMaFpul72FRDgAAMHmgww (envelope-from ) for ; Tue, 25 Jan 2022 07:24:11 +0000 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH v2] btrfs: add test to verify the defrag behavior around preallocated extents Date: Tue, 25 Jan 2022 15:23:54 +0800 Message-Id: <20220125072354.44034-1-wqu@suse.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Recent v5.16 has some regression around btrfs autodefrag mount option, and the extra scrutiny around defrag code exposes some questionable behavior from the old code. One behavior is to defrag extents along with the next preallocated extent. This behavior will cause extra IO and convert all the preallocated extent to regular zero filled extents, rendering the preallocated extent useless. The kernel fix is titled: btrfs: defrag: don't try to merge regular extents with preallocated extents Signed-off-by: Qu Wenruo --- Changelog: v2: - Add _require_btrfs_support_sectorsize() helper And use it to make sure the platform supports 4k sectorsize - Use $AWK_PROG to replace awk --- common/btrfs | 16 +++++++++ tests/btrfs/255 | 84 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/255.out | 2 ++ 3 files changed, 102 insertions(+) create mode 100755 tests/btrfs/255 create mode 100644 tests/btrfs/255.out diff --git a/common/btrfs b/common/btrfs index 4afe81eb..5de926dd 100644 --- a/common/btrfs +++ b/common/btrfs @@ -480,3 +480,19 @@ _btrfs_no_v1_cache_opt() fi echo -n "-onospace_cache" } + +# Require certain sectorsize support +_require_btrfs_support_sectorsize() +{ + local sectorsize=$1 + + # PAGE_SIZE as sectorsize is always supported + if [ $sectorsize -eq $(get_page_size) ]; then + return + fi + + test -f /sys/fs/btrfs/features/supported_sectorsizes || \ + _notrun "no subpage support found" + grep -wq $sectorsize /sys/fs/btrfs/features/supported_sectorsizes || \ + _notrun "sectorsize $sectorsize is not supported" +} diff --git a/tests/btrfs/255 b/tests/btrfs/255 new file mode 100755 index 00000000..7f76bc4a --- /dev/null +++ b/tests/btrfs/255 @@ -0,0 +1,84 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2022 SUSE Linux Products GmbH. All Rights Reserved. +# +# FS QA Test 255 +# +# Make sure btrfs doesn't defrag preallocated extents, nor lone extents +# before preallocated extents. +# + +. ./common/preamble +_begin_fstest auto quick defrag + +# Override the default cleanup function. +# _cleanup() +# { +# cd / +# rm -r -f $tmp.* +# } + +# Import common functions. +. ./common/filter + +# real QA test starts here + +# Modify as appropriate. +_supported_fs btrfs +_require_scratch + +# Needs 4K sectorsize +_require_btrfs_support_sectorsize 4096 + +get_extent_disk_sector() +{ + local file=$1 + local offset=$2 + + $XFS_IO_PROG -c "fiemap $offset" "$file" | _filter_xfs_io_fiemap |\ + head -n1 | $AWK_PROG '{print $3}' +} + +_scratch_mkfs -s 4k >> $seqres.full 2>&1 + +# Need datacow to make the defragged extents to have different bytenr +_scratch_mount -o datacow + +# Create a file with the following layout: +# 0 4K 8K 16K +# |<- R ->|<-- Preallocated ->| +# R is regular extents. +# +# In this case it makes no sense to defrag any extent. +$XFS_IO_PROG -f -c "pwrite 0 4k" -c sync -c "falloc 4k 12k" \ + "$SCRATCH_MNT/foobar" >> $seqres.full + +echo "=== Initial file extent layout ===" >> $seqres.full +$XFS_IO_PROG -c "fiemap -v" "$SCRATCH_MNT/foobar" >> $seqres.full + +# Save the bytenr of both extents +old_regular=$(get_extent_disk_sector "$SCRATCH_MNT/foobar" 0) +old_prealloc=$(get_extent_disk_sector "$SCRATCH_MNT/foobar" 4096) + +# Now defrag and write the defragged range back to disk +$BTRFS_UTIL_PROG filesystem defrag "$SCRATCH_MNT/foobar" >> $seqres.full +sync + +echo "=== File extent layout after defrag ===" >> $seqres.full +$XFS_IO_PROG -c "fiemap -v" "$SCRATCH_MNT/foobar" >> $seqres.full + +new_regular=$(get_extent_disk_sector "$SCRATCH_MNT/foobar" 0) +new_prealloc=$(get_extent_disk_sector "$SCRATCH_MNT/foobar" 4096) + +if [ "$old_regular" -ne "$new_regular" ]; then + echo "the single lone sector get defragged" +fi +if [ "$old_prealloc" -ne "$new_prealloc" ]; then + echo "the preallocated extent get defragged" +fi + +echo "Silence is golden" + +# success, all done +status=0 +exit diff --git a/tests/btrfs/255.out b/tests/btrfs/255.out new file mode 100644 index 00000000..7eefb828 --- /dev/null +++ b/tests/btrfs/255.out @@ -0,0 +1,2 @@ +QA output created by 255 +Silence is golden -- 2.34.1