| Message ID | 20240129224542.162599-3-nphamcs@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 012688f6006c01655e250c1612b544561b7c50be |
| Headers | show |
| Series | fix and extend zswap kselftests | expand |
On Mon, Jan 29, 2024 at 02:45:41PM -0800, Nhat Pham wrote: > The zswap no invasive shrink selftest breaks because we rename the zswap > writeback counter (see [1]). Fix the test. > > [1]: https://patchwork.kernel.org/project/linux-kselftest/patch/20231205193307.2432803-1-nphamcs@gmail.com/ > > Fixes: a697dc2be925 ("selftests: cgroup: update per-memcg zswap writeback selftest") Looks like this should go into v6.8 too. > Signed-off-by: Nhat Pham <nphamcs@gmail.com> Acked-by: Yosry Ahmed <yosryahmed@google.com>
diff --git a/tools/testing/selftests/cgroup/test_zswap.c b/tools/testing/selftests/cgroup/test_zswap.c index 47fdaa146443..32ce975b21d1 100644 --- a/tools/testing/selftests/cgroup/test_zswap.c +++ b/tools/testing/selftests/cgroup/test_zswap.c @@ -52,7 +52,7 @@ static int get_zswap_stored_pages(size_t *value) static int get_cg_wb_count(const char *cg) { - return cg_read_key_long(cg, "memory.stat", "zswp_wb"); + return cg_read_key_long(cg, "memory.stat", "zswpwb"); } static long get_zswpout(const char *cgroup)
The zswap no invasive shrink selftest breaks because we rename the zswap writeback counter (see [1]). Fix the test. [1]: https://patchwork.kernel.org/project/linux-kselftest/patch/20231205193307.2432803-1-nphamcs@gmail.com/ Fixes: a697dc2be925 ("selftests: cgroup: update per-memcg zswap writeback selftest") Signed-off-by: Nhat Pham <nphamcs@gmail.com> --- tools/testing/selftests/cgroup/test_zswap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)