name_to_handle_at: Add test cases for AT_HANDLE_FID
PATCH 1/1 name_to_handle_at: Add test cases for AT_HANDLE_FID
Add a few testcases verifying AT_HANDLE_FID flag.
--- include/lapi/fcntl.h | 4 + .../name_to_handle_at/name_to_handle_at03.c | 88 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c
This is actually a testcase for a kernel regression, the kernel fix is on the way.
include/lapi/fcntl.h +4 -0
@@ -98,6 +98,10 @@# define AT_HANDLE_FID AT_REMOVEDIR#endif +#ifndef AT_HANDLE_CONNECTABLE +# define AT_HANDLE_CONNECTABLE 0x002 +#endif +#ifndef AT_SYMLINK_FOLLOW # define AT_SYMLINK_FOLLOW 0x400#endif
testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c new file +88 -0
88 lines not on this page · raw message
Signature · 5 lines
2.51.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 4 lines · Jan Kara
Add a few testcases verifying
AT_HANDLE_FIDflag.Signed-off-by Jan Kara <[email protected]>
Quoted 8 lines
--- include/lapi/fcntl.h | 4 + .../name_to_handle_at/name_to_handle_at03.c | 88 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.cThis is actually a testcase for a kernel regression, the kernel fix is on the way.
Best that we wait for fix to land before merging the test so that we can add linux-git tag to the test (or can add it later)
With minor nits below fixed, feel free to add:
Thanks for covering my test debt!!
Amir.
Quoted 24 lines
include/lapi/fcntl.h +4
-0@@ -98,6 +98,10 @@# define AT_HANDLE_FID AT_REMOVEDIR#endif +#ifndef AT_HANDLE_CONNECTABLE +# define AT_HANDLE_CONNECTABLE 0x002 +#endif +#ifndef AT_SYMLINK_FOLLOW # define AT_SYMLINK_FOLLOW 0x400#endif testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c new file +2
-0@@ -0,0 +1,88 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/*
testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c line 12
Quoted 10 lines
testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c new file +10
-0+* Copyright (c) 2020 Viresh Kumar <[email protected]> +*/ + +/*\ +* Basic name_to_handle_at() tests. +* +* [Algorithm] +* - Check that EOVERFLOW is returned as expected by name_to_handle_at(). +* - Check that we were able to access a file's stat with name_to_handle_at() +* and open_by_handle_at().
stale description
Quoted 16 lines
testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c new file +16
-0+*/ + +#define _GNU_SOURCE +#include <sys/stat.h> +#include "lapi/name_to_handle_at.h" + +#define TEST_FILE "test_file" + +static int fd_atcwd =AT_FDCWD ; +static struct file_handle *fhp; + +static struct tcase { + const char *name; + int *dfd; + const char *pathname; + int name_flags;
testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c line 38
Quoted 10 lines
testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c new file +10
-0+int exp_errno; +} tcases[] = { + {"test-file", &fd_atcwd, TEST_FILE, AT_HANDLE_FID, 0}, + {"unexportable-file", &fd_atcwd, "/proc/filesystems", AT_HANDLE_FID, 0}, + {"test-file-connectable", &fd_atcwd, TEST_FILE, AT_HANDLE_FID | AT_HANDLE_CONNECTABLE, EINVAL}, +}; + +static bool handle_type_supported(unsigned int flag, const char *name) +{ + if (name_to_handle_at(-1, ".", NULL, NULL, flag) && errno == EINVAL) {
explain that -1 would fail with EBADF if flags are supported?
Quoted 53 lines
testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c new file +50
-1+tst_brk (TCONF ,"%s not supported by the kernel." , name); +return false; + } +return true; +} + +#define REQUIRE_HANDLE_TYPE_SUPPORT (flag) handle_type_supported(flag, #flag) + +static void setup (void ) +{ +SAFE_TOUCH (TEST_FILE ,0600 ,NULL ); + fhp =malloc (MAX_HANDLE_SZ ); +if (!fhp) +tst_brk (TBROK ,"malloc failed" ); + +REQUIRE_HANDLE_TYPE_SUPPORT (AT_HANDLE_FID ); +REQUIRE_HANDLE_TYPE_SUPPORT (AT_HANDLE_CONNECTABLE ); +} + +static void run (unsigned int n) +{ +struct tcase *tc = &tcases[n]; +int mount_id; + + fhp->handle_bytes =MAX_HANDLE_SZ ; +TEST (name_to_handle_at (*tc->dfd, tc->pathname, fhp, &mount_id, + tc->name_flags)); +if (!tc->exp_errno) { +if (TST_RET ) +tst_res (TFAIL |TTERRNO ,"%s: name_to_handle_at() failed" , tc->name); +else +tst_res (TPASS ,"%s: name_to_handle_at() passed" , tc->name); +return ; + } + +if (TST_RET !=-1 ) +tst_res (TFAIL ,"%s: name_to_handle_at() unexpectedly succeeded" , tc->name); +else if (TST_ERR != tc->exp_errno) +tst_res (TFAIL |TTERRNO ,"%s: name_to_handle_at() should fail with errno %s" , + tc->name,tst_strerrno (tc->exp_errno)); +else +tst_res (TPASS ,"%s: name_to_handle_at() failed as expected" , tc->name); +} + +static struct tst_test test = { + .tcnt =ARRAY_SIZE (tcases), + .test = run, + .setup = setup, + .needs_tmpdir =1 , +}; --2.51.0
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 11 lines · Amir Goldstein
Quoted 10 lines · Jan Kara
Add a few testcases verifying
AT_HANDLE_FIDflag.Signed-off-by Jan Kara <[email protected]>--- include/lapi/fcntl.h | 4 + .../name_to_handle_at/name_to_handle_at03.c | 88 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c
Quoted 5 lines
Quoted 2 lines
This is actually a testcase for a kernel regression, the kernel fix is on the way.
Best that we wait for fix to land before merging the test so that we can add linux-git tag to the test (or can add it later)
Yes, I was intending to do that but wanted to send out the test for review before that...
Quoted 2 lines
With minor nits below fixed, feel free to add:
Reviewed-by Amir Goldstein <[email protected]>
Thanks, nits fixed up. I'll send v2 once the kernel fix is merged.
Honza
Signature · 5 lines
Jan Kara <[email protected]> SUSE Labs, CR -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Jan,
Quoted 1 line
Add a few testcases verifying
AT_HANDLE_FIDflag.
Thanks for keeping tests updated, we really appreciate that. I wonder if the functionality got merged.
Quoted 31 lines
Signed-off-by Jan Kara <[email protected]>--- include/lapi/fcntl.h | 4 + .../name_to_handle_at/name_to_handle_at03.c | 88 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.cThis is actually a testcase for a kernel regression, the kernel fix is on the way.
include/lapi/fcntl.h +4
-0@@ -98,6 +98,10 @@# define AT_HANDLE_FID AT_REMOVEDIR#endif +#ifndef AT_HANDLE_CONNECTABLE +# define AT_HANDLE_CONNECTABLE 0x002 +#endif +#ifndef AT_SYMLINK_FOLLOW # define AT_SYMLINK_FOLLOW 0x400#endif testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c new file +0
-0
testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c line 9
Quoted 9 lines
testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c new file +9
-0@@ -0,0 +1,88 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2020 Viresh Kumar <[email protected]> +*/ + +/*\ +* Basic name_to_handle_at() tests. +* +* [Algorithm]
nit: unrelated to the test subject. Here needs to be a blank line, otherwise following lines aren't recognised as list, but they remain inline (RST format used for spinx).
Quoted 52 lines
testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c new file +52
-0+* - Check that EOVERFLOW is returned as expected by name_to_handle_at(). +* - Check that we were able to access a file's stat with name_to_handle_at() +* and open_by_handle_at(). +*/ + +#define _GNU_SOURCE +#include <sys/stat.h> +#include "lapi/name_to_handle_at.h" + +#define TEST_FILE "test_file" + +static int fd_atcwd =AT_FDCWD ; +static struct file_handle *fhp; + +static struct tcase { +const char *name; +int *dfd; +const char *pathname; +int name_flags; +int exp_errno; +} tcases[] = { + {"test-file" , &fd_atcwd,TEST_FILE ,AT_HANDLE_FID ,0 }, + {"unexportable-file" , &fd_atcwd,"/proc/filesystems" ,AT_HANDLE_FID ,0 }, + {"test-file-connectable" , &fd_atcwd,TEST_FILE ,AT_HANDLE_FID |AT_HANDLE_CONNECTABLE ,EINVAL }, +}; + +static bool handle_type_supported (unsigned int flag,const char *name) +{ +if (name_to_handle_at (-1 ,"." ,NULL ,NULL , flag) && errno ==EINVAL ) { +tst_brk (TCONF ,"%s not supported by the kernel." , name); +return false; + } +return true; +} + +#define REQUIRE_HANDLE_TYPE_SUPPORT (flag) handle_type_supported(flag, #flag) + +static void setup (void ) +{ +SAFE_TOUCH (TEST_FILE ,0600 ,NULL ); + fhp =malloc (MAX_HANDLE_SZ ); +if (!fhp) +tst_brk (TBROK ,"malloc failed" ); + +REQUIRE_HANDLE_TYPE_SUPPORT (AT_HANDLE_FID ); +REQUIRE_HANDLE_TYPE_SUPPORT (AT_HANDLE_CONNECTABLE ); +} + +static void run (unsigned int n) +{ +struct tcase *tc = &tcases[n]; +int mount_id;
testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c line 71
Quoted 10 lines
testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c new file +10
-0+ + fhp->handle_bytes =MAX_HANDLE_SZ ; +TEST (name_to_handle_at (*tc->dfd, tc->pathname, fhp, &mount_id, + tc->name_flags)); +if (!tc->exp_errno) { +if (TST_RET ) +tst_res (TFAIL |TTERRNO ,"%s: name_to_handle_at() failed" , tc->name); +else +tst_res (TPASS ,"%s: name_to_handle_at() passed" , tc->name); +return ;
nit: We have TST_EXP_PASS() ...
testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c line 80
Quoted 9 lines
testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at03.c new file +9
-0+ } + +if (TST_RET !=-1 ) +tst_res (TFAIL ,"%s: name_to_handle_at() unexpectedly succeeded" , tc->name); +else if (TST_ERR != tc->exp_errno) +tst_res (TFAIL |TTERRNO ,"%s: name_to_handle_at() should fail with errno %s" , + tc->name,tst_strerrno (tc->exp_errno)); +else +tst_res (TPASS ,"%s: name_to_handle_at() failed as expected" , tc->name);
... and TST_EXP_FAIL() to simplify. Something like should work (untested):
if (!tc->exp_errno) {
TST_EXP_PASS(name_to_handle_at(*tc->dfd, tc->pathname, fhp, &mount_id,
tc->name_flags));
return;
} else {
TST_EXP_FAIL(name_to_handle_at(*tc->dfd, tc->pathname, fhp, &mount_id,
tc->name_flags), tc->exp_errno);
}Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 6 lines · Petr Vorel
Hi Jan,
Quoted 1 line
Add a few testcases verifying
AT_HANDLE_FIDflag.Thanks for keeping tests updated, we really appreciate that. I wonder if the functionality got merged.
Not yet (due to my screwup with email). It should be merged later this week at which point I'll resend the LTP patch with fixups Amir suggested and proper kernel commit.
Honza
Signature · 5 lines
Jan Kara <[email protected]> SUSE Labs, CR -- Mailing list info: https://lists.linux.it/listinfo/ltp