diff mbox series

[1/1] zram01.sh: Fix minimal size for XFS on kernel 5.19

Message ID 20220929192047.22125-1-pvorel@suse.cz
State Changes Requested
Headers show
Series [1/1] zram01.sh: Fix minimal size for XFS on kernel 5.19 | expand

Commit Message

Petr Vorel Sept. 29, 2022, 7:20 p.m. UTC
mkfs.xfs for kernel 5.19 bumps minimum filesystems 300 MB. Due this we
already updated minimal filesystem size for all_filesystems /
$TST_ALL_FILESYSTEMS in 66e05c841. But zram01.sh does not use the API,
thus update it now.

Check for RAM size was added for f18c8fd3a for Btrfs on ppc64le due to
larger page size. Hopefully this is not needed.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Hi Cyril, Li,

sorry for putting this patch so late (tomorrow we want to release LTP).
Not really sure if RAM check is needed for XFS on ppc64le, any idea?

Kind regards,
Petr

 testcases/kernel/device-drivers/zram/zram01.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Cyril Hrubis Sept. 30, 2022, 9:04 a.m. UTC | #1
Hi!
> mkfs.xfs for kernel 5.19 bumps minimum filesystems 300 MB. Due this we
> already updated minimal filesystem size for all_filesystems /
> $TST_ALL_FILESYSTEMS in 66e05c841. But zram01.sh does not use the API,
> thus update it now.
> 
> Check for RAM size was added for f18c8fd3a for Btrfs on ppc64le due to
> larger page size. Hopefully this is not needed.

Looks to me like that check is there to make sure we have enough RAM to
run the system and create the filesystem at the same time.

It does check if we have more than 1G of memory, which seems sensible
if we are going to allocate ~300MB for a RAM based filesystem.

I would say that we should really do the same for xfs, i.e. rename the
check_space_for_brtfs to check_space_for_fs and pass the fs in the first
argument so that it can appear in the tst_res message.
Petr Vorel Sept. 30, 2022, 9:04 a.m. UTC | #2
> Hi!
> > mkfs.xfs for kernel 5.19 bumps minimum filesystems 300 MB. Due this we
> > already updated minimal filesystem size for all_filesystems /
> > $TST_ALL_FILESYSTEMS in 66e05c841. But zram01.sh does not use the API,
> > thus update it now.

> > Check for RAM size was added for f18c8fd3a for Btrfs on ppc64le due to
> > larger page size. Hopefully this is not needed.

> Looks to me like that check is there to make sure we have enough RAM to
> run the system and create the filesystem at the same time.

> It does check if we have more than 1G of memory, which seems sensible
> if we are going to allocate ~300MB for a RAM based filesystem.

> I would say that we should really do the same for xfs, i.e. rename the
> check_space_for_brtfs to check_space_for_fs and pass the fs in the first
> argument so that it can appear in the tst_res message.

I understood the concern, just wasn't sure if it were Btrfs specific.
Makes sense to use this for XFS, I'll send v2 shortly.

Kind regards,
Petr
Petr Vorel Sept. 30, 2022, 9:06 a.m. UTC | #3
> Hi!
> > mkfs.xfs for kernel 5.19 bumps minimum filesystems 300 MB. Due this we
> > already updated minimal filesystem size for all_filesystems /
> > $TST_ALL_FILESYSTEMS in 66e05c841. But zram01.sh does not use the API,
> > thus update it now.

> > Check for RAM size was added for f18c8fd3a for Btrfs on ppc64le due to
> > larger page size. Hopefully this is not needed.

> Looks to me like that check is there to make sure we have enough RAM to
> run the system and create the filesystem at the same time.

> It does check if we have more than 1G of memory, which seems sensible
> if we are going to allocate ~300MB for a RAM based filesystem.

> I would say that we should really do the same for xfs, i.e. rename the
> check_space_for_brtfs to check_space_for_fs and pass the fs in the first
> argument so that it can appear in the tst_res message.
BTW I even had originally this version prepared, thus this v1 is wrong due this
left over:

-                       check_space_for_btrfs || continue
+                       check_space_for_btrfs "$fs" || continue

Kind regards,
Petr
diff mbox series

Patch

diff --git a/testcases/kernel/device-drivers/zram/zram01.sh b/testcases/kernel/device-drivers/zram/zram01.sh
index 8b92b699f..d126663b6 100755
--- a/testcases/kernel/device-drivers/zram/zram01.sh
+++ b/testcases/kernel/device-drivers/zram/zram01.sh
@@ -41,10 +41,14 @@  initialize_vars()
 	for fs in $(tst_supported_fs -s tmpfs); do
 		size="26214400"
 		limit="25M"
+
 		if [ "$fs" = "btrfs" ]; then
-			check_space_for_btrfs || continue
+			check_space_for_btrfs "$fs" || continue
 			size="402653184"
 			limit="$((size/1024/1024))M"
+		elif [ "$fs" = "xfs" ]; then
+			size=314572800
+			limit="$((size/1024/1024))M"
 		fi
 
 		stream=$((stream+3))