[PATCHSET 0/2] fstests: random fixes

[PATCHSET 0/2] fstests: random fixes

[Darrick J. Wong]

Hi all,

Here's the usual batch of odd fixes for fstests.

If you're going to start using this mess, you probably ought to just
pull from my git trees, which are linked below.

This is an extraordinary way to destroy everything.  Enjoy!
Comments and questions are, as always, welcome.

--D

kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=random-fixes

xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=random-fixes

fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=random-fixes
---
 tests/generic/019 |    4 ++--
 tests/xfs/019     |    3 +--
 tests/xfs/019.out |    2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

[PATCH 1/2] xfs/019: fix golden output for files created in setgid dir

[Darrick J. Wong]

From: Darrick J. Wong <djwong@kernel.org>

A recent change to xfs/019 exposed a long-standing bug in mkfs where
it would always set the gid of a new child created in a setgid directory
to match the gid parent directory instead of what's in the protofile.

Ignoring the user's directions is not the correct behavior, so update
this test to reflect that.  Also don't erase the $seqres.full file,
because that makes forensic analysis pointlessly difficult.

Cc: Catherine Hoang <catherine.hoang@oracle.com>
Fixes: 7834a740 ("xfs/019: extend protofile test")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 tests/xfs/019     |    3 +--
 tests/xfs/019.out |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/tests/xfs/019 b/tests/xfs/019
index 535b7af1..790a6821 100755
--- a/tests/xfs/019
+++ b/tests/xfs/019
@@ -10,6 +10,7 @@
 _begin_fstest mkfs auto quick
 
 seqfull="$seqres.full"
+rm -f $seqfull
 # Import common functions.
 . ./common/filter
 
@@ -97,7 +98,6 @@ _verify_fs()
 	echo "*** create FS version $1"
 	VERSION="-n version=$1"
 
-	rm -f $seqfull
 	_scratch_unmount >/dev/null 2>&1
 
 	_full "mkfs"
@@ -131,6 +131,5 @@ _verify_fs()
 _verify_fs 2
 
 echo "*** done"
-rm $seqfull
 status=0
 exit
diff --git a/tests/xfs/019.out b/tests/xfs/019.out
index 8584f593..9db157f9 100644
--- a/tests/xfs/019.out
+++ b/tests/xfs/019.out
@@ -61,7 +61,7 @@ Device: <DEVICE> Inode: <INODE> Links: 2
 
  File: "./directory_setgid/file_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_5"
  Size: 5 Filetype: Regular File
- Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (2)
+ Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (1)
 Device: <DEVICE> Inode: <INODE> Links: 1 
 
  File: "./pipe"

[PATCH 2/2] generic/019: fix incorrect unset statements

[Darrick J. Wong]

From: Darrick J. Wong <djwong@kernel.org>

Fix incorrect usage of unset -- one passes the name of the variable, not
the *value* contained within it.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 tests/generic/019 |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


diff --git a/tests/generic/019 b/tests/generic/019
index 854ba57d..45c91624 100755
--- a/tests/generic/019
+++ b/tests/generic/019
@@ -140,8 +140,8 @@ _workout()
 	kill $fs_pid &> /dev/null
 	wait $fs_pid
 	wait $fio_pid
-	unset $fs_pid
-	unset $fio_pid
+	unset fs_pid
+	unset fio_pid
 
 	# We expect that broken FS still can be umounted
 	run_check _scratch_unmount

Re: [PATCH 1/2] xfs/019: fix golden output for files created in setgid dir

[Zorro Lang]

On Tue, Apr 19, 2022 at 10:32:00AM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
> 
> A recent change to xfs/019 exposed a long-standing bug in mkfs where
> it would always set the gid of a new child created in a setgid directory
> to match the gid parent directory instead of what's in the protofile.
> 
> Ignoring the user's directions is not the correct behavior, so update
> this test to reflect that.  Also don't erase the $seqres.full file,
> because that makes forensic analysis pointlessly difficult.
> 
> Cc: Catherine Hoang <catherine.hoang@oracle.com>
> Fixes: 7834a740 ("xfs/019: extend protofile test")
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---

After merge this patch, xfs/019 fails on my system. So this test will cover
a new bug of xfsprogs which hasn't been fixed? If so, this change is good to me.
But we'd better to take a look at the patch you used to fix xfsprogs, and make
sure it's reviewed.

Thanks,
Zorro

>  tests/xfs/019     |    3 +--
>  tests/xfs/019.out |    2 +-
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> 
> diff --git a/tests/xfs/019 b/tests/xfs/019
> index 535b7af1..790a6821 100755
> --- a/tests/xfs/019
> +++ b/tests/xfs/019
> @@ -10,6 +10,7 @@
>  _begin_fstest mkfs auto quick
>  
>  seqfull="$seqres.full"
> +rm -f $seqfull
>  # Import common functions.
>  . ./common/filter
>  
> @@ -97,7 +98,6 @@ _verify_fs()
>  	echo "*** create FS version $1"
>  	VERSION="-n version=$1"
>  
> -	rm -f $seqfull
>  	_scratch_unmount >/dev/null 2>&1
>  
>  	_full "mkfs"
> @@ -131,6 +131,5 @@ _verify_fs()
>  _verify_fs 2
>  
>  echo "*** done"
> -rm $seqfull
>  status=0
>  exit
> diff --git a/tests/xfs/019.out b/tests/xfs/019.out
> index 8584f593..9db157f9 100644
> --- a/tests/xfs/019.out
> +++ b/tests/xfs/019.out
> @@ -61,7 +61,7 @@ Device: <DEVICE> Inode: <INODE> Links: 2
>  
>   File: "./directory_setgid/file_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_5"
>   Size: 5 Filetype: Regular File
> - Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (2)
> + Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (1)
>  Device: <DEVICE> Inode: <INODE> Links: 1 
>  
>   File: "./pipe"
> 

Re: [PATCH 2/2] generic/019: fix incorrect unset statements

[Zorro Lang]

On Tue, Apr 19, 2022 at 10:32:06AM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
> 
> Fix incorrect usage of unset -- one passes the name of the variable, not
> the *value* contained within it.
> 
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---

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

>  tests/generic/019 |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> 
> diff --git a/tests/generic/019 b/tests/generic/019
> index 854ba57d..45c91624 100755
> --- a/tests/generic/019
> +++ b/tests/generic/019
> @@ -140,8 +140,8 @@ _workout()
>  	kill $fs_pid &> /dev/null
>  	wait $fs_pid
>  	wait $fio_pid
> -	unset $fs_pid
> -	unset $fio_pid
> +	unset fs_pid
> +	unset fio_pid
>  
>  	# We expect that broken FS still can be umounted
>  	run_check _scratch_unmount
> 

Re: [PATCH 1/2] xfs/019: fix golden output for files created in setgid dir

[Darrick J. Wong]

On Wed, Apr 20, 2022 at 02:33:47AM +0800, Zorro Lang wrote:
> On Tue, Apr 19, 2022 at 10:32:00AM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <djwong@kernel.org>
> > 
> > A recent change to xfs/019 exposed a long-standing bug in mkfs where
> > it would always set the gid of a new child created in a setgid directory
> > to match the gid parent directory instead of what's in the protofile.
> > 
> > Ignoring the user's directions is not the correct behavior, so update
> > this test to reflect that.  Also don't erase the $seqres.full file,
> > because that makes forensic analysis pointlessly difficult.
> > 
> > Cc: Catherine Hoang <catherine.hoang@oracle.com>
> > Fixes: 7834a740 ("xfs/019: extend protofile test")
> > Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> > ---
> 
> After merge this patch, xfs/019 fails on my system. So this test will cover
> a new bug of xfsprogs which hasn't been fixed? If so, this change is good to me.
> But we'd better to take a look at the patch you used to fix xfsprogs, and make
> sure it's reviewed.

Yep.  Already reviewed, just waiting for xfsprogs 5.15.1:

https://lore.kernel.org/linux-xfs/B28D1D24-2E23-4F60-AA50-C199392BBE4F@oracle.com/T/#u

--D

> 
> Thanks,
> Zorro
> 
> >  tests/xfs/019     |    3 +--
> >  tests/xfs/019.out |    2 +-
> >  2 files changed, 2 insertions(+), 3 deletions(-)
> > 
> > 
> > diff --git a/tests/xfs/019 b/tests/xfs/019
> > index 535b7af1..790a6821 100755
> > --- a/tests/xfs/019
> > +++ b/tests/xfs/019
> > @@ -10,6 +10,7 @@
> >  _begin_fstest mkfs auto quick
> >  
> >  seqfull="$seqres.full"
> > +rm -f $seqfull
> >  # Import common functions.
> >  . ./common/filter
> >  
> > @@ -97,7 +98,6 @@ _verify_fs()
> >  	echo "*** create FS version $1"
> >  	VERSION="-n version=$1"
> >  
> > -	rm -f $seqfull
> >  	_scratch_unmount >/dev/null 2>&1
> >  
> >  	_full "mkfs"
> > @@ -131,6 +131,5 @@ _verify_fs()
> >  _verify_fs 2
> >  
> >  echo "*** done"
> > -rm $seqfull
> >  status=0
> >  exit
> > diff --git a/tests/xfs/019.out b/tests/xfs/019.out
> > index 8584f593..9db157f9 100644
> > --- a/tests/xfs/019.out
> > +++ b/tests/xfs/019.out
> > @@ -61,7 +61,7 @@ Device: <DEVICE> Inode: <INODE> Links: 2
> >  
> >   File: "./directory_setgid/file_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_5"
> >   Size: 5 Filetype: Regular File
> > - Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (2)
> > + Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (1)
> >  Device: <DEVICE> Inode: <INODE> Links: 1 
> >  
> >   File: "./pipe"
> > 
> 

Re: [PATCH 1/2] xfs/019: fix golden output for files created in setgid dir

[Zorro Lang]

On Tue, Apr 19, 2022 at 11:38:55AM -0700, Darrick J. Wong wrote:
> On Wed, Apr 20, 2022 at 02:33:47AM +0800, Zorro Lang wrote:
> > On Tue, Apr 19, 2022 at 10:32:00AM -0700, Darrick J. Wong wrote:
> > > From: Darrick J. Wong <djwong@kernel.org>
> > > 
> > > A recent change to xfs/019 exposed a long-standing bug in mkfs where
> > > it would always set the gid of a new child created in a setgid directory
> > > to match the gid parent directory instead of what's in the protofile.
> > > 
> > > Ignoring the user's directions is not the correct behavior, so update
> > > this test to reflect that.  Also don't erase the $seqres.full file,
> > > because that makes forensic analysis pointlessly difficult.
> > > 
> > > Cc: Catherine Hoang <catherine.hoang@oracle.com>
> > > Fixes: 7834a740 ("xfs/019: extend protofile test")
> > > Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> > > ---
> > 
> > After merge this patch, xfs/019 fails on my system. So this test will cover
> > a new bug of xfsprogs which hasn't been fixed? If so, this change is good to me.
> > But we'd better to take a look at the patch you used to fix xfsprogs, and make
> > sure it's reviewed.
> 
> Yep.  Already reviewed, just waiting for xfsprogs 5.15.1:
> 
> https://lore.kernel.org/linux-xfs/B28D1D24-2E23-4F60-AA50-C199392BBE4F@oracle.com/T/#u

Thanks for this information, it makes sense to me.

Reviewed-by: Zorro Lang <zlang@redhat.com>

> 
> --D
> 
> > 
> > Thanks,
> > Zorro
> > 
> > >  tests/xfs/019     |    3 +--
> > >  tests/xfs/019.out |    2 +-
> > >  2 files changed, 2 insertions(+), 3 deletions(-)
> > > 
> > > 
> > > diff --git a/tests/xfs/019 b/tests/xfs/019
> > > index 535b7af1..790a6821 100755
> > > --- a/tests/xfs/019
> > > +++ b/tests/xfs/019
> > > @@ -10,6 +10,7 @@
> > >  _begin_fstest mkfs auto quick
> > >  
> > >  seqfull="$seqres.full"
> > > +rm -f $seqfull
> > >  # Import common functions.
> > >  . ./common/filter
> > >  
> > > @@ -97,7 +98,6 @@ _verify_fs()
> > >  	echo "*** create FS version $1"
> > >  	VERSION="-n version=$1"
> > >  
> > > -	rm -f $seqfull
> > >  	_scratch_unmount >/dev/null 2>&1
> > >  
> > >  	_full "mkfs"
> > > @@ -131,6 +131,5 @@ _verify_fs()
> > >  _verify_fs 2
> > >  
> > >  echo "*** done"
> > > -rm $seqfull
> > >  status=0
> > >  exit
> > > diff --git a/tests/xfs/019.out b/tests/xfs/019.out
> > > index 8584f593..9db157f9 100644
> > > --- a/tests/xfs/019.out
> > > +++ b/tests/xfs/019.out
> > > @@ -61,7 +61,7 @@ Device: <DEVICE> Inode: <INODE> Links: 2
> > >  
> > >   File: "./directory_setgid/file_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_5"
> > >   Size: 5 Filetype: Regular File
> > > - Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (2)
> > > + Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (1)
> > >  Device: <DEVICE> Inode: <INODE> Links: 1 
> > >  
> > >   File: "./pipe"
> > > 
> > 
> 

Re: [PATCH 1/2] xfs/019: fix golden output for files created in setgid dir

[Catherine Hoang]

> On Apr 19, 2022, at 10:32 AM, Darrick J. Wong <djwong@kernel.org> wrote:
> 
> From: Darrick J. Wong <djwong@kernel.org>
> 
> A recent change to xfs/019 exposed a long-standing bug in mkfs where
> it would always set the gid of a new child created in a setgid directory
> to match the gid parent directory instead of what's in the protofile.
> 
> Ignoring the user's directions is not the correct behavior, so update
> this test to reflect that.  Also don't erase the $seqres.full file,
> because that makes forensic analysis pointlessly difficult.

Looks good
Reviewed-by: Catherine Hoang <catherine.hoang@oracle.com>
> 
> Cc: Catherine Hoang <catherine.hoang@oracle.com>
> Fixes: 7834a740 ("xfs/019: extend protofile test")
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---
> tests/xfs/019     |    3 +--
> tests/xfs/019.out |    2 +-
> 2 files changed, 2 insertions(+), 3 deletions(-)
> 
> 
> diff --git a/tests/xfs/019 b/tests/xfs/019
> index 535b7af1..790a6821 100755
> --- a/tests/xfs/019
> +++ b/tests/xfs/019
> @@ -10,6 +10,7 @@
> _begin_fstest mkfs auto quick
> 
> seqfull="$seqres.full"
> +rm -f $seqfull
> # Import common functions.
> . ./common/filter
> 
> @@ -97,7 +98,6 @@ _verify_fs()
> 	echo "*** create FS version $1"
> 	VERSION="-n version=$1"
> 
> -	rm -f $seqfull
> 	_scratch_unmount >/dev/null 2>&1
> 
> 	_full "mkfs"
> @@ -131,6 +131,5 @@ _verify_fs()
> _verify_fs 2
> 
> echo "*** done"
> -rm $seqfull
> status=0
> exit
> diff --git a/tests/xfs/019.out b/tests/xfs/019.out
> index 8584f593..9db157f9 100644
> --- a/tests/xfs/019.out
> +++ b/tests/xfs/019.out
> @@ -61,7 +61,7 @@ Device: <DEVICE> Inode: <INODE> Links: 2
> 
>  File: "./directory_setgid/file_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_5"
>  Size: 5 Filetype: Regular File
> - Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (2)
> + Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (1)
> Device: <DEVICE> Inode: <INODE> Links: 1 
> 
>  File: "./pipe"
> 

[PATCHSET 0/2] fstests: random fixes

[Darrick J. Wong]

Hi all,

Here's the usual batch of odd fixes for fstests.

If you're going to start using this mess, you probably ought to just
pull from my git trees, which are linked below.

This is an extraordinary way to destroy everything.  Enjoy!
Comments and questions are, as always, welcome.

--D

kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=random-fixes

xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=random-fixes

fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=random-fixes
---
 tests/xfs/187 |    2 +-
 tests/xfs/507 |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

[PATCHSET 0/2] fstests: random fixes

[Darrick J. Wong]

Hi all,

This week I have two random fixes:

The first update removes xfs_check from the default test configuration,
as I have finally completed my quest to make sure that xfs_repair (5.13)
catches all the corruption errors that xfs_check does.  Since xfs_check
has a tendency to OOM, let's remove the redundant code to save everyone
some run time.

The other is an update to the swapfile corruption test to add the commit
id for the kernel fix and fix some problems on arm64.

If you're going to start using this mess, you probably ought to just
pull from my git trees, which are linked below.

This is an extraordinary way to destroy everything.  Enjoy!
Comments and questions are, as always, welcome.

--D

kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=random-fixes

xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=random-fixes

fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=random-fixes
---
 README                |    4 ++++
 common/xfs            |   12 ++++++++----
 tests/generic/643     |   33 ++++++++++++++++++++++-----------
 tests/generic/643.out |    2 +-
 4 files changed, 35 insertions(+), 16 deletions(-)

[PATCHSET 0/2] fstests: random fixes

[Darrick J. Wong]

Hi all,

Here are the usual weekly fixes for fstests.

If you're going to start using this mess, you probably ought to just
pull from my git trees, which are linked below.

This is an extraordinary way to destroy everything.  Enjoy!
Comments and questions are, as always, welcome.

--D

kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=random-fixes

xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=random-fixes

fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=random-fixes
---
 common/scsi_debug |    4 ++--
 tests/xfs/176     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

[PATCHSET 0/2] fstests: random fixes

[Darrick J. Wong]

Hi all,

This branch contains fixes to various tests to fix miscellaneous test
bugs and unnecessary regressions when XFS is configured with somewhat
unusual configurations (e.g. external logs, and realtime devices).

If you're going to start using this mess, you probably ought to just
pull from my git trees, which are linked below.

This is an extraordinary way to destroy everything.  Enjoy!
Comments and questions are, as always, welcome.

--D

kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=random-fixes

xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=random-fixes

fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=random-fixes
---
 common/dmthin     |    9 ++++++++-
 tests/generic/223 |    5 +++++
 tests/generic/347 |    2 +-
 tests/generic/500 |    2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)