Skip to contentSkip to conversation

common/btrfs: handle dmdust as mounted device in _btrfs_buffered_read_on_mirror()

PATCH Superseded Qu Wenruo 4 participants 7 messages Jun 26, 2023 – Jun 28, 2023 Btrfs file system

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Qu Wenruo

author
#0 lore raw

PATCH 1/1 common/btrfs: handle dmdust as mounted device in _btrfs_buffered_read_on_mirror()

[BUG]
After commit ab41f0bddb73 ("common/btrfs: use _scratch_cycle_mount to ensure all page caches are dropped"), the test case btrfs/143 can fail like below:

btrfs/143 6s ... [failed, exit status 1]- output mismatch (see ~/xfstests/results//btrfs/143.out.bad)

    --- tests/btrfs/143.out 2020-06-10 19:29:03.818519162 +0100
    +++ ~/xfstests/results//btrfs/143.out.bad 2023-06-19 17:04:00.575033899 +0100
    @@ -1,37 +1,6 @@
     QA output created by 143
     wrote 131072/131072 bytes
     XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
    -XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa

................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................

[CAUSE]
Test case btrfs/143 uses dm-dust device to emulate read errors, this means we can not use _scratch_cycle_mount to cycle mount $SCRATCH_MNT.

As it would go mount $SCRATCH_DEV, not the dm-dust device to $SCRATCH_MNT.
This prevents us to trigger read-repair (since no error would be hit) thus fail the test.

[FIX]
Since we can mount whatever device at $SCRATCH_MNT, we can not use _scratch_cycle_mount in this case.

Instead implement a small helper to grab the mounted device and its mount options, and use the same device and mount options to cycle $SCRATCH_MNT mount.

This would fix btrfs/143 and hopefully future test cases which use dm devices.

---
 common/btrfs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
common/btrfs +12 -2
index 175b33ae..4a02b2cc 100644
@@ -601,8 +601,18 @@ _btrfs_buffered_read_on_mirror()
 	# The drop_caches doesn't seem to drop every pages on aarch64 with
 	# 64K page size.
 	# So here as another workaround, cycle mount the SCRATCH_MNT to ensure
-	# the cache are dropped.
-	_scratch_cycle_mount
+	# the cache are dropped, but we can not use _scratch_cycle_mount, as
+	# we may mount whatever dm device at SCRATCH_MNT.
+	# So here we grab the mounted block device and its mount options, then
+	# unmount and re-mount with the same device and options.
+	local mount_info=$(_mount | grep "$SCRATCH_MNT")
+	if [ -z "$mount_info" ]; then
+		_fail "failed to grab mount info of $SCRATCH_MNT"
+	fi
+	local dev=$(echo $mount_info | $AWK_PROG '{print $1}')
+	local opts=$(echo $mount_info | $AWK_PROG '{print $6}' | sed 's/[()]//g')
+	_scratch_unmount
+	_mount $dev -o $opts $SCRATCH_MNT
 	while [[ -z $( (( BASHPID % nr_mirrors == mirror )) &&
 		exec $XFS_IO_PROG \
 			-c "pread -b $size $offset $size" $file) ]]; do
Signature · 1 line
2.39.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 39 lines · Qu Wenruo

[BUG]
After commit ab41f0bddb73 ("common/btrfs: use _scratch_cycle_mount to ensure all page caches are dropped"), the test case btrfs/143 can fail like below:

btrfs/143 6s ... [failed, exit status 1]- output mismatch (see ~/xfstests/results//btrfs/143.out.bad)

    --- tests/btrfs/143.out 2020-06-10 19:29:03.818519162 +0100
    +++ ~/xfstests/results//btrfs/143.out.bad 2023-06-19 17:04:00.575033899 +0100
    @@ -1,37 +1,6 @@
     QA output created by 143
     wrote 131072/131072 bytes
     XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
    -XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa

................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................

[CAUSE]
Test case btrfs/143 uses dm-dust device to emulate read errors, this means we can not use _scratch_cycle_mount to cycle mount $SCRATCH_MNT.

As it would go mount $SCRATCH_DEV, not the dm-dust device to $SCRATCH_MNT.
This prevents us to trigger read-repair (since no error would be hit) thus fail the test.

[FIX]
Since we can mount whatever device at $SCRATCH_MNT, we can not use _scratch_cycle_mount in this case.

Instead implement a small helper to grab the mounted device and its mount options, and use the same device and mount options to cycle $SCRATCH_MNT mount.

Quoted 5 lines

This would fix btrfs/143 and hopefully future test cases which use dm devices.

Looks fine to me, and it works, so:

Thanks.

Quoted 32 lines
---
 common/btrfs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
common/btrfs +12 -3
index 175b33ae..4a02b2cc 100644
@@ -601,8 +601,18 @@ _btrfs_buffered_read_on_mirror()
        # The drop_caches doesn't seem to drop every pages on aarch64 with
        # 64K page size.
        # So here as another workaround, cycle mount the SCRATCH_MNT to ensure
-       # the cache are dropped.
-       _scratch_cycle_mount
+       # the cache are dropped, but we can not use _scratch_cycle_mount, as
+       # we may mount whatever dm device at SCRATCH_MNT.
+       # So here we grab the mounted block device and its mount options, then
+       # unmount and re-mount with the same device and options.
+       local mount_info=$(_mount | grep "$SCRATCH_MNT")
+       if [ -z "$mount_info" ]; then
+               _fail "failed to grab mount info of $SCRATCH_MNT"
+       fi
+       local dev=$(echo $mount_info | $AWK_PROG '{print $1}')
+       local opts=$(echo $mount_info | $AWK_PROG '{print $6}' | sed 's/[()]//g')
+       _scratch_unmount
+       _mount $dev -o $opts $SCRATCH_MNT
        while [[ -z $( (( BASHPID % nr_mirrors == mirror )) &&
                exec $XFS_IO_PROG \
                        -c "pread -b $size $offset $size" $file) ]]; do
--

2.39.0

#2 lore raw
In reply to Qu Wenruo
Quoted 57 lines · Qu Wenruo

[BUG]
After commit ab41f0bddb73 ("common/btrfs: use _scratch_cycle_mount to ensure all page caches are dropped"), the test case btrfs/143 can fail like below:

btrfs/143 6s ... [failed, exit status 1]- output mismatch (see ~/xfstests/results//btrfs/143.out.bad)

    --- tests/btrfs/143.out 2020-06-10 19:29:03.818519162 +0100
    +++ ~/xfstests/results//btrfs/143.out.bad 2023-06-19 17:04:00.575033899 +0100
    @@ -1,37 +1,6 @@
     QA output created by 143
     wrote 131072/131072 bytes
     XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
    -XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa

................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................

[CAUSE]
Test case btrfs/143 uses dm-dust device to emulate read errors, this means we can not use _scratch_cycle_mount to cycle mount $SCRATCH_MNT.

As it would go mount $SCRATCH_DEV, not the dm-dust device to $SCRATCH_MNT.
This prevents us to trigger read-repair (since no error would be hit) thus fail the test.

[FIX]
Since we can mount whatever device at $SCRATCH_MNT, we can not use _scratch_cycle_mount in this case.

Instead implement a small helper to grab the mounted device and its mount options, and use the same device and mount options to cycle $SCRATCH_MNT mount.

This would fix btrfs/143 and hopefully future test cases which use dm devices.

---
 common/btrfs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
common/btrfs +0 -2
index 175b33ae..4a02b2cc 100644
@@ -601,8 +601,18 @@ _btrfs_buffered_read_on_mirror()
 	# The drop_caches doesn't seem to drop every pages on aarch64 with
 	# 64K page size.
 	# So here as another workaround, cycle mount the SCRATCH_MNT to ensure
-	# the cache are dropped.
-	_scratch_cycle_mount

common/btrfs _btrfs_buffered_read_on_mirror() · line 613

Quoted 10 lines
common/btrfs +10 -0
+	# the cache are dropped, but we can not use _scratch_cycle_mount, as
+	# we may mount whatever dm device at SCRATCH_MNT.
+	# So here we grab the mounted block device and its mount options, then
+	# unmount and re-mount with the same device and options.
+	local mount_info=$(_mount | grep "$SCRATCH_MNT")
+	if [ -z "$mount_info" ]; then
+		_fail "failed to grab mount info of $SCRATCH_MNT"
+	fi
+	local dev=$(echo $mount_info | $AWK_PROG '{print $1}')
+	local opts=$(echo $mount_info | $AWK_PROG '{print $6}' | sed 's/[()]//g')

The findmnt can help to get $dev and $opts:

  local dev=$(findmnt -n -T $SCRATCH_MNT -o SOURCE)
  local opts=$(findmnt -n -T $SCRATCH_MNT -o OPTIONS)

If you hope to check you can keep:

if [ -z "$dev" -o -z "$opts" ];then
_fail "failed to grab mount info of $SCRATCH_MNT"
fi

common/btrfs _btrfs_buffered_read_on_mirror() · line 615

Quoted 2 lines
common/btrfs +2 -0
+	_scratch_unmount
+	_mount $dev -o $opts $SCRATCH_MNT

I'm wondering can this help that, after you get the "real" device name:

SCRATCH_DEV=$dev _scratch_cycle_mount

Thanks,
Zorro

Quoted 6 lines
common/btrfs +0 -0
 	while [[ -z $( (( BASHPID % nr_mirrors == mirror )) &&
 		exec $XFS_IO_PROG \
 			-c "pread -b $size $offset $size" $file) ]]; do
Signature · 1 line
2.39.0
#3 lore raw
Quoted 71 lines · Zorro Lang
Quoted 57 lines · Qu Wenruo

[BUG]
After commit ab41f0bddb73 ("common/btrfs: use _scratch_cycle_mount to ensure all page caches are dropped"), the test case btrfs/143 can fail like below:

btrfs/143 6s ... [failed, exit status 1]- output mismatch (see ~/xfstests/results//btrfs/143.out.bad)

     --- tests/btrfs/143.out 2020-06-10 19:29:03.818519162 +0100
     +++ ~/xfstests/results//btrfs/143.out.bad 2023-06-19 17:04:00.575033899 +0100
     @@ -1,37 +1,6 @@
      QA output created by 143
      wrote 131072/131072 bytes
      XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
     -XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa

................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................

[CAUSE]
Test case btrfs/143 uses dm-dust device to emulate read errors, this means we can not use _scratch_cycle_mount to cycle mount $SCRATCH_MNT.

As it would go mount $SCRATCH_DEV, not the dm-dust device to $SCRATCH_MNT.
This prevents us to trigger read-repair (since no error would be hit) thus fail the test.

[FIX]
Since we can mount whatever device at $SCRATCH_MNT, we can not use _scratch_cycle_mount in this case.

Instead implement a small helper to grab the mounted device and its mount options, and use the same device and mount options to cycle $SCRATCH_MNT mount.

This would fix btrfs/143 and hopefully future test cases which use dm devices.

---
  common/btrfs | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
common/btrfs +0 -2
index 175b33ae..4a02b2cc 100644
@@ -601,8 +601,18 @@ _btrfs_buffered_read_on_mirror()
  	# The drop_caches doesn't seem to drop every pages on aarch64 with
  	# 64K page size.
  	# So here as another workaround, cycle mount the SCRATCH_MNT to ensure
-	# the cache are dropped.
-	_scratch_cycle_mount

common/btrfs _btrfs_buffered_read_on_mirror() · line 613

Quoted 10 lines
common/btrfs +10 -0
+	# the cache are dropped, but we can not use _scratch_cycle_mount, as
+	# we may mount whatever dm device at SCRATCH_MNT.
+	# So here we grab the mounted block device and its mount options, then
+	# unmount and re-mount with the same device and options.
+	local mount_info=$(_mount | grep "$SCRATCH_MNT")
+	if [ -z "$mount_info" ]; then
+		_fail "failed to grab mount info of $SCRATCH_MNT"
+	fi
+	local dev=$(echo $mount_info | $AWK_PROG '{print $1}')
+	local opts=$(echo $mount_info | $AWK_PROG '{print $6}' | sed 's/[()]//g')

The findmnt can help to get $dev and $opts:

Quoted 8 lines
   local dev=$(findmnt -n -T $SCRATCH_MNT -o SOURCE)
   local opts=$(findmnt -n -T $SCRATCH_MNT -o OPTIONS)

If you hope to check you can keep:

if [ -z "$dev" -o -z "$opts" ];then
_fail "failed to grab mount info of $SCRATCH_MNT"
fi

That's really helpful!

Quoted 7 lines

common/btrfs _btrfs_buffered_read_on_mirror() · line 615

Quoted 3 lines
common/btrfs +2 -0
+	_scratch_unmount
+	_mount $dev -o $opts $SCRATCH_MNT

I'm wondering can this help that, after you get the "real" device name:

SCRATCH_DEV=$dev _scratch_cycle_mount

AFAIK we still need to specify the mount option.

As it's possible previous mount is specifying certain mount option that's not in MOUNT_OPTIONS environment variables.

E.g. mounting a specific subvolume or a temporary mount option.

Thus I believe we may still need to specific the mount options.

Thanks,
Qu

Quoted 11 lines

Thanks,
Zorro

Quoted 6 lines
common/btrfs +0 -1
  	while [[ -z $( (( BASHPID % nr_mirrors == mirror )) &&
  		exec $XFS_IO_PROG \
  			-c "pread -b $size $offset $size" $file) ]]; do
--

2.39.0

#4 lore raw
Quoted 93 lines · Qu Wenruo
Quoted 71 lines · Zorro Lang
Quoted 57 lines · Qu Wenruo

[BUG]
After commit ab41f0bddb73 ("common/btrfs: use _scratch_cycle_mount to ensure all page caches are dropped"), the test case btrfs/143 can fail like below:

btrfs/143 6s ... [failed, exit status 1]- output mismatch (see ~/xfstests/results//btrfs/143.out.bad)

     --- tests/btrfs/143.out 2020-06-10 19:29:03.818519162 +0100
     +++ ~/xfstests/results//btrfs/143.out.bad 2023-06-19 17:04:00.575033899 +0100
     @@ -1,37 +1,6 @@
      QA output created by 143
      wrote 131072/131072 bytes
      XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
     -XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa

................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................

[CAUSE]
Test case btrfs/143 uses dm-dust device to emulate read errors, this means we can not use _scratch_cycle_mount to cycle mount $SCRATCH_MNT.

As it would go mount $SCRATCH_DEV, not the dm-dust device to $SCRATCH_MNT.
This prevents us to trigger read-repair (since no error would be hit) thus fail the test.

[FIX]
Since we can mount whatever device at $SCRATCH_MNT, we can not use _scratch_cycle_mount in this case.

Instead implement a small helper to grab the mounted device and its mount options, and use the same device and mount options to cycle $SCRATCH_MNT mount.

This would fix btrfs/143 and hopefully future test cases which use dm devices.

---
  common/btrfs | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
common/btrfs +0 -2
index 175b33ae..4a02b2cc 100644
@@ -601,8 +601,18 @@ _btrfs_buffered_read_on_mirror()
  	# The drop_caches doesn't seem to drop every pages on aarch64 with
  	# 64K page size.
  	# So here as another workaround, cycle mount the SCRATCH_MNT to ensure
-	# the cache are dropped.
-	_scratch_cycle_mount

common/btrfs _btrfs_buffered_read_on_mirror() · line 613

Quoted 10 lines
common/btrfs +10 -0
+	# the cache are dropped, but we can not use _scratch_cycle_mount, as
+	# we may mount whatever dm device at SCRATCH_MNT.
+	# So here we grab the mounted block device and its mount options, then
+	# unmount and re-mount with the same device and options.
+	local mount_info=$(_mount | grep "$SCRATCH_MNT")
+	if [ -z "$mount_info" ]; then
+		_fail "failed to grab mount info of $SCRATCH_MNT"
+	fi
+	local dev=$(echo $mount_info | $AWK_PROG '{print $1}')
+	local opts=$(echo $mount_info | $AWK_PROG '{print $6}' | sed 's/[()]//g')

The findmnt can help to get $dev and $opts:

Quoted 8 lines
   local dev=$(findmnt -n -T $SCRATCH_MNT -o SOURCE)
   local opts=$(findmnt -n -T $SCRATCH_MNT -o OPTIONS)

If you hope to check you can keep:

if [ -z "$dev" -o -z "$opts" ];then
_fail "failed to grab mount info of $SCRATCH_MNT"
fi

That's really helpful!

Quoted 7 lines

common/btrfs _btrfs_buffered_read_on_mirror() · line 615

Quoted 3 lines
common/btrfs +2 -0
+	_scratch_unmount
+	_mount $dev -o $opts $SCRATCH_MNT

I'm wondering can this help that, after you get the "real" device name:

SCRATCH_DEV=$dev _scratch_cycle_mount

Quoted 8 lines

AFAIK we still need to specify the mount option.

As it's possible previous mount is specifying certain mount option that's not in MOUNT_OPTIONS environment variables.

E.g. mounting a specific subvolume or a temporary mount option.

Thus I believe we may still need to specific the mount options.

Hmm... if the _scratch_cycle_mount doesn't support dmdust, others dmxxxx (e.g. dmdelay, dmthin, dmerror, dmflaky) have similar problem, right?

Thanks,
Zorro

Quoted 16 lines

Thanks,
Qu

Quoted 11 lines

Thanks,
Zorro

Quoted 6 lines
common/btrfs +0 -1
  	while [[ -z $( (( BASHPID % nr_mirrors == mirror )) &&
  		exec $XFS_IO_PROG \
  			-c "pread -b $size $offset $size" $file) ]]; do
--

2.39.0

#5 lore raw
Quoted 99 lines · Zorro Lang
Quoted 98 lines · Qu Wenruo
Quoted 71 lines · Zorro Lang
Quoted 57 lines · Qu Wenruo

[BUG]
After commit ab41f0bddb73 ("common/btrfs: use _scratch_cycle_mount to ensure all page caches are dropped"), the test case btrfs/143 can fail like below:

   btrfs/143 6s ... [failed, exit status 1]- output mismatch (see ~/xfstests/results//btrfs/143.out.bad)
      --- tests/btrfs/143.out 2020-06-10 19:29:03.818519162 +0100
      +++ ~/xfstests/results//btrfs/143.out.bad 2023-06-19 17:04:00.575033899 +0100
      @@ -1,37 +1,6 @@
       QA output created by 143
       wrote 131072/131072 bytes
       XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
      -XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa

................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................

[CAUSE]
Test case btrfs/143 uses dm-dust device to emulate read errors, this means we can not use _scratch_cycle_mount to cycle mount $SCRATCH_MNT.

As it would go mount $SCRATCH_DEV, not the dm-dust device to $SCRATCH_MNT.
This prevents us to trigger read-repair (since no error would be hit) thus fail the test.

[FIX]
Since we can mount whatever device at $SCRATCH_MNT, we can not use _scratch_cycle_mount in this case.

Instead implement a small helper to grab the mounted device and its mount options, and use the same device and mount options to cycle $SCRATCH_MNT mount.

This would fix btrfs/143 and hopefully future test cases which use dm devices.

---
   common/btrfs | 14 ++++++++++++--
   1 file changed, 12 insertions(+), 2 deletions(-)
common/btrfs +0 -2
index 175b33ae..4a02b2cc 100644
@@ -601,8 +601,18 @@ _btrfs_buffered_read_on_mirror()
   	# The drop_caches doesn't seem to drop every pages on aarch64 with
   	# 64K page size.
   	# So here as another workaround, cycle mount the SCRATCH_MNT to ensure
-	# the cache are dropped.
-	_scratch_cycle_mount

common/btrfs _btrfs_buffered_read_on_mirror() · line 613

Quoted 10 lines
common/btrfs +10 -0
+	# the cache are dropped, but we can not use _scratch_cycle_mount, as
+	# we may mount whatever dm device at SCRATCH_MNT.
+	# So here we grab the mounted block device and its mount options, then
+	# unmount and re-mount with the same device and options.
+	local mount_info=$(_mount | grep "$SCRATCH_MNT")
+	if [ -z "$mount_info" ]; then
+		_fail "failed to grab mount info of $SCRATCH_MNT"
+	fi
+	local dev=$(echo $mount_info | $AWK_PROG '{print $1}')
+	local opts=$(echo $mount_info | $AWK_PROG '{print $6}' | sed 's/[()]//g')

The findmnt can help to get $dev and $opts:

Quoted 8 lines
    local dev=$(findmnt -n -T $SCRATCH_MNT -o SOURCE)
    local opts=$(findmnt -n -T $SCRATCH_MNT -o OPTIONS)

If you hope to check you can keep:

if [ -z "$dev" -o -z "$opts" ];then
_fail "failed to grab mount info of $SCRATCH_MNT"
fi

That's really helpful!

Quoted 7 lines

common/btrfs _btrfs_buffered_read_on_mirror() · line 615

Quoted 3 lines
common/btrfs +2 -0
+	_scratch_unmount
+	_mount $dev -o $opts $SCRATCH_MNT

I'm wondering can this help that, after you get the "real" device name:

SCRATCH_DEV=$dev _scratch_cycle_mount

AFAIK we still need to specify the mount option.

As it's possible previous mount is specifying certain mount option that's not in MOUNT_OPTIONS environment variables.

Quoted 6 lines
Quoted 3 lines

E.g. mounting a specific subvolume or a temporary mount option.

Thus I believe we may still need to specific the mount options.

Hmm... if the _scratch_cycle_mount doesn't support dmdust, others dmxxxx (e.g. dmdelay, dmthin, dmerror, dmflaky) have similar problem, right?

Yes, but my point here is, although "SCRATCH_DEV=$dev _scratch_cycle_mount" can work for most cases, it can still miss the specific mount option of the current mount.

Thus we still need to go "_mount $dev -o $opts $SCRATCH_MNT", just for the extra mount options.

Thanks,
Qu

Quoted 21 lines

Thanks,
Zorro

Quoted 16 lines

Thanks,
Qu

Quoted 11 lines

Thanks,
Zorro

Quoted 6 lines
common/btrfs +0 -1
   	while [[ -z $( (( BASHPID % nr_mirrors == mirror )) &&
   		exec $XFS_IO_PROG \
   			-c "pread -b $size $offset $size" $file) ]]; do
--

2.39.0

#6 lore raw
Quoted 109 lines · Qu Wenruo
Quoted 99 lines · Zorro Lang
Quoted 98 lines · Qu Wenruo
Quoted 71 lines · Zorro Lang
Quoted 57 lines · Qu Wenruo

[BUG]
After commit ab41f0bddb73 ("common/btrfs: use _scratch_cycle_mount to ensure all page caches are dropped"), the test case btrfs/143 can fail like below:

   btrfs/143 6s ... [failed, exit status 1]- output mismatch (see ~/xfstests/results//btrfs/143.out.bad)
      --- tests/btrfs/143.out 2020-06-10 19:29:03.818519162 +0100
      +++ ~/xfstests/results//btrfs/143.out.bad 2023-06-19 17:04:00.575033899 +0100
      @@ -1,37 +1,6 @@
       QA output created by 143
       wrote 131072/131072 bytes
       XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
      -XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa

................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................
-XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
................

[CAUSE]
Test case btrfs/143 uses dm-dust device to emulate read errors, this means we can not use _scratch_cycle_mount to cycle mount $SCRATCH_MNT.

As it would go mount $SCRATCH_DEV, not the dm-dust device to $SCRATCH_MNT.
This prevents us to trigger read-repair (since no error would be hit) thus fail the test.

[FIX]
Since we can mount whatever device at $SCRATCH_MNT, we can not use _scratch_cycle_mount in this case.

Instead implement a small helper to grab the mounted device and its mount options, and use the same device and mount options to cycle $SCRATCH_MNT mount.

This would fix btrfs/143 and hopefully future test cases which use dm devices.

---
   common/btrfs | 14 ++++++++++++--
   1 file changed, 12 insertions(+), 2 deletions(-)
common/btrfs +0 -2
index 175b33ae..4a02b2cc 100644
@@ -601,8 +601,18 @@ _btrfs_buffered_read_on_mirror()
   	# The drop_caches doesn't seem to drop every pages on aarch64 with
   	# 64K page size.
   	# So here as another workaround, cycle mount the SCRATCH_MNT to ensure
-	# the cache are dropped.
-	_scratch_cycle_mount

common/btrfs _btrfs_buffered_read_on_mirror() · line 613

Quoted 10 lines
common/btrfs +10 -0
+	# the cache are dropped, but we can not use _scratch_cycle_mount, as
+	# we may mount whatever dm device at SCRATCH_MNT.
+	# So here we grab the mounted block device and its mount options, then
+	# unmount and re-mount with the same device and options.
+	local mount_info=$(_mount | grep "$SCRATCH_MNT")
+	if [ -z "$mount_info" ]; then
+		_fail "failed to grab mount info of $SCRATCH_MNT"
+	fi
+	local dev=$(echo $mount_info | $AWK_PROG '{print $1}')
+	local opts=$(echo $mount_info | $AWK_PROG '{print $6}' | sed 's/[()]//g')

The findmnt can help to get $dev and $opts:

Quoted 8 lines
    local dev=$(findmnt -n -T $SCRATCH_MNT -o SOURCE)
    local opts=$(findmnt -n -T $SCRATCH_MNT -o OPTIONS)

If you hope to check you can keep:

if [ -z "$dev" -o -z "$opts" ];then
_fail "failed to grab mount info of $SCRATCH_MNT"
fi

That's really helpful!

Quoted 7 lines

common/btrfs _btrfs_buffered_read_on_mirror() · line 615

Quoted 3 lines
common/btrfs +2 -0
+	_scratch_unmount
+	_mount $dev -o $opts $SCRATCH_MNT

I'm wondering can this help that, after you get the "real" device name:

SCRATCH_DEV=$dev _scratch_cycle_mount

AFAIK we still need to specify the mount option.

As it's possible previous mount is specifying certain mount option that's not in MOUNT_OPTIONS environment variables.

Quoted 6 lines
Quoted 3 lines

E.g. mounting a specific subvolume or a temporary mount option.

Thus I believe we may still need to specific the mount options.

Hmm... if the _scratch_cycle_mount doesn't support dmdust, others dmxxxx (e.g. dmdelay, dmthin, dmerror, dmflaky) have similar problem, right?

Quoted 6 lines

Yes, but my point here is, although "SCRATCH_DEV=$dev _scratch_cycle_mount" can work for most cases, it can still miss the specific mount option of the current mount.

Thus we still need to go "_mount $dev -o $opts $SCRATCH_MNT", just for the extra mount options.

OK, let's merge this patch to fix this small regression issue at first. Then I'll think about how to make _scratch_cycle_mount work with dmXXXX in another patch.

Please send a V2 to use findmnt, I'll merge it in next fstests release.

Thanks,
Zorro

Quoted 25 lines

Thanks,
Qu

Quoted 21 lines

Thanks,
Zorro

Quoted 16 lines

Thanks,
Qu

Quoted 11 lines

Thanks,
Zorro

Quoted 6 lines
common/btrfs +0 -1
   	while [[ -z $( (( BASHPID % nr_mirrors == mirror )) &&
   		exec $XFS_IO_PROG \
   			-c "pread -b $size $offset $size" $file) ]]; do
--

2.39.0