From nobody Fri Feb 13 10:59:08 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A0E5E7D27E for ; Tue, 26 Sep 2023 19:50:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235483AbjIZTuK (ORCPT ); Tue, 26 Sep 2023 15:50:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234838AbjIZTuA (ORCPT ); Tue, 26 Sep 2023 15:50:00 -0400 Received: from mail-oi1-x230.google.com (mail-oi1-x230.google.com [IPv6:2607:f8b0:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D88E0A3; Tue, 26 Sep 2023 12:49:52 -0700 (PDT) Received: by mail-oi1-x230.google.com with SMTP id 5614622812f47-3a86a0355dfso5544960b6e.0; Tue, 26 Sep 2023 12:49:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695757792; x=1696362592; darn=vger.kernel.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=36Ec5DlRzmoQv9z0q1zeDBidbeUYibAaRRb/G9wYEfI=; b=TLHpHT/suS2GeTb8qkbTQimruiLvBzbbTpyVK5bfIhFKofkGEWFIzP5YMKapYeNH4I Wog804PXTwsyuWzMbZIrBmi3zqpTAkk8r/Re1hGXTZUT47C97sox2+DiB5dCTaynTTfz NQvrs4Yi9t+1hhxFkmj3lrVR77lHAKOf/NyQ7pDKl0UB5APMikiQbFUTyCjqOsI5wREQ 1o2Fkb0dbdUa13nfobX0JlNtg8HRx3kZNgc9CXIq39mV5LU9qKmMwH3v8wC5AlPQJtsi mXzPyaRDt7SXh2ED//BUClLChL8E3DcNWh+EskEtmigB7LEW9A/Czg49OJtbefUXPI3P QiQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695757792; x=1696362592; 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=36Ec5DlRzmoQv9z0q1zeDBidbeUYibAaRRb/G9wYEfI=; b=MWGJAASznV+WcrchYNYaTRCNngMtM6NH1dg9DnjO5n5WkiKAPKTAkonAVeVjXwJ5bh jrCaCUtz7yVAELM7pAZ2XNap0stiUq5YP+NTOKzcYAResma4BhGLOb84gjFbCwNxfOBp mwlniRW1e+QxgjepDytzpJraSRzpGckmFyBeTD0rj3q7SBY2Bd42U3q+vWV7+gss9+5r yLE2K75Z1AhaDxhoIr1Qbq9LiC0GwwPY9/ozhYwNq1GTsqGHh+NCImetDJXJ0UYjAwTc 1BHtgsBZ7/ARPhMPoe0gVaDlcUvCg5b0x/MH7Ils8k/ab2Vr0FTvDywl0F/ZWh15VXzP JPwg== X-Gm-Message-State: AOJu0YynOtYvWFKayGWZ/iL5GRbJBPBycZdXd1BrlotCukdClK8B4w46 hPdGe2WUc6Dc7tZrTIZ/+I8= X-Google-Smtp-Source: AGHT+IE9SG7tw6HLiOdoU2vIpJZrAb5VF2U/ZD9Y17VJ9SxnVN81Mx8Pnf1wdzUtPy4d45NiXjBSPQ== X-Received: by 2002:aca:1311:0:b0:3a6:f622:70f1 with SMTP id e17-20020aca1311000000b003a6f62270f1mr9105389oii.57.1695757792002; Tue, 26 Sep 2023 12:49:52 -0700 (PDT) Received: from localhost (fwdproxy-prn-016.fbsv.net. [2a03:2880:ff:10::face:b00c]) by smtp.gmail.com with ESMTPSA id i4-20020a63e444000000b0056428865aadsm10113211pgk.82.2023.09.26.12.49.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 12:49:51 -0700 (PDT) From: Nhat Pham To: akpm@linux-foundation.org Cc: riel@surriel.com, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, muchun.song@linux.dev, tj@kernel.org, lizefan.x@bytedance.com, shuah@kernel.org, mike.kravetz@oracle.com, yosryahmed@google.com, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Subject: [PATCH 2/2] selftests: add a selftest to verify hugetlb usage in memcg Date: Tue, 26 Sep 2023 12:49:49 -0700 Message-Id: <20230926194949.2637078-3-nphamcs@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230926194949.2637078-1-nphamcs@gmail.com> References: <20230926194949.2637078-1-nphamcs@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch add a new kselftest to demonstrate and verify the new hugetlb memcg accounting behavior. Signed-off-by: Nhat Pham --- MAINTAINERS | 2 + tools/testing/selftests/cgroup/.gitignore | 1 + tools/testing/selftests/cgroup/Makefile | 2 + .../selftests/cgroup/test_hugetlb_memcg.c | 222 ++++++++++++++++++ 4 files changed, 227 insertions(+) create mode 100644 tools/testing/selftests/cgroup/test_hugetlb_memcg.c diff --git a/MAINTAINERS b/MAINTAINERS index bf0f54c24f81..ce9f40bcc2ba 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5269,6 +5269,7 @@ S: Maintained F: mm/memcontrol.c F: mm/swap_cgroup.c F: tools/testing/selftests/cgroup/memcg_protection.m +F: tools/testing/selftests/cgroup/test_hugetlb_memcg.c F: tools/testing/selftests/cgroup/test_kmem.c F: tools/testing/selftests/cgroup/test_memcontrol.c =20 @@ -9652,6 +9653,7 @@ F: include/linux/hugetlb.h F: mm/hugetlb.c F: mm/hugetlb_vmemmap.c F: mm/hugetlb_vmemmap.h +F: tools/testing/selftests/cgroup/test_hugetlb_memcg.c =20 HVA ST MEDIA DRIVER M: Jean-Christophe Trotin diff --git a/tools/testing/selftests/cgroup/.gitignore b/tools/testing/self= tests/cgroup/.gitignore index af8c3f30b9c1..2732e0b29271 100644 --- a/tools/testing/selftests/cgroup/.gitignore +++ b/tools/testing/selftests/cgroup/.gitignore @@ -7,4 +7,5 @@ test_kill test_cpu test_cpuset test_zswap +test_hugetlb_memcg wait_inotify diff --git a/tools/testing/selftests/cgroup/Makefile b/tools/testing/selfte= sts/cgroup/Makefile index c27f05f6ce9b..00b441928909 100644 --- a/tools/testing/selftests/cgroup/Makefile +++ b/tools/testing/selftests/cgroup/Makefile @@ -14,6 +14,7 @@ TEST_GEN_PROGS +=3D test_kill TEST_GEN_PROGS +=3D test_cpu TEST_GEN_PROGS +=3D test_cpuset TEST_GEN_PROGS +=3D test_zswap +TEST_GEN_PROGS +=3D test_hugetlb_memcg =20 LOCAL_HDRS +=3D $(selfdir)/clone3/clone3_selftests.h $(selfdir)/pidfd/pidf= d.h =20 @@ -27,3 +28,4 @@ $(OUTPUT)/test_kill: cgroup_util.c $(OUTPUT)/test_cpu: cgroup_util.c $(OUTPUT)/test_cpuset: cgroup_util.c $(OUTPUT)/test_zswap: cgroup_util.c +$(OUTPUT)/test_hugetlb_memcg: cgroup_util.c diff --git a/tools/testing/selftests/cgroup/test_hugetlb_memcg.c b/tools/te= sting/selftests/cgroup/test_hugetlb_memcg.c new file mode 100644 index 000000000000..9651f6af6914 --- /dev/null +++ b/tools/testing/selftests/cgroup/test_hugetlb_memcg.c @@ -0,0 +1,222 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE + +#include +#include +#include +#include +#include +#include +#include "../kselftest.h" +#include "cgroup_util.h" + +#define ADDR ((void *)(0x0UL)) +#define FLAGS (MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB) +/* mapping 8 MBs =3D=3D 4 hugepages */ +#define LENGTH (8UL*1024*1024) +#define PROTECTION (PROT_READ | PROT_WRITE) + +/* borrowed from mm/hmm-tests.c */ +static long get_hugepage_size(void) +{ + int fd; + char buf[2048]; + int len; + char *p, *q, *path =3D "/proc/meminfo", *tag =3D "Hugepagesize:"; + long val; + + fd =3D open(path, O_RDONLY); + if (fd < 0) { + /* Error opening the file */ + return -1; + } + + len =3D read(fd, buf, sizeof(buf)); + close(fd); + if (len < 0) { + /* Error in reading the file */ + return -1; + } + if (len =3D=3D sizeof(buf)) { + /* Error file is too large */ + return -1; + } + buf[len] =3D '\0'; + + /* Search for a tag if provided */ + if (tag) { + p =3D strstr(buf, tag); + if (!p) + return -1; /* looks like the line we want isn't there */ + p +=3D strlen(tag); + } else + p =3D buf; + + val =3D strtol(p, &q, 0); + if (*q !=3D ' ') { + /* Error parsing the file */ + return -1; + } + + return val; +} + +static int set_file(const char *path, long value) +{ + FILE *file; + int ret; + + file =3D fopen(path, "w"); + if (!file) + return -1; + ret =3D fprintf(file, "%ld\n", value); + fclose(file); + return ret; +} + +static int set_nr_hugepages(long value) +{ + return set_file("/proc/sys/vm/nr_hugepages", value); +} + +static unsigned int check_first(char *addr) +{ + return *(unsigned int *)addr; +} + +static void write_data(char *addr) +{ + unsigned long i; + + for (i =3D 0; i < LENGTH; i++) + *(addr + i) =3D (char)i; +} + +static int hugetlb_test_program(const char *cgroup, void *arg) +{ + char *test_group =3D (char *)arg; + void *addr; + long old_current, expected_current, current; + int ret =3D EXIT_FAILURE; + + old_current =3D cg_read_long(test_group, "memory.current"); + + addr =3D mmap(ADDR, LENGTH, PROTECTION, FLAGS, 0, 0); + if (addr =3D=3D MAP_FAILED) { + ksft_print_msg("fail to mmap.\n"); + return EXIT_FAILURE; + } + current =3D cg_read_long(test_group, "memory.current"); + if (current - old_current >=3D MB(2)) { + ksft_print_msg("mmap should not increase hugepage usage.\n"); + goto out_failed_munmap; + } + old_current =3D current; + + /* read the first page */ + check_first(addr); + expected_current =3D old_current + MB(2); + current =3D cg_read_long(test_group, "memory.current"); + if (!values_close(expected_current, current, 1)) { + ksft_print_msg("memory usage should increase by around 2MB.\n"); + goto out_failed_munmap; + } + + /* write to the whole range */ + write_data(addr); + current =3D cg_read_long(test_group, "memory.current"); + expected_current =3D old_current + MB(8); + if (!values_close(expected_current, current, 1)) { + ksft_print_msg("memory usage should increase by around 8MB.\n"); + goto out_failed_munmap; + } + + /* unmap the whole range */ + munmap(addr, LENGTH); + current =3D cg_read_long(test_group, "memory.current"); + expected_current =3D old_current; + if (!values_close(expected_current, current, 1)) { + ksft_print_msg("memory usage should go back down.\n"); + return ret; + } + + ret =3D EXIT_SUCCESS; + return ret; + +out_failed_munmap: + munmap(addr, LENGTH); + return ret; +} + +static int test_hugetlb_memcg(char *root) +{ + int ret =3D KSFT_FAIL; + char *test_group; + long old_current, expected_current, current; + + test_group =3D cg_name(root, "hugetlb_memcg_test"); + + if (!test_group || cg_create(test_group)) { + ksft_print_msg("fail to create cgroup.\n"); + goto out; + } + + if (cg_write(test_group, "memory.max", "100M")) { + ksft_print_msg("fail to set cgroup memory limit.\n"); + goto out; + } + + /* disable swap */ + if (cg_write(test_group, "memory.swap.max", "0")) { + ksft_print_msg("fail to disable swap.\n"); + goto out; + } + old_current =3D cg_read_long(test_group, "memory.current"); + + set_nr_hugepages(20); + current =3D cg_read_long(test_group, "memory.current"); + expected_current =3D old_current; + if (!values_close(expected_current, current, 10)) { + ksft_print_msg( + "memory usage should not increase after setting nr_hugepages.\n"); + goto out; + } + + if (!cg_run(test_group, hugetlb_test_program, (void *)test_group)) + ret =3D KSFT_PASS; +out: + cg_destroy(test_group); + free(test_group); + return ret; +} + +int main(int argc, char **argv) +{ + char root[PATH_MAX]; + int ret =3D EXIT_SUCCESS; + + /* Unit is kB! */ + if (get_hugepage_size() !=3D 2048) { + ksft_print_msg("test_hugetlb_memcg requires 2MB hugepages\n"); + ksft_test_result_skip("test_hugetlb_memcg\n"); + return ret; + } + + if (cg_find_unified_root(root, sizeof(root))) + ksft_exit_skip("cgroup v2 isn't mounted\n"); + + switch (test_hugetlb_memcg(root)) { + case KSFT_PASS: + ksft_test_result_pass("test_hugetlb_memcg\n"); + break; + case KSFT_SKIP: + ksft_test_result_skip("test_hugetlb_memcg\n"); + break; + default: + ret =3D EXIT_FAILURE; + ksft_test_result_fail("test_hugetlb_memcg\n"); + break; + } + + return ret; +} --=20 2.34.1