Skip to content

Commit

Permalink
selftests: cgroup: add zswap-memcg unwanted writeback test
Browse files Browse the repository at this point in the history
Add a test to verify that when a memcg hits its limit in zswap, it doesn't
trigger an unwanted writeback that would result in pages not owned by that
memcg to be sent to disk, even if zswap isn't full.  This was fixed by
commit 0bdf0ef("zswap: do not shrink if cgroup may not zswap").

Link: https://lkml.kernel.org/r/20230621153548.428093-4-cerasuolodomenico@gmail.com
Signed-off-by: Domenico Cerasuolo <cerasuolodomenico@gmail.com>
Cc: Dan Streetman <ddstreet@ieee.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Rik van Riel <riel@surriel.com>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Seth Jennings <sjenning@redhat.com>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: Vitaly Wool <vitaly.wool@konsulko.com>
Cc: Zefan Li <lizefan.x@bytedance.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Domenico Cerasuolo authored and Andrew Morton committed Aug 18, 2023
1 parent a549f9f commit d9cfaf4
Showing 1 changed file with 61 additions and 0 deletions.
61 changes: 61 additions & 0 deletions tools/testing/selftests/cgroup/test_zswap.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,66 @@ static int get_zswap_stored_pages(size_t *value)
return read_int("/sys/kernel/debug/zswap/stored_pages", value);
}

static int get_zswap_written_back_pages(size_t *value)
{
return read_int("/sys/kernel/debug/zswap/written_back_pages", value);
}

static int allocate_bytes(const char *cgroup, void *arg)
{
size_t size = (size_t)arg;
char *mem = (char *)malloc(size);

if (!mem)
return -1;
for (int i = 0; i < size; i += 4095)
mem[i] = 'a';
free(mem);
return 0;
}

/*
* When trying to store a memcg page in zswap, if the memcg hits its memory
* limit in zswap, writeback should not be triggered.
*
* This was fixed with commit 0bdf0efa180a("zswap: do not shrink if cgroup may
* not zswap"). Needs to be revised when a per memcg writeback mechanism is
* implemented.
*/
static int test_no_invasive_cgroup_shrink(const char *root)
{
size_t written_back_before, written_back_after;
int ret = KSFT_FAIL;
char *test_group;

/* Set up */
test_group = cg_name(root, "no_shrink_test");
if (!test_group)
goto out;
if (cg_create(test_group))
goto out;
if (cg_write(test_group, "memory.max", "1M"))
goto out;
if (cg_write(test_group, "memory.zswap.max", "10K"))
goto out;
if (get_zswap_written_back_pages(&written_back_before))
goto out;

/* Allocate 10x memory.max to push memory into zswap */
if (cg_run(test_group, allocate_bytes, (void *)MB(10)))
goto out;

/* Verify that no writeback happened because of the memcg allocation */
if (get_zswap_written_back_pages(&written_back_after))
goto out;
if (written_back_after == written_back_before)
ret = KSFT_PASS;
out:
cg_destroy(test_group);
free(test_group);
return ret;
}

struct no_kmem_bypass_child_args {
size_t target_alloc_bytes;
size_t child_allocated;
Expand Down Expand Up @@ -176,6 +236,7 @@ struct zswap_test {
const char *name;
} tests[] = {
T(test_no_kmem_bypass),
T(test_no_invasive_cgroup_shrink),
};
#undef T

Expand Down

0 comments on commit d9cfaf4

Please sign in to comment.