syscalls/process_madvise01: fix smaps scan and min_swap_avail

smaps matching can prematurely end, because the comparison to "VmFlags" string is not exact. So depending on address on line, it can break before it finds Swap line. This makes the test fail on recent aarch64 kernels. min_swap_avail per documentation is in MB not KB. Signed-off-by: Jan Stancek <[email protected]> Acked-by: Andrea Cervesato <[email protected]>
linux-test-project · Oct 27, 2023 · a3830ba · a3830ba
1 parent 35f77e7
commit a3830ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/testcases/kernel/syscalls/process_madvise/process_madvise.h b/testcases/kernel/syscalls/process_madvise/process_madvise.h
@@ -54,7 +54,7 @@ static inline void read_address_mapping(unsigned long address, struct addr_mappi
 		if (!found)
 			continue;
 
-		if (found && strcmp(line, "VmFlags") >= 0)
+		if (found && strncmp(line, "VmFlags", 7) == 0)
 			break;
 
 		if (sscanf(line, "%31[^:]: %d", label, &value) > 0) {

diff --git a/testcases/kernel/syscalls/process_madvise/process_madvise01.c b/testcases/kernel/syscalls/process_madvise/process_madvise01.c
@@ -123,7 +123,7 @@ static struct tst_test test = {
 	.min_kver = "5.10",
 	.needs_checkpoints = 1,
 	.needs_root = 1,
-	.min_swap_avail = MEM_CHILD / TST_KB,
+	.min_swap_avail = MEM_CHILD / TST_MB,
 	.needs_kconfigs = (const char *[]) {
 		"CONFIG_SWAP=y",
 		NULL