From: Murphy Zhou <xzhou@redhat.com> To: liwang@redhat.com Cc: ltp@lists.linux.it, amir73il@gmail.com, chrubis@suse.cz, linux-fsdevel@vger.kernel.org, Murphy Zhou <xzhou@redhat.com> Subject: [PATCH v7 2/4] swapon/libswapon: add helper is_swap_supported Date: Tue, 11 Jun 2019 15:47:39 +0800 [thread overview] Message-ID: <20190611074741.31903-2-xzhou@redhat.com> (raw) In-Reply-To: <20190611074741.31903-1-xzhou@redhat.com> To check if the filesystem we are testing on supports FIBMAP, mkswap, swapon and swapoff operations. Survivor of this function should support swapfile function well, like swapon and swapoff. Modify make_swapfile function to test mkswap support status safely. Reviewed-by: Li Wang <liwang@redhat.com> Signed-off-by: Murphy Zhou <xzhou@redhat.com> --- testcases/kernel/syscalls/swapon/libswapon.c | 45 +++++++++++++++++++- testcases/kernel/syscalls/swapon/libswapon.h | 7 ++- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/testcases/kernel/syscalls/swapon/libswapon.c b/testcases/kernel/syscalls/swapon/libswapon.c index cf6a98891..0a4501bdd 100644 --- a/testcases/kernel/syscalls/swapon/libswapon.c +++ b/testcases/kernel/syscalls/swapon/libswapon.c @@ -19,13 +19,15 @@ * */ +#include <errno.h> +#include "lapi/syscalls.h" #include "test.h" #include "libswapon.h" /* * Make a swap file */ -void make_swapfile(void (cleanup)(void), const char *swapfile) +int make_swapfile(void (cleanup)(void), const char *swapfile, int safe) { if (!tst_fs_has_free(NULL, ".", sysconf(_SC_PAGESIZE) * 10, TST_BYTES)) { @@ -45,5 +47,44 @@ void make_swapfile(void (cleanup)(void), const char *swapfile) argv[1] = swapfile; argv[2] = NULL; - tst_run_cmd(cleanup, argv, "/dev/null", "/dev/null", 0); + return tst_run_cmd(cleanup, argv, "/dev/null", "/dev/null", safe); +} + +/* + * Check swapon/swapoff support status of filesystems or files + * we are testing on. + */ +void is_swap_supported(void (cleanup)(void), const char *filename) +{ + int fibmap = tst_fibmap(filename); + long fs_type = tst_fs_type(cleanup, filename); + const char *fstype = tst_fs_type_name(fs_type); + + int ret = make_swapfile(NULL, filename, 1); + if (ret != 0) { + if (fibmap == 1) { + tst_brkm(TCONF, cleanup, + "mkswap on %s not supported", fstype); + } else { + tst_brkm(TFAIL, cleanup, + "mkswap on %s failed", fstype); + } + } + + TEST(ltp_syscall(__NR_swapon, filename, 0)); + if (TEST_RETURN == -1) { + if (fibmap == 1 && errno == EINVAL) { + tst_brkm(TCONF, cleanup, + "Swapfile on %s not implemented", fstype); + } else { + tst_brkm(TFAIL | TERRNO, cleanup, + "swapon on %s failed", fstype); + } + } + + TEST(ltp_syscall(__NR_swapoff, filename, 0)); + if (TEST_RETURN == -1) { + tst_brkm(TFAIL | TERRNO, cleanup, + "swapoff on %s failed", fstype); + } } diff --git a/testcases/kernel/syscalls/swapon/libswapon.h b/testcases/kernel/syscalls/swapon/libswapon.h index 7f7211eb4..a51833ec1 100644 --- a/testcases/kernel/syscalls/swapon/libswapon.h +++ b/testcases/kernel/syscalls/swapon/libswapon.h @@ -29,6 +29,11 @@ /* * Make a swap file */ -void make_swapfile(void (cleanup)(void), const char *swapfile); +int make_swapfile(void (cleanup)(void), const char *swapfile, int safe); +/* + * Check swapon/swapoff support status of filesystems or files + * we are testing on. + */ +void is_swap_supported(void (cleanup)(void), const char *filename); #endif /* __LIBSWAPON_H__ */ -- 2.21.0
WARNING: multiple messages have this Message-ID (diff)
From: Murphy Zhou <xzhou@redhat.com> To: ltp@lists.linux.it Subject: [LTP] [PATCH v7 2/4] swapon/libswapon: add helper is_swap_supported Date: Tue, 11 Jun 2019 15:47:39 +0800 [thread overview] Message-ID: <20190611074741.31903-2-xzhou@redhat.com> (raw) In-Reply-To: <20190611074741.31903-1-xzhou@redhat.com> To check if the filesystem we are testing on supports FIBMAP, mkswap, swapon and swapoff operations. Survivor of this function should support swapfile function well, like swapon and swapoff. Modify make_swapfile function to test mkswap support status safely. Reviewed-by: Li Wang <liwang@redhat.com> Signed-off-by: Murphy Zhou <xzhou@redhat.com> --- testcases/kernel/syscalls/swapon/libswapon.c | 45 +++++++++++++++++++- testcases/kernel/syscalls/swapon/libswapon.h | 7 ++- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/testcases/kernel/syscalls/swapon/libswapon.c b/testcases/kernel/syscalls/swapon/libswapon.c index cf6a98891..0a4501bdd 100644 --- a/testcases/kernel/syscalls/swapon/libswapon.c +++ b/testcases/kernel/syscalls/swapon/libswapon.c @@ -19,13 +19,15 @@ * */ +#include <errno.h> +#include "lapi/syscalls.h" #include "test.h" #include "libswapon.h" /* * Make a swap file */ -void make_swapfile(void (cleanup)(void), const char *swapfile) +int make_swapfile(void (cleanup)(void), const char *swapfile, int safe) { if (!tst_fs_has_free(NULL, ".", sysconf(_SC_PAGESIZE) * 10, TST_BYTES)) { @@ -45,5 +47,44 @@ void make_swapfile(void (cleanup)(void), const char *swapfile) argv[1] = swapfile; argv[2] = NULL; - tst_run_cmd(cleanup, argv, "/dev/null", "/dev/null", 0); + return tst_run_cmd(cleanup, argv, "/dev/null", "/dev/null", safe); +} + +/* + * Check swapon/swapoff support status of filesystems or files + * we are testing on. + */ +void is_swap_supported(void (cleanup)(void), const char *filename) +{ + int fibmap = tst_fibmap(filename); + long fs_type = tst_fs_type(cleanup, filename); + const char *fstype = tst_fs_type_name(fs_type); + + int ret = make_swapfile(NULL, filename, 1); + if (ret != 0) { + if (fibmap == 1) { + tst_brkm(TCONF, cleanup, + "mkswap on %s not supported", fstype); + } else { + tst_brkm(TFAIL, cleanup, + "mkswap on %s failed", fstype); + } + } + + TEST(ltp_syscall(__NR_swapon, filename, 0)); + if (TEST_RETURN == -1) { + if (fibmap == 1 && errno == EINVAL) { + tst_brkm(TCONF, cleanup, + "Swapfile on %s not implemented", fstype); + } else { + tst_brkm(TFAIL | TERRNO, cleanup, + "swapon on %s failed", fstype); + } + } + + TEST(ltp_syscall(__NR_swapoff, filename, 0)); + if (TEST_RETURN == -1) { + tst_brkm(TFAIL | TERRNO, cleanup, + "swapoff on %s failed", fstype); + } } diff --git a/testcases/kernel/syscalls/swapon/libswapon.h b/testcases/kernel/syscalls/swapon/libswapon.h index 7f7211eb4..a51833ec1 100644 --- a/testcases/kernel/syscalls/swapon/libswapon.h +++ b/testcases/kernel/syscalls/swapon/libswapon.h @@ -29,6 +29,11 @@ /* * Make a swap file */ -void make_swapfile(void (cleanup)(void), const char *swapfile); +int make_swapfile(void (cleanup)(void), const char *swapfile, int safe); +/* + * Check swapon/swapoff support status of filesystems or files + * we are testing on. + */ +void is_swap_supported(void (cleanup)(void), const char *filename); #endif /* __LIBSWAPON_H__ */ -- 2.21.0
next prev parent reply other threads:[~2019-06-11 7:48 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-30 7:14 [LTP] [PATCH] syscalls/swapon02: Do not fail on overlayfs Murphy Zhou 2019-04-30 8:14 ` Li Wang 2019-04-30 8:30 ` Murphy Zhou 2019-04-30 8:54 ` Li Wang 2019-04-30 9:08 ` Murphy Zhou 2019-04-30 9:21 ` Li Wang 2019-04-30 9:29 ` Murphy Zhou 2019-04-30 9:37 ` Amir Goldstein 2019-04-30 9:54 ` Murphy Zhou 2019-04-30 15:29 ` [LTP] [PATCH v2] syscalls/swap{on, off}: skip if FIBMAP ioctl trial fails Murphy Zhou 2019-04-30 23:59 ` [LTP] [PATCH v3] " Murphy Zhou 2019-05-07 8:52 ` Li Wang 2019-05-08 3:43 ` Murphy Zhou 2019-05-08 10:22 ` Amir Goldstein 2019-05-08 14:38 ` Murphy Zhou 2019-05-10 4:42 ` [LTP] [PATCH v4] syscalls/swap{on, off}: fail softly " Murphy Zhou 2019-05-10 5:27 ` Amir Goldstein 2019-05-10 8:15 ` Murphy Zhou 2019-05-10 8:48 ` Amir Goldstein 2019-05-11 4:20 ` Murphy Zhou 2019-05-11 9:30 ` Amir Goldstein 2019-05-13 7:39 ` Murphy Zhou 2019-05-23 13:55 ` Cyril Hrubis 2019-05-23 14:06 ` Murphy Zhou 2019-05-28 4:39 ` [LTP] [PATCH v5 1/4] lib/tst_ioctl.c: add helper tst_fibmap Murphy Zhou 2019-05-28 4:39 ` [LTP] [PATCH v5 2/4] swapon/libswapon: add helper is_swap_supported Murphy Zhou 2019-05-28 5:56 ` Amir Goldstein 2019-05-28 8:33 ` Murphy Zhou 2019-05-28 9:56 ` Murphy Zhou 2019-05-28 11:59 ` Amir Goldstein 2019-05-28 14:12 ` [LTP] [PATCH v6 1/4] lib/tst_ioctl.c: add helper tst_fibmap Murphy Zhou 2019-05-28 14:12 ` [LTP] [PATCH v6 2/4] swapon/libswapon: add helper is_swap_supported Murphy Zhou 2019-05-28 14:52 ` Amir Goldstein 2019-06-05 5:51 ` Li Wang 2019-06-05 6:55 ` Li Wang 2019-06-05 9:30 ` Murphy Zhou 2019-06-05 9:53 ` Li Wang 2019-06-10 6:12 ` Murphy Zhou 2019-06-10 9:28 ` Li Wang 2019-06-11 7:47 ` [PATCH v7 1/4] lib/tst_ioctl.c: add helper tst_fibmap Murphy Zhou 2019-06-11 7:47 ` [LTP] " Murphy Zhou 2019-06-11 7:47 ` Murphy Zhou [this message] 2019-06-11 7:47 ` [LTP] [PATCH v7 2/4] swapon/libswapon: add helper is_swap_supported Murphy Zhou 2019-06-11 7:47 ` [PATCH v7 3/4] syscalls/swapon/swapon0{1..3}: use helpers to check support status Murphy Zhou 2019-06-11 7:47 ` [LTP] " Murphy Zhou 2019-06-11 7:47 ` [PATCH v7 4/4] syscalls/swapoff/swapoff0{1,2}: " Murphy Zhou 2019-06-11 7:47 ` [LTP] [PATCH v7 4/4] syscalls/swapoff/swapoff0{1, 2}: " Murphy Zhou 2019-06-30 1:51 ` [LTP] [PATCH v7 1/4] lib/tst_ioctl.c: add helper tst_fibmap Murphy Zhou 2019-07-16 5:19 ` Li Wang 2019-05-28 14:12 ` [LTP] [PATCH v6 3/4] syscalls/swapon/swapon0{1..3}: use helper to check support status Murphy Zhou 2019-05-28 14:12 ` [LTP] [PATCH v6 4/4] syscalls/swapoff/swapoff0{1, 2}: " Murphy Zhou 2019-06-05 4:44 ` [LTP] [PATCH v6 1/4] lib/tst_ioctl.c: add helper tst_fibmap Murphy Zhou 2019-06-05 5:40 ` Li Wang 2019-05-28 4:39 ` [LTP] [PATCH v5 3/4] syscalls/swapon/swapon0{1..3}: use helper to check support status Murphy Zhou 2019-05-28 4:39 ` [LTP] [PATCH v5 4/4] syscalls/swapoff/swapoff01: " Murphy Zhou
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190611074741.31903-2-xzhou@redhat.com \ --to=xzhou@redhat.com \ --cc=amir73il@gmail.com \ --cc=chrubis@suse.cz \ --cc=linux-fsdevel@vger.kernel.org \ --cc=liwang@redhat.com \ --cc=ltp@lists.linux.it \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.