* [LTP] [PATCH v3 2/7] libltpswap: alter tst_count_swaps api
2024-02-08 10:05 [LTP] [PATCH v3 1/7] libltpswap: Add tst_max_swapfiles api Yang Xu via ltp
@ 2024-02-08 10:05 ` Yang Xu via ltp
2024-02-08 10:05 ` [LTP] [PATCH v3 3/7] syscalls/swapon03: use tst_max_swapfiles() and GET_USED_SWAPFILES() api Yang Xu via ltp
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Yang Xu via ltp @ 2024-02-08 10:05 UTC (permalink / raw)
To: ltp
Like we count the ipc resource total, we can also add a
similar api for swapfiles, so we can use it for swapon03 case.
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
include/libswap.h | 5 +++++
libs/libltpswap/libswap.c | 27 +++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/include/libswap.h b/include/libswap.h
index 361d73175..76a3ed0c0 100644
--- a/include/libswap.h
+++ b/include/libswap.h
@@ -27,4 +27,9 @@ bool is_swap_supported(const char *filename);
*/
int tst_max_swapfiles(void);
+/*
+ * Get the used swapfiles number
+ */
+int tst_count_swaps(void);
+
#endif /* __LIBSWAP_H__ */
diff --git a/libs/libltpswap/libswap.c b/libs/libltpswap/libswap.c
index 69273fb33..fa0d42543 100644
--- a/libs/libltpswap/libswap.c
+++ b/libs/libltpswap/libswap.c
@@ -261,3 +261,30 @@ int tst_max_swapfiles(void)
return max_swapfile - swp_migration_num - swp_hwpoison_num - swp_device_num - swp_pte_marker_num;
}
+
+/*
+ * Get the used swapfiles number
+ */
+int tst_count_swaps(void)
+{
+ FILE *fp;
+ int used = -1;
+ char c;
+
+ fp = fopen("/proc/swaps", "r");
+ if (fp == NULL) {
+ return -1;
+ }
+
+ while ((c = fgetc(fp)) != EOF) {
+ if (c == '\n')
+ used++;
+ }
+
+ fclose(fp);
+ if (used < 0) {
+ tst_brk(TBROK, "can't read /proc/swaps to get used swapfiles resource total ");
+ }
+
+ return used;
+}
--
2.39.3
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 10+ messages in thread* [LTP] [PATCH v3 3/7] syscalls/swapon03: use tst_max_swapfiles() and GET_USED_SWAPFILES() api
2024-02-08 10:05 [LTP] [PATCH v3 1/7] libltpswap: Add tst_max_swapfiles api Yang Xu via ltp
2024-02-08 10:05 ` [LTP] [PATCH v3 2/7] libltpswap: alter tst_count_swaps api Yang Xu via ltp
@ 2024-02-08 10:05 ` Yang Xu via ltp
2024-02-09 23:05 ` Petr Vorel
2024-02-08 10:05 ` [LTP] [PATCH v3 4/7] swaponoff.h: Remove useless header Yang Xu via ltp
` (3 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Yang Xu via ltp @ 2024-02-08 10:05 UTC (permalink / raw)
To: ltp
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
testcases/kernel/syscalls/swapon/swapon03.c | 43 +++++----------------
1 file changed, 9 insertions(+), 34 deletions(-)
diff --git a/testcases/kernel/syscalls/swapon/swapon03.c b/testcases/kernel/syscalls/swapon/swapon03.c
index 05fe2045f..e27d954a1 100644
--- a/testcases/kernel/syscalls/swapon/swapon03.c
+++ b/testcases/kernel/syscalls/swapon/swapon03.c
@@ -19,7 +19,6 @@
#include "tst_test.h"
#include "lapi/syscalls.h"
-#include "swaponoff.h"
#include "libswap.h"
#define MNTPOINT "mntpoint"
@@ -105,47 +104,20 @@ static void verify_swapon(void)
static int setup_swap(void)
{
pid_t pid;
- int j, fd;
int status;
+ int j, max_swapfiles, used_swapfiles;
int res = 0;
char filename[FILENAME_MAX];
- char buf[BUFSIZ + 1];
-
- /* Find out how many swapfiles (1 line per entry) already exist */
- swapfiles = 0;
if (seteuid(0) < 0)
tst_brk(TFAIL | TERRNO, "Failed to call seteuid");
- /* This includes the first (header) line */
- if ((fd = open("/proc/swaps", O_RDONLY)) == -1) {
- tst_brk(TFAIL | TERRNO,
- "Failed to find out existing number of swap files");
- }
- do {
- char *p = buf;
- res = read(fd, buf, BUFSIZ);
- if (res < 0) {
- tst_brk(TFAIL | TERRNO,
- "Failed to find out existing number of swap files");
- }
- buf[res] = '\0';
- while ((p = strchr(p, '\n'))) {
- p++;
- swapfiles++;
- }
- } while (BUFSIZ <= res);
- close(fd);
- if (swapfiles)
- swapfiles--; /* don't count the /proc/swaps header */
-
- if (swapfiles < 0)
- tst_brk(TFAIL, "Failed to find existing number of swapfiles");
-
/* Determine how many more files are to be created */
- swapfiles = MAX_SWAPFILES - swapfiles;
- if (swapfiles > MAX_SWAPFILES)
- swapfiles = MAX_SWAPFILES;
+ max_swapfiles = tst_max_swapfiles();
+ used_swapfiles = tst_count_swaps();
+ swapfiles = max_swapfiles - used_swapfiles;
+ if (swapfiles > max_swapfiles)
+ swapfiles = max_swapfiles;
pid = SAFE_FORK();
if (pid == 0) {
/*create and turn on remaining swapfiles */
@@ -260,6 +232,9 @@ static void setup(void)
if (access("/proc/swaps", F_OK))
tst_brk(TCONF, "swap not supported by kernel");
+ if (tst_fs_type(".") == TST_TMPFS_MAGIC)
+ tst_brk(TCONF, "swap not supported on tmpfs");
+
is_swap_supported(TEST_FILE);
}
--
2.39.3
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 10+ messages in thread* [LTP] [PATCH v3 4/7] swaponoff.h: Remove useless header
2024-02-08 10:05 [LTP] [PATCH v3 1/7] libltpswap: Add tst_max_swapfiles api Yang Xu via ltp
2024-02-08 10:05 ` [LTP] [PATCH v3 2/7] libltpswap: alter tst_count_swaps api Yang Xu via ltp
2024-02-08 10:05 ` [LTP] [PATCH v3 3/7] syscalls/swapon03: use tst_max_swapfiles() and GET_USED_SWAPFILES() api Yang Xu via ltp
@ 2024-02-08 10:05 ` Yang Xu via ltp
2024-02-08 10:05 ` [LTP] [PATCH v3 5/7] swapon/Makefile: Remove useless section for MAX_SWAPFILES Yang Xu via ltp
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Yang Xu via ltp @ 2024-02-08 10:05 UTC (permalink / raw)
To: ltp
Since we have use tst_max_swapfiles() api in swapon03.c, so this header
is useless and can be removed safely.
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
testcases/kernel/syscalls/swapon/swaponoff.h | 8 --------
1 file changed, 8 deletions(-)
delete mode 100644 testcases/kernel/syscalls/swapon/swaponoff.h
diff --git a/testcases/kernel/syscalls/swapon/swaponoff.h b/testcases/kernel/syscalls/swapon/swaponoff.h
deleted file mode 100644
index 900761bda..000000000
--- a/testcases/kernel/syscalls/swapon/swaponoff.h
+++ /dev/null
@@ -1,8 +0,0 @@
-
-#ifndef __SWAP_ON_OFF_H_
-#define __SWAP_ON_OFF_H_
-
-#include <linux/version.h>
-#define MAX_SWAPFILES 30
-
-#endif
--
2.39.3
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 10+ messages in thread* [LTP] [PATCH v3 5/7] swapon/Makefile: Remove useless section for MAX_SWAPFILES
2024-02-08 10:05 [LTP] [PATCH v3 1/7] libltpswap: Add tst_max_swapfiles api Yang Xu via ltp
` (2 preceding siblings ...)
2024-02-08 10:05 ` [LTP] [PATCH v3 4/7] swaponoff.h: Remove useless header Yang Xu via ltp
@ 2024-02-08 10:05 ` Yang Xu via ltp
2024-02-08 10:05 ` [LTP] [PATCH v3 6/7] syscalls/swapon03: Simply this case Yang Xu via ltp
2024-02-08 10:05 ` [LTP] [PATCH v3 7/7] Add fallback for RHEL9 Yang Xu via ltp
5 siblings, 0 replies; 10+ messages in thread
From: Yang Xu via ltp @ 2024-02-08 10:05 UTC (permalink / raw)
To: ltp
It seems this section doesn't affect anything, btw it is useless,
so remove it.
Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
testcases/kernel/syscalls/swapon/Makefile | 5 -----
1 file changed, 5 deletions(-)
diff --git a/testcases/kernel/syscalls/swapon/Makefile b/testcases/kernel/syscalls/swapon/Makefile
index 53c795090..6954112a8 100644
--- a/testcases/kernel/syscalls/swapon/Makefile
+++ b/testcases/kernel/syscalls/swapon/Makefile
@@ -1,11 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (c) International Business Machines Corp., 2001
-NEEDSPECIAL := $(shell echo MAX_SWAPFILES | $(CC) -E -xc -include linux/swap.h 2>/dev/null - | tail -n 1 | grep 32; echo $?)
-ifneq ($(strip $(NEEDSPECIAL)),)
-export CFLAGS += -DOLDER_DISTRO_RELEASE
-endif
-
top_srcdir ?= ../../../..
LTPLIBS = ltpswap
--
2.39.3
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 10+ messages in thread* [LTP] [PATCH v3 6/7] syscalls/swapon03: Simply this case
2024-02-08 10:05 [LTP] [PATCH v3 1/7] libltpswap: Add tst_max_swapfiles api Yang Xu via ltp
` (3 preceding siblings ...)
2024-02-08 10:05 ` [LTP] [PATCH v3 5/7] swapon/Makefile: Remove useless section for MAX_SWAPFILES Yang Xu via ltp
@ 2024-02-08 10:05 ` Yang Xu via ltp
2024-02-09 22:45 ` Petr Vorel
2024-02-08 10:05 ` [LTP] [PATCH v3 7/7] Add fallback for RHEL9 Yang Xu via ltp
5 siblings, 1 reply; 10+ messages in thread
From: Yang Xu via ltp @ 2024-02-08 10:05 UTC (permalink / raw)
To: ltp
By moving swapfile create stage from verify_swaopon and
test EPERM error more accurate. Also use glibc wrapper by
using swapon/swapoff instead of call syscall number directly
because glibc/musl/binoic also support them since long time ago.
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
testcases/kernel/syscalls/swapon/swapon03.c | 170 +++++---------------
1 file changed, 43 insertions(+), 127 deletions(-)
diff --git a/testcases/kernel/syscalls/swapon/swapon03.c b/testcases/kernel/syscalls/swapon/swapon03.c
index e27d954a1..5ba7971e7 100644
--- a/testcases/kernel/syscalls/swapon/swapon03.c
+++ b/testcases/kernel/syscalls/swapon/swapon03.c
@@ -16,7 +16,7 @@
#include <errno.h>
#include <stdlib.h>
#include <sys/wait.h>
-
+#include <sys/swap.h>
#include "tst_test.h"
#include "lapi/syscalls.h"
#include "libswap.h"
@@ -24,89 +24,13 @@
#define MNTPOINT "mntpoint"
#define TEST_FILE MNTPOINT"/testswap"
-static int setup_swap(void);
-static int clean_swap(void);
-static int check_and_swapoff(const char *filename);
-
static int swapfiles;
-int testfiles = 3;
-static struct swap_testfile_t {
- char *filename;
-} swap_testfiles[] = {
- {"firstswapfile"},
- {"secondswapfile"},
- {"thirdswapfile"}
-};
-
-int expected_errno = EPERM;
-
-static void verify_swapon(void)
-{
- if (setup_swap() < 0) {
- clean_swap();
- tst_brk(TBROK, "Setup failed, quitting the test");
- }
-
- TEST(tst_syscall(__NR_swapon, swap_testfiles[0].filename, 0));
-
- if ((TST_RET == -1) && (TST_ERR == expected_errno)) {
- tst_res(TPASS, "swapon(2) got expected failure (%d),",
- expected_errno);
- } else if (TST_RET < 0) {
- tst_res(TFAIL | TTERRNO,
- "swapon(2) failed to produce expected error "
- "(%d). System reboot recommended.",
- expected_errno);
- } else {
- /*
- * Probably the system supports MAX_SWAPFILES > 30, let's try with
- * MAX_SWAPFILES == 32. Call swapon sys call once again for 32
- * now we can't receive an error.
- */
- TEST(tst_syscall(__NR_swapon, swap_testfiles[1].filename, 0));
-
- /* Check return code (now we're expecting success) */
- if (TST_RET < 0) {
- tst_res(TFAIL | TTERRNO,
- "swapon(2) got an unexpected failure");
- } else {
- /*
- * Call swapon sys call once again for 33 now we have to receive an error.
- */
- TEST(tst_syscall(__NR_swapon, swap_testfiles[2].filename, 0));
-
- /* Check return code (should be an error) */
- if ((TST_RET == -1) && (TST_ERR == expected_errno)) {
- tst_res(TPASS,
- "swapon(2) got expected failure;"
- " Got errno = %d, probably your"
- " MAX_SWAPFILES is 32",
- expected_errno);
- } else {
- tst_res(TFAIL,
- "swapon(2) failed to produce"
- " expected error: %d, got %s."
- " System reboot after execution of LTP"
- " test suite is recommended.",
- expected_errno, strerror(TST_ERR));
- }
- }
- }
-
- if (clean_swap() < 0)
- tst_brk(TBROK, "Cleanup failed, quitting the test");
-}
-
-/*
- * Create 33 and activate 30 swapfiles.
- */
static int setup_swap(void)
{
pid_t pid;
int status;
int j, max_swapfiles, used_swapfiles;
- int res = 0;
char filename[FILENAME_MAX];
if (seteuid(0) < 0)
@@ -134,16 +58,7 @@ static int setup_swap(void)
make_swapfile(filename, 10, 0);
/* turn on the swap file */
- res = tst_syscall(__NR_swapon, filename, 0);
- if (res != 0) {
- if (errno == EPERM) {
- printf("Successfully created %d swapfiles\n", j);
- break;
- } else {
- printf("Failed to create swapfile: %s\n", filename);
- exit(1);
- }
- }
+ TST_EXP_PASS_SILENT(swapon(filename, 0));
}
exit(0);
} else
@@ -152,13 +67,41 @@ static int setup_swap(void)
if (WEXITSTATUS(status))
tst_brk(TFAIL, "Failed to setup swaps");
- /* Create all needed extra swapfiles for testing */
- for (j = 0; j < testfiles; j++)
- make_swapfile(swap_testfiles[j].filename, 10, 0);
+ tst_res(TINFO, "Successfully created %d swapfiles", swapfiles);
+ make_swapfile(TEST_FILE, 10, 0);
return 0;
}
+/*
+ * Check if the file is at /proc/swaps and remove it giving swapoff
+ */
+static int check_and_swapoff(const char *filename)
+{
+ char cmd_buffer[256];
+ int rc = -1;
+
+ if (snprintf(cmd_buffer, sizeof(cmd_buffer),
+ "grep -q '%s.*file' /proc/swaps", filename) < 0) {
+ tst_res(TWARN, "sprintf() failed to create the command string");
+ } else {
+ rc = 0;
+ if (system(cmd_buffer) == 0) {
+ /* now we need to swapoff the file */
+ if (swapoff(filename) != 0) {
+ tst_res(TWARN, "Failed to turn off swap "
+ "file. system reboot after "
+ "execution of LTP test suite "
+ "is recommended");
+ rc = -1;
+ }
+
+ }
+ }
+
+ return rc;
+}
+
/*
* Turn off all swapfiles previously turned on
*/
@@ -182,49 +125,17 @@ static int clean_swap(void)
}
}
- for (j = 0; j < testfiles; j++) {
- if (check_and_swapoff(swap_testfiles[j].filename) != 0) {
- tst_res(TWARN, "Failed to turn off swap file %s.",
- swap_testfiles[j].filename);
- return -1;
- }
+ if (check_and_swapoff("testfile") != 0) {
+ tst_res(TWARN, "Failed to turn off swap file testfile");
+ return -1;
}
return 0;
}
-/*
- * Check if the file is at /proc/swaps and remove it giving swapoff
- */
-static int check_and_swapoff(const char *filename)
+static void verify_swapon(void)
{
- char cmd_buffer[256];
- int rc = -1;
-
- if (snprintf(cmd_buffer, sizeof(cmd_buffer),
- "grep -q '%s.*file' /proc/swaps", filename) < 0) {
- tst_res(TWARN, "sprintf() failed to create the command string");
- } else {
-
- rc = 0;
-
- if (system(cmd_buffer) == 0) {
-
- /* now we need to swapoff the file */
- if (tst_syscall(__NR_swapoff, filename) != 0) {
-
- tst_res(TWARN, "Failed to turn off swap "
- "file. system reboot after "
- "execution of LTP test suite "
- "is recommended");
- rc = -1;
-
- }
-
- }
- }
-
- return rc;
+ TST_EXP_FAIL(swapon(TEST_FILE, 0), EPERM, "swapon(%s, 0)", TEST_FILE);
}
static void setup(void)
@@ -236,6 +147,11 @@ static void setup(void)
tst_brk(TCONF, "swap not supported on tmpfs");
is_swap_supported(TEST_FILE);
+
+ if (setup_swap() < 0) {
+ clean_swap();
+ tst_brk(TBROK, "Setup failed, quitting the test");
+ }
}
static void cleanup(void)
--
2.39.3
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [LTP] [PATCH v3 6/7] syscalls/swapon03: Simply this case
2024-02-08 10:05 ` [LTP] [PATCH v3 6/7] syscalls/swapon03: Simply this case Yang Xu via ltp
@ 2024-02-09 22:45 ` Petr Vorel
2024-02-09 23:02 ` Petr Vorel
0 siblings, 1 reply; 10+ messages in thread
From: Petr Vorel @ 2024-02-09 22:45 UTC (permalink / raw)
To: Yang Xu; +Cc: ltp
Hi Yang Xu,
This fails on TMPDIR on btrfs on all tested filesystems:
...
swapon03.c:61: TFAIL: swapon(filename, 0) failed: EPERM (1)
swapon03.c:70: TINFO: Successfully created 23 swapfiles
swapon03.c:138: TPASS: swapon(mntpoint/testswap, 0) : EPERM (1)
...
Summary:
passed 8
failed 8
broken 0
skipped 2
warnings 0
Kind regards,
Petr
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [LTP] [PATCH v3 6/7] syscalls/swapon03: Simply this case
2024-02-09 22:45 ` Petr Vorel
@ 2024-02-09 23:02 ` Petr Vorel
0 siblings, 0 replies; 10+ messages in thread
From: Petr Vorel @ 2024-02-09 23:02 UTC (permalink / raw)
To: Yang Xu, ltp
Hi Yang Xu,
> Hi Yang Xu,
> This fails on TMPDIR on btrfs on all tested filesystems:
s/btrfs/tmpfs/ (I'm sorry for a confusion)
> ...
> swapon03.c:61: TFAIL: swapon(filename, 0) failed: EPERM (1)
> swapon03.c:70: TINFO: Successfully created 23 swapfiles
> swapon03.c:138: TPASS: swapon(mntpoint/testswap, 0) : EPERM (1)
I'm sorry, I was wrong. The failure is on master, your patchset actually fix
this on TMPDIR tmpfs:
tst_supported_fs_types.c:49: TINFO: mkfs is not needed for tmpfs
tst_test.c:1701: TINFO: === Testing on ext2 ===
tst_test.c:1117: TINFO: Formatting /dev/loop0 with ext2 opts='' extra opts=''
mke2fs 1.47.0 (5-Feb-2023)
tst_test.c:1131: TINFO: Mounting /dev/loop0 to /tmp/LTP_swaGbGeNL/mntpoint fstyp=ext2 flags=0
swapon03.c:147: TCONF: swap not supported on tmpfs
tst_test.c:1701: TINFO: === Testing on ext3 ===
tst_test.c:1117: TINFO: Formatting /dev/loop0 with ext3 opts='' extra opts=''
mke2fs 1.47.0 (5-Feb-2023)
tst_test.c:1131: TINFO: Mounting /dev/loop0 to /tmp/LTP_swaGbGeNL/mntpoint fstyp=ext3 flags=0
swapon03.c:147: TCONF: swap not supported on tmpfs
tst_test.c:1701: TINFO: === Testing on ext4 ===
tst_test.c:1117: TINFO: Formatting /dev/loop0 with ext4 opts='' extra opts=''
mke2fs 1.47.0 (5-Feb-2023)
tst_test.c:1131: TINFO: Mounting /dev/loop0 to /tmp/LTP_swaGbGeNL/mntpoint fstyp=ext4 flags=0
swapon03.c:147: TCONF: swap not supported on tmpfs
tst_test.c:1701: TINFO: === Testing on xfs ===
tst_test.c:1117: TINFO: Formatting /dev/loop0 with xfs opts='' extra opts=''
tst_test.c:1131: TINFO: Mounting /dev/loop0 to /tmp/LTP_swaGbGeNL/mntpoint fstyp=xfs flags=0
swapon03.c:147: TCONF: swap not supported on tmpfs
tst_test.c:1701: TINFO: === Testing on btrfs ===
tst_test.c:1117: TINFO: Formatting /dev/loop0 with btrfs opts='' extra opts=''
tst_test.c:1131: TINFO: Mounting /dev/loop0 to /tmp/LTP_swaGbGeNL/mntpoint fstyp=btrfs flags=0
swapon03.c:147: TCONF: swap not supported on tmpfs
tst_test.c:1701: TINFO: === Testing on bcachefs ===
tst_test.c:1117: TINFO: Formatting /dev/loop0 with bcachefs opts='' extra opts=''
tst_test.c:1131: TINFO: Mounting /dev/loop0 to /tmp/LTP_swaGbGeNL/mntpoint fstyp=bcachefs flags=0
swapon03.c:147: TCONF: swap not supported on tmpfs
tst_test.c:1701: TINFO: === Testing on vfat ===
tst_test.c:1117: TINFO: Formatting /dev/loop0 with vfat opts='' extra opts=''
tst_test.c:1131: TINFO: Mounting /dev/loop0 to /tmp/LTP_swaGbGeNL/mntpoint fstyp=vfat flags=0
swapon03.c:147: TCONF: swap not supported on tmpfs
tst_test.c:1701: TINFO: === Testing on exfat ===
tst_test.c:1117: TINFO: Formatting /dev/loop0 with exfat opts='' extra opts=''
tst_test.c:1131: TINFO: Mounting /dev/loop0 to /tmp/LTP_swaGbGeNL/mntpoint fstyp=exfat flags=0
swapon03.c:147: TCONF: swap not supported on tmpfs
Although it's a bit suspicious that it always TCONF on tmpfs - this is a
regression on "syscalls/swapon03: use tst_max_swapfiles() and
GET_USED_SWAPFILES() api", but I'll discuss it there.
But now TMPFS on btrfs:
swapon03.c:61: TFAIL: swapon(filename, 0) failed: EPERM (1)
Current master on tmpfs fails:
./swapon03
tst_test.c:1701: TINFO: === Testing on ext2 ===
tst_test.c:1117: TINFO: Formatting /dev/loop0 with ext2 opts='' extra opts=''
mke2fs 1.47.0 (5-Feb-2023)
tst_test.c:1131: TINFO: Mounting /dev/loop0 to /tmp/LTP_swa0jhXpO/mntpoint fstyp=ext2 flags=0
tst_ioctl.c:26: TINFO: FIBMAP ioctl is supported
Failed to create swapfile: swapfile02
swapon03.c:181: TFAIL: Failed to setup swaps
master on btrfs works.
Kind regards,
Petr
> ...
> Summary:
> passed 8
> failed 8
> broken 0
> skipped 2
> warnings 0
> Kind regards,
> Petr
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 10+ messages in thread
* [LTP] [PATCH v3 7/7] Add fallback for RHEL9
2024-02-08 10:05 [LTP] [PATCH v3 1/7] libltpswap: Add tst_max_swapfiles api Yang Xu via ltp
` (4 preceding siblings ...)
2024-02-08 10:05 ` [LTP] [PATCH v3 6/7] syscalls/swapon03: Simply this case Yang Xu via ltp
@ 2024-02-08 10:05 ` Yang Xu via ltp
5 siblings, 0 replies; 10+ messages in thread
From: Yang Xu via ltp @ 2024-02-08 10:05 UTC (permalink / raw)
To: ltp
Since device number patch and pte number patch have been backported into
RHEL9, we should add fallback for this distro.
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
libs/libltpswap/libswap.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/libs/libltpswap/libswap.c b/libs/libltpswap/libswap.c
index fa0d42543..547750948 100644
--- a/libs/libltpswap/libswap.c
+++ b/libs/libltpswap/libswap.c
@@ -17,6 +17,7 @@
#include "libswap.h"
#include "lapi/syscalls.h"
#include "tst_kconfig.h"
+#include "tst_kvercmp.h"
#include "tst_safe_stdio.h"
static const char *const swap_supported_fs[] = {
@@ -231,6 +232,11 @@ int tst_max_swapfiles(void)
struct tst_kconfig_var memory_kconfig = TST_KCONFIG_INIT("CONFIG_MEMORY_FAILURE");
struct tst_kconfig_var device_kconfig = TST_KCONFIG_INIT("CONFIG_DEVICE_PRIVATE");
struct tst_kconfig_var marker_kconfig = TST_KCONFIG_INIT("CONFIG_PTE_MARKER");
+ struct tst_kern_exv kvers[] = {
+ /* RHEL9 kernel has patch 6c287605f and 679d10331 since 5.14.0-179 */
+ { "RHEL9", "5.14.0-179" },
+ { NULL, NULL},
+ };
tst_kconfig_read(&migration_kconfig, 1);
tst_kconfig_read(&memory_kconfig, 1);
@@ -238,7 +244,7 @@ int tst_max_swapfiles(void)
tst_kconfig_read(&marker_kconfig, 1);
if (migration_kconfig.choice == 'y') {
- if (tst_kvercmp(5, 19, 0) < 0)
+ if (tst_kvercmp2(5, 19, 0, kvers) < 0)
swp_migration_num = 2;
else
swp_migration_num = 3;
@@ -255,7 +261,7 @@ int tst_max_swapfiles(void)
}
if (marker_kconfig.choice == 'y') {
- if (tst_kvercmp(5, 19, 0) >= 0)
+ if (tst_kvercmp2(5, 19, 0, kvers) >= 0)
swp_pte_marker_num = 1;
}
--
2.39.3
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 10+ messages in thread