@@ -3,8 +3,8 @@
* Copyright (c) 2016 Red Hat, Inc.
*/
-/*
- * DESCRIPTION
+/*\
+ * [DESCRIPTION]
*
* Page fault occurs in spite that madvise(WILLNEED) system call is called
* to prefetch the page. This issue is reproduced by running a program
@@ -36,13 +36,14 @@
* else unexpected, but irrelevant procedure, registers a fault to
* our process.
*
- */
+\*/
#include <errno.h>
#include <stdio.h>
#include <sys/mount.h>
#include <sys/sysinfo.h>
#include "tst_test.h"
+#include "tst_cgroup.h"
#define CHUNK_SZ (400*1024*1024L)
#define MEM_LIMIT (CHUNK_SZ / 2)
@@ -50,8 +51,7 @@
#define PASS_THRESHOLD (CHUNK_SZ / 4)
#define PASS_THRESHOLD_KB (PASS_THRESHOLD / 1024)
-#define MNT_NAME "memory"
-#define GROUP_NAME "madvise06"
+static const struct tst_cgroup *cg;
static const char drop_caches_fname[] = "/proc/sys/vm/drop_caches";
static int pg_sz, stat_refresh_sup;
@@ -64,17 +64,19 @@ static void check_path(const char *path)
tst_brk(TCONF, "file needed: %s", path);
}
-#define READ_CGMEM(item) \
- ({long tst_rval = 0; \
- const char *cgpath = MNT_NAME"/"GROUP_NAME"/memory."item; \
- if (!access(cgpath, R_OK)) \
- SAFE_FILE_LINES_SCANF(cgpath, "%ld", &tst_rval); \
- tst_rval;})
+static void print_cgmem(const char *name)
+{
+ long ret;
+
+ if (!SAFE_CGROUP_HAS(cg, name))
+ return;
+
+ SAFE_CGROUP_SCANF(cg, name, "%ld", &ret);
+ tst_res(TINFO, "\t%s: %ld Kb", name, ret / 1024);
+}
static void meminfo_diag(const char *point)
{
- long rval;
-
if (stat_refresh_sup)
SAFE_FILE_PRINTF("/proc/sys/vm/stat_refresh", "1");
@@ -85,16 +87,10 @@ static void meminfo_diag(const char *point)
SAFE_READ_MEMINFO("SwapCached:") - init_swap_cached);
tst_res(TINFO, "\tCached: %ld Kb",
SAFE_READ_MEMINFO("Cached:") - init_cached);
- tst_res(TINFO, "\tcgmem.usage_in_bytes: %ld Kb",
- READ_CGMEM("usage_in_bytes") / 1024);
-
- rval = READ_CGMEM("memsw.usage_in_bytes") / 1024;
- if (rval)
- tst_res(TINFO, "\tcgmem.memsw.usage_in_bytes: %ld Kb", rval);
- rval = READ_CGMEM("kmem.usage_in_bytes") / 1024;
- if (rval)
- tst_res(TINFO, "\tcgmem.kmem.usage_in_bytes: %ld Kb", rval);
+ print_cgmem("memory.current");
+ print_cgmem("memory.swap.current");
+ print_cgmem("memory.kmem.usage_in_bytes");
}
static void setup(void)
@@ -117,28 +113,24 @@ static void setup(void)
2 * CHUNK_SZ);
}
- SAFE_MKDIR(MNT_NAME, 0700);
- if (mount("memory", MNT_NAME, "cgroup", 0, "memory") == -1) {
- if (errno == ENODEV || errno == ENOENT)
- tst_brk(TCONF, "memory cgroup needed");
- }
- SAFE_MKDIR(MNT_NAME"/"GROUP_NAME, 0700);
-
check_path("/proc/self/oom_score_adj");
- check_path(MNT_NAME"/"GROUP_NAME"/memory.limit_in_bytes");
- check_path(MNT_NAME"/"GROUP_NAME"/memory.swappiness");
- check_path(MNT_NAME"/"GROUP_NAME"/tasks");
-
SAFE_FILE_PRINTF("/proc/self/oom_score_adj", "%d", -1000);
- SAFE_FILE_PRINTF(MNT_NAME"/"GROUP_NAME"/memory.limit_in_bytes", "%ld\n",
- MEM_LIMIT);
- if (!access(MNT_NAME"/"GROUP_NAME"/memory.memsw.limit_in_bytes", W_OK)) {
- SAFE_FILE_PRINTF(MNT_NAME"/"GROUP_NAME"/memory.memsw.limit_in_bytes",
- "%ld\n", MEMSW_LIMIT);
+ tst_cgroup_require(TST_CGROUP_MEMORY, NULL);
+ cg = tst_cgroup_get_test();
+
+ SAFE_CGROUP_PRINTF(cg, "memory.max", "%ld", MEM_LIMIT);
+ if (SAFE_CGROUP_HAS(cg, "memory.swap.max"))
+ SAFE_CGROUP_PRINTF(cg, "memory.swap.max", "%ld", MEMSW_LIMIT);
+
+ if (SAFE_CGROUP_HAS(cg, "memory.swappiness")) {
+ SAFE_CGROUP_PRINT(cg, "memory.swappiness", "60");
+ } else {
+ check_path("/proc/sys/vm/swappiness");
+ SAFE_FILE_PRINTF("/proc/sys/vm/swappiness", "%d", 60);
}
- SAFE_FILE_PRINTF(MNT_NAME"/"GROUP_NAME"/memory.swappiness", "60");
- SAFE_FILE_PRINTF(MNT_NAME"/"GROUP_NAME"/tasks", "%d\n", getpid());
+
+ SAFE_CGROUP_PRINTF(cg, "cgroup.procs", "%d", getpid());
meminfo_diag("Initial meminfo, later values are relative to this (except memcg)");
init_swap = SAFE_READ_MEMINFO("SwapTotal:") - SAFE_READ_MEMINFO("SwapFree:");
@@ -154,11 +146,7 @@ static void setup(void)
static void cleanup(void)
{
- if (!access(MNT_NAME"/tasks", F_OK)) {
- SAFE_FILE_PRINTF(MNT_NAME"/tasks", "%d\n", getpid());
- SAFE_RMDIR(MNT_NAME"/"GROUP_NAME);
- SAFE_UMOUNT(MNT_NAME);
- }
+ tst_cgroup_cleanup();
}
static void dirty_pages(char *ptr, long size)
@@ -248,6 +236,10 @@ static struct tst_test test = {
.min_kver = "3.10.0",
.needs_tmpdir = 1,
.needs_root = 1,
+ .save_restore = (const char * const[]) {
+ "?/proc/sys/vm/swappiness",
+ NULL
+ },
.tags = (const struct tst_tag[]) {
{"linux-git", "55231e5c898c"},
{"linux-git", "8de15e920dc8"},
Signed-off-by: Richard Palethorpe <rpalethorpe@suse.com> --- testcases/kernel/syscalls/madvise/madvise06.c | 82 +++++++++---------- 1 file changed, 37 insertions(+), 45 deletions(-)