[LTP] [PATCH v2] syscalls/readahead02: use bdi max readahead limit
Jan Stancek
jstancek@redhat.com
Tue Mar 15 15:40:08 CET 2016
From: Roman Gushchin <klamm@yandex-team.ru>
After commit 600e19afc5f8a6 ("mm: use only per-device readahead limit")
readahead size is not limited anymore by 2 megabytes. Instead,
the per-bdi limit is used for kernels 4.4 and older.
Signed-off-by: Roman Gushchin <klamm@yandex-team.ru>
Signed-off-by: Jan Stancek <jstancek@redhat.com>
---
testcases/kernel/syscalls/readahead/readahead02.c | 40 +++++++++++++++++++++--
1 file changed, 37 insertions(+), 3 deletions(-)
Changes in v2:
- added check to use bdi readahead max only for kernels 4.4 and later
- tested on 3.10 kernel (RHEL7) and upstream 4.5 on x86_64
diff --git a/testcases/kernel/syscalls/readahead/readahead02.c b/testcases/kernel/syscalls/readahead/readahead02.c
index 90ad853f17fa..c014579c3b11 100644
--- a/testcases/kernel/syscalls/readahead/readahead02.c
+++ b/testcases/kernel/syscalls/readahead/readahead02.c
@@ -184,6 +184,30 @@ static void create_testfile(void)
free(tmp);
}
+static long get_device_readahead(const char *fname)
+{
+ FILE *f;
+ struct stat st;
+ unsigned long ra_kb = 0;
+ char buf[256];
+
+ if (stat(fname, &st) == -1)
+ return -1;
+ snprintf(buf, sizeof(buf), "/sys/dev/block/%d:%d/queue/read_ahead_kb",
+ major(st.st_dev), minor(st.st_dev));
+ f = fopen(buf, "r");
+ if (!f)
+ return -1;
+
+ if (fscanf(f, "%lu", &ra_kb) != 1) {
+ fclose(f);
+ return -1;
+ }
+
+ fclose(f);
+ return ra_kb * 1024;
+}
+
/* read_testfile - mmap testfile and read every page.
* This functions measures how many I/O and time it takes to fully
* read contents of test file.
@@ -206,16 +230,26 @@ static void read_testfile(int do_readahead, const char *fname, size_t fsize,
unsigned long time_start_usec, time_end_usec;
off_t offset;
struct timeval now;
+ long readahead_size;
+
+ if ((tst_kvercmp(4, 4, 0)) >= 0) {
+ readahead_size = get_device_readahead(fname);
+ if (readahead_size == -1)
+ tst_brkm(TBROK, cleanup, "get_device_readahead");
+ } else {
+ /* default to 2M, which should work on kernels prior to 4.4 */
+ readahead_size = 2 * 1024 * 1024;
+ }
+ tst_resm(TINFO, "max readahead size is: %ld", readahead_size);
fd = open(fname, O_RDONLY);
if (fd < 0)
tst_brkm(TBROK | TERRNO, cleanup, "Failed to open %s", fname);
if (do_readahead) {
- /* read ahead in chunks, 2MB is maximum since 3.15-rc1 */
- for (i = 0; i < fsize; i += 2*1024*1024) {
+ for (i = 0; i < fsize; i += readahead_size) {
TEST(ltp_syscall(__NR_readahead, fd,
- (off64_t) i, 2*1024*1024));
+ (off64_t) i, readahead_size));
if (TEST_RETURN != 0)
break;
}
--
1.8.3.1
More information about the ltp
mailing list