From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D131EC07CB1 for ; Mon, 27 Nov 2023 23:46:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D04166B029C; Mon, 27 Nov 2023 18:46:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CB4496B02E5; Mon, 27 Nov 2023 18:46:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B0AFA6B02E9; Mon, 27 Nov 2023 18:46:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 98FC66B029C for ; Mon, 27 Nov 2023 18:46:09 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 74DE01C0041 for ; Mon, 27 Nov 2023 23:46:09 +0000 (UTC) X-FDA: 81505370058.05.AA2B4D8 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf06.hostedemail.com (Postfix) with ESMTP id 4A8411804A3 for ; Mon, 27 Nov 2023 23:46:07 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=QdsoZita; spf=pass (imf06.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701128767; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=qpgmz+lE50DZaA/oBKT5EnJWyAwPJO9gmArvQZM8Xwo=; b=iwbnkrB48YnfCyCs4LJjS1BY2L5ItsOK9KJGLp28sxdUTWt5n+OOr1/p6MvzQ39ojvDF4V wMusbfAKDqru/9CAI+tTZDvWaknnYl5F3+es/1yKEM5CUWyII/Uq9Domc8TsCu0yiZuMc7 QClne+JKvV3daJ8HhXYu3jYHycC276Q= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701128767; a=rsa-sha256; cv=none; b=zrKQFDGyIPYtizDFu0F8IxRWIeSGBj6Ren/dDiDUXK5kkGXk04iHDYbOY274INBcKb6Dye AGcNzT6MPDc/NGTLYmrsvalgB/CQk0jtHQd0MJ3AMk/RUw/pmrbEA2Ln5Q+r3yV7Bc3ArU 6nkNLtTzCBjrEWIffXOSRwL69z3b01k= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=QdsoZita; spf=pass (imf06.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1cf8c462766so33955315ad.1 for ; Mon, 27 Nov 2023 15:46:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701128766; x=1701733566; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qpgmz+lE50DZaA/oBKT5EnJWyAwPJO9gmArvQZM8Xwo=; b=QdsoZitaWFkAKzxUgsitZqEP+jcbWiZnea0UZVScN7XS3fIssxMryw7W3gX6XzxRqw RV/D405c+UzbBOq/1TYqLYGQ3JpEbXVuzzwuUHw7uSzc1qBWFDFpusoZajl/hMIyK2v7 H1F9r8/KWHh6ncFkpUmrOi//ubdP56HnzM8UzlpyghXdo/mmJAR7vJX1NNCU0xtgS1gA BnEwseGAJONZIdgcP63chgD73ssIdtGUsN8DkNV8gqEomjLCXCgs1i8xikhOWVrnx6xd mJ5zw4ZLfxDLte2yVYvSPIoZbkH1+VZkwD7mXnkh8GU8h+5Eccw+f8wrm7wvGJ027C61 TXgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701128766; x=1701733566; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qpgmz+lE50DZaA/oBKT5EnJWyAwPJO9gmArvQZM8Xwo=; b=Rerv09/z17DywPPhZTJApzt2xbdA8BMJbC4Pj7pqIJVu9Ukl215Xd5dFrjeE1hQk6U yoshymUnZAbIGQARaALYM93OqNzNzkfFy+zhmNnyVvi1YsktiPULSbwTGRkSegvYikZi Vv/S+XqWsIH1ncD2GTXHld4nMb+AsvS62q4mgA5ehq2gjLNR45R1w9Jc9DSVCgjvKinq mvvX4GqF9sFV+xggus7Z2PMbi/BlDv9yFePQShT6608LEtx+I/132fPKulB3mt4cD7DX SFyd7tNfmUrIrVR6GSGRDBFZKFS3rUSpheWtLZRRWNs9uoP6q+7AhlC1E5QOQjPgkzl2 AjnA== X-Gm-Message-State: AOJu0YwV6gzMgT3bcd150KMMDB9EjN/tCeWi79/YLuLTxTkx8ItmUII2 GLhTdaKuvXO93Zhbqodb4ak= X-Google-Smtp-Source: AGHT+IGu6efuRIiSCPKCUDwRobB76N4xJJlnLFjZnsosc5Yzt4lkGdloLxXAga7HCdsLQ7YjiKz6pw== X-Received: by 2002:a17:902:c411:b0:1cf:a0b1:ec06 with SMTP id k17-20020a170902c41100b001cfa0b1ec06mr15743491plk.55.1701128766074; Mon, 27 Nov 2023 15:46:06 -0800 (PST) Received: from localhost (fwdproxy-prn-011.fbsv.net. [2a03:2880:ff:b::face:b00c]) by smtp.gmail.com with ESMTPSA id c12-20020a170902c1cc00b001cf96a0e4e6sm8166994plc.242.2023.11.27.15.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 15:46:05 -0800 (PST) From: Nhat Pham To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, cerasuolodomenico@gmail.com, yosryahmed@google.com, sjenning@redhat.com, ddstreet@ieee.org, vitaly.wool@konsulko.com, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, muchun.song@linux.dev, chrisl@kernel.org, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, shuah@kernel.org Subject: [PATCH v7 5/6] selftests: cgroup: update per-memcg zswap writeback selftest Date: Mon, 27 Nov 2023 15:45:59 -0800 Message-Id: <20231127234600.2971029-6-nphamcs@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231127234600.2971029-1-nphamcs@gmail.com> References: <20231127234600.2971029-1-nphamcs@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4A8411804A3 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: fmohuf4seftdp6h95u3dza76mccpehqr X-HE-Tag: 1701128767-566241 X-HE-Meta: U2FsdGVkX1/wfKjsVkhhirwgHWKF7qbeRvcaIKzNbJLZke8WMjnpsR/8Ii8FiWv5ntP/FZr5APt7yyW7tgsr7JrGZIbkcJ/1wgiHIGbNPQ257efAYGJvvmzdaUTJvK7dlQlKr67LHI/tAOy+DZxoZnN2km9QdLbQoCxCCaCmr/pPGjyOKHw+cspS+Bkz3XvySjgb1/rNKsbwr3FNa9LY/YYFcnxOfplSCICuVv2ZLxAA1v38+GQQgATc7swGiax36lAOetT/9StRsljQyANJwB87cXnubQXYJ258hi8lAMo7KrHkS/tcOPoQMD7qZll/XnTZrFhWFqPFiCmsbpCruH+Efhe8CUhWvTnKkSH0naL4DB3nNA1WniTcd0Re0YJGdKXReUy9LgiAKhckjFi4DV8NxjaYjJ/s/XrQX8hVvs4voQgJWafHn38ogL4NzXj114A5DE6HI/hNZqSWkbooxuYHN3kkVQ84uVB/kFY9/hBVCn9tK3L4+Bm08uUEVCteG3jpZK6maN+m03wiakZwca/GZgtCox1vhplblC8yGK3NO2uHTS6yCtOK1h8/lg1ZRADljFbRjupiv+9JBnfUELccYMyH2jpBvY11FtuJX6F+3OXoP4GEUxw1YSSdVtfyRnyHaX4L6RlS0v0HqJojKacAgqtkdvce6THy/L1njNkej5pOms9bxjUDqoycJTP6z7crgSEo+1qYAugQL8/DTQ3ugN3RKOvj8rwRrNxhQFs5thsm28zbbt2T8FdFeZ345LJSpwtAnPNCbv1c1bpMywzeEyhW0gCeryHH4EVZbbIWrOKiTvPCNNsY+NNhmvmGsFCpUI/qVj03ycNg9InH0Albd1D9jmuBCGALbepUHGk9EXopNUSrS7ppc0xjlILBFp2Qq69XUStnzhRl23T+F3vuwoYnNGZewhOkHCNx7PAaC85jw3FWDsffvvgEGaFguqPEM+wKIMnlSmFu3KD DdjTCCie FGeOz5QN1TjIVILYaf3sJZWPYAQsviklksCNODKuDN3n8Rb6ru3BEmwUXsnrUa4EfdWFUuLI6C2c2PZSiEkU5bu9twjNV0bMgcH4WGSkMRMG5NAawP+Fk8+xxlGFVIMBdOLZglY/4ACB4aHbXdHw+MH0NhxQXdET0m5ONzu4SFbtPnHJz0lI3hpVVtT1kGb2fTBiM9il/r8mBlS/6VcEXCaGIuEp8EArpdgw4MpsVWBJa1ALNlRLAbz4+5FO+9o8wremg+jP4hCEnJOFMiOm/BtlP+YXkjdcBGZLX/klsQUAyA7bEbgtCkWc7dNTke0gO3WtZhApC/4Lj+sFGJcv2Ukw5FjqVzLtb2bgVJAJGn7AWrEwkARWBelgAKCfvoLvFk9TqNrPi6qSi6pWPnDpVpP9/bXQCS0O3xKjNz3L1ilwmUZ8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.121858, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Domenico Cerasuolo The memcg-zswap self test is updated to adjust to the behavior change implemented by commit 87730b165089 ("zswap: make shrinking memcg-aware"), where zswap performs writeback for specific memcg. Signed-off-by: Domenico Cerasuolo Signed-off-by: Nhat Pham --- tools/testing/selftests/cgroup/test_zswap.c | 74 ++++++++++++++------- 1 file changed, 50 insertions(+), 24 deletions(-) diff --git a/tools/testing/selftests/cgroup/test_zswap.c b/tools/testing/selftests/cgroup/test_zswap.c index c99d2adaca3f..47fdaa146443 100644 --- a/tools/testing/selftests/cgroup/test_zswap.c +++ b/tools/testing/selftests/cgroup/test_zswap.c @@ -50,9 +50,9 @@ 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) +static int get_cg_wb_count(const char *cg) { - return read_int("/sys/kernel/debug/zswap/written_back_pages", value); + return cg_read_key_long(cg, "memory.stat", "zswp_wb"); } static long get_zswpout(const char *cgroup) @@ -73,6 +73,24 @@ static int allocate_bytes(const char *cgroup, void *arg) return 0; } +static char *setup_test_group_1M(const char *root, const char *name) +{ + char *group_name = cg_name(root, name); + + if (!group_name) + return NULL; + if (cg_create(group_name)) + goto fail; + if (cg_write(group_name, "memory.max", "1M")) { + cg_destroy(group_name); + goto fail; + } + return group_name; +fail: + free(group_name); + return NULL; +} + /* * Sanity test to check that pages are written into zswap. */ @@ -117,43 +135,51 @@ static int test_zswap_usage(const char *root) /* * 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. + * limit in zswap, writeback should affect only the zswapped pages of that + * memcg. */ 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; + size_t control_allocation_size = MB(10); + char *control_allocation, *wb_group = NULL, *control_group = NULL; /* Set up */ - test_group = cg_name(root, "no_shrink_test"); - if (!test_group) - goto out; - if (cg_create(test_group)) + wb_group = setup_test_group_1M(root, "per_memcg_wb_test1"); + if (!wb_group) + return KSFT_FAIL; + if (cg_write(wb_group, "memory.zswap.max", "10K")) goto out; - if (cg_write(test_group, "memory.max", "1M")) + control_group = setup_test_group_1M(root, "per_memcg_wb_test2"); + if (!control_group) goto out; - if (cg_write(test_group, "memory.zswap.max", "10K")) + + /* Push some test_group2 memory into zswap */ + if (cg_enter_current(control_group)) goto out; - if (get_zswap_written_back_pages(&written_back_before)) + control_allocation = malloc(control_allocation_size); + for (int i = 0; i < control_allocation_size; i += 4095) + control_allocation[i] = 'a'; + if (cg_read_key_long(control_group, "memory.stat", "zswapped") < 1) goto out; - /* Allocate 10x memory.max to push memory into zswap */ - if (cg_run(test_group, allocate_bytes, (void *)MB(10))) + /* Allocate 10x memory.max to push wb_group memory into zswap and trigger wb */ + if (cg_run(wb_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) + /* Verify that only zswapped memory from gwb_group has been written back */ + if (get_cg_wb_count(wb_group) > 0 && get_cg_wb_count(control_group) == 0) ret = KSFT_PASS; out: - cg_destroy(test_group); - free(test_group); + cg_enter_current(root); + if (control_group) { + cg_destroy(control_group); + free(control_group); + } + cg_destroy(wb_group); + free(wb_group); + if (control_allocation) + free(control_allocation); return ret; } -- 2.34.1