[LTP] [PATCH v6 2/4] swapon/libswapon: add helper is_swap_supported

[Li Wang]

On Wed, Jun 5, 2019 at 1:51 PM Li Wang <liwang@redhat.com> wrote:

>
>
> On Tue, May 28, 2019 at 10:13 PM Murphy Zhou <xzhou@redhat.com> wrote:
>
>> To check if the filesystem we are testing on supports FIBMAP, mkswap,
>> swapon and swapoff operations.
>> Modify make_swapfile function to test mkswap support status safely.
>>
>> 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..f66d19548 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 != 0) {
>>
>
> As I replied in patch 1/4, how do we know that means FIBMAP not support if
> just verify fibmap != 0?
> So I would suggest to make the return value of tst_fibmap() is more
> precise and do if (fibmap == 1) check here.
>

And also, imagine that if swapon01 test failed on BRTFS or NFS(support
swapfile but not
support FIBMAP ioctl), then here will report the new bug as a TCONF to LTP.


> +                       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 != 0 && errno == EINVAL) {
>> +                       tst_brkm(TCONF, cleanup,
>> +                               "Swapfile on %s not implemented", fstype);
>>
>
> Maybe there is unnecessary to check fibmap value again? Since if the
> fibmap is 1, it has already broken in make_swapfile() error handler and
> never coming here?
>
>
>
>> +               } 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
>>
>>
>> --
>> Mailing list info: https://lists.linux.it/listinfo/ltp
>>
>
>
> --
> Regards,
> Li Wang
>


-- 
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20190605/0d333ce9/attachment.html>