From nobody Thu Apr 2 00:15:31 2026 Received: from out-170.mta0.migadu.com (out-170.mta0.migadu.com [91.218.175.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ED32A27BF7D for ; Fri, 13 Feb 2026 07:18:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770967136; cv=none; b=HLz12NR23rZtQ0mBda0pBaHkQtF+OFblLooq16+4GQq8NhXNPXbuVopV1MKbiEqeRHJeom4KaHA45cGCOIXGfHEgwL+g9VH3KYIMFW83/xwBCLHvcw5dDaybZQPiJ5hxS9efI4q7Ub747KHZF4dw1nhHnUYfB8HrhKkt9MlMfdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770967136; c=relaxed/simple; bh=OIu4Il4UO+4ipcMmAhGhJILiO6XfQZnYMCTjf3tv/Eg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f6tWt18WUzEBDGxxx259+lZfziAsixYZI2NM5IC8VwmtvY5EWSK+5E1xgCzNc/XRLOm8u3VGxq2Dpul5eaSksd84EwonWzQP4y4WzhrBgjQ0AfDudZRI1aTlDYlwQl3W8MLj3srrzsGSSjDM1DsJylHcwSt1TdNiJoDzvNI+Mb0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=q8s5gGk6; arc=none smtp.client-ip=91.218.175.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="q8s5gGk6" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1770967132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mHfHSc3Ob3QWgekFQ3UZMwloiqpQ6O0L56YYA+KphRQ=; b=q8s5gGk6nAy7TfViTElsNOtPlfFYJ5AKUJcxKKqU6N/XWwt2pCyQB3Kb7hQRh7V1JSa5Ew L97yUQC6jl83wBZqHVzK6GLQtifrsAMqT29P+FF2tc20W5qyuG8nD3ekQkwUtTQDRt4B/o WL2zvutLAMTUbwgTkfzHX2BiHTtzGo8= From: Jiayuan Chen To: linux-mm@kvack.org Cc: jiayuan.chen@linux.dev, Jiayuan Chen , Nhat Pham , Shakeel Butt , Yosry Ahmed , SeongJae Park , Tejun Heo , Johannes Weiner , =?UTF-8?q?Michal=20Koutn=C3=BD?= , Jonathan Corbet , Michal Hocko , Roman Gushchin , Muchun Song , Andrew Morton , Chengming Zhou , Shuah Khan , cgroups@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH mm-new v3 1/2] mm: zswap: add per-memcg stat for incompressible pages Date: Fri, 13 Feb 2026 15:18:22 +0800 Message-ID: <20260213071827.5688-2-jiayuan.chen@linux.dev> In-Reply-To: <20260213071827.5688-1-jiayuan.chen@linux.dev> References: <20260213071827.5688-1-jiayuan.chen@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Jiayuan Chen The global zswap_stored_incompressible_pages counter was added in commit dca4437a5861 ("mm/zswap: store Acked-by: Shakeel Butt Reviewed-by: Yosry Ahmed Reviewed-by: SeongJae Park Signed-off-by: Jiayuan Chen --- Documentation/admin-guide/cgroup-v2.rst | 5 +++++ include/linux/memcontrol.h | 1 + mm/memcontrol.c | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-= guide/cgroup-v2.rst index 7f5b59d95fce..78a329414615 100644 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst @@ -1737,6 +1737,11 @@ The following nested keys are defined. zswpwb Number of pages written from zswap to swap. =20 + zswap_incomp + Number of incompressible pages currently stored in zswap + without compression. These pages could not be compressed to + a size smaller than PAGE_SIZE, so they are stored as-is. + thp_fault_alloc (npn) Number of transparent hugepages which were allocated to satisfy a page fault. This counter is not present when CONFIG_TRANSPARENT_HUGEPA= GE diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index b6c82c8f73e1..d8ec05dd5d43 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -39,6 +39,7 @@ enum memcg_stat_item { MEMCG_KMEM, MEMCG_ZSWAP_B, MEMCG_ZSWAPPED, + MEMCG_ZSWAP_INCOMP, MEMCG_NR_STAT, }; =20 diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 007413a53b45..4c5672169753 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -341,6 +341,7 @@ static const unsigned int memcg_stat_items[] =3D { MEMCG_KMEM, MEMCG_ZSWAP_B, MEMCG_ZSWAPPED, + MEMCG_ZSWAP_INCOMP, }; =20 #define NR_MEMCG_NODE_STAT_ITEMS ARRAY_SIZE(memcg_node_stat_items) @@ -1346,6 +1347,7 @@ static const struct memory_stat memory_stats[] =3D { #ifdef CONFIG_ZSWAP { "zswap", MEMCG_ZSWAP_B }, { "zswapped", MEMCG_ZSWAPPED }, + { "zswap_incomp", MEMCG_ZSWAP_INCOMP }, #endif { "file_mapped", NR_FILE_MAPPED }, { "file_dirty", NR_FILE_DIRTY }, @@ -5458,6 +5460,8 @@ void obj_cgroup_charge_zswap(struct obj_cgroup *objcg= , size_t size) memcg =3D obj_cgroup_memcg(objcg); mod_memcg_state(memcg, MEMCG_ZSWAP_B, size); mod_memcg_state(memcg, MEMCG_ZSWAPPED, 1); + if (size =3D=3D PAGE_SIZE) + mod_memcg_state(memcg, MEMCG_ZSWAP_INCOMP, 1); rcu_read_unlock(); } =20 @@ -5481,6 +5485,8 @@ void obj_cgroup_uncharge_zswap(struct obj_cgroup *obj= cg, size_t size) memcg =3D obj_cgroup_memcg(objcg); mod_memcg_state(memcg, MEMCG_ZSWAP_B, -size); mod_memcg_state(memcg, MEMCG_ZSWAPPED, -1); + if (size =3D=3D PAGE_SIZE) + mod_memcg_state(memcg, MEMCG_ZSWAP_INCOMP, -1); rcu_read_unlock(); } =20 --=20 2.43.0 From nobody Thu Apr 2 00:15:31 2026 Received: from out-181.mta0.migadu.com (out-181.mta0.migadu.com [91.218.175.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 783DB2989BC; Fri, 13 Feb 2026 07:19:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770967146; cv=none; b=j5pQZLdagbc6Fpkf78WUgLEiuBjnrWZAVECQgVda4lSFuvckKhWCZrIP1+DhFzkpAsUkEDNsI1mUa7kmMDFI3DlxQfTCkvIj7aRfIKjf3tsVQfOoIPIEvZkdXJ9ULwJavtuO4eHQJsd+qdCz+UpCGFX3IrxyGGJAYCStk08YzzQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770967146; c=relaxed/simple; bh=3FbY3oiUDhxvvJsY+ZzL8u6BhbEXlfel5ApzMIwducM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WwupcK2CpO5DpIR2CyrWt+Ucp64qKptJ74wc14gOwXITE00EYD1Lqbe3/QCmtDVgwEcudExwwU11hmLoJE+6NDnrG1YTvxq3rZ+UtNHbzhRvFRggAmv/kZXLCwd/KP8hF73cX3vKh5cDERkvbBblfD6LybPTmtnf4gLyMZ+QbYw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=lIXNPvSq; arc=none smtp.client-ip=91.218.175.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="lIXNPvSq" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1770967140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fHxD0q/WzMwerrB6ZvB9y/vH4lR5GGZkuNBvcMrlqCg=; b=lIXNPvSqtq/mhCIHqxeszIYr/dYCcHPhuKv8BU2LzkjdLcK9P1zVhUyLfgrTBtWksG2iM/ Cd9uWmaQOjCZeDqnMhBfEkW5CxhEcfoN0N8H3l5JRit/TmtkhvnztmxIr2KOWqN/FtKzwx XJKKxxEqFXLCORDZbvr0dcqUqxpn4b4= From: Jiayuan Chen To: linux-mm@kvack.org Cc: jiayuan.chen@linux.dev, Jiayuan Chen , Shakeel Butt , Nhat Pham , SeongJae Park , Tejun Heo , Johannes Weiner , =?UTF-8?q?Michal=20Koutn=C3=BD?= , Jonathan Corbet , Michal Hocko , Roman Gushchin , Muchun Song , Andrew Morton , Yosry Ahmed , Chengming Zhou , Shuah Khan , cgroups@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH mm-new v3 2/2] selftests/cgroup: add test for zswap incompressible pages Date: Fri, 13 Feb 2026 15:18:23 +0800 Message-ID: <20260213071827.5688-3-jiayuan.chen@linux.dev> In-Reply-To: <20260213071827.5688-1-jiayuan.chen@linux.dev> References: <20260213071827.5688-1-jiayuan.chen@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Jiayuan Chen Add test_zswap_incompressible() to verify that the zswap_incomp memcg stat correctly tracks incompressible pages. The test allocates memory filled with random data from /dev/urandom, which cannot be effectively compressed by zswap. When this data is swapped out to zswap, it should be stored as-is and tracked by the zswap_incomp counter. The test verifies that: 1. Pages are swapped out to zswap (zswpout increases) 2. Incompressible pages are tracked (zswap_incomp increases) test: dd if=3D/dev/zero of=3D/swapfile bs=3D1M count=3D2048 chmod 600 /swapfile mkswap /swapfile swapon /swapfile echo Y > /sys/module/zswap/parameters/enabled ./test_zswap TAP version 13 1..8 ok 1 test_zswap_usage ok 2 test_swapin_nozswap ok 3 test_zswapin ok 4 test_zswap_writeback_enabled ok 5 test_zswap_writeback_disabled ok 6 test_no_kmem_bypass ok 7 test_no_invasive_cgroup_shrink ok 8 test_zswap_incompressible Totals: pass:8 fail:0 xfail:0 xpass:0 skip:0 error:0 Acked-by: Shakeel Butt Acked-by: Nhat Pham Reviewed-by: SeongJae Park Signed-off-by: Jiayuan Chen --- tools/testing/selftests/cgroup/test_zswap.c | 136 ++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/tools/testing/selftests/cgroup/test_zswap.c b/tools/testing/se= lftests/cgroup/test_zswap.c index 64ebc3f3f203..a7bdcdd09d62 100644 --- a/tools/testing/selftests/cgroup/test_zswap.c +++ b/tools/testing/selftests/cgroup/test_zswap.c @@ -5,6 +5,8 @@ #include #include #include +#include +#include #include #include #include @@ -574,6 +576,139 @@ static int test_no_kmem_bypass(const char *root) return ret; } =20 +struct incomp_child_args { + size_t size; + int pipefd[2]; + int madvise_ret; + int madvise_errno; +}; + +static int allocate_random_and_wait(const char *cgroup, void *arg) +{ + struct incomp_child_args *values =3D arg; + size_t size =3D values->size; + char *mem; + int fd; + ssize_t n; + + close(values->pipefd[0]); + + mem =3D mmap(NULL, size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (mem =3D=3D MAP_FAILED) + return -1; + + /* Fill with random data from /dev/urandom - incompressible */ + fd =3D open("/dev/urandom", O_RDONLY); + if (fd < 0) { + munmap(mem, size); + return -1; + } + + for (size_t i =3D 0; i < size; ) { + n =3D read(fd, mem + i, size - i); + if (n <=3D 0) + break; + i +=3D n; + } + close(fd); + + /* Touch all pages to ensure they're faulted in */ + for (size_t i =3D 0; i < size; i +=3D PAGE_SIZE) + mem[i] =3D mem[i]; + + /* Use MADV_PAGEOUT to push pages into zswap */ + values->madvise_ret =3D madvise(mem, size, MADV_PAGEOUT); + values->madvise_errno =3D errno; + + /* Notify parent that allocation and pageout are done */ + write(values->pipefd[1], "x", 1); + close(values->pipefd[1]); + + /* Keep memory alive for parent to check stats */ + pause(); + munmap(mem, size); + return 0; +} + +static long get_zswap_incomp(const char *cgroup) +{ + return cg_read_key_long(cgroup, "memory.stat", "zswap_incomp "); +} + +/* + * Test that incompressible pages (random data) are tracked by zswap_incom= p. + * + * The child process allocates random data within memory.max, then uses + * MADV_PAGEOUT to push pages into zswap. The parent waits on a pipe for + * the child to finish, then checks the zswap_incomp stat before the child + * exits (zswap_incomp is a gauge that decreases on free). + */ +static int test_zswap_incompressible(const char *root) +{ + int ret =3D KSFT_FAIL; + struct incomp_child_args *values; + char *test_group; + long zswap_incomp; + pid_t child_pid; + int child_status; + char buf; + + values =3D mmap(0, sizeof(struct incomp_child_args), PROT_READ | + PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0); + if (values =3D=3D MAP_FAILED) + return KSFT_FAIL; + + if (pipe(values->pipefd)) { + munmap(values, sizeof(struct incomp_child_args)); + return KSFT_FAIL; + } + + test_group =3D cg_name(root, "zswap_incompressible_test"); + if (!test_group) + goto out; + if (cg_create(test_group)) + goto out; + if (cg_write(test_group, "memory.max", "32M")) + goto out; + + values->size =3D MB(4); + child_pid =3D cg_run_nowait(test_group, allocate_random_and_wait, values); + if (child_pid < 0) + goto out; + + close(values->pipefd[1]); + + /* Wait for child to finish allocating and pageout */ + read(values->pipefd[0], &buf, 1); + close(values->pipefd[0]); + + zswap_incomp =3D get_zswap_incomp(test_group); + if (zswap_incomp <=3D 0) { + long zswpout =3D get_zswpout(test_group); + long zswapped =3D cg_read_key_long(test_group, "memory.stat", "zswapped = "); + long zswap_b =3D cg_read_key_long(test_group, "memory.stat", "zswap "); + + ksft_print_msg("zswap_incomp not increased: %ld\n", zswap_incomp); + ksft_print_msg("debug: zswpout=3D%ld zswapped=3D%ld zswap_b=3D%ld\n", + zswpout, zswapped, zswap_b); + ksft_print_msg("debug: madvise ret=3D%d errno=3D%d\n", + values->madvise_ret, values->madvise_errno); + goto out_kill; + } + + ret =3D KSFT_PASS; + +out_kill: + kill(child_pid, SIGTERM); + waitpid(child_pid, &child_status, 0); +out: + cg_destroy(test_group); + free(test_group); + munmap(values, sizeof(struct incomp_child_args)); + return ret; +} + #define T(x) { x, #x } struct zswap_test { int (*fn)(const char *root); @@ -586,6 +721,7 @@ struct zswap_test { T(test_zswap_writeback_disabled), T(test_no_kmem_bypass), T(test_no_invasive_cgroup_shrink), + T(test_zswap_incompressible), }; #undef T =20 --=20 2.43.0