shared/298: Wire btrfs support in get_free_sectors
PATCH v3 1/1 shared/298: Wire btrfs support in get_free_sectors
Add support for btrfs in shared/298. Achieve this by introducing 2 new awk scripts that parse relevant btrfs structures and print holes. Additionally modify the test to create larger - 3gb filesystem in the case of btrfs. This is needed so that distinct block groups are used for data and metadata.
Signed-off-by Nikolay Borisov <[email protected]>
---
Changes since v2:
* Moved files to src/ dir
* Rename spb parameter in both scripts to sectorsize
* Added comments for function
* Added spaces after every # of a comment
* Removed btrfs_Free variable from shared/298, now the awk scripts directly print their output
src/parse-dev-tree.awk | 64 +++++++++++++++++++++ src/parse-extent-tree.awk | 144 ++++++++++++++++++++++++++++++++++++++++++++++ tests/shared/298 | 33 ++++++++++- 3 files changed, 238 insertions(+), 3 deletions(-) create mode 100755 src/parse-dev-tree.awk create mode 100755 src/parse-extent-tree.awk
src/parse-dev-tree.awk new file +64 -0
@@ -0,0 +1,64 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2019 Nikolay Borisov, SUSE LLC. All Rights Reserved. +# +# Parses btrfs' device tree for holes. For example given the followin device extents: +# item 3 key (1 DEV_EXTENT 38797312) itemoff 16091 itemsize 48 +# dev extent chunk_tree 3 +# chunk_objectid 256 chunk_offset 30408704 length 1073741824 +# chunk_tree_uuid b8c8f022-452b-4fc1-bf5c-b42d9fba613e +# item 4 key (1 DEV_EXTENT 1112539136) itemoff 16043 itemsize 48 +# dev extent chunk_tree 3 +# chunk_objectid 256 chunk_offset 30408704 length 1073741824 +# chunk_tree_uuid b8c8f022-452b-4fc1-bf5c-b42d9fba613e +# +# The scripts will find out if there is a hole between 38797312+1073741824 and +# the start offset of the next extent, in this case 1112539136 so no hole. But +# if there was it would have printed the size of the hole. +# +# Following paramters must be set: +# * sectorsize - how many bytes per sector, used to convert script's output +# to sectors. +# * devsize - size of the device in bytes, used to output the final +# hole (if any) + +# Given a 'chunk_objectid 256 chunk_offset 22020096 length 8388608' line this +# function returns 8388608 +function get_extent_size(line, tmp) { + split(line, tmp) + return tmp[6] +} + +# Given a ' item 3 key (1 DEV_EXTENT 38797312) itemoff 16091 itemsize 48' line +# this function returns 38797312 +function get_extent_offset(line, tmp) { + split(line, tmp) + gsub(/\)/,"", tmp[6]) + return tmp[6] +} + +BEGIN { + dev_extent_match="^.item [0-9]* key \\([0-9]* DEV_EXTENT [0-9]*\\).*" + dev_extent_len_match="^\\s*chunk_objectid [0-9]* chunk_offset [0-9]* length [0-9]*$" +} + +{ + if (match($0,dev_extent_match)) { + extent_offset = get_extent_offset($0) + if (prev_extent_end) { + hole_size = extent_offset - prev_extent_end + if (hole_size > 0) { + print prev_extent_end / sectorsize, int((extent_offset - 1) / sectorsize) + } + } + } else if (match($0, dev_extent_len_match)) { + extent_size = get_extent_size($0) + prev_extent_end = extent_offset + extent_size + } +} + +END { + if (prev_extent_end) { + print prev_extent_end / sectorsize, int((devsize - 1) / sectorsize) + } +} +
src/parse-extent-tree.awk new file +144 -0
144 lines not on this page · raw message
tests/shared/298 +30 -3
@@ -15,14 +15,24 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common/rc -_supported_fs ext4 xfs +_supported_fs ext4 xfs btrfs _supported_os Linux _require_test _require_loop _require_fstrim _require_xfs_io_command "fiemap" -_require_fs_space $TEST_DIR 307200 +if [ "$FSTYP" = "btrfs" ]; then + # 3g for btrfs to have distinct bgs + _require_fs_space $TEST_DIR 3145728 + fssize=3000 +else + _require_fs_space $TEST_DIR 307200 + fssize=300 +fi + [ "$FSTYP" = "ext4" ] && _require_dumpe2fs +[ "$FSTYP" = "btrfs" ] && _require_btrfs_command inspect-internal dump-super +[ "$FSTYP" = "btrfs" ] && _require_btrfs_command inspect-internal dump-tree _cleanup() {
@@ -61,6 +71,22 @@ get_free_sectors() $AWK_PROG -v spb=$sectors_per_block -v agsize=$agsize \ '{ print spb * ($1 * agsize + $2), spb * ($1 * agsize + $2 + $3) - 1 }' ;; + btrfs) + local device_size=$($BTRFS_UTIL_PROG filesystem show --raw $loop_mnt 2>&1 \ + | sed -n "s/^.*size \([0-9]*\).*$/\1/p") + + local nodesize=$($BTRFS_UTIL_PROG inspect-internal dump-super $img_file \ + | sed -n 's/nodesize\s*\(.*\)/\1/p') + + # Get holes within block groups + $BTRFS_UTIL_PROG inspect-internal dump-tree -t extent $img_file \ + | $AWK_PROG -v sectorsize=512 -v nodesize=$nodesize -f $here/src/parse-extent-tree.awk + + # Get holes within unallocated space on disk + $BTRFS_UTIL_PROG inspect-internal dump-tree -t dev $img_file \ + | $AWK_PROG -v sectorsize=512 -v devsize=$device_size -f $here/src/parse-dev-tree.awk + + ;; esac }
@@ -105,7 +131,7 @@ here=`pwd` tmp=`mktemp -d` img_file=$TEST_DIR/$$.fs -dd if=/dev/zero of=$img_file bs=1M count=300 &> /dev/null +dd if=/dev/zero of=$img_file bs=1M count=$fssize &> /dev/null loop_dev=$(_create_loop_device $img_file) loop_mnt=$tmp/loop_mnt
@@ -118,6 +144,7 @@ merged_sectors="$tmp/merged_free_sectors" mkdir $loop_mnt [ "$FSTYP" = "xfs" ] && MKFS_OPTIONS="-f $MKFS_OPTIONS" +[ "$FSTYP" = "btrfs" ] && MKFS_OPTIONS="$MKFS_OPTIONS -f -dsingle -msingle" _mkfs_dev $loop_dev _mount $loop_dev $loop_mnt
Signature · 1 line
2.7.4