| Message ID | 1562359357-24526-1-git-send-email-xuyang2018.jy@cn.fujitsu.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Petr Vorel |
| Headers | show |
| Series | [v2] syscalls/copy_file_range02: increase coverage and remove EXDEV test | expand |
On Mon, Jul 8, 2019 at 1:46 PM Yang Xu <xuyang2018.jy@cn.fujitsu.com> wrote: > > Since Amir path for copy_file_range has been merged into linux-xfs, > I add test for swapfile, immutable file, bounds in ltp. Also, add test > for block char pipe dev and remove EXDEV test(5.3 will relax the cross-device > constraint[2]). I follow xfstests code[3][4][5] and increase it . > > [1]https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/commit/?h=for-next-5.3&id=5dae222a5ff0c269730393018a5539cc970a4726 > [2]https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/commit/?h=for-next-5.3&id=96e6e8f4a68df2d94800311163faa67124df24e5 > [3]https://patchwork.kernel.org/patch/10971759/ > [4]https://patchwork.kernel.org/patch/10971747/ > [5]https://patchwork.kernel.org/patch/10961421/ > > Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com> > --- > .../copy_file_range/copy_file_range.h | 11 +- > .../copy_file_range/copy_file_range02.c | 139 +++++++++++++++--- > 2 files changed, 130 insertions(+), 20 deletions(-) > > diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range.h b/testcases/kernel/syscalls/copy_file_range/copy_file_range.h > index b6d132978..f9e2565d9 100644 > --- a/testcases/kernel/syscalls/copy_file_range/copy_file_range.h > +++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range.h > @@ -9,6 +9,7 @@ > > #include <stdbool.h> > #include <unistd.h> > +#include <sys/sysmacros.h> > #include "lapi/syscalls.h" > > #define TEST_VARIANTS 2 > @@ -18,10 +19,18 @@ > #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 FILE_IMMUTABLE_PATH "file_immutable" > +#define FILE_SWAP_PATH "file_swap" > +#define FILE_BLKDEV "file_blk" > +#define FILE_CHRDEV "file_chr" > +#define FILE_FIFO "file_fifo" > +#define FILE_COPY_PATH "file_copy" > > #define CONTENT "ABCDEFGHIJKLMNOPQRSTUVWXYZ12345\n" > #define CONTSIZE (sizeof(CONTENT) - 1) > +#define MAX_LEN ((long long)(~0ULL >> 1)) > +#define MIN_OFF 65537 > +#define MAX_OFF (MAX_LEN - MIN_OFF) In the xfstest the value of MAX_OFF is ((1ULL << 63) - MIN_OFF) Not sure why it was changed here? > [...] > + > static void verify_copy_file_range(unsigned int n) > { > struct tcase *tc = &tcases[n]; > + if (tc->exp_err == ETXTBSY && chattr_i_nsup) { if (tc->copy_to_fd == &fd_immutable && chattr_i_nsup) Would have made much more sense to code readers. > + tst_res(TCONF, "filesystem doesn't support chattr +i, skip it"); > + return; > + } > + if (tc->exp_err == EPERM && swap_nsup) { Same here. > + tst_res(TCONF, "filesystem doesn't support swapfile, skip it"); > + return; > + } > > TEST(sys_copy_file_range(fd_src, 0, *tc->copy_to_fd, > - 0, CONTSIZE, tc->flags)); > + &tc->dst, tc->len, tc->flags)); > [...] > > static void setup(void) > { > syscall_info(); > + dev_t dev[2]; > + > + dev[1] = makedev(7, 127); As I wrote before, while it is probable the loop127 is free it is not safe programming to assume it is free, especially not if you are trying to overwrite its content! I suggest that you alter find_free_loopdev() to return the free loopdev minor (and -1 for no free loopdev) and then you can safely use the minor number that find_free_loopdev() returned in this test. If there is no free loopdev you can return TCONF. > + dev[2] = makedev(1, 3); What I meant was #define FILE_CHRDEV "/dev/null" Obviously, no need to mknod nor unlink it on cleanup... Thanks, Amir.
on 2019/07/08 23:17, Amir Goldstein wrote: > On Mon, Jul 8, 2019 at 1:46 PM Yang Xu<xuyang2018.jy@cn.fujitsu.com> wrote: >> Since Amir path for copy_file_range has been merged into linux-xfs, >> I add test for swapfile, immutable file, bounds in ltp. Also, add test >> for block char pipe dev and remove EXDEV test(5.3 will relax the cross-device >> constraint[2]). I follow xfstests code[3][4][5] and increase it . >> >> [1]https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/commit/?h=for-next-5.3&id=5dae222a5ff0c269730393018a5539cc970a4726 >> [2]https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/commit/?h=for-next-5.3&id=96e6e8f4a68df2d94800311163faa67124df24e5 >> [3]https://patchwork.kernel.org/patch/10971759/ >> [4]https://patchwork.kernel.org/patch/10971747/ >> [5]https://patchwork.kernel.org/patch/10961421/ >> >> Signed-off-by: Yang Xu<xuyang2018.jy@cn.fujitsu.com> >> --- >> .../copy_file_range/copy_file_range.h | 11 +- >> .../copy_file_range/copy_file_range02.c | 139 +++++++++++++++--- >> 2 files changed, 130 insertions(+), 20 deletions(-) >> >> diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range.h b/testcases/kernel/syscalls/copy_file_range/copy_file_range.h >> index b6d132978..f9e2565d9 100644 >> --- a/testcases/kernel/syscalls/copy_file_range/copy_file_range.h >> +++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range.h >> @@ -9,6 +9,7 @@ >> >> #include<stdbool.h> >> #include<unistd.h> >> +#include<sys/sysmacros.h> >> #include "lapi/syscalls.h" >> >> #define TEST_VARIANTS 2 >> @@ -18,10 +19,18 @@ >> #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 FILE_IMMUTABLE_PATH "file_immutable" >> +#define FILE_SWAP_PATH "file_swap" >> +#define FILE_BLKDEV "file_blk" >> +#define FILE_CHRDEV "file_chr" >> +#define FILE_FIFO "file_fifo" >> +#define FILE_COPY_PATH "file_copy" >> >> #define CONTENT "ABCDEFGHIJKLMNOPQRSTUVWXYZ12345\n" >> #define CONTSIZE (sizeof(CONTENT) - 1) >> +#define MAX_LEN ((long long)(~0ULL>> 1)) >> +#define MIN_OFF 65537 >> +#define MAX_OFF (MAX_LEN - MIN_OFF) > In the xfstest the value of MAX_OFF is ((1ULL<< 63) - MIN_OFF) > Not sure why it was changed here? Because the LONG LONG max value in kernel linux/limit.h is defined as" #define LLONG_MAX ((long long)(~0ULL>> 1))". I think it is a common usage. If you don't like this way, I will use the xfstests vaule. > [...] >> + >> static void verify_copy_file_range(unsigned int n) >> { >> struct tcase *tc =&tcases[n]; >> + if (tc->exp_err == ETXTBSY&& chattr_i_nsup) { > if (tc->copy_to_fd ==&fd_immutable&& chattr_i_nsup) > > Would have made much more sense to code readers. Yes. >> + tst_res(TCONF, "filesystem doesn't support chattr +i, skip it"); >> + return; >> + } >> + if (tc->exp_err == EPERM&& swap_nsup) { > Same here. OK. >> + tst_res(TCONF, "filesystem doesn't support swapfile, skip it"); >> + return; >> + } >> >> TEST(sys_copy_file_range(fd_src, 0, *tc->copy_to_fd, >> - 0, CONTSIZE, tc->flags)); >> +&tc->dst, tc->len, tc->flags)); >> > [...] > >> static void setup(void) >> { >> syscall_info(); >> + dev_t dev[2]; >> + >> + dev[1] = makedev(7, 127); > As I wrote before, while it is probable the loop127 is free it is not safe > programming to assume it is free, especially not if you are trying to overwrite > its content! > I suggest that you alter find_free_loopdev() to return the free loopdev minor > (and -1 for no free loopdev) and then you can safely use the minor number > that find_free_loopdev() returned in this test. > If there is no free loopdev you can return TCONF. Hi Amir Thank for you mentionation. Befor this, I don't know the find_free_loopdev api in ltp. If I alter it, I think we can add find_free_loopdev document in doc/test-writing-guidelines.txt. I will send a v3 patch for your comment. >> + dev[2] = makedev(1, 3); > What I meant was > #define FILE_CHRDEV "/dev/null" > > Obviously, no need to mknod nor unlink it on cleanup... OK. This way is great. > Thanks, > Amir. > > > . >
On Tue, Jul 9, 2019 at 9:57 AM Yang Xu <xuyang2018.jy@cn.fujitsu.com> wrote: > > on 2019/07/08 23:17, Amir Goldstein wrote: > > > On Mon, Jul 8, 2019 at 1:46 PM Yang Xu<xuyang2018.jy@cn.fujitsu.com> wrote: > >> Since Amir path for copy_file_range has been merged into linux-xfs, > >> I add test for swapfile, immutable file, bounds in ltp. Also, add test > >> for block char pipe dev and remove EXDEV test(5.3 will relax the cross-device > >> constraint[2]). I follow xfstests code[3][4][5] and increase it . > >> > >> [1]https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/commit/?h=for-next-5.3&id=5dae222a5ff0c269730393018a5539cc970a4726 > >> [2]https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/commit/?h=for-next-5.3&id=96e6e8f4a68df2d94800311163faa67124df24e5 > >> [3]https://patchwork.kernel.org/patch/10971759/ > >> [4]https://patchwork.kernel.org/patch/10971747/ > >> [5]https://patchwork.kernel.org/patch/10961421/ > >> > >> Signed-off-by: Yang Xu<xuyang2018.jy@cn.fujitsu.com> > >> --- > >> .../copy_file_range/copy_file_range.h | 11 +- > >> .../copy_file_range/copy_file_range02.c | 139 +++++++++++++++--- > >> 2 files changed, 130 insertions(+), 20 deletions(-) > >> > >> diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range.h b/testcases/kernel/syscalls/copy_file_range/copy_file_range.h > >> index b6d132978..f9e2565d9 100644 > >> --- a/testcases/kernel/syscalls/copy_file_range/copy_file_range.h > >> +++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range.h > >> @@ -9,6 +9,7 @@ > >> > >> #include<stdbool.h> > >> #include<unistd.h> > >> +#include<sys/sysmacros.h> > >> #include "lapi/syscalls.h" > >> > >> #define TEST_VARIANTS 2 > >> @@ -18,10 +19,18 @@ > >> #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 FILE_IMMUTABLE_PATH "file_immutable" > >> +#define FILE_SWAP_PATH "file_swap" > >> +#define FILE_BLKDEV "file_blk" > >> +#define FILE_CHRDEV "file_chr" > >> +#define FILE_FIFO "file_fifo" > >> +#define FILE_COPY_PATH "file_copy" > >> > >> #define CONTENT "ABCDEFGHIJKLMNOPQRSTUVWXYZ12345\n" > >> #define CONTSIZE (sizeof(CONTENT) - 1) > >> +#define MAX_LEN ((long long)(~0ULL>> 1)) > >> +#define MIN_OFF 65537 > >> +#define MAX_OFF (MAX_LEN - MIN_OFF) > > In the xfstest the value of MAX_OFF is ((1ULL<< 63) - MIN_OFF) > > Not sure why it was changed here? > Because the LONG LONG max value in kernel linux/limit.h is defined as" #define LLONG_MAX ((long long)(~0ULL>> 1))". > I think it is a common usage. If you don't like this way, I will use the xfstests vaule. No it makes sense. VFS max size is larger than XFS max size and I think btrfs is limited for the VFS max. Maybe it is better to define MAX_LFS_FILESIZE if it is not defined in some ltp header file and #define MAX_LEN MAX_LFS_FILESIZE leaving comments where due. Also, I now wonder if running this test on 32bit kernel and with test compiled for 32bit will yield the expected errors? Thanks, Amir.
on 2019/07/09 18:06, Amir Goldstein wrote: > On Tue, Jul 9, 2019 at 9:57 AM Yang Xu<xuyang2018.jy@cn.fujitsu.com> wrote: >> on 2019/07/08 23:17, Amir Goldstein wrote: >> >>> On Mon, Jul 8, 2019 at 1:46 PM Yang Xu<xuyang2018.jy@cn.fujitsu.com> wrote: >>>> Since Amir path for copy_file_range has been merged into linux-xfs, >>>> I add test for swapfile, immutable file, bounds in ltp. Also, add test >>>> for block char pipe dev and remove EXDEV test(5.3 will relax the cross-device >>>> constraint[2]). I follow xfstests code[3][4][5] and increase it . >>>> >>>> [1]https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/commit/?h=for-next-5.3&id=5dae222a5ff0c269730393018a5539cc970a4726 >>>> [2]https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/commit/?h=for-next-5.3&id=96e6e8f4a68df2d94800311163faa67124df24e5 >>>> [3]https://patchwork.kernel.org/patch/10971759/ >>>> [4]https://patchwork.kernel.org/patch/10971747/ >>>> [5]https://patchwork.kernel.org/patch/10961421/ >>>> >>>> Signed-off-by: Yang Xu<xuyang2018.jy@cn.fujitsu.com> >>>> --- >>>> .../copy_file_range/copy_file_range.h | 11 +- >>>> .../copy_file_range/copy_file_range02.c | 139 +++++++++++++++--- >>>> 2 files changed, 130 insertions(+), 20 deletions(-) >>>> >>>> diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range.h b/testcases/kernel/syscalls/copy_file_range/copy_file_range.h >>>> index b6d132978..f9e2565d9 100644 >>>> --- a/testcases/kernel/syscalls/copy_file_range/copy_file_range.h >>>> +++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range.h >>>> @@ -9,6 +9,7 @@ >>>> >>>> #include<stdbool.h> >>>> #include<unistd.h> >>>> +#include<sys/sysmacros.h> >>>> #include "lapi/syscalls.h" >>>> >>>> #define TEST_VARIANTS 2 >>>> @@ -18,10 +19,18 @@ >>>> #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 FILE_IMMUTABLE_PATH "file_immutable" >>>> +#define FILE_SWAP_PATH "file_swap" >>>> +#define FILE_BLKDEV "file_blk" >>>> +#define FILE_CHRDEV "file_chr" >>>> +#define FILE_FIFO "file_fifo" >>>> +#define FILE_COPY_PATH "file_copy" >>>> >>>> #define CONTENT "ABCDEFGHIJKLMNOPQRSTUVWXYZ12345\n" >>>> #define CONTSIZE (sizeof(CONTENT) - 1) >>>> +#define MAX_LEN ((long long)(~0ULL>> 1)) >>>> +#define MIN_OFF 65537 >>>> +#define MAX_OFF (MAX_LEN - MIN_OFF) >>> In the xfstest the value of MAX_OFF is ((1ULL<< 63) - MIN_OFF) >>> Not sure why it was changed here? >> Because the LONG LONG max value in kernel linux/limit.h is defined as" #define LLONG_MAX ((long long)(~0ULL>> 1))". >> I think it is a common usage. If you don't like this way, I will use the xfstests vaule. > No it makes sense. VFS max size is larger than XFS max size and > I think btrfs is limited for the VFS max. > > Maybe it is better to define MAX_LFS_FILESIZE if it is not defined > in some ltp header file and #define MAX_LEN MAX_LFS_FILESIZE > leaving comments where due. > > Also, I now wonder if running this test on 32bit kernel and with test > compiled for 32bit will yield the expected errors? Hi Amir I have sent a v3 patch. I split it into 3 patch. lib: alter find_free_loopdev() syscalls/copy_file_range01: add cross-device test syscalls/copy_file_range02: increase coverage and remove EXDEV test I don't have 32bit machine or vm. It takes some time. Please wait. ps: If someone can help to test it, it will be great. Thanks, Yang Xu > Thanks, > Amir. > > >
diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range.h b/testcases/kernel/syscalls/copy_file_range/copy_file_range.h index b6d132978..f9e2565d9 100644 --- a/testcases/kernel/syscalls/copy_file_range/copy_file_range.h +++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range.h @@ -9,6 +9,7 @@ #include <stdbool.h> #include <unistd.h> +#include <sys/sysmacros.h> #include "lapi/syscalls.h" #define TEST_VARIANTS 2 @@ -18,10 +19,18 @@ #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 FILE_IMMUTABLE_PATH "file_immutable" +#define FILE_SWAP_PATH "file_swap" +#define FILE_BLKDEV "file_blk" +#define FILE_CHRDEV "file_chr" +#define FILE_FIFO "file_fifo" +#define FILE_COPY_PATH "file_copy" #define CONTENT "ABCDEFGHIJKLMNOPQRSTUVWXYZ12345\n" #define CONTSIZE (sizeof(CONTENT) - 1) +#define MAX_LEN ((long long)(~0ULL >> 1)) +#define MIN_OFF 65537 +#define MAX_OFF (MAX_LEN - MIN_OFF) static void syscall_info(void) { diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c index 07c0207c2..89519ac1d 100644 --- a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c +++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c @@ -10,15 +10,25 @@ * * 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 + * 2) Try to copy contents to directory -> EISDIR + * 3) Try to copy contents to a file opened with the * O_APPEND flag -> EBADF - * 5) Try to copy contents to closed filedescriptor + * 4) Try to copy contents to closed filedescriptor * -> EBADF - * 6) Try to copy contents with invalid 'flags' value + * 5) Try to copy contents with invalid 'flags' value * -> EINVAL + * 6) Try to copy contents to a file chattred with +i + * flag -> EPERM + * 7) Try to copy contents to a swapfile ->ETXTBSY + * 8) Try to copy contents to the samefile with overlapping + * ->EINVAL + * 9) Try to copy contents to a blkdev ->EINVAL + * 10) Try to copy contents to a chardev ->EINVAL + * 11) Try to copy contents to a FIFO ->EINVAL + * 12) Try to copy contents to a file with length beyond + * 8EiB wraps around 0 -> EOVERFLOW + * 13) Try to copy contents to a file with target file range + * beyond 8TiB ->EFBIG */ #define _GNU_SOURCE @@ -29,30 +39,74 @@ 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 int fd_immutable; +static int fd_swapfile; +static int fd_dup; +static int fd_blkdev; +static int fd_chrdev; +static int fd_fifo; +static int fd_copy; + +static int chattr_i_nsup; +static int swap_nsup; static struct tcase { int *copy_to_fd; int flags; int exp_err; + loff_t dst; + loff_t len; } 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}, + {&fd_rdonly, 0, EBADF, 0, CONTSIZE}, + {&fd_dir, 0, EISDIR, 0, CONTSIZE}, + {&fd_append, 0, EBADF, 0, CONTSIZE}, + {&fd_closed, 0, EBADF, 0, CONTSIZE}, + {&fd_dest, -1, EINVAL, 0, CONTSIZE}, + {&fd_immutable, 0, EPERM, 0, CONTSIZE}, + {&fd_swapfile, 0, ETXTBSY, 0, CONTSIZE}, + {&fd_dup, 0, EINVAL, 0, CONTSIZE/2}, + {&fd_blkdev, 0, EINVAL, 0, CONTSIZE}, + {&fd_chrdev, 0, EINVAL, 0, CONTSIZE}, + {&fd_fifo, 0, EINVAL, 0, CONTSIZE}, + {&fd_copy, 0, EOVERFLOW, MAX_OFF, 2*MAX_LEN}, + {&fd_copy, 0, EFBIG, MAX_OFF, MIN_OFF}, }; +static int run_command(char *command, char *option, char *file) +{ + const char *const cmd[] = {command, option, file, NULL}; + int ret; + + ret = tst_run_cmd(cmd, NULL, NULL, 1); + switch (ret) { + case 0: + return 0; + case 255: + tst_res(TCONF, "%s binary not installed", command); + return 1; + default: + tst_res(TCONF, "%s exited with %i", command, ret); + return 2; + } +} + static void verify_copy_file_range(unsigned int n) { struct tcase *tc = &tcases[n]; + if (tc->exp_err == ETXTBSY && chattr_i_nsup) { + tst_res(TCONF, "filesystem doesn't support chattr +i, skip it"); + return; + } + if (tc->exp_err == EPERM && swap_nsup) { + tst_res(TCONF, "filesystem doesn't support swapfile, skip it"); + return; + } TEST(sys_copy_file_range(fd_src, 0, *tc->copy_to_fd, - 0, CONTSIZE, tc->flags)); + &tc->dst, tc->len, tc->flags)); if (TST_RET == -1) { if (tc->exp_err == TST_ERR) { @@ -76,33 +130,80 @@ static void cleanup(void) 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); + if (fd_immutable > 0) { + run_command("chattr", "-i", FILE_IMMUTABLE_PATH); + SAFE_CLOSE(fd_immutable); + } + if (fd_swapfile > 0) { + run_command("swapoff", FILE_SWAP_PATH, NULL); + SAFE_CLOSE(fd_swapfile); + } + if (fd_dup > 0) + SAFE_CLOSE(fd_dup); + if (fd_copy > 0) + SAFE_CLOSE(fd_copy); + + SAFE_UNLINK(FILE_BLKDEV); + SAFE_UNLINK(FILE_CHRDEV); + SAFE_UNLINK(FILE_FIFO); } static void setup(void) { syscall_info(); + dev_t dev[2]; + + dev[1] = makedev(7, 127); + dev[2] = makedev(1, 3); if (access(FILE_DIR_PATH, F_OK) == -1) SAFE_MKDIR(FILE_DIR_PATH, 0777); + SAFE_MKNOD(FILE_BLKDEV, S_IFBLK | 0777, dev[1]); + SAFE_MKNOD(FILE_CHRDEV, S_IFCHR | 0777, dev[2]); + SAFE_MKNOD(FILE_FIFO, S_IFIFO | 0777, 0); + 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); + fd_immutable = SAFE_OPEN(FILE_IMMUTABLE_PATH, O_RDWR | O_CREAT, 0664); + fd_swapfile = SAFE_OPEN(FILE_SWAP_PATH, O_RDWR | O_CREAT, 0600); + fd_blkdev = SAFE_OPEN(FILE_BLKDEV, O_RDWR, 0664); + fd_chrdev = SAFE_OPEN(FILE_CHRDEV, O_RDWR, 0664); + fd_fifo = SAFE_OPEN(FILE_FIFO, O_RDWR, 0664); + + SAFE_WRITE(1, fd_src, CONTENT, CONTSIZE); + close(fd_src); + fd_src = SAFE_OPEN(FILE_SRC_PATH, O_RDONLY, 0664); + fd_dup = SAFE_OPEN(FILE_SRC_PATH, O_WRONLY|O_CREAT, 0666); + + fd_copy = SAFE_OPEN(FILE_COPY_PATH, O_RDWR | O_CREAT | O_TRUNC, 0664); + chattr_i_nsup = run_command("chattr", "+i", FILE_IMMUTABLE_PATH); + + if (!tst_fs_has_free(".", sysconf(_SC_PAGESIZE) * 10, TST_BYTES)) { + tst_res(TCONF, "Insufficient disk space to create swap file"); + swap_nsup = 3; + return; + } + + if (tst_fill_file(FILE_SWAP_PATH, 0, sysconf(_SC_PAGESIZE), 10) != 0) { + tst_res(TCONF, "Failed to create swapfile"); + swap_nsup = 4; + return; + } - SAFE_WRITE(1, fd_src, CONTENT, CONTSIZE); + swap_nsup = run_command("mkswap", FILE_SWAP_PATH, NULL); + swap_nsup = run_command("swapon", FILE_SWAP_PATH, NULL); } static struct tst_test test = { @@ -113,6 +214,6 @@ static struct tst_test test = { .needs_root = 1, .mount_device = 1, .mntpoint = MNTPOINT, - .dev_fs_type = "ext4", + .all_filesystems = 1, .test_variants = TEST_VARIANTS, };
Since Amir path for copy_file_range has been merged into linux-xfs, I add test for swapfile, immutable file, bounds in ltp. Also, add test for block char pipe dev and remove EXDEV test(5.3 will relax the cross-device constraint[2]). I follow xfstests code[3][4][5] and increase it . [1]https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/commit/?h=for-next-5.3&id=5dae222a5ff0c269730393018a5539cc970a4726 [2]https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/commit/?h=for-next-5.3&id=96e6e8f4a68df2d94800311163faa67124df24e5 [3]https://patchwork.kernel.org/patch/10971759/ [4]https://patchwork.kernel.org/patch/10971747/ [5]https://patchwork.kernel.org/patch/10961421/ Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com> --- .../copy_file_range/copy_file_range.h | 11 +- .../copy_file_range/copy_file_range02.c | 139 +++++++++++++++--- 2 files changed, 130 insertions(+), 20 deletions(-)