From: Yosry Ahmed <yosryahmed@google.com>
To: Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@kernel.org>,
Shakeel Butt <shakeelb@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Roman Gushchin <roman.gushchin@linux.dev>
Cc: "David Rientjes" <rientjes@google.com>,
"Tejun Heo" <tj@kernel.org>, "Zefan Li" <lizefan.x@bytedance.com>,
"Jonathan Corbet" <corbet@lwn.net>,
"Shuah Khan" <shuah@kernel.org>, "Yu Zhao" <yuzhao@google.com>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
"Wei Xu" <weixugc@google.com>, "Greg Thelen" <gthelen@google.com>,
"Chen Wandun" <chenwandun@huawei.com>,
"Vaibhav Jain" <vaibhav@linux.ibm.com>,
"Michal Koutný" <mkoutny@suse.com>,
"Tim Chen" <tim.c.chen@linux.intel.com>,
cgroups@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux-kselftest@vger.kernel.org,
"Yosry Ahmed" <yosryahmed@google.com>
Subject: [PATCH v3 4/4] selftests: cgroup: add a selftest for memory.reclaim
Date: Fri, 8 Apr 2022 04:57:43 +0000 [thread overview]
Message-ID: <20220408045743.1432968-5-yosryahmed@google.com> (raw)
In-Reply-To: <20220408045743.1432968-1-yosryahmed@google.com>
Add a new test for memory.reclaim that verifies that the interface
correctly reclaims memory as intended, from both anon and file pages.
Signed-off-by: Yosry Ahmed <yosryahmed@google.com>
---
.../selftests/cgroup/test_memcontrol.c | 85 +++++++++++++++++++
1 file changed, 85 insertions(+)
diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c
index f2ffb3a30194..75ae441c01c3 100644
--- a/tools/testing/selftests/cgroup/test_memcontrol.c
+++ b/tools/testing/selftests/cgroup/test_memcontrol.c
@@ -760,6 +760,90 @@ static int test_memcg_max(const char *root)
return ret;
}
+/*
+ * This test checks that memory.reclaim reclaims the given
+ * amount of memory (from both anon and file).
+ */
+static int test_memcg_reclaim(const char *root)
+{
+ int ret = KSFT_FAIL, fd;
+ char *memcg;
+ long current, to_reclaim;
+ char buf[64];
+
+ memcg = cg_name(root, "memcg_test");
+ if (!memcg)
+ goto cleanup;
+
+ if (cg_create(memcg))
+ goto cleanup;
+
+ current = cg_read_long(memcg, "memory.current");
+ if (current != 0)
+ goto cleanup;
+
+ cg_run_nowait(memcg, alloc_anon_noexit, (void *) MB(50));
+ sleep(1);
+
+ fd = get_temp_fd();
+ if (fd < 0)
+ goto cleanup;
+
+ cg_run_nowait(memcg, alloc_pagecache_50M_noexit, (void *)(long)fd);
+ sleep(1);
+
+ current = cg_read_long(memcg, "memory.current");
+ if (!values_close(current, MB(100), 10))
+ goto cleanup;
+
+ /*
+ * Reclaim until current reaches 30M, make sure to reclaim over 50M to
+ * hit both anon and file.
+ */
+ while (true) {
+ int err;
+
+ current = cg_read_long(memcg, "memory.current");
+ to_reclaim = current - MB(30);
+
+ /*
+ * We only keep looping if we get EAGAIN, which means we could
+ * not reclaim the full amount.
+ */
+ if (to_reclaim <= 0)
+ goto cleanup;
+
+
+ snprintf(buf, sizeof(buf), "%ld", to_reclaim);
+ err = cg_write(memcg, "memory.reclaim", buf);
+ if (!err) {
+ /*
+ * If writing succeeds, then the written amount should have been
+ * fully reclaimed (and maybe more).
+ */
+ current = cg_read_long(memcg, "memory.current");
+ if (!values_close(current, MB(30), 3) && current > MB(30))
+ goto cleanup;
+ break;
+ }
+
+ /* The kernel could not reclaim the full amount, try again. */
+ if (err == EAGAIN)
+ continue;
+
+ /* We got an unexpected error. */
+ goto cleanup;
+ }
+
+ ret = KSFT_PASS;
+cleanup:
+ cg_destroy(memcg);
+ free(memcg);
+ close(fd);
+
+ return ret;
+}
+
static int alloc_anon_50M_check_swap(const char *cgroup, void *arg)
{
long mem_max = (long)arg;
@@ -1263,6 +1347,7 @@ struct memcg_test {
T(test_memcg_high),
T(test_memcg_high_sync),
T(test_memcg_max),
+ T(test_memcg_reclaim),
T(test_memcg_oom_events),
T(test_memcg_swap_max),
T(test_memcg_sock),
--
2.35.1.1178.g4f1659d476-goog
next prev parent reply other threads:[~2022-04-08 4:57 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-08 4:57 [PATCH v3 0/4] memcg: introduce per-memcg proactive reclaim Yosry Ahmed
2022-04-08 4:57 ` [PATCH v3 1/4] memcg: introduce per-memcg reclaim interface Yosry Ahmed
2022-04-08 13:43 ` Dan Schatzberg
2022-04-08 14:11 ` Michal Hocko
2022-04-08 14:55 ` Dan Schatzberg
2022-04-08 20:08 ` Yosry Ahmed
2022-04-14 17:25 ` Yosry Ahmed
2022-04-20 12:47 ` Michal Hocko
2022-04-11 7:20 ` Michal Hocko
2022-04-08 17:21 ` Yosry Ahmed
2022-04-09 1:13 ` Roman Gushchin
2022-04-08 4:57 ` [PATCH v3 2/4] selftests: cgroup: return the errno of write() in cg_write() on failure Yosry Ahmed
2022-04-09 1:21 ` Yosry Ahmed
2022-04-09 1:44 ` Roman Gushchin
2022-04-09 6:43 ` Yosry Ahmed
2022-04-09 1:33 ` Roman Gushchin
2022-04-08 4:57 ` [PATCH v3 3/4] selftests: cgroup: fix alloc_anon_noexit() instantly freeing memory Yosry Ahmed
2022-04-09 1:31 ` Roman Gushchin
2022-04-08 4:57 ` Yosry Ahmed [this message]
2022-04-09 1:31 ` [PATCH v3 4/4] selftests: cgroup: add a selftest for memory.reclaim Roman Gushchin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220408045743.1432968-5-yosryahmed@google.com \
--to=yosryahmed@google.com \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=chenwandun@huawei.com \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=gthelen@google.com \
--cc=hannes@cmpxchg.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lizefan.x@bytedance.com \
--cc=mhocko@kernel.org \
--cc=mkoutny@suse.com \
--cc=rientjes@google.com \
--cc=roman.gushchin@linux.dev \
--cc=shakeelb@google.com \
--cc=shuah@kernel.org \
--cc=tim.c.chen@linux.intel.com \
--cc=tj@kernel.org \
--cc=vaibhav@linux.ibm.com \
--cc=weixugc@google.com \
--cc=yuzhao@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).