From patchwork Fri Oct 6 18:46:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13411838 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 10A65E81E1E for ; Fri, 6 Oct 2023 18:46:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2B5A98000B; Fri, 6 Oct 2023 14:46:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2646780008; Fri, 6 Oct 2023 14:46:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 090588000B; Fri, 6 Oct 2023 14:46:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E797180008 for ; Fri, 6 Oct 2023 14:46:38 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B1E43404F1 for ; Fri, 6 Oct 2023 18:46:38 +0000 (UTC) X-FDA: 81315917676.26.3B4365E Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) by imf19.hostedemail.com (Postfix) with ESMTP id F03341A0013 for ; Fri, 6 Oct 2023 18:46:36 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ghMqF+w5; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.167.169 as permitted sender) smtp.mailfrom=nphamcs@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696617997; 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=vY+Soyh4ezPzEsiTwAjxm3PLfRjJVUJ94CEs1TUSu9g=; b=aKwWCxa5nErHiIkhpgDxZv3EtMtD6cMyCgH4IhJzOkd9sG1Fze7YhmPjLGAM1/8iZ5UaSB +vHu9msh1v1S5oPho6ca8INlEPQwesU6NYYazxpxFGXETjmT8fcJYNajO25m/aX2gNr5a/ 7nF+mmcx1+kVoUmqPgNSqzDKjkrT6SI= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ghMqF+w5; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.167.169 as permitted sender) smtp.mailfrom=nphamcs@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696617997; a=rsa-sha256; cv=none; b=JeIRfQfBCHYFdyOzLqw8p9vnvzAXuvhkQyM90jU7YzKl/0c4xx9BPQccMpbEzUSNvnvI44 2XQNVB7SUww85alPttexHIjWtO1E9DwQXKkCNbw+bWzwypd4c9YUgoMd15iZ2OFuwMJxz5 yFjY21xe/3M26fJEzRWJDgy41M6ISH8= Received: by mail-oi1-f169.google.com with SMTP id 5614622812f47-3ae2896974bso1555940b6e.0 for ; Fri, 06 Oct 2023 11:46:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696617996; x=1697222796; 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=vY+Soyh4ezPzEsiTwAjxm3PLfRjJVUJ94CEs1TUSu9g=; b=ghMqF+w5ebG8v8Y0eBmDaXnjz13ACQ1MI1AlcdZ9U9xssP0F94fP0VxQMyxiyOOmb/ nsnJTOicXZJT6D5kBoLBUrM/ehaPzVYfgm05RqYBu3IU0wtByktdHcBir2D2KNlOYX6o 20QE622Y+wfnXDSy7oAZ2GMNQNEb4CVwMZHInGuqVC7Ccnpqivo/0StfdhyFOgqq6IJI Onn6J/L86pUTyXaG6mhNr10vkliun6IGp9boJvx96kkYZqRHOv6FF7mmrZ8nrtK9ZT7G WgBZZd9n8tWduC2Qkv1A1cVz+DABmt6THbU6sdpTShSeKGS6L/dYRgy9hCNJM8MqlJfb dOlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696617996; x=1697222796; 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=vY+Soyh4ezPzEsiTwAjxm3PLfRjJVUJ94CEs1TUSu9g=; b=J/9KFCzc5R9sdaKyXeJqAJvjkIB4t73C7+0YwZrWUZUtrua6zP4ble63///2diFTMg spBsBanMOZvDXI499huCtTevyztTqf7Y26eG6o60kg3+xt6o/nSHRG0LMchndc89vAW6 qqRowGh1Wah8ijZY7IIsUxy6J8RgHFmSIF2558L05AL9x5YcFMjKvGKYCPM2I/8mQjdg 4Ybz+1NdmIdtNDnABZa0HUbgv/oyclcSpmNkkhI14HX5WZO+6qgEs1yaL56m4cTxYvTi BEEdTfa7/ynnyPQ5//54Va6S+BLq90RXglXA6rOk2Y/tPp/68S8Ourjozc3vuBe9cb4I 670Q== X-Gm-Message-State: AOJu0YwS9W4qiAkn7dEc1/Xpftb/LSeoF1wzZmgtMCBz6KSHsH0yTEdM +cYKqMOz7MOidrIyGoQAdgM= X-Google-Smtp-Source: AGHT+IEy8b9pbe0uvLgz2KimcopbbkeJwi6+OhwuqZtXmIDIBfGt5NNnJWLdEFwXkYOWepQdee4kyg== X-Received: by 2002:a54:4812:0:b0:3ad:c497:1336 with SMTP id j18-20020a544812000000b003adc4971336mr9048765oij.16.1696617995913; Fri, 06 Oct 2023 11:46:35 -0700 (PDT) Received: from localhost (fwdproxy-prn-013.fbsv.net. [2a03:2880:ff:d::face:b00c]) by smtp.gmail.com with ESMTPSA id a24-20020a637058000000b00581048ffc13sm3722085pgn.81.2023.10.06.11.46.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 11:46:35 -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, fvdl@google.com, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Subject: [PATCH v4 4/4] selftests: add a selftest to verify hugetlb usage in memcg Date: Fri, 6 Oct 2023 11:46:29 -0700 Message-Id: <20231006184629.155543-5-nphamcs@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231006184629.155543-1-nphamcs@gmail.com> References: <20231006184629.155543-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: F03341A0013 X-Stat-Signature: o8jqqifd8bgejxwpponi3hsmne86eeij X-HE-Tag: 1696617996-597107 X-HE-Meta: U2FsdGVkX19+QYJyvjPesYPs8RzorCt62Lx0OSXBrosjP6z3gOLmNSZMqe7MVF2whbic0GJXrmgzjVyLXqlo2mho06Ygyx8qPUgYHIs2eilYIhdSdghzESVfTvZApwOgTkVpdztUSxK2N/zYlJW4TjycAmsMojhnC+H9FIGOlJ7uCGMbt53ZPYy9WHfQkUTmr4810CeLPRAu/HuxNBwJzrr6B6+qYU0J/ww8aBKH7r5xOoGn35S7THmxvsWA6dV+tF/J5NO3vj2eA6JEHpHijJpZJ0uJRrAR2k1HnRu32T7GhydFaVRUYJTAZsON2kbz9yhC6KWjwIF0v8dQqA4wCLthQI6C0/aiv717Th2wQCNNcf48+i+U08LT84JkjvI69CpfR+YwjG1Djkt0fROUndvj8XebnqIFxouSuExd1yKs+uc+qbSeUPwsPXlnClyrfCnQmdaK3kbMNSLCpX3LvYDTW4s9OpujpaDOca4ovNsrFkRTdnmhWKnH7bGhLFe4WpqhxigFFhK35wRF6vY5dHNa8E1qnOoRiFf/sfVhWQ4YBu4rQ7G4NI0Umz+FN5DZxHr3DGy5ask9XUn5g5r2PlTgkmt6Z4Y5ZBQEXIZ+TJzkHTvqyXtdmUMEanAmOoZl72hmDlXY311liChsR9DSdclHVrSbHFObS+2AY/M/8QeQ5Sg+N0nIGbPbSzwDEtFjoXsmGipSoH3H5zdOjJUt5+l1kNvVDp3mvl11u+c+Egnpkvbu+rDDtIlm7sLuZp8DNsltvAwFQ3UcPuYsiQ6DhrSULEKPvp0GlVuv7wu+6P2/Apnne5UuBmOrxMLdkXXvX2h166XBRMOdYAiW1iOnYT27BN0eQ1sliJG6U4lClYrWQzD/ZRw9qEIxDQV6Z0Rg4D5XkovvicYedUvWlawXnZyQ2SOUTyy209D3M4G7sAXGZkywWVSEvZC1jzEm2wh2bwooebE1usFepPd3VKN LPVkuhPV 2tUuDNySS5wXwwEw3nA/TP84a8rkzdX4gu/cSGMmes02MxM1hY76qj0jRqsMpaTvZ0awYlJBZ16FFxYba102SArjT8SoozVbkV4CQRJ1tVYtZ6PsyRWwvBchZRJ5L93zugguwHSyr43N+1KCuQCFGAZeQzs21b0CpRLfIoYZNYrdlEqdFG6NSZ3lAw3Wl5Ss5YlD9g2lz86NoWwLUNzaXk7Qf5d9QBF1PyABjZotiul92lVD1KPvi2Qc1g/9d2gL/izbafU4GL6kmIaLlvHFb+3XIFmDRDxOs1xNLspiW2cyyePJ0s19eKGJoF1VG53HHoGUQpanu9AMPJobm+NWt0Gx8ThSWbky2z+TZIfzwqQhzK3Ldo0PGqqpNshox1R+TRrR7ywgzJjjno7qRaqFoei1oN2cjH35sfDnTW9glVWA2k8w7rLLbUrFM4s/xLRIWa/89N62dmD0XhMF6GP7Q4Wq6GjxuZI0TeaW26h3zC8YnTaw= X-Bogosity: Ham, tests=bogofilter, spamicity=0.436917, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 | 234 ++++++++++++++++++ 4 files changed, 239 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 @@ -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 HVA ST MEDIA DRIVER M: Jean-Christophe Trotin diff --git a/tools/testing/selftests/cgroup/.gitignore b/tools/testing/selftests/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/selftests/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 += test_kill TEST_GEN_PROGS += test_cpu TEST_GEN_PROGS += test_cpuset TEST_GEN_PROGS += test_zswap +TEST_GEN_PROGS += test_hugetlb_memcg LOCAL_HDRS += $(selfdir)/clone3/clone3_selftests.h $(selfdir)/pidfd/pidfd.h @@ -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/testing/selftests/cgroup/test_hugetlb_memcg.c new file mode 100644 index 000000000000..f0fefeb4cc24 --- /dev/null +++ b/tools/testing/selftests/cgroup/test_hugetlb_memcg.c @@ -0,0 +1,234 @@ +// 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 == 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 = "/proc/meminfo", *tag = "Hugepagesize:"; + long val; + + fd = open(path, O_RDONLY); + if (fd < 0) { + /* Error opening the file */ + return -1; + } + + len = read(fd, buf, sizeof(buf)); + close(fd); + if (len < 0) { + /* Error in reading the file */ + return -1; + } + if (len == sizeof(buf)) { + /* Error file is too large */ + return -1; + } + buf[len] = '\0'; + + /* Search for a tag if provided */ + if (tag) { + p = strstr(buf, tag); + if (!p) + return -1; /* looks like the line we want isn't there */ + p += strlen(tag); + } else + p = buf; + + val = strtol(p, &q, 0); + if (*q != ' ') { + /* Error parsing the file */ + return -1; + } + + return val; +} + +static int set_file(const char *path, long value) +{ + FILE *file; + int ret; + + file = fopen(path, "w"); + if (!file) + return -1; + ret = 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 = 0; i < LENGTH; i++) + *(addr + i) = (char)i; +} + +static int hugetlb_test_program(const char *cgroup, void *arg) +{ + char *test_group = (char *)arg; + void *addr; + long old_current, expected_current, current; + int ret = EXIT_FAILURE; + + old_current = cg_read_long(test_group, "memory.current"); + set_nr_hugepages(20); + current = cg_read_long(test_group, "memory.current"); + if (current - old_current >= MB(2)) { + ksft_print_msg( + "setting nr_hugepages should not increase hugepage usage.\n"); + ksft_print_msg("before: %ld, after: %ld\n", old_current, current); + return EXIT_FAILURE; + } + + addr = mmap(ADDR, LENGTH, PROTECTION, FLAGS, 0, 0); + if (addr == MAP_FAILED) { + ksft_print_msg("fail to mmap.\n"); + return EXIT_FAILURE; + } + current = cg_read_long(test_group, "memory.current"); + if (current - old_current >= MB(2)) { + ksft_print_msg("mmap should not increase hugepage usage.\n"); + ksft_print_msg("before: %ld, after: %ld\n", old_current, current); + goto out_failed_munmap; + } + old_current = current; + + /* read the first page */ + check_first(addr); + expected_current = old_current + MB(2); + current = cg_read_long(test_group, "memory.current"); + if (!values_close(expected_current, current, 5)) { + ksft_print_msg("memory usage should increase by around 2MB.\n"); + ksft_print_msg( + "expected memory: %ld, actual memory: %ld\n", + expected_current, current); + goto out_failed_munmap; + } + + /* write to the whole range */ + write_data(addr); + current = cg_read_long(test_group, "memory.current"); + expected_current = old_current + MB(8); + if (!values_close(expected_current, current, 5)) { + ksft_print_msg("memory usage should increase by around 8MB.\n"); + ksft_print_msg( + "expected memory: %ld, actual memory: %ld\n", + expected_current, current); + goto out_failed_munmap; + } + + /* unmap the whole range */ + munmap(addr, LENGTH); + current = cg_read_long(test_group, "memory.current"); + expected_current = old_current; + if (!values_close(expected_current, current, 5)) { + ksft_print_msg("memory usage should go back down.\n"); + ksft_print_msg( + "expected memory: %ld, actual memory: %ld\n", + expected_current, current); + return ret; + } + + ret = EXIT_SUCCESS; + return ret; + +out_failed_munmap: + munmap(addr, LENGTH); + return ret; +} + +static int test_hugetlb_memcg(char *root) +{ + int ret = KSFT_FAIL; + char *test_group; + + test_group = 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; + } + + if (!cg_run(test_group, hugetlb_test_program, (void *)test_group)) + ret = KSFT_PASS; +out: + cg_destroy(test_group); + free(test_group); + return ret; +} + +int main(int argc, char **argv) +{ + char root[PATH_MAX]; + int ret = EXIT_SUCCESS, has_memory_hugetlb_acc; + + has_memory_hugetlb_acc = proc_mount_contains("memory_hugetlb_accounting"); + if (has_memory_hugetlb_acc < 0) + ksft_exit_skip("Failed to query cgroup mount option\n"); + else if (!has_memory_hugetlb_acc) + ksft_exit_skip("memory hugetlb accounting is disabled\n"); + + /* Unit is kB! */ + if (get_hugepage_size() != 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 = EXIT_FAILURE; + ksft_test_result_fail("test_hugetlb_memcg\n"); + break; + } + + return ret; +}