syscalls/copy_file_range: add/restructured tests
PATCH v4 1/1 syscalls/copy_file_range: add/restructured tests
The following tests are run for the syscall itself, as well as the glibc implementation.
copy_file_range01:
restructured testcase, removed unnecessary code, improved readability and shortened output (only failures get printed now). This tests the basic functionality of the syscall.
copy_file_range02:
add testcases which test basic error handling of the syscall.
copy_file_range03:
add testcase to check if this operation updates timestamps accordingly.
--- configure.ac | 1 + m4/ltp-copy_file_range.m4 | 7 + runtest/syscalls | 2 + .../kernel/syscalls/copy_file_range/.gitignore | 2 + .../syscalls/copy_file_range/copy_file_range.h | 57 +++++ .../syscalls/copy_file_range/copy_file_range01.c | 239 +++++++++++---------- .../syscalls/copy_file_range/copy_file_range02.c | 118 ++++++++++ .../syscalls/copy_file_range/copy_file_range03.c | 77 +++++++ 8 files changed, 387 insertions(+), 116 deletions(-) create mode 100644 m4/ltp-copy_file_range.m4 create mode 100644 testcases/kernel/syscalls/copy_file_range/copy_file_range.h create mode 100644 testcases/kernel/syscalls/copy_file_range/copy_file_range02.c create mode 100644 testcases/kernel/syscalls/copy_file_range/copy_file_range03.c
configure.ac +1 -0
@@ -197,6 +197,7 @@ LTP_CHECK_BUILTIN_CLEAR_CACHE LTP_CHECK_CAPABILITY_SUPPORT LTP_CHECK_CC_WARN_OLDSTYLE LTP_CHECK_CLONE_SUPPORTS_7_ARGS +LTP_CHECK_COPY_FILE_RANGE LTP_CHECK_CRYPTO LTP_CHECK_FIDEDUPE LTP_CHECK_FORTIFY_SOURCE
m4/ltp-copy_file_range.m4 new file +7 -0
@@ -0,0 +1,7 @@ +dnl SPDX-License-Identifier: GPL-2.0-or-later +dnl Copyright (c) 2019 SUSE LLC +dnl Author: Christian Amann <[email protected]> + +AC_DEFUN([LTP_CHECK_COPY_FILE_RANGE],[ +AC_CHECK_FUNCS(copy_file_range,,) +])
runtest/syscalls +2 -0
@@ -1561,6 +1561,8 @@ memfd_create03 memfd_create03 memfd_create04 memfd_create04 copy_file_range01 copy_file_range01 +copy_file_range02 copy_file_range02 +copy_file_range03 copy_file_range03 statx01 statx01 statx02 statx02
testcases/kernel/syscalls/copy_file_range/.gitignore +2 -0
@@ -1 +1,3 @@ /copy_file_range01 +/copy_file_range02 +/copy_file_range03
testcases/kernel/syscalls/copy_file_range/copy_file_range.h new file +57 -0
57 lines not on this page · raw message
testcases/kernel/syscalls/copy_file_range/copy_file_range01.c +123 -116
318 lines not on this page · raw message
testcases/kernel/syscalls/copy_file_range/copy_file_range02.c new file +118 -0
118 lines not on this page · raw message
testcases/kernel/syscalls/copy_file_range/copy_file_range03.c new file +77 -0
77 lines not on this page · raw message
Signature · 1 line
2.16.4
PATCH v4 1/1 syscalls/copy_file_range: add/restructured tests
@ Li Wang Thanks again for your review. I implemented your suggestions:
- changed failure report type from TINFO to TFAIL (01.c) - added 2 new error handling tests (02.c): This still leaves out some errors described on the manpage but most of them are very difficult to test (out of memory, low level io error, etc). If anyone knows a way how to test this, I'm open for suggestions. - slight restructuring of error handling logic (02.c) - renamed getTimestamp to get_timestamp (03.c) - minor changes in reporting failures (03.c) Kind regards, Christian
Quoted 664 lines · Christian Amann
The following tests are run for the syscall itself, as well as the glibc implementation.
copy_file_range01:
restructured testcase, removed unnecessary code, improved readability and shortened output (only failures get printed now). This tests the basic functionality of the syscall.
copy_file_range02:
add testcases which test basic error handling of the syscall.
copy_file_range03:
add testcase to check if this operation updates timestamps accordingly.Signed-off-by Christian Amann <[email protected]>--- configure.ac | 1 + m4/ltp-copy_file_range.m4 | 7 + runtest/syscalls | 2 + .../kernel/syscalls/copy_file_range/.gitignore | 2 + .../syscalls/copy_file_range/copy_file_range.h | 57 +++++ .../syscalls/copy_file_range/copy_file_range01.c | 239 +++++++++++---------- .../syscalls/copy_file_range/copy_file_range02.c | 118 ++++++++++ .../syscalls/copy_file_range/copy_file_range03.c | 77 +++++++ 8 files changed, 387 insertions(+), 116 deletions(-) create mode 100644 m4/ltp-copy_file_range.m4 create mode 100644 testcases/kernel/syscalls/copy_file_range/copy_file_range.h create mode 100644 testcases/kernel/syscalls/copy_file_range/copy_file_range02.c create mode 100644 testcases/kernel/syscalls/copy_file_range/copy_file_range03.cconfigure.ac +1
-0@@ -197,6 +197,7 @@ LTP_CHECK_BUILTIN_CLEAR_CACHE LTP_CHECK_CAPABILITY_SUPPORT LTP_CHECK_CC_WARN_OLDSTYLE LTP_CHECK_CLONE_SUPPORTS_7_ARGS +LTP_CHECK_COPY_FILE_RANGE LTP_CHECK_CRYPTO LTP_CHECK_FIDEDUPE LTP_CHECK_FORTIFY_SOURCEm4/ltp-copy_file_range.m4 new file +7
-0@@ -0,0 +1,7 @@ +dnl SPDX-License-Identifier: GPL-2.0-or-later +dnl Copyright (c) 2019 SUSE LLC +dnl Author: Christian Amann <[email protected]> + +AC_DEFUN([LTP_CHECK_COPY_FILE_RANGE],[ +AC_CHECK_FUNCS(copy_file_range,,) +])runtest/syscalls +2
-0@@ -1561,6 +1561,8 @@ memfd_create03 memfd_create03 memfd_create04 memfd_create04 copy_file_range01 copy_file_range01 +copy_file_range02 copy_file_range02 +copy_file_range03 copy_file_range03 statx01 statx01 statx02 statx02testcases/kernel/syscalls/copy_file_range/.gitignore +2
-0@@ -1 +1,3 @@ /copy_file_range01 +/copy_file_range02 +/copy_file_range03testcases/kernel/syscalls/copy_file_range/copy_file_range.h new file +57
-0@@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2019 SUSE LLC +* Author: Christian Amann <[email protected]> +*/ + +#ifndef __COPY_FILE_RANGE_H__ +#define __COPY_FILE_RANGE_H__ + +#include <stdbool.h> +#include <unistd.h> +#include "lapi/syscalls.h" + +#define TEST_VARIANTS 2 + +#define MNTPOINT "mnt_point" +#define FILE_SRC_PATH "file_src" +#define FILE_DEST_PATH "file_dest" +#define FILE_RDONL_PATH "file_rdonl" +#define FILE_DIR_PATH "file_dir" +#define FILE_MNTED_PATH MNTPOINT"/file_mnted" + +#define CONTENT "ABCDEFGHIJKLMNOPQRSTUVWXYZ12345\n" +#define CONTSIZE (sizeof(CONTENT) - 1) + +static void syscall_info (void ) +{ +switch (tst_variant) { +case 0 : +tst_res (TINFO ,"Testing libc copy_file_range()" ); +break ; +case 1 : +tst_res (TINFO ,"Testing tst copy_file_range()" ); + } +} + +static int sys_copy_file_range (int fd_in,loff_t *off_in, +int fd_out,loff_t *off_out,size_t len,unsigned int flags) +{ +switch (tst_variant) { + +case 0 : +#ifdef HAVE_COPY_FILE_RANGE +return copy_file_range (fd_in, off_in, + fd_out, off_out, len, flags); +#else +tst_brk (TCONF ,"libc copy_file_range() not supported!" ); +#endif +break ; +case 1 : +return tst_syscall (__NR_copy_file_range, fd_in, off_in, fd_out, + off_out, len, flags); + } +return -1 ; +} + +#endif /* __COPY_FILE_RANGE_H__ */ testcases/kernel/syscalls/copy_file_range/copy_file_range01.c +123
-116@@ -1,66 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* Copyright (c) Linux Test Project, 2017 -* -* 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. +* Copyright (c) Linux Test Project, 2019 +*/ + +/* +* This tests the fundamental functionalities of the copy_file_range +* syscall. It does so by copying the contents of one file into +* another using various different combinations for length and +* input/output offsets. * -* This program is distributed in the hope that it will 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. +* After a copy is done this test checks if the contents of both files +* are equal at the given offsets. It is also inspected if the offsets +* of the file descriptors are advanced correctly. */ #define _GNU_SOURCE +#include <stdio.h> -#include <errno.h> #include <stdlib.h> #include "tst_test.h" #include "tst_safe_stdio.h" -#include "lapi/syscalls.h" - -#define TEST_FILE_1 "copy_file_range_ltp01.txt" -#define TEST_FILE_2 "copy_file_range_ltp02.txt" -#define STR "abcdefghijklmnopqrstuvwxyz12345\n" - -#define verbose 0 - -static size_t *len_arr; -static loff_t **off_arr; -static int len_sz, off_sz; +#include "copy_file_range.h" -static void setup (void ) -{ -int i, fd, page_size; - - page_size =getpagesize (); - - fd =SAFE_OPEN (TEST_FILE_1 ,O_RDWR |O_CREAT ,0664 ); -/* Writing page_size * 4 of data into test file */ -for (i =0 ; i < (int )(page_size *4 ); i++) -SAFE_WRITE (1 , fd,STR ,strlen (STR )); -SAFE_CLOSE (fd); - - len_sz =4 ; - len_arr =malloc (sizeof (size_t ) * len_sz); - len_arr[0 ] =11 ; - len_arr[1 ] = page_size -1 ; - len_arr[2 ] = page_size; - len_arr[3 ] = page_size +1 ; - - off_sz =6 ; - off_arr =malloc (sizeof (loff_t *) * off_sz); -for (i =1 ; i < off_sz; i++) - off_arr[i] =malloc (sizeof (loff_t)); - - off_arr[0 ] =NULL ; - *off_arr[1 ] =0 ; - *off_arr[2 ] =17 ; - *off_arr[3 ] = page_size -1 ; - *off_arr[4 ] = page_size; - *off_arr[5 ] = page_size +1 ; -} +static int page_size; +static int errcount, numcopies; +static int fd_in, fd_out;static int check_file_content (const char *fname1,const char *fname2,loff_t *off1,loff_t *off2,size_t len)@@ -90,52 +54,37 @@ static int check_file_content(const char *fname1, const char *fname2, }static int check_file_offset (const char *m,int fd,loff_t len, -loff_t *off_ori,loff_t *off_after) +loff_t *off_before,loff_t *off_after) { +loff_t fd_off =SAFE_LSEEK (fd,0 ,SEEK_CUR );int ret =0 ; -if (off_ori) { -/* FD should stay untouched, and off_in/out is updated */ -loff_t fd_off =SAFE_LSEEK (fd,0 ,SEEK_CUR ); - -if (fd_off ==0 ) { -if (verbose) -tst_res (TPASS ,"%s FD offset unchanged" , m); - }else { -tst_res (TFAIL ,"%s FD offset changed: %ld" , +if (off_before) { +/* +* copy_file_range offset is given: +* - fd offset should stay 0, +* - copy_file_range offset is updated +*/ +if (fd_off !=0 ) { +tst_res (TFAIL , +"%s fd offset unexpectedly changed: %ld" , m, (long )fd_off); ret =1 ; - } -if (!off_after) { -tst_res (TFAIL ,"%s offset is NULL" , m); - ret =1 ; - } - -if ((off_after) && (*off_ori + len == *off_after)) { -if (verbose) { -tst_res (TPASS ,"%s offset advanced as" -" expected: %ld" , m, (long )*off_after); - } - }else { + }else if (*off_before + len != *off_after) {tst_res (TFAIL ,"%s offset unexpected value: %ld" , m, (long )*off_after); ret =1 ; } - }else { -/* FD offset is advanced by len */ -loff_t fd_off =SAFE_LSEEK (fd,0 ,SEEK_CUR ); - -if (fd_off == len) { -if (verbose) { -tst_res (TPASS ,"%s FD offset changed as" -" expected: %ld" , m, (long )fd_off); - } - }else { -tst_res (TFAIL ,"%s FD offset unexpected value: %ld" , + } +/* +* no copy_file_range offset given: +* - fd offset advanced by length +*/ +else if (fd_off != len) { +tst_res (TFAIL ,"%s fd offset unexpected value: %ld" , m, (long )fd_off); - ret =1 ; - } + ret =1 ; }return ret;@@ -143,77 +92,135 @@ static int check_file_offset(const char *m, int fd, loff_t len,static void test_one (size_t len,loff_t *off_in,loff_t *off_out) { +int ret;size_t to_copy = len; -int fd_in, fd_out, ret; -loff_t *off_in_ori = off_in; -loff_t *off_out_ori = off_out; -loff_t off_in_copy; -loff_t off_out_copy; +loff_t off_in_value_copy, off_out_value_copy; +loff_t *off_new_in = &off_in_value_copy; +loff_t *off_new_out = &off_out_value_copy;char str_off_in[32 ], str_off_out[32 ];if (off_in) { - off_in_copy = *off_in; - off_in = &off_in_copy; + off_in_value_copy = *off_in;sprintf (str_off_in,"%ld" , (long )*off_in); }else { + off_new_in =NULL ;strcpy (str_off_in,"NULL" ); }if (off_out) { - off_out_copy = *off_out; - off_out = &off_out_copy; + off_out_value_copy = *off_out;sprintf (str_off_out,"%ld" , (long )*off_out); }else { + off_new_out =NULL ;strcpy (str_off_out,"NULL" ); } - fd_in =SAFE_OPEN (TEST_FILE_1 ,O_RDONLY ); - fd_out =SAFE_OPEN (TEST_FILE_2 ,O_CREAT |O_WRONLY |O_TRUNC ,0644 ); -/* * copy_file_range() will return the number of bytes copied between * files. This could be less than the length originally requested. */ do { -TEST (tst_syscall (__NR_copy_file_range, fd_in, off_in, fd_out, - off_out, to_copy,0 )); +TEST (sys_copy_file_range (fd_in, off_new_in, fd_out, + off_new_out, to_copy,0 ));if (TST_RET ==-1 ) {tst_res (TFAIL |TTERRNO ,"copy_file_range() failed" ); -SAFE_CLOSE (fd_in); -SAFE_CLOSE (fd_out); + errcount++;return ; } to_copy -=TST_RET ; }while (to_copy >0 ); - ret =check_file_content (TEST_FILE_1 ,TEST_FILE_2 , - off_in_ori, off_out_ori, len); -if (ret) + ret =check_file_content (FILE_SRC_PATH ,FILE_DEST_PATH , + off_in, off_out, len); +if (ret) {tst_res (TFAIL ,"file contents do not match" ); + errcount++; +return ; + } - ret |=check_file_offset ("(in)" , fd_in, len, off_in_ori, off_in); - ret |=check_file_offset ("(out)" , fd_out, len, off_out_ori, off_out); + ret |=check_file_offset ("(in)" , fd_in, len, off_in, off_new_in); + ret |=check_file_offset ("(out)" , fd_out, len, off_out, off_new_out); + +if (ret !=0 ) { +tst_res (TFAIL ,"off_in: %s, off_out: %s, len: %ld" , + str_off_in, str_off_out, (long )len); + errcount++; + } +} -tst_res (ret ==0 ?TPASS :TFAIL ,"off_in: %s, off_out: %s, len: %ld" , - str_off_in, str_off_out, (long )len); +static void open_files (void ) +{ + fd_in =SAFE_OPEN (FILE_SRC_PATH ,O_RDONLY ); + fd_out =SAFE_OPEN (FILE_DEST_PATH ,O_CREAT |O_WRONLY |O_TRUNC ,0644 ); +} -SAFE_CLOSE (fd_in); -SAFE_CLOSE (fd_out); +static void close_files (void ) +{ +if (fd_out >0 ) +SAFE_CLOSE (fd_out); +if (fd_in >0 ) +SAFE_CLOSE (fd_in); }static void copy_file_range_verify (void ) {int i, j, k; -for (i =0 ; i < len_sz; i++) -for (j =0 ; j < off_sz; j++) -for (k =0 ; k < off_sz; k++) + errcount = numcopies =0 ; +size_t len_arr[] = {11 , page_size-1 , page_size, page_size+1 }; +loff_t off_arr_values[] = {0 ,17 , page_size-1 , page_size, page_size+1 }; + +int num_offsets =ARRAY_SIZE (off_arr_values) +1 ; +loff_t *off_arr[num_offsets]; + + off_arr[0 ] =NULL ; +for (i =1 ; i < num_offsets; i++) + off_arr[i] = &off_arr_values[i-1 ]; + +/* Test all possible cobinations of given lengths and offsets */ +for (i =0 ; i < (int )ARRAY_SIZE (len_arr); i++) +for (j =0 ; j < num_offsets; j++) +for (k =0 ; k < num_offsets; k++) { +open_files ();test_one (len_arr[i], off_arr[j], off_arr[k]); +close_files (); + numcopies++; + } + +if (errcount ==0 ) +tst_res (TPASS , +"copy_file_range completed all %d copy jobs successfully!" , + numcopies); +else +tst_res (TFAIL ,"copy_file_range failed %d of %d copy jobs." , + errcount, numcopies); +} + +static void setup (void ) +{ +int i, fd; + +syscall_info (); + + page_size =getpagesize (); + + fd =SAFE_OPEN (FILE_SRC_PATH ,O_RDWR |O_CREAT ,0664 ); +/* Writing page_size * 4 of data into test file */ +for (i =0 ; i < (int )(page_size *4 ); i++) +SAFE_WRITE (1 , fd,CONTENT ,CONTSIZE ); +SAFE_CLOSE (fd); +} + +static void cleanup (void ) +{ +close_files (); }static struct tst_test test = { .setup = setup, + .cleanup = cleanup, .needs_tmpdir =1 , .test_all = copy_file_range_verify, + .test_variants =TEST_VARIANTS , };testcases/kernel/syscalls/copy_file_range/copy_file_range02.c new file +118
-0@@ -0,0 +1,118 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2019 SUSE LLC +* Author: Christian Amann <[email protected]> +*/ + +/* +* Tests basic error handling of the +* copy_file_range syscall +* +* 1) Try to copy contents to file open as readonly +* -> EBADF +* 2) Try to copy contents to file on different mounted +* filesystem -> EXDEV +* 3) Try to copy contents to directory -> EISDIR +* 4) Try to copy contents to a file opened with the +* O_APPEND flag -> EBADF +* 5) Try to copy contents to closed filedescriptor +* -> EBADF +* 6) Try to copy contents with invalid 'flags' value +* -> EINVAL +*/ + +#define _GNU_SOURCE + +#include "tst_test.h" +#include "copy_file_range.h" + +static int fd_src; +static int fd_dest; +static int fd_rdonly; +static int fd_mnted; +static int fd_dir; +static int fd_closed; +static int fd_append; + +static struct tcase { +int *copy_to_fd; +int flags; +int exp_err; +} tcases[] = { + {&fd_rdonly,0 ,EBADF }, + {&fd_mnted,0 ,EXDEV }, + {&fd_dir,0 ,EISDIR }, + {&fd_append,0 ,EBADF }, + {&fd_closed,0 ,EBADF }, + {&fd_dest,-1 ,EINVAL }, +}; + +static void verify_copy_file_range (unsigned int n) +{ +struct tcase *tc = &tcases[n]; + +TEST (sys_copy_file_range (fd_src,0 , *tc->copy_to_fd, +0 ,CONTSIZE , tc->flags)); + +if (TST_RET ==-1 ) { +if (tc->exp_err ==TST_ERR ) { +tst_res (TPASS |TTERRNO , +"copy_file_range failed as expected" ); + }else { +tst_res (TFAIL |TTERRNO , +"copy_file_range failed unexpectedly; expected %s, but got" , +tst_strerrno (tc->exp_err)); +return ; + } + }else { +tst_res (TFAIL , +"copy_file_range returned wrong value: %ld" ,TST_RET ); + } +} + +static void cleanup (void ) +{ +if (fd_append >0 ) +SAFE_CLOSE (fd_append); +if (fd_dir >0 ) +SAFE_CLOSE (fd_dir); +if (fd_mnted >0 ) +SAFE_CLOSE (fd_mnted); +if (fd_rdonly >0 ) +SAFE_CLOSE (fd_rdonly); +if (fd_dest >0 ) +SAFE_CLOSE (fd_dest); +if (fd_src >0 ) +SAFE_CLOSE (fd_src); +} + +static void setup (void ) +{ +syscall_info (); + +if (access (FILE_DIR_PATH ,F_OK ) ==-1 ) +SAFE_MKDIR (FILE_DIR_PATH ,0777 ); + + fd_src =SAFE_OPEN (FILE_SRC_PATH ,O_RDWR |O_CREAT ,0664 ); + fd_dest =SAFE_OPEN (FILE_DEST_PATH ,O_RDWR |O_CREAT ,0664 ); + fd_rdonly =SAFE_OPEN (FILE_RDONL_PATH ,O_RDONLY |O_CREAT ,0664 ); + fd_mnted =SAFE_OPEN (FILE_MNTED_PATH ,O_RDWR |O_CREAT ,0664 ); + fd_dir =SAFE_OPEN (FILE_DIR_PATH ,O_DIRECTORY ); + fd_closed =-1 ; + fd_append =SAFE_OPEN (FILE_DEST_PATH , +O_RDWR |O_CREAT |O_APPEND ,0664 ); + +SAFE_WRITE (1 , fd_src,CONTENT ,CONTSIZE ); +} + +static struct tst_test test = { + .test = verify_copy_file_range, + .tcnt =ARRAY_SIZE (tcases), + .setup = setup, + .cleanup = cleanup, + .needs_root =1 , + .mount_device =1 , + .mntpoint =MNTPOINT , + .dev_fs_type ="ext4" , + .test_variants =TEST_VARIANTS , +};testcases/kernel/syscalls/copy_file_range/copy_file_range03.c new file +67
-0@@ -0,0 +1,77 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2019 SUSE LLC +* Author: Christian Amann <[email protected]> +*/ + +/* +* Copies the contents of one file into another and +* checks if the timestamp gets updated in the process. +*/ + +#define _GNU_SOURCE + +#include "tst_test.h" +#include "copy_file_range.h" + +static int fd_src; +static int fd_dest; + +unsigned long get_timestamp (int fd) +{ +struct stat filestat; + +fstat (fd, &filestat); +return filestat.st_mtime; +} + +static void verify_copy_file_range_timestamp (void ) +{ +loff_t offset; +unsigned long timestamp, updated_timestamp; + + timestamp =get_timestamp (fd_dest); +usleep (1000000 ); + + offset =0 ; +TEST (sys_copy_file_range (fd_src, &offset, + fd_dest,0 ,CONTSIZE ,0 )); +if (TST_RET ==-1 ) +tst_brk (TBROK |TTERRNO , +"copy_file_range unexpectedly failed" ); + + updated_timestamp =get_timestamp (fd_dest); + +if (timestamp == updated_timestamp) +tst_brk (TFAIL ,"copy_file_range did not update timestamp." ); + +tst_res (TPASS ,"copy_file_range sucessfully updated the timestamp!" ); +} + +static void cleanup (void ) +{ +if (fd_dest >0 ) +SAFE_CLOSE (fd_dest); +if (fd_src >0 ) +SAFE_CLOSE (fd_src); +} + +static void setup (void ) +{ +syscall_info (); + + fd_dest =SAFE_OPEN (FILE_DEST_PATH ,O_RDWR |O_CREAT ,0664 ); + fd_src =SAFE_OPEN (FILE_SRC_PATH ,O_RDWR |O_CREAT ,0664 ); +SAFE_WRITE (1 , fd_src,CONTENT ,CONTSIZE ); +SAFE_CLOSE (fd_src); + fd_src =SAFE_OPEN (FILE_SRC_PATH ,O_RDONLY );
testcases/kernel/syscalls/copy_file_range/copy_file_range03.c line 77
Quoted 10 lines
testcases/kernel/syscalls/copy_file_range/copy_file_range03.c new file +10
-0+} + + +static struct tst_test test = { + .test_all = verify_copy_file_range_timestamp, + .setup = setup, + .cleanup = cleanup, + .needs_tmpdir =1 , + .test_variants =TEST_VARIANTS , +};
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20190506/6c04daca/attachment-0001.html>
PATCH v4 1/1 syscalls/copy_file_range: add/restructured tests
Hi Christian,
...
Quoted 14 lines
Quoted 14 lines
+++ b/configure.ac
(quoted diff) +1
-0@@ -197,6 +197,7 @@ LTP_CHECK_BUILTIN_CLEAR_CACHE LTP_CHECK_CAPABILITY_SUPPORT LTP_CHECK_CC_WARN_OLDSTYLE LTP_CHECK_CLONE_SUPPORTS_7_ARGS +LTP_CHECK_COPY_FILE_RANGE LTP_CHECK_CRYPTO LTP_CHECK_FIDEDUPE LTP_CHECK_FORTIFY_SOURCEm4/ltp-copy_file_range.m4 new file +0
-0
Quoted 8 lines
m4/ltp-copy_file_range.m4 line 7
Quoted 8 lines
m4/ltp-copy_file_range.m4 new file +7
-0@@ -0,0 +1,7 @@ +dnl SPDX-License-Identifier: GPL-2.0-or-later +dnl Copyright (c) 2019 SUSE LLC +dnl Author: Christian Amann <[email protected]> + +AC_DEFUN([LTP_CHECK_COPY_FILE_RANGE],[ +AC_CHECK_FUNCS(copy_file_range,,) +])
Instead of putting AC_CHECK_FUNCS into separate file (m4/ltp-copy_file_range.m4) since 8fd49cebd ("configure.ac: Simplify the check for libc function implementations") we add copy_file_range into AC_CHECK_FUNCS in configure.ac.
So I'd be for applying it with following diff after LTP release. Nice work, thanks for your patch.
Kind regards,
Petr
configure.ac +1 -1
@@ -60,6 +60,7 @@ AC_CHECK_HEADERS([ \ ]) AC_CHECK_FUNCS([ \ + copy_file_range \ epoll_pwait \ execveat \ fallocate \
@@ -197,7 +198,6 @@ LTP_CHECK_BUILTIN_CLEAR_CACHE LTP_CHECK_CAPABILITY_SUPPORT LTP_CHECK_CC_WARN_OLDSTYLE LTP_CHECK_CLONE_SUPPORTS_7_ARGS -LTP_CHECK_COPY_FILE_RANGE LTP_CHECK_CRYPTO LTP_CHECK_FIDEDUPE LTP_CHECK_FORTIFY_SOURCE
ltp-copy_file_range.m4 deleted +0 -7
@@ -1,7 +0,0 @@ -dnl SPDX-License-Identifier: GPL-2.0-or-later -dnl Copyright (c) 2019 SUSE LLC -dnl Author: Christian Amann <[email protected]> - -AC_DEFUN([LTP_CHECK_COPY_FILE_RANGE],[ -AC_CHECK_FUNCS(copy_file_range,,) -])
PATCH v4 1/1 syscalls/copy_file_range: add/restructured tests
Hi Christian, Cyril,
Before applying (with following diff), just 2 questions:
./copy_file_range02
tst_test.c:1096: INFO: Timeout per run is 0h 05m 00s copy_file_range.h:30: INFO: Testing libc copy_file_range() copy_file_range.h:47: CONF: libc copy_file_range() not supported!
1) I know I was the one who asked to use .test_variants, but it probably does not make sense to use it until glibc (or some other libc) adds copy_file_range() wrapper.
tst_test.c:1096: INFO: Timeout per run is 0h 05m 00s
copy_file_range.h:33: INFO: Testing tst copy_file_range() copy_file_range01.c:194: PASS: copy_file_range completed all 144 copy jobs successfully!
2) Glibc adds internal implementation of copy_file_range(), used as fallback when kernel < 4.5 (which brought copy_file_range()) [1]. I guess there is no way to use it explicitly :(.
Kind regards,
Petr
configure.ac +1 -1
@@ -60,6 +60,7 @@ AC_CHECK_HEADERS([ \ ]) AC_CHECK_FUNCS([ \ + copy_file_range \ epoll_pwait \ execveat \ fallocate \
@@ -198,7 +199,6 @@ LTP_CHECK_BUILTIN_CLEAR_CACHE LTP_CHECK_CAPABILITY_SUPPORT LTP_CHECK_CC_WARN_OLDSTYLE LTP_CHECK_CLONE_SUPPORTS_7_ARGS -LTP_CHECK_COPY_FILE_RANGE LTP_CHECK_CRYPTO LTP_CHECK_FIDEDUPE LTP_CHECK_FORTIFY_SOURCE
ltp-copy_file_range.m4 deleted +0 -7
@@ -1,7 +0,0 @@ -dnl SPDX-License-Identifier: GPL-2.0-or-later -dnl Copyright (c) 2019 SUSE LLC -dnl Author: Christian Amann <[email protected]> - -AC_DEFUN([LTP_CHECK_COPY_FILE_RANGE],[ -AC_CHECK_FUNCS(copy_file_range,,) -])
kernel/syscalls/copy_file_range/copy_file_range.h +1 -1
@@ -44,7 +44,7 @@ static int sys_copy_file_range(int fd_in, loff_t *off_in,return copy_file_range (fd_in, off_in, fd_out, off_out, len, flags);#else -tst_brk (TCONF ,"libc copy_file_range() not supported!" ); +tst_brk (TCONF ,"libc copy_file_range() not supported" );#endif break ;case 1 :
kernel/syscalls/copy_file_range/copy_file_range03.c +1 -1
@@ -45,7 +45,7 @@ static void verify_copy_file_range_timestamp(void)if (timestamp == updated_timestamp)tst_brk (TFAIL ,"copy_file_range did not update timestamp." ); -tst_res (TPASS ,"copy_file_range sucessfully updated the timestamp!" ); +tst_res (TPASS ,"copy_file_range sucessfully updated the timestamp" ); }static void cleanup (void )
PATCH v4 1/1 syscalls/copy_file_range: add/restructured tests
Hi!
Quoted 3 lines
2) Glibc adds internal implementation of
copy_file_range(), used as fallback when kernel < 4.5 (which broughtcopy_file_range()) [1]. I guess there is no way to use it explicitly :(.
Well we can always use filesystem that does not support the operation, so running the test for all filesystems should get the emulation covered for sure...
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v4 1/1 syscalls/copy_file_range: add/restructured tests
Hi,
Quoted 7 lines
Quoted 3 lines
2) Glibc adds internal implementation of
copy_file_range(), used as fallback when kernel < 4.5 (which broughtcopy_file_range()) [1]. I guess there is no way to use it explicitly :(.Well we can always use filesystem that does not support the operation, so running the test for all filesystems should get the emulation covered for sure...
Oh, that's the way :).
Merged then, thanks for your patch, Christian.
Kind regards,
Petr
PATCH v4 1/1 syscalls/copy_file_range: add/restructured tests
Quoted 11 lines · Petr Vorel
Hi,
Quoted 7 lines
Quoted 3 lines
2) Glibc adds internal implementation of
copy_file_range(), used as fallback when kernel < 4.5 (which broughtcopy_file_range()) [1]. I guess there is no way to use it explicitly :(.Well we can always use filesystem that does not support the operation, so running the test for all filesystems should get the emulation covered for sure...
Oh, that's the way :).
Actually, there is no such thing as filesystem that does not support copy_file_range() because the kernel provides a fallback default implementation (in-kernel copy).
Quoted 2 lines
Merged then, thanks for your patch, Christian.
I was going to ask that you drop the EXDEV test, because I am working on a path set to relax the cross-device constraint.
Oh well. I will post a patch to remove that test case once my code is merged.
Thanks,
Amir.
PATCH v4 1/1 syscalls/copy_file_range: add/restructured tests
Hi Amir,
Quoted 4 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
2) Glibc adds internal implementation of
copy_file_range(), used as fallback when kernel < 4.5 (which broughtcopy_file_range()) [1]. I guess there is no way to use it explicitly :(.
Quoted 8 lines
Quoted 4 lines
Quoted 3 lines
Well we can always use filesystem that does not support the operation, so running the test for all filesystems should get the emulation covered for sure...
Oh, that's the way :).
Actually, there is no such thing as filesystem that does not support
copy_file_range()because the kernel provides a fallback default implementation (in-kernel copy).
Thanks for explanation.
Quoted 6 lines
Quoted 1 line
Merged then, thanks for your patch, Christian.
I was going to ask that you drop the EXDEV test, because I am working on a path set to relax the cross-device constraint.
Oh well. I will post a patch to remove that test case once my code is merged.
Sorry, I thought patch was in ML for some time :(. Yes, please do.
Quoted 2 lines
Thanks,
Amir.
Kind regards,
Petr
PATCH v4 1/1 syscalls/copy_file_range: add/restructured tests
In reply to Amir GoldsteinHi!
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
Quoted 3 lines
2) Glibc adds internal implementation of
copy_file_range(), used as fallback when kernel < 4.5 (which broughtcopy_file_range()) [1]. I guess there is no way to use it explicitly :(.
Quoted 8 lines
Quoted 4 lines
Quoted 3 lines
Well we can always use filesystem that does not support the operation, so running the test for all filesystems should get the emulation covered for sure...
Oh, that's the way :).
Actually, there is no such thing as filesystem that does not support
copy_file_range()because the kernel provides a fallback default implementation (in-kernel copy).
So the glibc fallback code is probably something that will end up being used if someone wants to run application that uses this syscall on BSD or other corner cases. I guess that we do not care that much about testing the glibc fallback code then.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v4 1/1 syscalls/copy_file_range: add/restructured tests
Quoted 9 lines · Cyril Hrubis
Hi!
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
2) Glibc adds internal implementation of
copy_file_range(), used as fallback when kernel < 4.5 (which broughtcopy_file_range()) [1]. I guess there is no way to use it explicitly :(.Well we can always use filesystem that does not support the operation, so running the test for all filesystems should get the emulation covered for sure...
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Oh, that's the way :).
Actually, there is no such thing as filesystem that does not support
copy_file_range()because the kernel provides a fallback default implementation (in-kernel copy).So the glibc fallback code is probably something that will end up being used if someone wants to run application that uses this syscall on BSD
Or Linux kernel < 4.5.
Quoted 6 lines
or other corner cases. I guess that we do not care that much about testing the glibc fallback code then.
--
Cyril Hrubis
[email protected]
PATCH v4 1/1 syscalls/copy_file_range: add/restructured tests
Hi!
Quoted 4 lines
Quoted 2 lines
So the glibc fallback code is probably something that will end up being used if someone wants to run application that uses this syscall on BSD
Or Linux kernel < 4.5.
Linux kernel 4.5 is about two years older than glibc 2.27 that implements the emulation, so I doubt that someone will actually run this combination.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v4 1/1 syscalls/copy_file_range: add/restructured tests
In reply to Cyril HrubisHi,
Quoted 9 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 3 lines
2) Glibc adds internal implementation of
copy_file_range(), used as fallback when kernel < 4.5 (which broughtcopy_file_range()) [1]. I guess there is no way to use it explicitly :(.Well we can always use filesystem that does not support the operation, so running the test for all filesystems should get the emulation covered for sure...
Oh, that's the way :).
Quoted 8 lines
Quoted 3 lines
Actually, there is no such thing as filesystem that does not support
copy_file_range()because the kernel provides a fallback default implementation (in-kernel copy).So the glibc fallback code is probably something that will end up being used if someone wants to run application that uses this syscall on BSD or other corner cases. I guess that we do not care that much about testing the glibc fallback code then.
OK, we should remove test variants then.
Kind regards,
Petr
PATCH v4 1/1 syscalls/copy_file_range: add/restructured tests
Hi!
Quoted 5 lines
Quoted 4 lines
So the glibc fallback code is probably something that will end up being used if someone wants to run application that uses this syscall on BSD or other corner cases. I guess that we do not care that much about testing the glibc fallback code then.
OK, we should remove test variants then.
I wouldn't say so, there were real bugs in syscall even in fairly simple syscall wrappers in glibc, by running the test twice both for the raw syscall and the glibc wrapper we are testing both the kernel and then the glibc-kernel integration.
Signature · 2 lines
Cyril Hrubis [email protected]