@@ -16,93 +16,27 @@
#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"
+#define TESTFILE "testfile"
+
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");
+ TST_EXP_FAIL(swapon(TESTFILE, 0), EPERM, "swapon(%s, 0)", TESTFILE);
}
-/*
- * Create 33 and activate 30 swapfiles.
- */
static int setup_swap(void)
{
pid_t pid;
int j, max_swapfiles, used_swapfiles;
int status;
- int res = 0;
char filename[FILENAME_MAX];
if (seteuid(0) < 0)
@@ -130,16 +64,7 @@ static int setup_swap(void)
make_swapfile(filename, 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
@@ -148,9 +73,8 @@ 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, 0);
+ tst_res(TINFO, "Successfully created %d swapfiles", swapfiles);
+ make_swapfile(TESTFILE, 0);
return 0;
}
@@ -178,12 +102,9 @@ 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;
@@ -201,20 +122,15 @@ static int check_and_swapoff(const char *filename)
"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) {
-
+ 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;
-
}
}
@@ -229,6 +145,11 @@ static void setup(void)
tst_brk(TCONF, "swap not supported by kernel");
is_swap_supported("./tstswap");
+
+ if (setup_swap() < 0) {
+ clean_swap();
+ tst_brk(TBROK, "Setup failed, quitting the test");
+ }
}
static void cleanup(void)
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 | 111 +++----------------- 1 file changed, 16 insertions(+), 95 deletions(-)