| Message ID | 1551428901-30162-1-git-send-email-sumit.garg@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] syscalls/sync_file_range: add partial file sync test-case | expand |
Hi! > +static void verify_sync_partial_file(void) > +{ > + int fd; > + unsigned long written; > + > + fd = SAFE_OPEN(FNAME, O_RDWR|O_CREAT, MODE); > + > + lseek(fd, FILE_SIZE/4, SEEK_SET); > + > + tst_dev_bytes_written(tst_device->dev); > + > + tst_fill_fd(fd, 0xff, TST_MB, FILE_SIZE_MB/2); Any reason why we don't do full FILE_SIZE_MB write here and then check that the result was somewhere between FILE_SIZE/2 +-10% ? Other than that the patch looks good.
On Mon, 4 Mar 2019 at 20:10, Cyril Hrubis <chrubis@suse.cz> wrote: > > Hi! > > +static void verify_sync_partial_file(void) > > +{ > > + int fd; > > + unsigned long written; > > + > > + fd = SAFE_OPEN(FNAME, O_RDWR|O_CREAT, MODE); > > + > > + lseek(fd, FILE_SIZE/4, SEEK_SET); > > + > > + tst_dev_bytes_written(tst_device->dev); > > + > > + tst_fill_fd(fd, 0xff, TST_MB, FILE_SIZE_MB/2); > > Any reason why we don't do full FILE_SIZE_MB write here and then check > that the result was somewhere between FILE_SIZE/2 +-10% ? > Don't have any compelling reason to not do full file write. So will write whole file and test sync for particular portion of file (FILE_SIZE/4 to 3*FILE_SIZE/4). -Sumit > Other than that the patch looks good. > > -- > Cyril Hrubis > chrubis@suse.cz
diff --git a/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c b/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c index 82d77f7..23240c0 100644 --- a/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c +++ b/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c @@ -27,7 +27,7 @@ #define FILE_SIZE (FILE_SIZE_MB * TST_MB) #define MODE 0644 -static void verify_sync_file_range(void) +static void verify_sync_full_file(void) { int fd; unsigned long written; @@ -56,6 +56,50 @@ static void verify_sync_file_range(void) tst_res(TFAIL, "Synced %li, expected %i", written, FILE_SIZE); } +static void verify_sync_partial_file(void) +{ + int fd; + unsigned long written; + + fd = SAFE_OPEN(FNAME, O_RDWR|O_CREAT, MODE); + + lseek(fd, FILE_SIZE/4, SEEK_SET); + + tst_dev_bytes_written(tst_device->dev); + + tst_fill_fd(fd, 0xff, TST_MB, FILE_SIZE_MB/2); + + TEST(sync_file_range(fd, FILE_SIZE/4, FILE_SIZE/2, + SYNC_FILE_RANGE_WAIT_BEFORE | + SYNC_FILE_RANGE_WRITE | + SYNC_FILE_RANGE_WAIT_AFTER)); + + if (TST_RET) + tst_brk(TFAIL | TTERRNO, "sync_file_range() failed"); + + written = tst_dev_bytes_written(tst_device->dev); + + SAFE_CLOSE(fd); + + if (written >= FILE_SIZE/2) + tst_res(TPASS, "Test file range synced to device"); + else + tst_res(TFAIL, "Synced %li, expected %i", written, + FILE_SIZE/2); +} + +static struct tcase { + void (*tfunc)(void); +} tcases[] = { + {&verify_sync_full_file}, + {&verify_sync_partial_file} +}; + +static void run(unsigned int i) +{ + tcases[i].tfunc(); +} + static void setup(void) { if (!check_sync_file_range()) @@ -63,10 +107,11 @@ static void setup(void) } static struct tst_test test = { + .tcnt = ARRAY_SIZE(tcases), .needs_root = 1, .mount_device = 1, .all_filesystems = 1, .mntpoint = MNTPOINT, .setup = setup, - .test_all = verify_sync_file_range, + .test = run, };
Add partial file sync test as part of sync_file_range02 test-case. Signed-off-by: Sumit Garg <sumit.garg@linaro.org> --- .../syscalls/sync_file_range/sync_file_range02.c | 49 +++++++++++++++++++++- 1 file changed, 47 insertions(+), 2 deletions(-)