From patchwork Mon Nov 27 19:37:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 170376 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3407571vqx; Mon, 27 Nov 2023 11:37:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IEFTfWppU14Hi/Qwr7PnboE4pE/inKtFMwkTrS1gvnbqq9+fHH1Eqtl7nIc/lLGqoMAMuXN X-Received: by 2002:a05:6a20:d48d:b0:189:dc00:cf85 with SMTP id im13-20020a056a20d48d00b00189dc00cf85mr12814000pzb.36.1701113872799; Mon, 27 Nov 2023 11:37:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701113872; cv=none; d=google.com; s=arc-20160816; b=zVGVg8Rz8ak72HAMHSPfog5YtJa6oai1ppIGSJ2yLhaTElu4bZBbConiIQqvBl/77q 6QBP1ub2OWdNRJxBPVAYk44emCvdve2t1CzRrVhY2BW6Ghov7D+8sbWiiCT2mVx2zM5M m/OUdTqKr+Frbbkz1M3pGHeVAualxTAZcaOAxzyJKXpfKSuzWu94CKmx1hafOhGBx3iz bbb0a44ljN9jK0QOVK+24llPjSiquyM+czAS6nX4HR5Dh9N9Oo5VqfxJXurr7JXksO3F wtSyWXhp6GToKWO2NZCPOJqILhLVyNTImlsryFguHCXZzr2qwB/LySFAAUF6lxQgvV/P S2yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qpgmz+lE50DZaA/oBKT5EnJWyAwPJO9gmArvQZM8Xwo=; fh=5ynFD2G6LA0fdRuAOSZxbBxHoIIG4U3xrwbnkupZs28=; b=ARQDnqqPpJfHEETVGW6E0PZzrLTRL2DqHytFHLFvnE0flF5hYr5I/gv0cuYqOOY0qp foHm8nLMvHBC+ncVkQGFPURtT2vsiuQpVWZAxqLXVEhjgOIXwSAVkLf+07qlYpwTsynp F+7yBC7v1q9JwsNpnZDv22AGqZWraYseEqC2UIBL86XSP+RmXXugqu1EIBoKHDnP1npM Cn9eRkVJ+qFLzm4z3mhDmMzBPtUrhFtE5XXxg99wcdrWSAKKNgCon19MQcqUl1RzOvFK c4vmnp7ahSlphDrR21QTZvH4TErXl4NCQhcPsmgq/gnbkPMnJWHu7JaRdKj1PwSC/Aeo zegw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="SXlWG/nA"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id p24-20020a634f58000000b005af21fd2c6fsi10408138pgl.898.2023.11.27.11.37.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 11:37:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="SXlWG/nA"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 6A9BB8097E46; Mon, 27 Nov 2023 11:37:45 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233054AbjK0ThY (ORCPT + 99 others); Mon, 27 Nov 2023 14:37:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232903AbjK0ThD (ORCPT ); Mon, 27 Nov 2023 14:37:03 -0500 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F02D3D72; Mon, 27 Nov 2023 11:37:09 -0800 (PST) Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1cfb83211b9so17278035ad.3; Mon, 27 Nov 2023 11:37:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701113829; x=1701718629; darn=vger.kernel.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=SXlWG/nAYi2grr2NgCkC810P5nZk+fFiJFnz+hSfoieiAqeNnizFAD5uDmDwSvDqYr v1qmMECvIsDPS98igoUxgjpj9mRnmH6SdXtSks/6/aidNjbMh3OfJto7kTzqFzzaSvqc DLZIcYgD+ptuPFGcnIpUL9OimAdpppQiVqJvcdV2SfGNGYLxrKiaB/UhACmmgRqKVB2N K02nxw9KKevF0UVS7pYgFl1mknBfukXLRnfINlPKA0lgOs6hb2AzW4gRHLXx4Wydgr3u tloZI3lUKKZsilzLgWmZuAgSfh+6AEEUUdUuchEUQQDNzwu5Nveci5mx80c0Ub/7ZNGM 6stg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701113829; x=1701718629; 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=KrHtzfglf2V0WzZy22QKz/5Em+IAr3Q243Ty1pMK3sfQkXwLLDfjpEL61/cj1460lv 6i/B5dWhohCSc8VGSE8prJeLxfsoa4L66wclBg3mkDwnk8OwSpBqJH3P5zoA2Dyn293X H5+ASwX4AWz0WHUovEXBFI9Go8rGeD1xbKFj6moURgZIfnMpUw0PIem04fh495uDrG+r h0eZCpK3zkvCXHuP/tQu4zD/atrJYzBkwaHFW/FcOVjYoEKjChtyC0CxFon8YInNp1Az 1OmszlSH3KN66Or0K9DjXSDl4BvVpJqmonxk1Ji3t+/bOZYG8wlGpCNQxgO2uFJL8vHu 53tQ== X-Gm-Message-State: AOJu0YzeYswRK21HhURBxN+EBS3BJ1EvPTo5CTH/Pj1+vuXfLf0oKIsV fxvEa6aoxob2tCUuRFjmMuc= X-Received: by 2002:a17:903:2281:b0:1cf:ea64:f508 with SMTP id b1-20020a170903228100b001cfea64f508mr1418367plh.2.1701113829283; Mon, 27 Nov 2023 11:37:09 -0800 (PST) Received: from localhost (fwdproxy-prn-015.fbsv.net. [2a03:2880:ff:f::face:b00c]) by smtp.gmail.com with ESMTPSA id o11-20020a170902d4cb00b001cc0e3a29a8sm7207131plg.89.2023.11.27.11.37.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 11:37:08 -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 v6 5/6] selftests: cgroup: update per-memcg zswap writeback selftest Date: Mon, 27 Nov 2023 11:37:02 -0800 Message-Id: <20231127193703.1980089-6-nphamcs@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231127193703.1980089-1-nphamcs@gmail.com> References: <20231127193703.1980089-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 27 Nov 2023 11:37:45 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783747180261715130 X-GMAIL-MSGID: 1783747180261715130 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; }