From patchwork Thu Feb 1 03:27:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13540597 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 7F85FC47DB3 for ; Thu, 1 Feb 2024 03:27:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EC9358D0001; Wed, 31 Jan 2024 22:27:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DB47E6B0083; Wed, 31 Jan 2024 22:27:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BE1E08D0001; Wed, 31 Jan 2024 22:27:24 -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 A06A56B0082 for ; Wed, 31 Jan 2024 22:27:24 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 6E64D404A1 for ; Thu, 1 Feb 2024 03:27:24 +0000 (UTC) X-FDA: 81741799608.19.4F859EE Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by imf06.hostedemail.com (Postfix) with ESMTP id 9696C18000D for ; Thu, 1 Feb 2024 03:27:22 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Wvti49mn; spf=pass (imf06.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.222.182 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=1706758042; 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=rTqBj0H08VxjpoFeh5ezYndc7+HSVccdU5yqVd6FGXw=; b=vr0/KMMhLxLaDHYXVJqxyvNK2w9d4G9+e7nf3PPTQ5V1nj+hJOcjGvO42Kfw1dzzct7Ac0 0uRX5WkqthmEHlqUCKiW6vAL/1LTfgvld0wYBvZvR1j0dBfIQFle1gauOvjAsEUZt0oiEL OiMeEAxJh0UVRIEc4/vJssnywN3pik4= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Wvti49mn; spf=pass (imf06.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.222.182 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706758042; a=rsa-sha256; cv=none; b=yFBI0iy/jCcCYlfuGVfIs6zA3fFWdgp6GqVjloot5Ag1r2X1DI8p2BkJ/K0SyMqYyf/TSe SAEEIHTpSQW/5o0IptbxmlKlzqxu+Bn08aOuG1bceG7UZi6PTI2seMIQYtMXWdypACTsLV s1P4WyYBfFggLdjz26N3EVuQv9Fgd4E= Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-783d4b3a00bso35896285a.3 for ; Wed, 31 Jan 2024 19:27:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706758041; x=1707362841; 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=rTqBj0H08VxjpoFeh5ezYndc7+HSVccdU5yqVd6FGXw=; b=Wvti49mn49MR89gDRYq75kgo4iiTiR/FxAgCfO0lNkc1l9lUQ64ffFAVWMVWOSRn2T +P71bgekkgK796BaIVTwIzbRMnefxRLJQ3q29rEmdEXIv9ZjCp6o066i5dGDUshbvsqM YXy9fHXcwCcwRWT09v5tFHAnox7P/W/eDlpxVMlmCTmYDYxEpQF9WyLaSNWHrWzRypGE +2T6ptraEkp6/+qfMe/Q0Bx8p2zEV1dTlG47i0fSivT8Zav+A6Inr506cQoH8Kt+uBxX 8Hl5OXTo2Nd+0I7g8Y9AOk5NIHmnmIr5L8NwQhd5c4r5bxfKh/DjeK2IgGvqHQGWz3ZT KqBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706758041; x=1707362841; 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=rTqBj0H08VxjpoFeh5ezYndc7+HSVccdU5yqVd6FGXw=; b=TdLFuRXVsxOkR24eqNDcB92cC+PXWQSL9cE6q0Vpa0UziOS3KtjP2/KWB8XTtjJA3j PQoxVy8eOVc4jpgj/3vzQJ/frG9YYLco+6/QAV2AC2+k6bEPmvnIbIJEygZnFU7oI9kc /YX5WTsHtTKSV0WAbGru9As4zwJnmSfJ+T7HJFXkqZNffu89Z+RjkaGxK3D1kWuIwROj NW0yaZW6qaCZZJ3mejUAwj4v5xUrqPStaVI0elzVF2AB2DloHq7bdtTHnqn9INU7H0PK mlj/Bo7Q9L692OTfEDQXZ0t605n7bLklsIryx4LsPaT+VxAUhWJpJjdCGotbJnUz13if nKZQ== X-Gm-Message-State: AOJu0Ywi/K5x1olBP2p2sFg8GFk2zOyORZULJaD4UENJRRP1bGpkV0LM 5LJ3fQskeIKDjZEWYzq+3bMrWBFe32kssmy5M/A8U9rEur5kXN4a X-Google-Smtp-Source: AGHT+IHPWXSjkdUZuigp/9B7j6ivfpKy5HxAUMa6O9hLIMzhBIt/uWnFjXMQetpqhcvAu9PSMKwhVQ== X-Received: by 2002:a05:620a:4148:b0:785:46f0:615b with SMTP id k8-20020a05620a414800b0078546f0615bmr358625qko.2.1706758041672; Wed, 31 Jan 2024 19:27:21 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCUIv71tJwO29OMitKPFnpPOCXCL8BuVktI6doG1tJVc7/qR+y0O1AXR3wBOmsC4Qpffj7sUQ/KvOHDJ3cjhityaWK8c6DQta2mok58PQKzyNMRYi0NBxE+fudr705gyldiLvtVDxeVD4Y/YBHb0b/QTNJBIXuB6UgcZyUeKMza5ekf49cqVqrwZ+yFdNzpD4eR3WySWDx0k6eHPjVEjtMAYQMMFpHdujzSNJ24YQgSlib3EdrjukJE9XYj5tQUTBP7eM86wjlW/Eo9XAjgXgVqReu2zzRc0V4aBxOGW8RQSM8/9+pDlticWA+KTxQANd6ZrLRySCqgVqZR+0qhBBavYdTkV8LgIibWRilyUHyT/2lAZKZI/ Received: from localhost (fwdproxy-nao-009.fbsv.net. [2a03:2880:23ff:9::face:b00c]) by smtp.gmail.com with ESMTPSA id v18-20020ae9e312000000b0078535190648sm1450417qkf.67.2024.01.31.19.27.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 19:27:21 -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, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 3/3] selftests: add zswapin and no zswap tests Date: Wed, 31 Jan 2024 19:27:18 -0800 Message-Id: <20240201032718.1968208-4-nphamcs@gmail.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240201032718.1968208-1-nphamcs@gmail.com> References: <20240201032718.1968208-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 9696C18000D X-Rspam-User: X-Stat-Signature: dozgywzum9frj1dqw5dnkey5ejbdtjai X-Rspamd-Server: rspam01 X-HE-Tag: 1706758042-31828 X-HE-Meta: U2FsdGVkX1/4/4xI4C9ywkTN9UJLF0vcS//6ye2lxStuejEty1pwC7V2gymv6hUHfZILNYsneJsaoY0cV2E+gVS9+LwqSAPG3Z2fwU5r52OQaq49hQ8GnoqIdF0N7X16LTYBDRmOx9i3ThuenuluE/Qqy1PB588H3gF36P4KCC0L0sloPCVO1ibi/4FFP5Ka7lX9hQ/1KgqgV26v8GowCDlX+tMRwhHm3V00p3UMDXL20n2kRHFLJgwcnWdrEMdgIm6ob+X39FZLSuzj5eyAgrSK6MCyR59h3bjASUv70CA11hEWsoNrrqy6OX6iHg7iDudkwbpeyuu+KyfWt81wQlJzqDtCBnXbX+M7PmCxTNXg2c1SWVL1qx1Q3nyR0lTlBP6XdzWSpM4moJTfiH6hOFIcdvazVhouBL+JCipzh3Jbbnz1O7vi5RTyi6Iq5rlBwK96J8TBEeEFsN5fCwDQ9kiytcl6g6TJeZ0aQLJCsp7Vv+CBBJYSmFLML3cy8GUQgGdpAg+jHLHI9ZfLkaWcJQ4irkqYh7Qy80+l2xMjhqu4jDyvU/XC/Ym2PtfFQq0hV+rmFnD1SAP7I4EOYwT4poD8XI408EZjI9IVfjbnqnPd36XdDuX4dux1Y8+EY+quayfjcdwIVQbItrAVn5AusyUfH1YUdfZbe9Ytpuyfkt+P5mm0n1emBrJK5pUtbGQimvKOC0EuvdppP5DiuWqfBHKwk8aR/G7dh210w7KF0FZDVKR7CP4hibEogIyzEomrQ9XOJzbHpFzDG4fHc1fHWUeXRHQiaNJNwuPWDh/YiZ/A2iXfwz+9IuV/ElGXkgNKAiwsTx2m6O9OqJjR1gZ+Nc2GOhtVgJtRF3pkiMRbMvb1He/JUUi9KYfEEkMHeNpskwJBmbx+yfZiTtZ374VP5TZ6JVX2Fx8u5UFEISLMiiGRJpz6lR4exoV+esAI8B5IxGk2JQUFng+iJVqPnrN kahrh8Ye 46KOjoC1BdldiqR3LZyeZPKxbxsNwXqk/uo0UQX0aa3zaNsU05x495pGCeDDukLAd7BPvk/AKYQhTThHMuWuauB0I20U0T9tAvljj6BcIb2c1ud5jY+1Ahf1NfoyNCu8COhltdzz7deg4LB8FrEL6f6Ccb0PCGl89yZZbgV1tNaoALEJuqUBgW7lEDDh6YKx0YnFzFoUS4UXxU1p0FTQceG0XPZCETWIOwky6tMUJX6HtcqXqC7oHwg4q8TVv7kEJM/3V897uQeba7Dd19/iAakp1Hyg8gHYvTi0UZavu4Bx3dc2DD01shHWfWYIpRbiCIQYojGEkfWA/SU8d4/bYtrXBw6YJT/Dz6ZdGzBgh7F0+n1JUN2n0qFUSxvorjJ6qNPVAGgurMVUdr4C9Z4jRcDRwfF0Lck2bji8siAIjfr3NgO32YazFJpKjwNk731pQLzawGMvEEujU8Af/qwZGyvaeJbI2yQWuKXKhKdIdnTjC2Pn7bmOQ3EpWVZRxYVbFBNVP X-Bogosity: Ham, tests=bogofilter, spamicity=0.429785, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Add a selftest to cover the zswapin code path, allocating more memory than the cgroup limit to trigger swapout/zswapout, then reading the pages back in memory several times. This is inspired by a recently encountered kernel crash on the zswapin path in our internal kernel, which went undetected because of a lack of test coverage for this path. Add a selftest to verify that when memory.zswap.max = 0, no pages can go to the zswap pool for the cgroup. Suggested-by: Rik van Riel Suggested-by: Yosry Ahmed Signed-off-by: Nhat Pham --- tools/testing/selftests/cgroup/test_zswap.c | 97 +++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/tools/testing/selftests/cgroup/test_zswap.c b/tools/testing/selftests/cgroup/test_zswap.c index 32ce975b21d1..14d1f18f1098 100644 --- a/tools/testing/selftests/cgroup/test_zswap.c +++ b/tools/testing/selftests/cgroup/test_zswap.c @@ -60,6 +60,27 @@ static long get_zswpout(const char *cgroup) return cg_read_key_long(cgroup, "memory.stat", "zswpout "); } +static int allocate_bytes_and_read(const char *cgroup, void *arg) +{ + size_t size = (size_t)arg; + char *mem = (char *)malloc(size); + int ret = 0; + + if (!mem) + return -1; + for (int i = 0; i < size; i += 4095) + mem[i] = 'a'; + + /* go through the allocated memory to (z)swap in and out pages */ + for (int i = 0; i < size; i += 4095) { + if (mem[i] != 'a') + ret = -1; + } + + free(mem); + return ret; +} + static int allocate_bytes(const char *cgroup, void *arg) { size_t size = (size_t)arg; @@ -133,6 +154,80 @@ static int test_zswap_usage(const char *root) return ret; } +/* + * Check that when memory.zswap.max = 0, no pages can go to the zswap pool for + * the cgroup. + */ +static int test_swapin_nozswap(const char *root) +{ + int ret = KSFT_FAIL; + char *test_group; + long zswpout; + + /* Set up */ + test_group = cg_name(root, "no_zswap_test"); + + if (!test_group) + goto out; + if (cg_create(test_group)) + goto out; + if (cg_write(test_group, "memory.max", "8M")) + goto out; + /* Disable zswap */ + if (cg_write(test_group, "memory.zswap.max", "0")) + goto out; + + /* Allocate and read more than memory.max to trigger swapin */ + if (cg_run(test_group, allocate_bytes_and_read, (void *)MB(32))) + goto out; + + /* Verify that no zswap happened */ + zswpout = get_zswpout(test_group); + if (zswpout < 0) { + ksft_print_msg("Failed to get zswpout\n"); + goto out; + } else if (zswpout > 0) { + ksft_print_msg( + "Pages should not go to zswap when memory.zswap.max = 0\n"); + goto out; + } + ret = KSFT_PASS; + +out: + cg_destroy(test_group); + free(test_group); + return ret; +} + +/* Simple test to verify the (z)swapin code paths */ +static int test_zswapin_no_limit(const char *root) +{ + int ret = KSFT_FAIL; + char *test_group; + + /* Set up */ + test_group = cg_name(root, "zswapin_test"); + if (!test_group) + goto out; + if (cg_create(test_group)) + goto out; + if (cg_write(test_group, "memory.max", "8M")) + goto out; + if (cg_write(test_group, "memory.zswap.max", "max")) + goto out; + + /* Allocate and read more than memory.max to trigger (z)swap in */ + if (cg_run(test_group, allocate_bytes_and_read, (void *)MB(32))) + goto out; + + ret = KSFT_PASS; + +out: + cg_destroy(test_group); + free(test_group); + return ret; +} + /* * When trying to store a memcg page in zswap, if the memcg hits its memory * limit in zswap, writeback should affect only the zswapped pages of that @@ -309,6 +404,8 @@ struct zswap_test { const char *name; } tests[] = { T(test_zswap_usage), + T(test_swapin_nozswap), + T(test_zswapin_no_limit), T(test_no_kmem_bypass), T(test_no_invasive_cgroup_shrink), };