On Wed, May 08, 2024 at 09:06:27AM -0700, Darrick J. Wong wrote: > On Wed, May 08, 2024 at 08:20:01AM +0530, Ritesh Harjani wrote: > > On Wed, May 8, 2024 at 3:53 AM Darrick J. Wong <djwong@xxxxxxxxxx> wrote: > > > > > > On Mon, May 06, 2024 at 05:01:17PM +0200, Pankaj Raghav (Samsung) wrote: > > > > From: Pankaj Raghav <p.raghav@xxxxxxxxxxx> > > > > > > > > This test fails when xfs is formatted with 64k filesystem block size*. > > > > It fails because the soft quota is not exceeded with the hardcoded 64k > > > > pwrite, thereby, the grace time is not set. Even though soft quota is > > > > set to 12k for uid1, it is rounded up to the nearest blocksize. > > > > > > > > *** Report for user quotas on device /dev/sdb3 > > > > Block grace time: 7days; Inode grace time: 7days > > > > Block limits File limits > > > > User used soft hard grace used soft hard grace > > > > ---------------------------------------------------------------------- > > > > 0 -- 0 0 0 0 3 0 0 0 > > > > 1 -- 64 64 1024 0 1 0 0 0 > > > > 2 -- 64 0 0 0 1 0 0 0 > > > > > > > > Adapt the pwrite to do more than 64k write when the FS blocksize is 64k. > > > > > > > > Cap the blksz to be at least 64k to retain the same behaviour as before > > > > for smaller filesystem blocksizes. > > > > > > > > * This happens even on a 64k pagesize system and it is not related to > > > > LBS effort. > > > > > > > > Signed-off-by: Pankaj Raghav <p.raghav@xxxxxxxxxxx> > > > > --- > > > > tests/xfs/161 | 10 ++++++++-- > > > > 1 file changed, 8 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/tests/xfs/161 b/tests/xfs/161 > > > > index 486fa6ca..94290f18 100755 > > > > --- a/tests/xfs/161 > > > > +++ b/tests/xfs/161 > > > > @@ -38,9 +38,15 @@ _qmount_option "usrquota" > > > > _scratch_xfs_db -c 'version' -c 'sb 0' -c 'p' >> $seqres.full > > > > _scratch_mount >> $seqres.full > > > > > > > > +min_blksz=65536 > > > > +file_blksz=$(_get_file_block_size "$SCRATCH_MNT") > > > > +# Write more than one block to exceed the soft block quota limit. > > > > Maybe we should improve this comment to - > > > > # Write more than the soft block quota limit of 12k which is set later > > via xfs_quota > > # On 64k bs this will get rounded to the nearest blocksize which is 64k > > > > > > +blksz=$(( 2 * $file_blksz)) > > > > + > > > > +blksz=$(( blksz > min_blksz ? blksz : min_blksz )) > > > > > > If we don't set $min_blksize and always write (2 * $file_blksz) does the > > > test still work? > > > > I guess it won't (even for bs=4k), because we set the bsoft=12k via xfs_quota. > > So we have to write more than 12k to trigger the grace timer. > > Ah, ok. Yes, that makes sense with the improved comment. :) @ritesh and @darrick: I think we can also change the bsoft right? In the follow up email [1], I made pwrite to 2 fs block and bsoft to be 1 fsblock. That looks like a cleaner solution than having hardcoded values. Let me know what you all think. [1] https://lore.kernel.org/fstests/20240508105852.nfjtlp53v24xb3tw@quentin/ > > --D > > > -ritesh > > -- Pankaj Raghav
