selftests/cgroup: rename PAGE_SIZE to BUF_SIZE in cgroup_util

The cgroup utility code defines a local PAGE_SIZE macro hardcoded to 4096,
which is used primarily as a generic buffer size for reading cgroup and
proc files.  This naming is misleading because the value has nothing to do
with the actual page size of the system.  On architectures with larger
pages (e.g., 64K on arm64 or ppc64), the name suggests a relationship that
does not exist.  Additionally, the name can shadow or conflict with
PAGE_SIZE definitions from system headers, leading to confusion or subtle
bugs.

To resolve this, rename the macro to BUF_SIZE to accurately reflect its
purpose as a general I/O buffer size.

Furthermore, test_memcontrol currently relies on this hardcoded 4K value
to stride through memory and trigger page faults.  Update this logic to
use the actual system page size dynamically.  This micro-optimizes the
memory faulting process by ensuring it iterates correctly and efficiently
based on the underlying architecture's true page size.  (This part from
Waiman)

Link: https://lore.kernel.org/20260424040059.12940-5-li.wang@linux.dev
Signed-off-by: Li Wang <li.wang@linux.dev>
Signed-off-by: Waiman Long <longman@redhat.com>
Acked-by: Nhat Pham <nphamcs@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Michal Koutný <mkoutny@suse.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Tejun Heo <tj@kernel.org>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Yosry Ahmed <yosryahmed@google.com>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Cc: Jiayuan Chen <jiayuan.chen@linux.dev>
Cc: Yosry Ahmed <yosry@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/tools/testing/selftests/cgroup/lib/cgroup_util.c b/tools/testing/selftests/cgroup/lib/cgroup_util.c
index 42f54936f4bbd34ac8099d2315688480089042df..f1ec7de58ae3460a49ae0752ce991ddc7e4f2d91 100644 (file)
--- a/tools/testing/selftests/cgroup/lib/cgroup_util.c
+++ b/tools/testing/selftests/cgroup/lib/cgroup_util.c
@@ -141,7 +141,7 @@ int cg_read_strcmp_wait(const char *cgroup, const char *control,
 
 int cg_read_strstr(const char *cgroup, const char *control, const char *needle)
 {
-       char buf[PAGE_SIZE];
+       char buf[BUF_SIZE];
 
        if (cg_read(cgroup, control, buf, sizeof(buf)))
                return -1;
@@ -171,7 +171,7 @@ long cg_read_long_fd(int fd)
 
 long cg_read_key_long(const char *cgroup, const char *control, const char *key)
 {
-       char buf[PAGE_SIZE];
+       char buf[BUF_SIZE];
        char *ptr;
 
        if (cg_read(cgroup, control, buf, sizeof(buf)))
@@ -207,7 +207,7 @@ long cg_read_key_long_poll(const char *cgroup, const char *control,
 
 long cg_read_lc(const char *cgroup, const char *control)
 {
-       char buf[PAGE_SIZE];
+       char buf[BUF_SIZE];
        const char delim[] = "\n";
        char *line;
        long cnt = 0;
@@ -259,7 +259,7 @@ int cg_write_numeric(const char *cgroup, const char *control, long value)
 static int cg_find_root(char *root, size_t len, const char *controller,
                        bool *nsdelegate)
 {
-       char buf[10 * PAGE_SIZE];
+       char buf[10 * BUF_SIZE];
        char *fs, *mount, *type, *options;
        const char delim[] = "\n\t ";
 
@@ -314,7 +314,7 @@ int cg_create(const char *cgroup)
 
 int cg_wait_for_proc_count(const char *cgroup, int count)
 {
-       char buf[10 * PAGE_SIZE] = {0};
+       char buf[10 * BUF_SIZE] = {0};
        int attempts;
        char *ptr;
 
@@ -339,7 +339,7 @@ int cg_wait_for_proc_count(const char *cgroup, int count)
 
 int cg_killall(const char *cgroup)
 {
-       char buf[PAGE_SIZE];
+       char buf[BUF_SIZE];
        char *ptr = buf;
 
        /* If cgroup.kill exists use it. */
@@ -549,7 +549,7 @@ int cg_run_nowait(const char *cgroup,
 
 int proc_mount_contains(const char *option)
 {
-       char buf[4 * PAGE_SIZE];
+       char buf[4 * BUF_SIZE];
        ssize_t read;
 
        read = read_text("/proc/mounts", buf, sizeof(buf));
@@ -561,7 +561,7 @@ int proc_mount_contains(const char *option)
 
 int cgroup_feature(const char *feature)
 {
-       char buf[PAGE_SIZE];
+       char buf[BUF_SIZE];
        ssize_t read;
 
        read = read_text("/sys/kernel/cgroup/features", buf, sizeof(buf));
@@ -588,7 +588,7 @@ ssize_t proc_read_text(int pid, bool thread, const char *item, char *buf, size_t
 
 int proc_read_strstr(int pid, bool thread, const char *item, const char *needle)
 {
-       char buf[PAGE_SIZE];
+       char buf[BUF_SIZE];
 
        if (proc_read_text(pid, thread, item, buf, sizeof(buf)) < 0)
                return -1;

diff --git a/tools/testing/selftests/cgroup/lib/include/cgroup_util.h b/tools/testing/selftests/cgroup/lib/include/cgroup_util.h
index 567b1082974c539752e43c0327f9497d02f091ce..febc1723d090388113035633c7760223dafe5c0c 100644 (file)
--- a/tools/testing/selftests/cgroup/lib/include/cgroup_util.h
+++ b/tools/testing/selftests/cgroup/lib/include/cgroup_util.h
@@ -2,8 +2,8 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-#ifndef PAGE_SIZE
-#define PAGE_SIZE 4096
+#ifndef BUF_SIZE
+#define BUF_SIZE 4096
 #endif
 
 #define MB(x) (x << 20)

diff --git a/tools/testing/selftests/cgroup/test_core.c b/tools/testing/selftests/cgroup/test_core.c
index 7b83c7e7c9d4fa5a8accee3f4f9c3a6fe06c3aa7..88ca832d4fc13049f1af6b05b1717c6ff1d368f3 100644 (file)
--- a/tools/testing/selftests/cgroup/test_core.c
+++ b/tools/testing/selftests/cgroup/test_core.c
@@ -87,7 +87,7 @@ static int test_cgcore_destroy(const char *root)
        int ret = KSFT_FAIL;
        char *cg_test = NULL;
        int child_pid;
-       char buf[PAGE_SIZE];
+       char buf[BUF_SIZE];
 
        cg_test = cg_name(root, "cg_test");
 

diff --git a/tools/testing/selftests/cgroup/test_freezer.c b/tools/testing/selftests/cgroup/test_freezer.c
index 97fae92c8387eb8a3b93b62b2df4f0e411a50fac..160a9e6ad277d332a1e723de73557b16e25c65f3 100644 (file)
--- a/tools/testing/selftests/cgroup/test_freezer.c
+++ b/tools/testing/selftests/cgroup/test_freezer.c
@@ -642,7 +642,7 @@ cleanup:
  */
 static int proc_check_stopped(int pid)
 {
-       char buf[PAGE_SIZE];
+       char buf[BUF_SIZE];
        int len;
 
        len = proc_read_text(pid, 0, "stat", buf, sizeof(buf));

diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c
index b43da9bc20c49010741489d9b229d023d4271a70..44338dbaee819681aea7cf6e69e32009e4f06e29 100644 (file)
--- a/tools/testing/selftests/cgroup/test_memcontrol.c
+++ b/tools/testing/selftests/cgroup/test_memcontrol.c
@@ -26,6 +26,7 @@
 
 static bool has_localevents;
 static bool has_recursiveprot;
+static int page_size;
 
 int get_temp_fd(void)
 {
@@ -34,7 +35,7 @@ int get_temp_fd(void)
 
 int alloc_pagecache(int fd, size_t size)
 {
-       char buf[PAGE_SIZE];
+       char buf[BUF_SIZE];
        struct stat st;
        int i;
 
@@ -61,7 +62,7 @@ int alloc_anon(const char *cgroup, void *arg)
        char *buf, *ptr;
 
        buf = malloc(size);
-       for (ptr = buf; ptr < buf + size; ptr += PAGE_SIZE)
+       for (ptr = buf; ptr < buf + size; ptr += page_size)
                *ptr = 0;
 
        free(buf);
@@ -70,7 +71,7 @@ int alloc_anon(const char *cgroup, void *arg)
 
 int is_swap_enabled(void)
 {
-       char buf[PAGE_SIZE];
+       char buf[BUF_SIZE];
        const char delim[] = "\n";
        int cnt = 0;
        char *line;
@@ -113,7 +114,7 @@ static int test_memcg_subtree_control(const char *root)
 {
        char *parent, *child, *parent2 = NULL, *child2 = NULL;
        int ret = KSFT_FAIL;
-       char buf[PAGE_SIZE];
+       char buf[BUF_SIZE];
 
        /* Create two nested cgroups with the memory controller enabled */
        parent = cg_name(root, "memcg_test_0");
@@ -184,7 +185,7 @@ static int alloc_anon_50M_check(const char *cgroup, void *arg)
                return -1;
        }
 
-       for (ptr = buf; ptr < buf + size; ptr += PAGE_SIZE)
+       for (ptr = buf; ptr < buf + size; ptr += page_size)
                *ptr = 0;
 
        current = cg_read_long(cgroup, "memory.current");
@@ -414,7 +415,7 @@ static int alloc_anon_noexit(const char *cgroup, void *arg)
                return -1;
        }
 
-       for (ptr = buf; ptr < buf + size; ptr += PAGE_SIZE)
+       for (ptr = buf; ptr < buf + size; ptr += page_size)
                *ptr = 0;
 
        while (getppid() == ppid)
@@ -1000,7 +1001,7 @@ static int alloc_anon_50M_check_swap(const char *cgroup, void *arg)
                return -1;
        }
 
-       for (ptr = buf; ptr < buf + size; ptr += PAGE_SIZE)
+       for (ptr = buf; ptr < buf + size; ptr += page_size)
                *ptr = 0;
 
        mem_current = cg_read_long(cgroup, "memory.current");
@@ -1791,6 +1792,10 @@ int main(int argc, char **argv)
        char root[PATH_MAX];
        int i, proc_status;
 
+       page_size = sysconf(_SC_PAGE_SIZE);
+       if (page_size <= 0)
+               page_size = BUF_SIZE;
+
        ksft_print_header();
        ksft_set_plan(ARRAY_SIZE(tests));
        if (cg_find_unified_root(root, sizeof(root), NULL))