From patchwork Mon Jan 29 22:45:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13536474 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 DB06AC47DDF for ; Mon, 29 Jan 2024 22:45:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C11686B0087; Mon, 29 Jan 2024 17:45:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BC2446B00A7; Mon, 29 Jan 2024 17:45:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 99EDD6B00A6; Mon, 29 Jan 2024 17:45:47 -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 89F466B0087 for ; Mon, 29 Jan 2024 17:45:47 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 5CD2016044C for ; Mon, 29 Jan 2024 22:45:47 +0000 (UTC) X-FDA: 81733832334.20.20F19EC Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) by imf26.hostedemail.com (Postfix) with ESMTP id 793EC140011 for ; Mon, 29 Jan 2024 22:45:45 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=GVkKlOvg; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf26.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.222.180 as permitted sender) smtp.mailfrom=nphamcs@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706568345; a=rsa-sha256; cv=none; b=P4NuZ3Groe4heQL4ca+ZjSuaCFFbqI5Ob75NhnhNGki4cMJs83Dcqf523T269dgdo892vF cHfzFnLupjePjknFlwCnXUKCWYPpu0jnbxC1J3GUfmpoJSeQRwJkTlB0/XfHNWU525gtMs B2/ZlabWFuOJq0qYogde8zNlYB4IO8I= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=GVkKlOvg; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf26.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.222.180 as permitted sender) smtp.mailfrom=nphamcs@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706568345; 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=dC8jdsm04mIqNXpi4c3WwQu2utHfwjKvoXOteQVfINI=; b=HL36hLk6nWQyofxTwWv953WhuEsUjwG88IjQwghUG5o2Q2SDduMTW7mDlMt3Vefsna5Nz2 6DQTsxfwvx7xPyupvQkavgsFnGQCzu2q4llFK1VkYz6mlhGeMtoaR5cDIknLHCY8fo8pYD EYL5lUWlW1OxxF3S4IbIbmeCG3x7Hxw= Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-783eb452e01so186888885a.1 for ; Mon, 29 Jan 2024 14:45:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706568344; x=1707173144; 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=dC8jdsm04mIqNXpi4c3WwQu2utHfwjKvoXOteQVfINI=; b=GVkKlOvgM2h2uvGj5H7iJoPCdFCx1WNoWCLbPivIMQwc4CXPwSAETUQccc/B5MReXP A9l4vzf66FVYCJLB+ALO6zexVKNtK7pTpVR7i2GePlTO8MDflEWsN2JhjPZfW5+QZr4p KK/bWzHZP+/9Ce5t3eStIN0tdfXagWlCwXqL1ng63ESxNHDARpLvn2NOMWSCemTiwE3L ivbIuzko5eADexl9YUtO3qjJUSvchFZDjwSDxe1a+eZ+3LWwKQj4h2FMkOw7MmpmLIWe FB1GiU1G9R8/8nW5p3/aaj0gVKhc3YBbNmjYNVfcc9Iw9k5h5TdlwgSlXhXLXFL1bXvf EA3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706568344; x=1707173144; 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=dC8jdsm04mIqNXpi4c3WwQu2utHfwjKvoXOteQVfINI=; b=vtL3NhWu1rIyl+gQCJe7QrlPks/HwPrsy5kzlRbC8vskcNh6BmEOudnc+OHwbZz0UM mmsBTx3SAx/XOpN1euaL4jgHHiFNNAgnTCxnrfh06niVLIqjq0F7AEAoSiEPRg6VOsOd sJKUDcQE0T6aCpHh4W3EyuBKLFCmPhwVUhiTp+g9F/1nMI2P+M1/lAghgAignw+OYJTK 4bgvyCo+lLrbhdEq8bw+MZy5BAOjOz/6nYlv4rBO0sCixQsfQ/PHkHDvbY/XkygoD3GR wrcUir5y8BhqLe7t9SuD0SXTKNvF9GopQGretkIFNIsI0w+6rPRg1blucHXBtOAzlUmy Cdtg== X-Gm-Message-State: AOJu0YwbpTQWmztacd0dgQr/CueDVZ5NcArVVNKB6lBJTi4CTNjPFcUS tHS16Yixnz87PdH/Sla2JWPM8XJ+sSP/WP7neM7FEtcF3OZKb7qI X-Google-Smtp-Source: AGHT+IFHRDAjwttfHcY6DCVP5F3AhKrbmlzkwgYdhBdCAoj0RflAflHERJSdD2h9gDthZsxod44wkA== X-Received: by 2002:a05:620a:318c:b0:783:3cef:c885 with SMTP id bi12-20020a05620a318c00b007833cefc885mr9677984qkb.57.1706568344471; Mon, 29 Jan 2024 14:45:44 -0800 (PST) Received: from localhost (fwdproxy-nao-005.fbsv.net. [2a03:2880:23ff:5::face:b00c]) by smtp.gmail.com with ESMTPSA id c7-20020a05620a134700b00784087c7f21sm269076qkl.84.2024.01.29.14.45.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 14:45:44 -0800 (PST) From: Nhat Pham To: akpm@linux-foundation.org Cc: shuah@kernel.org, hannes@cmpxchg.org, yosryahmed@google.com, tj@kernel.org, lizefan.x@bytedance.com, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH 2/3] selftests: fix the zswap invasive shrink test Date: Mon, 29 Jan 2024 14:45:41 -0800 Message-Id: <20240129224542.162599-3-nphamcs@gmail.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240129224542.162599-1-nphamcs@gmail.com> References: <20240129224542.162599-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 793EC140011 X-Stat-Signature: gmy9ksnpec5wakqfg1j1z31qm6tasdf4 X-HE-Tag: 1706568345-168962 X-HE-Meta: U2FsdGVkX191I+wdBL66V75UxntymmBxpGAl4rppP3MlTyAP7Q+Zo5j+ItwAwSklELUrvuvbwfv10Oput02iI6oYNO6nEegoLNz5UGqiFpsuOT4uPfdOih4piFmKkkGNL9sVCXBTZqeB8BUCdh6Sww0LMDz3rjB4kvNoB2b8usUqViknUnV/z3nSaYcFalJRNuxv5mzlbrjULxzIIQ+4fG8jsrK9GDJSA/ppsSD6j0Sr3QI1PrdjcU6POpSQfM9gv7qcA2lFNpVJ0FoEvW5W1GCBqIGHo7UbWoAIJYxWynBWEYhQI7h5qiYLLBg8lt+jDrvMIF5aEwZ9Iy3tRonokh2HPv4WcoDxbTxw3OjPrrAW2U/gmH9r6vs4p753uCfSwO/l8tK5XHQelcGu0UQOZADK20Fw4TUtiVu+dC96ND43YibrEm+T01yeIAmBnvWGHN3qeZzRzctkrbTtIU9eowZYp+kWkUJ4P8ef3YyNX+u0gcr7cqcDDqANnzXHqXZ4Boo/Bi87BfYqmWoAXPWgag6LrO7OQkr1RjX7apD9LFGI8shkzuzq2Pl6L+k7pH96ARE9Tx58xBbxMENdPqUKD8BKlL47xo60BaeguOoIR6daUF662Q0hS/lV4H0PRfM34/BK/E5tRoT21/omNJwj6VwxkV3pBjJJLy9Xg3mvDKv8Nngt0WWTdwTv0uQ/b5qIazey7cf4k6dX36vswzxuCLKjGtecp0wm5oAcontR/M0MR6AAH3Np/5zeSjKV2sdsXR1OC0WCh8v7blrymIiRCybNDlIAGTBCu1TnDw0YapDwntWmjnmFXEUAuqn8tpt1kpu9Ks0SNXSSdrIqlxc1BOpmMKdPUOIxAmUNIxnJXv0jggMJA3QD2AUDonj/F4a0cRqvoXYbEnwNR8jRNgWSjWUUMG3m6eKyANd5YJVExVz5kUsOvIqJfo6ZUmc7zLFbH+9Z7qGzYvYj3oYHHS5 9dCPAdGI I0n2tzVaDXXu5Lg1HGhLYMjUJqIokKq7zV05rHIyfQqPBm5DiH83UmUXaHbe7RkllSTdTtcufDyt2vV25Gy5M5QwbbA7/JaUi7ddN3+1h3YeO5TXq7yWcjry8HzJFlEJV28sRYXISQ27Yteh03iFMV5e9WZ3YNjXJ78RntrTFuKM81KcC2Tg0i9q0gBJ4amBNpurcubCClAbpdfOc73ZXz9g13gjBfarE7q8DIxNoBhDikNkIrrkhQO/NuZkmvsIJcngZ+0V7L4Ny25aUTeW78T3X5JAXps3WAozZoXnRbvZEF+xLmyE/KyiLB2BEAt7uHztLHqWuClTycO7uihp5ln3AT1jMzV0T7sWF7y728NJRe7k33GqYCKhDCC82qOZSqwpZ7VVhKsALEKlf+yNps6RzDyJI+b4m5NLDLJqTU8EXylww228pimU5abBp4nFfP6LxKOf7H8x5uzTjpDxMbHCRHvMVCUUgV4qxnDWhWgy9w44PXWg/fZgC1wq4apCdCxOyiZ+uxvkIOrsr7whWSyY0Sgo6EOONhxt/9O+CE4JwRHMoSlrn3RrBIYhWoPccyZlK X-Bogosity: Ham, tests=bogofilter, spamicity=0.012695, 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)