From patchwork Mon Feb 5 22:56:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13546373 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 1A0E2C48260 for ; Mon, 5 Feb 2024 22:56:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E66D6B0080; Mon, 5 Feb 2024 17:56:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 546F86B0081; Mon, 5 Feb 2024 17:56:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3244A6B0082; Mon, 5 Feb 2024 17:56:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 23BDC6B0080 for ; Mon, 5 Feb 2024 17:56:14 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E925E14028B for ; Mon, 5 Feb 2024 22:56:13 +0000 (UTC) X-FDA: 81759260226.25.DA4AA87 Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) by imf02.hostedemail.com (Postfix) with ESMTP id 4760D80013 for ; Mon, 5 Feb 2024 22:56:12 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=gCl3nPJZ; spf=pass (imf02.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.219.53 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=1707173772; 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=leL/vEiB0VeH8ZIF97IARUVmsuNbNROoZaGIt1HbTGM=; b=sxewFkIwVsMwMf+AgeokjsUMqOLm/UX4mpXJs/t79oTxe+DJwN+PKq/qtHOHXAIELLFLUm gnRmJe/XRdkPdt/jSVj1WiH4sl6otbXM9gNmN+xsdL9/vN4sxglasG1ZwJYC3XubTBHzSY dRAfdEXfZQV/QcsHlFFksJfFbcxSe6k= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707173772; a=rsa-sha256; cv=none; b=V6yGUVHnwBiceYtEc+yuGmTzcQVEHnp5Y70FuPYlGGbCuXL9t96LQ0P7yhg//6OER+yCoc IQSnsxP4HjUSIOMv+JctH1gMqP8pX1cj8anT3690NMnyh/lnv7qVr/NNxwtdSPoykcZvYa pBBZVez6ZIvWgPKQrJ2DmxHg/qnfCmU= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=gCl3nPJZ; spf=pass (imf02.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.219.53 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-qv1-f53.google.com with SMTP id 6a1803df08f44-68c814135a9so18922406d6.1 for ; Mon, 05 Feb 2024 14:56:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707173771; x=1707778571; 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=leL/vEiB0VeH8ZIF97IARUVmsuNbNROoZaGIt1HbTGM=; b=gCl3nPJZeQ8FQRhUdBUQY4+e74YBY9wNQey+DYNX4qpqO9sU+kjKUMWLCvSbOK+OO4 c/c3dKG583YL3Me7eEayax3eO2d0NFeaPmhXA+MmKjfFZAvEbL7n+Hcc8cPzwW7pocXo 8unQzzIN28q5xXAIM5uwjfVut63B6BVITX8syQ5dLjG8/FsOcx2lv4MMbI4msMnJGjsI e6LA1+sABaeB17nuo4oosu2D5zE0tErIr9s6VRx1+91aj/DqkAAhaoOHyWZHfXm4Vdmn 9yJff7vhr+5I/xSYcerJ71Zz4noT6fNOOWhVfTa5YgGyLfiztDZGcqhKT+OxeEcgoe6+ pLsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707173771; x=1707778571; 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=leL/vEiB0VeH8ZIF97IARUVmsuNbNROoZaGIt1HbTGM=; b=mqUtKkDw8K42J2atoJ4RnFTVV8tBVYAVeSWhsHep3w8u+sQwKRyua/MI8pmngl2u5W SH+vQibZByF+5XgSHZHDg7nvM30/maS/2SIDY3H3LAQBJar/Vb9nb7H9iOuViWMxoBig DqojhvkGReoEGUrbL+RiIlDgkvxXRl3ms9vWY8lSj41tOqb9/xXt51+Sv5Y6Lb6TXhZq jw4v1zoH9bJEZL9WVIZdhOLUdeZzBGz65kuHDbHgevIurQJHrioRE2UWMGXk2iaXVzO9 Q5mTR6XPUvpHjhrxDpyQJWpH0wU0yIgFko/6AjXOIiDXP4GYMddEA/r1awQ82vKpQnJ4 4W8g== X-Gm-Message-State: AOJu0YzMSOZ6Y7eUvNXGoVy91cGv8SkKEpBHnuD3iNZn8cR1Zd3U+Vgg F5z6rra3YEBPfDQi0TFvoiRFba/LisaMYPBVNEh1Ly0lQ8CttKAg X-Google-Smtp-Source: AGHT+IESv97Kd8go2vQYFQli2hhUNviKbARAN2odGnIcieOptqRe4kVgIWNQc5zdOUprmXtRMEzg3Q== X-Received: by 2002:a05:6214:19ce:b0:68c:930e:6f49 with SMTP id j14-20020a05621419ce00b0068c930e6f49mr458443qvc.36.1707173771373; Mon, 05 Feb 2024 14:56:11 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCUCB274hPBtIag/AKoEk9o51vlokXWUWAxRE5V+Cz4My769VWoTejn2B1RAUCKKHbwcPLGoh+DbFwmU6KsfZgCcgH0wRnXWCOZngGJD7cmcs4vcKLVE9sTY6JFoELRq2eYGkxocLIj2as554uq56BmopBHWg5x8HAhLEaBOFRtdI4IRQDB6ccDlZfNGKLjtJ1eSpUn+JZ62iooCUAeriwm9z+w5PdcnTstjiBFbtcjmH+3giaUqKCAjZ9hOJeJF10XqvdB6jHHxjK2rrhGU+IKj+e7U0gQXMgTYkhNC4/+l8uI4oE9Lb4ZHnfpg3zOjQAfpk70OaOK5z464WgSLo9zW7cGhZBBAH9YCl1DYhGox66WdzafeB10RxjBNMUMi4Rawu+mYI0t6VUsMLM2mRb4= Received: from localhost (fwdproxy-nao-004.fbsv.net. [2a03:2880:23ff:4::face:b00c]) by smtp.gmail.com with ESMTPSA id e15-20020a0cf74f000000b0068c4b445991sm428451qvo.67.2024.02.05.14.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 14:56:11 -0800 (PST) From: Nhat Pham To: akpm@linux-foundation.org Cc: riel@surriel.com, shuah@kernel.org, hannes@cmpxchg.org, yosryahmed@google.com, tj@kernel.org, lizefan.x@bytedance.com, roman.gushchin@linux.dev, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v3 2/3] selftests: fix the zswap invasive shrink test Date: Mon, 5 Feb 2024 14:56:07 -0800 Message-Id: <20240205225608.3083251-3-nphamcs@gmail.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240205225608.3083251-1-nphamcs@gmail.com> References: <20240205225608.3083251-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Stat-Signature: mjtmyrnnb35iexrj3whugd3cro4ig97w X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 4760D80013 X-Rspam-User: X-HE-Tag: 1707173772-2357 X-HE-Meta: U2FsdGVkX18D2Dnjj4Kl2+UpFbuDkAsvsQdZ96z3SnYs6ZXcZdaB8H5zzR5tIoG3Neb+OfByZx7wXqVOqbIXqox9CDCQNNerr2iEK0lsSmrG/MAge1Wt+mljLGkd51mJ/Xu153Fiswjs+3tQ0TgNAxbeEV7Zg9nSF2h+oCesgo2iUq+1WTsMhgyUm1JYO3QkQRJpeai8TvKnGNVS8xbSFC2SiosKUCw+Zx/tWloRYPEcA4i9m/O9ZnFFQO/SWIfWi44KQqNoku6GeRhrSUgIumk9Dn2fUnDAth1RagZ0Hcu6ZxlaTovATLxg1HQ+5J5sM5z+FoaKyPe3G3skPtskym0+kEB9Bq2a+GGjypU2e4c1uAK1Gl0ykg/CP13q01490tnOq+IpbsBAbwdv8DTdyzjt03CO24zXA6WFULcVfJtfEkhdPuxLcfeegnUwzX6KFhvIJ1mAILk9SNTw87umStBi5WzbLfLQTkT1oQG8GZihZ5zXSjj6eJX9CKyyFit5Uuao8FhVEtDr41PkWEX1Cg1GxT67CJtQ2ruqvYX16PBWhMwCBsLlYqGExYIXOxdM2PqHlioRz8AR0J+CMa1QKpExxWTkAy9ay82G7whJkImldEtobnvYU+Bx+7PDYWfZerrNckMKE5DBSATeqShCFTxmgtS1qxbWivolGa6SuQSAk6xU2TtmrrbD2g32dCDOxmTh1sDlUjIMKmUzJ2aZhnrKE+WrY0QUCh4i4PvcnLdpE4BtZCEm/nyqDyPljfBn9AFGCTgEh88BKwePowXx+3bhqRgurID7YCeZKbYko1Fymxw7X0++Ws3wqvn4DYf9OiQXz+K3tfMh8tdEgWOgglABLTkG/YMkOB4jMIjCBVhA1/6EUc9BonLCMYpVF7+KTJMR2MRQ6Ycvsld8ybMbAPTiG2qwkucHPhitzeeHV1VoH9SeyW5YOwxVimyCQKEVAFxTkYj1eoELsAdnR/2 H6cDglZz AhZ6n1YQCb/LWpWhgYVqK6t4FdbjnNoZVtbPNqm0HlzHZ41mg9nvgc1dbvvAtpmW6UmbAQnhD0OYzZU+NSxWHYMXoOMB3OypsaO8mdi+A8/UC8Ag= X-Bogosity: Ham, tests=bogofilter, spamicity=0.001338, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 Acked-by: Yosry Ahmed --- tools/testing/selftests/cgroup/test_zswap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)