selftests-cgroup-test_zswap-skip-test_no_kmem_bypass-if-debugfs-is-unavailable.patch removed from -mm tree
The quilt patch titled
Subject: selftests/cgroup: test_zswap: skip test_no_kmem_bypass if debugfs is unavailable
has been removed from the -mm tree. Its filename was
selftests-cgroup-test_zswap-skip-test_no_kmem_bypass-if-debugfs-is-unavailable.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Wilson Felipe Pereira <[email protected]>
Subject: selftests/cgroup: test_zswap: skip test_no_kmem_bypass if debugfs is unavailable
Date: Tue, 11 Aug 2026 05:14:11 +0000
test_no_kmem_bypass() needs to read /sys/kernel/debug/zswap/stored_pages via get_zswap_stored_pages() to verify that compressed pages are charged to the memcg.
When running in an environment where debugfs is not mounted or CONFIG_DEBUG_FS is disabled, get_zswap_stored_pages() fails, causing the loop to terminate early and report a false negative (KSFT_FAIL).
Selftests should not fail if debugfs is unavailable, and it should print a message when it is skipped.
While I'm here, also add a warning message if the test is being skipped due to totalram size and make the check for totalram more readable.
---
tools/testing/selftests/cgroup/lib/include/cgroup_util.h | 1 tools/testing/selftests/cgroup/test_zswap.c | 13 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)
tools/testing/selftests/cgroup/lib/include/cgroup_util.h renamed from tools/testing/selftests/cgroup/lib/include/cgroup_util.h~selftests-cgroup-test_zswap-skip-test_no_kmem_bypass-if-debugfs-is-unavailable +1 -0
@@ -7,6 +7,7 @@#endif #define MB (x) (x << 20) +#define GB (x) ((unsigned long long)(x) << 30)#define USEC_PER_SEC 1000000L#define NSEC_PER_SEC 1000000000L
tools/testing/selftests/cgroup/test_zswap.c renamed from tools/testing/selftests/cgroup/test_zswap.c~selftests-cgroup-test_zswap-skip-test_no_kmem_bypass-if-debugfs-is-unavailable +11 -2
@@ -20,6 +20,7 @@ static int page_size;#define PATH_ZSWAP "/sys/module/zswap"#define PATH_ZSWAP_ENABLED "/sys/module/zswap/parameters/enabled" +#define PATH_ZSWAP_STORED_PAGES "/sys/kernel/debug/zswap/stored_pages"static int read_int (const char *path,size_t *value) {
@@ -55,7 +56,7 @@ static int read_min_free_kb(size_t *valustatic int get_zswap_stored_pages (size_t *value) { -return read_int ("/sys/kernel/debug/zswap/stored_pages" , value); +return read_int (PATH_ZSWAP_STORED_PAGES , value); }static long get_cg_wb_count (const char *cg)
@@ -570,8 +571,16 @@ static int test_no_kmem_bypass(const cha/* Read sys info and compute test values accordingly */ if (sysinfo (&sys_info) !=0 )return KSFT_FAIL ; -if (sys_info.totalram >5000000000 ) +if (sys_info.totalram >GB (4 )) { +ksft_print_msg ( +"requires less than 4GB total ram, sys_info.totalram: %.1fGB\n" , + (double )sys_info.totalram /GB (1 ));return KSFT_SKIP ; + } +if (access (PATH_ZSWAP_STORED_PAGES ,R_OK )) { +ksft_print_msg ("debugfs not mounted at /sys/kernel/debug\n" ); +return KSFT_SKIP ; + } values =mmap (0 ,sizeof (struct no_kmem_bypass_child_args ),PROT_READ |PROT_WRITE ,MAP_SHARED |MAP_ANONYMOUS ,-1 ,0 );if (values ==MAP_FAILED )
_
Patches currently in -mm which might be from [email protected] are