kernel/syscalls: add new test with 'open() + O_TMPFILE'
PATCH 1/1 kernel/syscalls: add new test with 'open() + O_TMPFILE'
Test does the following steps:
* create an unnamed temporary file in TMP directory,
* write data into it,
* check that file not visible in the filesystem,
* name the file and check that it becomes visible in FS.
'openat() + O_TMPFILE' test repeats the same steps.
Signed-off-by Alexey Kodanev <[email protected]>
--- runtest/syscalls | 2 + testcases/kernel/syscalls/.gitignore | 2 + testcases/kernel/syscalls/open/open14.c | 153 ++++++++++++++++++++++++++ testcases/kernel/syscalls/openat/openat03.c | 154 +++++++++++++++++++++++++++ 4 files changed, 311 insertions(+), 0 deletions(-) create mode 100644 testcases/kernel/syscalls/open/open14.c create mode 100644 testcases/kernel/syscalls/openat/openat03.c
runtest/syscalls +2 -0
@@ -721,10 +721,12 @@ open10 open10 open11 open11 open12 open12 open13 open13 +open14 open14 #openat test cases openat01 openat01 openat02 openat02 +openat03 openat03 mincore01 mincore01 mincore02 mincore02
testcases/kernel/syscalls/.gitignore +2 -0
@@ -624,9 +624,11 @@ /open/open12 /open/open12_child /open/open13 +/open/open14 /openat/openat01 /openat/openat02 /openat/openat02_child +/openat/openat03 /pathconf/pathconf01 /pause/pause01 /pause/pause02
testcases/kernel/syscalls/open/open14.c new file +153 -0
153 lines not on this page · raw message
testcases/kernel/syscalls/openat/openat03.c new file +154 -0
154 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH 1/1 kernel/syscalls: add new test with 'open() + O_TMPFILE'
Hi!
testcases/kernel/syscalls/open/open14.c line 32
Quoted 12 lines
testcases/kernel/syscalls/open/open14.c new file +12
-0+#define _GNU_SOURCE +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <errno.h> + +#include "test.h" +#include "safe_macros.h" + +#ifndef O_TMPFILE +#define O_TMPFILE (020000000 | O_DIRECTORY) +#endif
This should better be added to include/lapi/fcntl.h so that we do not have to add it to each test that needs it.
Quoted 12 lines
testcases/kernel/syscalls/open/open14.c new file +12
-0+char *TCID ="open14" ; +int TST_TOTAL =1 ; +static char *test_dir; +static ssize_t size; +static const ssize_t blocks_num =4 ; +static char *buf; +static struct stat st; + +static void cleanup (void ) +{ +tst_rmdir (); +free (test_dir);
testcases/kernel/syscalls/open/open14.c line 55
Quoted 10 lines
testcases/kernel/syscalls/open/open14.c new file +10
-0+free (buf); +} + +static void setup (void ) +{ +tst_tmpdir (); + test_dir =tst_get_tmpdir (); + +SAFE_STAT (cleanup, test_dir, &st); + size = st.st_blksize;
Any reason why we cannot use relative path to the test directory, which sould be "." while the test runs?
Quoted 30 lines
testcases/kernel/syscalls/open/open14.c new file +30
-0+ buf =SAFE_MALLOC (cleanup, size); +memset (buf,1 , size); +} + +static int dir_not_empty (void ) +{ +struct dirent *entry; +DIR *dir =SAFE_OPENDIR (cleanup, test_dir); +int ret =0 ; + +while ((entry =SAFE_READDIR (cleanup, dir)) !=NULL ) { +const char *file = entry->d_name; + +if (!strcmp (file,".." ) || !strcmp (file,"." )) +continue ; + +tst_resm (TINFO ,"found a file: %s" , file); + ret =1 ; +break ; + } + +SAFE_CLOSEDIR (cleanup, dir); +return ret; +} + +void test01 (void ) +{ +int fd, i; + +char path[PATH_MAX ], tmp[PATH_MAX ];
testcases/kernel/syscalls/open/open14.c line 96
Quoted 10 lines
testcases/kernel/syscalls/open/open14.c new file +10
-0+ +tst_resm (TINFO ,"creating a file with O_TMPFILE flag" ); + +TEST (open (test_dir,O_TMPFILE |O_WRONLY |O_SYNC )); + fd =TEST_RETURN ; +if (fd ==-1 ) { +if (TEST_ERRNO ==EISDIR ) { +tst_brkm (TCONF , cleanup, +"O_TMPFILE not supported" ); + }
Hmm, looks to me like the TEST() macro just complicates the code here. It would work just the same if we did fd = open(...) instead and use errno instead of TEST_ERRNO.
testcases/kernel/syscalls/open/open14.c line 97
Quoted 1 line
testcases/kernel/syscalls/open/open14.c new file +1
-0+tst_resm (TFAIL |TERRNO ,"open() failed" );
^
This should be TTERRNO in case we use TEST() macro. Well both would work in this case since but we should stick to TTERRNO if TEST() has been used.
testcases/kernel/syscalls/open/open14.c line 103
Quoted 6 lines
testcases/kernel/syscalls/open/open14.c new file +6
-0+return ; + } + +tst_resm (TINFO ,"writing data to the file" ); +for (i =0 ; i < blocks_num; ++i) +SAFE_WRITE (cleanup,0 , fd, buf, size);
Hmm, getting size from fstat() seems like an overkill to me. We do not need to choose optimal transfer size since the difference in speed with constant buffer (be it 1024 or something else) would not be noticeable in this case.
Also we should pass 1 as len_strict to the SAFE_WRITE() here.
Quoted 13 lines
testcases/kernel/syscalls/open/open14.c new file +13
-0+SAFE_FSTAT (cleanup, fd, &st); +tst_resm (TINFO ,"file size is '%zu'" , st.st_size); + +if (st.st_size != blocks_num * size) { +tst_resm (TFAIL ,"not expected size: '%zu' != '%zu'" , + st.st_size, blocks_num * size); +SAFE_CLOSE (cleanup, fd); +return ; + } + +tst_resm (TINFO ,"looking for the file in '%s'" , test_dir); +if (dir_not_empty ()) +tst_brkm (TBROK , cleanup,"found a file, this is not expected" );
testcases/kernel/syscalls/open/open14.c line 127
Quoted 10 lines
testcases/kernel/syscalls/open/open14.c new file +10
-0+tst_resm (TINFO ,"file not found, OK" ); + +snprintf (path,PATH_MAX ,"/proc/self/fd/%d" , fd); +if (readlink (path, tmp,PATH_MAX ) ==-1 ) +tst_brkm (TBROK |TERRNO , cleanup,"readlink() failed" ); + +tst_resm (TINFO ,"renaming '%s' -> '%s/tmpfile'" , + tmp, test_dir); +if (linkat (AT_FDCWD , path,AT_FDCWD ,"tmpfile" ,AT_SYMLINK_FOLLOW )) +tst_brkm (TBROK |TERRNO , cleanup,"linkat() failed" );
We may add SAFE_LINKAT().
Quoted 102 lines
testcases/kernel/syscalls/open/open14.c new file +25
-0+if (!dir_not_empty ()) +tst_brkm (TBROK , cleanup,"file not found" ); + +SAFE_UNLINK (cleanup,"tmpfile" ); +SAFE_CLOSE (cleanup, fd); + +tst_resm (TPASS ,"test succeeded" ); +} + +int main (int ac,char *av[]) +{ +int lc; + +tst_parse_opts (ac, av,NULL ,NULL ); + +setup (); + +for (lc =0 ;TEST_LOOPING (lc); ++lc) { + tst_count =0 ; +test01 (); + } + +cleanup (); +tst_exit (); +}testcases/kernel/syscalls/openat/openat03.c new file +71
-0@@ -0,0 +1,154 @@ +/* +* Copyright (c) 2015-2016 Oracle and/or its affiliates. All Rights Reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it would be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +* +* Author: Alexey Kodanev <[email protected]> +* +*/ + +#define _GNU_SOURCE +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <errno.h> + +#include "test.h" +#include "safe_macros.h" +#include "openat.h" + +#ifndef O_TMPFILE +#define O_TMPFILE (020000000 | O_DIRECTORY) +#endif + +char *TCID ="openat03" ; +int TST_TOTAL =1 ; +static char *test_dir; +static ssize_t size; +static const ssize_t blocks_num =4 ; +static char *buf; +static struct stat st; + +static void cleanup (void ) +{ +tst_rmdir (); +free (test_dir); +free (buf); +} + +static void setup (void ) +{ +tst_tmpdir (); + test_dir =tst_get_tmpdir (); + +SAFE_STAT (cleanup, test_dir, &st); + size = st.st_blksize; + + buf =SAFE_MALLOC (cleanup, size); +memset (buf,1 , size); +} + +static int dir_not_empty (void ) +{ +struct dirent *entry; +DIR *dir =SAFE_OPENDIR (cleanup, test_dir); +int ret =0 ; + +while ((entry =SAFE_READDIR (cleanup, dir)) !=NULL ) { +const char *file = entry->d_name; + +if (!strcmp (file,".." ) || !strcmp (file,"." ))
testcases/kernel/syscalls/openat/openat03.c line 81
Quoted 10 lines
testcases/kernel/syscalls/openat/openat03.c new file +10
-0+continue ; + +tst_resm (TINFO ,"found a file: %s" , file); + ret =1 ; +break ; + } + +SAFE_CLOSEDIR (cleanup, dir); +return ret; +}
Maybe we should add this function to a library, since it's used at two places allready.
Quoted 62 lines
testcases/kernel/syscalls/openat/openat03.c new file +62
-0+void test01 (void ) +{ +int fd, i; + +char path[PATH_MAX ], tmp[PATH_MAX ]; + +tst_resm (TINFO ,"creating a file with O_TMPFILE flag" ); + +TEST (openat (AT_FDCWD , test_dir,O_TMPFILE |O_WRONLY |O_SYNC )); + fd =TEST_RETURN ; +if (fd ==-1 ) { +if (TEST_ERRNO ==EISDIR ) { +tst_brkm (TCONF , cleanup, +"O_TMPFILE not supported" ); + } +tst_resm (TFAIL |TERRNO ,"openat() failed" ); +return ; + } + +tst_resm (TINFO ,"writing data to the file" ); +for (i =0 ; i < blocks_num; ++i) +SAFE_WRITE (cleanup,0 , fd, buf, size); + +SAFE_FSTAT (cleanup, fd, &st); +tst_resm (TINFO ,"file size is '%zu'" , st.st_size); + +if (st.st_size != blocks_num * size) { +tst_resm (TFAIL ,"not expected size: '%zu' != '%zu'" , + st.st_size, blocks_num * size); +SAFE_CLOSE (cleanup, fd); +return ; + } + +tst_resm (TINFO ,"looking for the file in '%s'" , test_dir); +if (dir_not_empty ()) +tst_brkm (TBROK , cleanup,"found a file, this is not expected" ); +tst_resm (TINFO ,"file not found, OK" ); + +snprintf (path,PATH_MAX ,"/proc/self/fd/%d" , fd); +if (readlink (path, tmp,PATH_MAX ) ==-1 ) +tst_brkm (TBROK |TERRNO , cleanup,"readlink() failed" ); + +tst_resm (TINFO ,"renaming '%s' -> '%s/tmpfile'" , + tmp, test_dir); +if (linkat (AT_FDCWD , path,AT_FDCWD ,"tmpfile" ,AT_SYMLINK_FOLLOW )) +tst_brkm (TBROK |TERRNO , cleanup,"linkat() failed" ); + +if (!dir_not_empty ()) +tst_brkm (TBROK , cleanup,"file not found" ); + +SAFE_UNLINK (cleanup,"tmpfile" ); +SAFE_CLOSE (cleanup, fd); + +tst_resm (TPASS ,"test succeeded" ); +} + +int main (int ac,char *av[]) +{ +int lc; + +tst_parse_opts (ac, av,NULL ,NULL ); +
testcases/kernel/syscalls/openat/openat03.c line 154
Quoted 10 lines
testcases/kernel/syscalls/openat/openat03.c new file +10
-0+setup (); + +for (lc =0 ;TEST_LOOPING (lc); ++lc) { + tst_count =0 ; +test01 (); + } + +cleanup (); +tst_exit (); +}
The same comments applies to this test as well.
Otherwise it looks good.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/1 kernel/syscalls: add new test with 'open() + O_TMPFILE'
Hi,
Quoted 17 lines · Cyril Hrubis
Hi!
Quoted 16 lines
testcases/kernel/syscalls/open/open14.c new file +16
-0+char *TCID ="open14" ; +int TST_TOTAL =1 ; +static char *test_dir; +static ssize_t size; +static const ssize_t blocks_num =4 ; +static char *buf; +static struct stat st; + +static void cleanup (void ) +{ +tst_rmdir (); +free (test_dir); +free (buf); +} + +static void setup (void )
Quoted 8 lines
testcases/kernel/syscalls/open/open14.c line 55
Quoted 6 lines
testcases/kernel/syscalls/open/open14.c new file +6
-0+{ +tst_tmpdir (); + test_dir =tst_get_tmpdir (); + +SAFE_STAT (cleanup, test_dir, &st); + size = st.st_blksize;Any reason why we cannot use relative path to the test directory, which sould be "." while the test runs?
Right, will change to ".", there is no reason for absolute path.
Quoted 16 lines
Quoted 16 lines
testcases/kernel/syscalls/open/open14.c new file +16
-0+SAFE_FSTAT (cleanup, fd, &st); +tst_resm (TINFO ,"file size is '%zu'" , st.st_size); + +if (st.st_size != blocks_num * size) { +tst_resm (TFAIL ,"not expected size: '%zu' != '%zu'" , + st.st_size, blocks_num * size); +SAFE_CLOSE (cleanup, fd); +return ; + } + +tst_resm (TINFO ,"looking for the file in '%s'" , test_dir); +if (dir_not_empty ()) +tst_brkm (TBROK , cleanup,"found a file, this is not expected" ); +tst_resm (TINFO ,"file not found, OK" ); + +snprintf (path,PATH_MAX ,"/proc/self/fd/%d" , fd);
Quoted 8 lines
testcases/kernel/syscalls/open/open14.c line 127
Quoted 7 lines
testcases/kernel/syscalls/open/open14.c new file +7
-0+if (readlink (path, tmp,PATH_MAX ) ==-1 ) +tst_brkm (TBROK |TERRNO , cleanup,"readlink() failed" ); + +tst_resm (TINFO ,"renaming '%s' -> '%s/tmpfile'" , + tmp, test_dir); +if (linkat (AT_FDCWD , path,AT_FDCWD ,"tmpfile" ,AT_SYMLINK_FOLLOW )) +tst_brkm (TBROK |TERRNO , cleanup,"linkat() failed" );We may add
SAFE_LINKAT().
Agree.
Quoted 16 lines
Quoted 16 lines
testcases/kernel/syscalls/open/open14.c new file +15
-0+ +static int dir_not_empty (void ) +{ +struct dirent *entry; +DIR *dir =SAFE_OPENDIR (cleanup, test_dir); +int ret =0 ; + +while ((entry =SAFE_READDIR (cleanup, dir)) !=NULL ) { +const char *file = entry->d_name; + +if (!strcmp (file,".." ) || !strcmp (file,"." )) +continue ; + +tst_resm (TINFO ,"found a file: %s" , file); + ret =1 ;
Quoted 8 lines
testcases/kernel/syscalls/open/open14.c line 80
Quoted 6 lines
testcases/kernel/syscalls/open/open14.c new file +6
-0+break ; + } + +SAFE_CLOSEDIR (cleanup, dir); +return ret; +}Maybe we should add this function to a library, since it's used at two places allready.
OK, tst_dir_is_empty(dir) is fine?
Thanks,
Alexey
PATCH 1/1 kernel/syscalls: add new test with 'open() + O_TMPFILE'
Hi!
Quoted 23 lines
Quoted 14 lines
Quoted 14 lines
testcases/kernel/syscalls/open/open14.c new file +14
-0+static int dir_not_empty (void ) +{ +struct dirent *entry; +DIR *dir =SAFE_OPENDIR (cleanup, test_dir); +int ret =0 ; + +while ((entry =SAFE_READDIR (cleanup, dir)) !=NULL ) { +const char *file = entry->d_name; + +if (!strcmp (file,".." ) || !strcmp (file,"." )) +continue ; + +tst_resm (TINFO ,"found a file: %s" , file); + ret =1 ;Quoted 8 lines
testcases/kernel/syscalls/open/open14.c line 80
Quoted 6 lines
testcases/kernel/syscalls/open/open14.c new file +6
-0+break ; + } + +SAFE_CLOSEDIR (cleanup, dir); +return ret; +}Maybe we should add this function to a library, since it's used at two places allready.
Quoted 1 line
OK,
tst_dir_is_empty(dir)is fine?
Fine with me.
Signature · 2 lines
Cyril Hrubis [email protected]