[PATCH 0/3] fstests: btrfs- add _fixed_by for new tests in the auto group

[PATCH 0/3] fstests: btrfs- add _fixed_by for new tests in the auto group

[Anand Jain]

From the POV of running these tests on older kernels, include the
_fixed_by_kernel_commit attribute.

These patches are to apply on top of the series
   run more tests in the auto group

Anand Jain (3):
  fstests: btrfs/198, add _fixed_by_kernel_commit
  fstests: btrfs/219, add _fixed_by_kernel_commit
  fstests: btrfs/185, add _fixed_by_kernel_commit

 tests/btrfs/185 | 2 ++
 tests/btrfs/198 | 6 +++---
 tests/btrfs/219 | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

-- 
2.31.1

[PATCH 1/3] fstests: btrfs/198, add _fixed_by_kernel_commit

[Anand Jain]

Add _fixed_by_kernel_commit for the fix and update the test summary.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 tests/btrfs/198 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/btrfs/198 b/tests/btrfs/198
index 2b68754ade52..7d23ffcee3c5 100755
--- a/tests/btrfs/198
+++ b/tests/btrfs/198
@@ -4,9 +4,7 @@
 #
 # FS QA Test 198
 #
-# Test stale and alien non-btrfs device in the fs devices list.
-#  Bug fixed in:
-#    btrfs: remove identified alien device in open_fs_devices
+# Test outdated and foreign non-btrfs devices in the device listing.
 #
 . ./common/preamble
 _begin_fstest auto quick volume
@@ -22,6 +20,8 @@ _require_scratch
 _require_scratch_dev_pool 4
 # Zoned btrfs only supports SINGLE profile
 _require_non_zoned_device ${SCRATCH_DEV}
+_fixed_by_kernel_commit 96c2e067ed3e3e \
+	"btrfs: skip devices without magic signature when mounting"
 
 workout()
 {
-- 
2.31.1

[PATCH 2/3] fstests: btrfs/219, add _fixed_by_kernel_commit

[Anand Jain]

btrfs/219 is in the auto group so add the _fixed_by_kernel_commit
tag for the benifit of the older kernels. The required commit is not yet
in the mainline so there is no commit id yet.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 tests/btrfs/219 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/btrfs/219 b/tests/btrfs/219
index 528175b8a4b9..79ba31549268 100755
--- a/tests/btrfs/219
+++ b/tests/btrfs/219
@@ -8,7 +8,7 @@
 # to make sure we do not allow stale devices, which can end up with some wonky
 # behavior for loop back devices.  This was changed with
 #
-#   btrfs: allow single disk devices to mount with older generations
+#	btrfs: free device in btrfs_close_devices for a single device filesystem
 #
 # But I've added a few other test cases so it's clear what we expect to happen
 # currently.
@@ -42,6 +42,8 @@ _supported_fs btrfs
 _require_test
 _require_loop
 _require_btrfs_forget_or_module_loadable
+_fixed_by_kernel_commit xxxxxxxxxxxx \
+	"btrfs: free device in btrfs_close_devices for a single device filesystem"
 
 loop_mnt=$TEST_DIR/$seq.mnt
 loop_mnt1=$TEST_DIR/$seq.mnt1
-- 
2.31.1

Re: [PATCH 2/3] fstests: btrfs/219, add _fixed_by_kernel_commit

[Zorro Lang]

On Fri, Feb 10, 2023 at 09:41:20PM +0800, Anand Jain wrote:
> btrfs/219 is in the auto group so add the _fixed_by_kernel_commit
> tag for the benifit of the older kernels. The required commit is not yet
> in the mainline so there is no commit id yet.
> 
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
> ---
>  tests/btrfs/219 | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/btrfs/219 b/tests/btrfs/219
> index 528175b8a4b9..79ba31549268 100755
> --- a/tests/btrfs/219
> +++ b/tests/btrfs/219
> @@ -8,7 +8,7 @@
>  # to make sure we do not allow stale devices, which can end up with some wonky
>  # behavior for loop back devices.  This was changed with
>  #
> -#   btrfs: allow single disk devices to mount with older generations
> +#	btrfs: free device in btrfs_close_devices for a single device filesystem
>  #
>  # But I've added a few other test cases so it's clear what we expect to happen
>  # currently.
> @@ -42,6 +42,8 @@ _supported_fs btrfs
>  _require_test
>  _require_loop
>  _require_btrfs_forget_or_module_loadable
> +_fixed_by_kernel_commit xxxxxxxxxxxx \
> +	"btrfs: free device in btrfs_close_devices for a single device filesystem"

It was just merged ;)

commit 5f58d783fd7823b2c2d5954d1126e702f94bfc4c
Author: Anand Jain <anand.jain@oracle.com>
Date:   Fri Jan 20 21:47:16 2023 +0800

    btrfs: free device in btrfs_close_devices for a single device filesystem


>  
>  loop_mnt=$TEST_DIR/$seq.mnt
>  loop_mnt1=$TEST_DIR/$seq.mnt1
> -- 
> 2.31.1
> 

Re: [PATCH 2/3] fstests: btrfs/219, add _fixed_by_kernel_commit

[Anand Jain]

On 2/14/23 14:07, Zorro Lang wrote:
> On Fri, Feb 10, 2023 at 09:41:20PM +0800, Anand Jain wrote:
>> btrfs/219 is in the auto group so add the _fixed_by_kernel_commit
>> tag for the benifit of the older kernels. The required commit is not yet
>> in the mainline so there is no commit id yet.
>>
>> Signed-off-by: Anand Jain <anand.jain@oracle.com>
>> ---
>>   tests/btrfs/219 | 4 +++-
>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/tests/btrfs/219 b/tests/btrfs/219
>> index 528175b8a4b9..79ba31549268 100755
>> --- a/tests/btrfs/219
>> +++ b/tests/btrfs/219
>> @@ -8,7 +8,7 @@
>>   # to make sure we do not allow stale devices, which can end up with some wonky
>>   # behavior for loop back devices.  This was changed with
>>   #
>> -#   btrfs: allow single disk devices to mount with older generations
>> +#	btrfs: free device in btrfs_close_devices for a single device filesystem
>>   #
>>   # But I've added a few other test cases so it's clear what we expect to happen
>>   # currently.
>> @@ -42,6 +42,8 @@ _supported_fs btrfs
>>   _require_test
>>   _require_loop
>>   _require_btrfs_forget_or_module_loadable
>> +_fixed_by_kernel_commit xxxxxxxxxxxx \
>> +	"btrfs: free device in btrfs_close_devices for a single device filesystem"
> 
> It was just merged ;)
> 
> commit 5f58d783fd7823b2c2d5954d1126e702f94bfc4c
> Author: Anand Jain <anand.jain@oracle.com>
> Date:   Fri Jan 20 21:47:16 2023 +0800
> 
>      btrfs: free device in btrfs_close_devices for a single device filesystem
> 

Ok. I'm updating the commit id.

I am sending v2 just for this path.

Also, I can combine the series into a single patch if you prefer.

Thanks.


> 
>>   
>>   loop_mnt=$TEST_DIR/$seq.mnt
>>   loop_mnt1=$TEST_DIR/$seq.mnt1
>> -- 
>> 2.31.1
>>
> 

[PATCH v2] fstests: btrfs/219, add _fixed_by_kernel_commit

[Anand Jain]

btrfs/219 is in the auto group so add the _fixed_by_kernel_commit
tag for the benifit of the older kernels.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v2: _fixed_by_kernel_commit: Substitute the placeholder with the commit id.

 tests/btrfs/219 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/btrfs/219 b/tests/btrfs/219
index d69e6ac918ae..b747ce34fcc4 100755
--- a/tests/btrfs/219
+++ b/tests/btrfs/219
@@ -6,11 +6,8 @@
 #
 # Test a variety of stale device usecases.  We cache the device and generation
 # to make sure we do not allow stale devices, which can end up with some wonky
-# behavior for loop back devices.  This was changed with
-#
-#   btrfs: allow single disk devices to mount with older generations
-#
-# But I've added a few other test cases so it's clear what we expect to happen
+# behavior for loop back devices.
+# And, added a few other test cases so it's clear what we expect to happen
 # currently.
 #
 
@@ -42,6 +39,8 @@ _supported_fs btrfs
 _require_test
 _require_loop
 _require_btrfs_forget_or_module_loadable
+_fixed_by_kernel_commit 5f58d783fd78 \
+	"btrfs: free device in btrfs_close_devices for a single device filesystem"
 
 loop_mnt=$TEST_DIR/$seq.mnt
 loop_mnt1=$TEST_DIR/$seq.mnt1
-- 
2.38.1

[PATCH 3/3] fstests: btrfs/185, add _fixed_by_kernel_commit

[Anand Jain]

btrfs/185 is in the auto group so add the _fixed_by_kernel_commit
tag for the benifit of the older kernels.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 tests/btrfs/185 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/btrfs/185 b/tests/btrfs/185
index efb10ac72b79..ba0200617e69 100755
--- a/tests/btrfs/185
+++ b/tests/btrfs/185
@@ -27,6 +27,8 @@ _cleanup()
 _supported_fs btrfs
 _require_scratch_dev_pool 2
 _scratch_dev_pool_get 2
+_fixed_by_kernel_commit a9261d4125c9 \
+	"btrfs: harden agaist duplicate fsid on scanned devices"
 
 device_1=$(echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $1}')
 device_2=$(echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $2}')
-- 
2.31.1

[PATCH v3] fstests: btrfs/185, 198 and 219 add _fixed_by_kernel_commit

[Anand Jain]

Recently, these test cases were added to the auto group. To ensure we have
some clues if they fail in older kernels, add "_fixed_by_kernel_commit"
for the fix and update the test summary.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v3: Combine these patches together.
	fstests: btrfs/198, add _fixed_by_kernel_commit
	fstests: btrfs/219, add _fixed_by_kernel_commit
	fstests: btrfs/185, add _fixed_by_kernel_commit
    
v2: btrfs/219: _fixed_by_kernel_commit: Substitute the placeholder with
    the commit id.

 tests/btrfs/185 | 2 ++
 tests/btrfs/198 | 6 +++---
 tests/btrfs/219 | 9 ++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/tests/btrfs/185 b/tests/btrfs/185
index efb10ac72b79..ba0200617e69 100755
--- a/tests/btrfs/185
+++ b/tests/btrfs/185
@@ -27,6 +27,8 @@ _cleanup()
 _supported_fs btrfs
 _require_scratch_dev_pool 2
 _scratch_dev_pool_get 2
+_fixed_by_kernel_commit a9261d4125c9 \
+	"btrfs: harden agaist duplicate fsid on scanned devices"
 
 device_1=$(echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $1}')
 device_2=$(echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $2}')
diff --git a/tests/btrfs/198 b/tests/btrfs/198
index 2b68754ade52..7d23ffcee3c5 100755
--- a/tests/btrfs/198
+++ b/tests/btrfs/198
@@ -4,9 +4,7 @@
 #
 # FS QA Test 198
 #
-# Test stale and alien non-btrfs device in the fs devices list.
-#  Bug fixed in:
-#    btrfs: remove identified alien device in open_fs_devices
+# Test outdated and foreign non-btrfs devices in the device listing.
 #
 . ./common/preamble
 _begin_fstest auto quick volume
@@ -22,6 +20,8 @@ _require_scratch
 _require_scratch_dev_pool 4
 # Zoned btrfs only supports SINGLE profile
 _require_non_zoned_device ${SCRATCH_DEV}
+_fixed_by_kernel_commit 96c2e067ed3e3e \
+	"btrfs: skip devices without magic signature when mounting"
 
 workout()
 {
diff --git a/tests/btrfs/219 b/tests/btrfs/219
index d69e6ac918ae..b747ce34fcc4 100755
--- a/tests/btrfs/219
+++ b/tests/btrfs/219
@@ -6,11 +6,8 @@
 #
 # Test a variety of stale device usecases.  We cache the device and generation
 # to make sure we do not allow stale devices, which can end up with some wonky
-# behavior for loop back devices.  This was changed with
-#
-#   btrfs: allow single disk devices to mount with older generations
-#
-# But I've added a few other test cases so it's clear what we expect to happen
+# behavior for loop back devices.
+# And, added a few other test cases so it's clear what we expect to happen
 # currently.
 #
 
@@ -42,6 +39,8 @@ _supported_fs btrfs
 _require_test
 _require_loop
 _require_btrfs_forget_or_module_loadable
+_fixed_by_kernel_commit 5f58d783fd78 \
+	"btrfs: free device in btrfs_close_devices for a single device filesystem"
 
 loop_mnt=$TEST_DIR/$seq.mnt
 loop_mnt1=$TEST_DIR/$seq.mnt1
-- 
2.38.1

Re: [PATCH v3] fstests: btrfs/185, 198 and 219 add _fixed_by_kernel_commit

[Zorro Lang]

On Wed, Feb 15, 2023 at 03:51:22PM +0800, Anand Jain wrote:
> Recently, these test cases were added to the auto group. To ensure we have
> some clues if they fail in older kernels, add "_fixed_by_kernel_commit"
> for the fix and update the test summary.
> 
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
> ---

Looks good to me,
Reviewed-by: Zorro Lang <zlang@redhat.com>

> v3: Combine these patches together.
> 	fstests: btrfs/198, add _fixed_by_kernel_commit
> 	fstests: btrfs/219, add _fixed_by_kernel_commit
> 	fstests: btrfs/185, add _fixed_by_kernel_commit
>     
> v2: btrfs/219: _fixed_by_kernel_commit: Substitute the placeholder with
>     the commit id.
> 
>  tests/btrfs/185 | 2 ++
>  tests/btrfs/198 | 6 +++---
>  tests/btrfs/219 | 9 ++++-----
>  3 files changed, 9 insertions(+), 8 deletions(-)
> 
> diff --git a/tests/btrfs/185 b/tests/btrfs/185
> index efb10ac72b79..ba0200617e69 100755
> --- a/tests/btrfs/185
> +++ b/tests/btrfs/185
> @@ -27,6 +27,8 @@ _cleanup()
>  _supported_fs btrfs
>  _require_scratch_dev_pool 2
>  _scratch_dev_pool_get 2
> +_fixed_by_kernel_commit a9261d4125c9 \
> +	"btrfs: harden agaist duplicate fsid on scanned devices"
>  
>  device_1=$(echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $1}')
>  device_2=$(echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $2}')
> diff --git a/tests/btrfs/198 b/tests/btrfs/198
> index 2b68754ade52..7d23ffcee3c5 100755
> --- a/tests/btrfs/198
> +++ b/tests/btrfs/198
> @@ -4,9 +4,7 @@
>  #
>  # FS QA Test 198
>  #
> -# Test stale and alien non-btrfs device in the fs devices list.
> -#  Bug fixed in:
> -#    btrfs: remove identified alien device in open_fs_devices
> +# Test outdated and foreign non-btrfs devices in the device listing.
>  #
>  . ./common/preamble
>  _begin_fstest auto quick volume
> @@ -22,6 +20,8 @@ _require_scratch
>  _require_scratch_dev_pool 4
>  # Zoned btrfs only supports SINGLE profile
>  _require_non_zoned_device ${SCRATCH_DEV}
> +_fixed_by_kernel_commit 96c2e067ed3e3e \
> +	"btrfs: skip devices without magic signature when mounting"
>  
>  workout()
>  {
> diff --git a/tests/btrfs/219 b/tests/btrfs/219
> index d69e6ac918ae..b747ce34fcc4 100755
> --- a/tests/btrfs/219
> +++ b/tests/btrfs/219
> @@ -6,11 +6,8 @@
>  #
>  # Test a variety of stale device usecases.  We cache the device and generation
>  # to make sure we do not allow stale devices, which can end up with some wonky
> -# behavior for loop back devices.  This was changed with
> -#
> -#   btrfs: allow single disk devices to mount with older generations
> -#
> -# But I've added a few other test cases so it's clear what we expect to happen
> +# behavior for loop back devices.
> +# And, added a few other test cases so it's clear what we expect to happen
>  # currently.
>  #
>  
> @@ -42,6 +39,8 @@ _supported_fs btrfs
>  _require_test
>  _require_loop
>  _require_btrfs_forget_or_module_loadable
> +_fixed_by_kernel_commit 5f58d783fd78 \
> +	"btrfs: free device in btrfs_close_devices for a single device filesystem"
>  
>  loop_mnt=$TEST_DIR/$seq.mnt
>  loop_mnt1=$TEST_DIR/$seq.mnt1
> -- 
> 2.38.1
>