| Message ID | 20240516104227.25381-3-andrea.cervesato@suse.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | cachestat testing suite | expand |
Hi! > diff --git a/testcases/kernel/syscalls/cachestat/cachestat01.c b/testcases/kernel/syscalls/cachestat/cachestat01.c > new file mode 100644 > index 000000000..7362a9dcf > --- /dev/null > +++ b/testcases/kernel/syscalls/cachestat/cachestat01.c > @@ -0,0 +1,102 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Copyright (C) 2024 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com> > + */ > + > +/*\ > + * [Description] > + * > + * This test verifies that cachestat() syscall is properly counting cached pages > + * written inside a file. If storage device synchronization is requested, test > + * will check if the number of dirty pages is zero. > + * > + * [Algorithm] > + * > + * * create a file with specific amount of pages > + * ** synchronize storage device, if needed > + * * monitor file with cachestat() > + * * check if the right amount of pages have been moved into cache > + * ** if storage device synchronization is requested, check that dirty pages is > + * zero > + */ > + > +#include "cachestat.h" > + > +#define MNTPOINT "mntpoint" > +#define FILENAME MNTPOINT "/myfile.bin" > +#define NUMPAGES 32 > + > +static char *data; > +static int file_size; > +static struct cachestat *cs; > +static struct cachestat_range *cs_range; > +static char *run_fsync; > + > +static void run(void) > +{ > + int fd; > + > + memset(cs, 0, sizeof(struct cachestat)); > + > + fd = SAFE_OPEN(FILENAME, O_RDWR | O_CREAT, 0600); > + SAFE_WRITE(0, fd, data, file_size); > + > + if (run_fsync) > + fsync(fd); > + > + TST_EXP_PASS(cachestat(fd, cs_range, cs, 0)); > + print_cachestat(cs); > + > + TST_EXP_EQ_LI(cs->nr_cache + cs->nr_evicted, NUMPAGES); > + > + if (run_fsync) > + TST_EXP_EQ_LI(cs->nr_dirty, 0); > + > + SAFE_CLOSE(fd); > + SAFE_UNLINK(FILENAME); > +} > + > +static void setup(void) > +{ > + int page_size; > + > + page_size = (int)sysconf(_SC_PAGESIZE); > + file_size = page_size * NUMPAGES; > + > + data = SAFE_MALLOC(file_size); > + memset(data, 'a', file_size); I would just allocate a single page and run the write in a loop in the test. That way we can make the number of pages command line parameter and try with a bigger mapping as well. > + cs_range->off = 0; > + cs_range->len = file_size; > +} > + > +static void cleanup(void) > +{ > + if (data) > + free(data); > +} > + > +static struct tst_test test = { > + .test_all = run, > + .setup = setup, > + .cleanup = cleanup, > + .needs_tmpdir = 1, > + .min_kver = "6.5", > + .mount_device = 1, > + .mntpoint = MNTPOINT, > + .all_filesystems = 1, > + .skip_filesystems = (const char *const []) { > + "fuse", > + "tmpfs", > + NULL > + }, > + .bufs = (struct tst_buffers []) { > + {&cs, .size = sizeof(struct cachestat)}, > + {&cs_range, .size = sizeof(struct cachestat_range)}, > + {} > + }, > + .options = (struct tst_option[]) { > + {"s", &run_fsync, "Synchronize file with storage device"}, > + {}, > + }, Can we, rather than adding a command line option, change the test so that it has two subtests with .tcnt = 2? I think that it's better that the test runs all testcases by default and the command like parameters should be used to change parameters of the test (such as number of pages) rather than to enable/disable tests.
diff --git a/runtest/syscalls b/runtest/syscalls index cf06ee563..961775cf7 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -62,6 +62,9 @@ capset04 capset04 cacheflush01 cacheflush01 +cachestat01 cachestat01 +cachestat01A cachestat01 -s + chdir01 chdir01 chdir01A symlink01 -T chdir01 chdir04 chdir04 diff --git a/testcases/kernel/syscalls/cachestat/.gitignore b/testcases/kernel/syscalls/cachestat/.gitignore new file mode 100644 index 000000000..daea1f4be --- /dev/null +++ b/testcases/kernel/syscalls/cachestat/.gitignore @@ -0,0 +1 @@ +cachestat01 diff --git a/testcases/kernel/syscalls/cachestat/Makefile b/testcases/kernel/syscalls/cachestat/Makefile new file mode 100644 index 000000000..62b00d2f4 --- /dev/null +++ b/testcases/kernel/syscalls/cachestat/Makefile @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2024 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com> + +top_srcdir ?= ../../../.. + +include $(top_srcdir)/include/mk/testcases.mk + +LDLIBS += -lrt + +include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/cachestat/cachestat.h b/testcases/kernel/syscalls/cachestat/cachestat.h new file mode 100644 index 000000000..efce6dc7f --- /dev/null +++ b/testcases/kernel/syscalls/cachestat/cachestat.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2024 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com> + */ + +#ifndef CACHESTAT_H__ +#define CACHESTAT_H__ + +#include "tst_test.h" +#include "lapi/mman.h" + +static inline void print_cachestat(struct cachestat *cs) +{ + tst_res(TDEBUG, + "nr_cache=%lu " + "nr_dirty=%lu " + "nr_writeback=%lu " + "nr_evicted=%lu " + "nr_recently_evicted=%lu", + cs->nr_cache, + cs->nr_dirty, + cs->nr_writeback, + cs->nr_evicted, + cs->nr_recently_evicted); +} + +#endif diff --git a/testcases/kernel/syscalls/cachestat/cachestat01.c b/testcases/kernel/syscalls/cachestat/cachestat01.c new file mode 100644 index 000000000..7362a9dcf --- /dev/null +++ b/testcases/kernel/syscalls/cachestat/cachestat01.c @@ -0,0 +1,102 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (C) 2024 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com> + */ + +/*\ + * [Description] + * + * This test verifies that cachestat() syscall is properly counting cached pages + * written inside a file. If storage device synchronization is requested, test + * will check if the number of dirty pages is zero. + * + * [Algorithm] + * + * * create a file with specific amount of pages + * ** synchronize storage device, if needed + * * monitor file with cachestat() + * * check if the right amount of pages have been moved into cache + * ** if storage device synchronization is requested, check that dirty pages is + * zero + */ + +#include "cachestat.h" + +#define MNTPOINT "mntpoint" +#define FILENAME MNTPOINT "/myfile.bin" +#define NUMPAGES 32 + +static char *data; +static int file_size; +static struct cachestat *cs; +static struct cachestat_range *cs_range; +static char *run_fsync; + +static void run(void) +{ + int fd; + + memset(cs, 0, sizeof(struct cachestat)); + + fd = SAFE_OPEN(FILENAME, O_RDWR | O_CREAT, 0600); + SAFE_WRITE(0, fd, data, file_size); + + if (run_fsync) + fsync(fd); + + TST_EXP_PASS(cachestat(fd, cs_range, cs, 0)); + print_cachestat(cs); + + TST_EXP_EQ_LI(cs->nr_cache + cs->nr_evicted, NUMPAGES); + + if (run_fsync) + TST_EXP_EQ_LI(cs->nr_dirty, 0); + + SAFE_CLOSE(fd); + SAFE_UNLINK(FILENAME); +} + +static void setup(void) +{ + int page_size; + + page_size = (int)sysconf(_SC_PAGESIZE); + file_size = page_size * NUMPAGES; + + data = SAFE_MALLOC(file_size); + memset(data, 'a', file_size); + + cs_range->off = 0; + cs_range->len = file_size; +} + +static void cleanup(void) +{ + if (data) + free(data); +} + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .cleanup = cleanup, + .needs_tmpdir = 1, + .min_kver = "6.5", + .mount_device = 1, + .mntpoint = MNTPOINT, + .all_filesystems = 1, + .skip_filesystems = (const char *const []) { + "fuse", + "tmpfs", + NULL + }, + .bufs = (struct tst_buffers []) { + {&cs, .size = sizeof(struct cachestat)}, + {&cs_range, .size = sizeof(struct cachestat_range)}, + {} + }, + .options = (struct tst_option[]) { + {"s", &run_fsync, "Synchronize file with storage device"}, + {}, + }, +};