From patchwork Fri Jun 28 20:59:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqi Yan X-Patchwork-Id: 13716604 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 1F116C30658 for ; Fri, 28 Jun 2024 21:00:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3FCA16B0096; Fri, 28 Jun 2024 17:00:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2E74F6B0098; Fri, 28 Jun 2024 17:00:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 163036B0099; Fri, 28 Jun 2024 17:00:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id D8F6F6B0096 for ; Fri, 28 Jun 2024 17:00:09 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 58E1140779 for ; Fri, 28 Jun 2024 21:00:09 +0000 (UTC) X-FDA: 82281514938.02.10A7C62 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) by imf10.hostedemail.com (Postfix) with ESMTP id 7C1CFC000E for ; Fri, 28 Jun 2024 21:00:07 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=0FHkO8Fl; spf=pass (imf10.hostedemail.com: domain of 3VSR_ZggKCNQ980G8O0D6EE6B4.2ECB8DKN-CCAL02A.EH6@flex--jiaqiyan.bounces.google.com designates 209.85.215.201 as permitted sender) smtp.mailfrom=3VSR_ZggKCNQ980G8O0D6EE6B4.2ECB8DKN-CCAL02A.EH6@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719608389; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LX2k2Odth3Czy1UPzCvu++jrFt8goB6d9yMZ+ndJ/Y8=; b=kJd26MtPjKjU9ueUU14SQW9jhyzrfutdN0YydR4OymUsii7ctxW73bZuXO5oou2BKcnHXK ajoXuVyAurtaMOdtAGODS532/Fz4QMTWCPgunHG9N8l7484KUVisOXx+YjudDPaCUQET8R v0MS4l5HLZVLvu3LecNN36HcIF6D4Tk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719608389; a=rsa-sha256; cv=none; b=mxCjgUFxjbF30MBWcSn1YOY9646iUL+HkdispWQijvCejiyxZZ/bjKcPU8dA6cbfJwLeWh DtMIh415yJhh9V9UbPSc6Vdhs1mB4UzSrk5/PqzK582duzxF6YrfUKTsMJxpTxb3EzXJcy aDUZ8ggGlrCzEFNavKOlywwXzlL1vcw= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=0FHkO8Fl; spf=pass (imf10.hostedemail.com: domain of 3VSR_ZggKCNQ980G8O0D6EE6B4.2ECB8DKN-CCAL02A.EH6@flex--jiaqiyan.bounces.google.com designates 209.85.215.201 as permitted sender) smtp.mailfrom=3VSR_ZggKCNQ980G8O0D6EE6B4.2ECB8DKN-CCAL02A.EH6@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-718c62ad099so767541a12.3 for ; Fri, 28 Jun 2024 14:00:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719608406; x=1720213206; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=LX2k2Odth3Czy1UPzCvu++jrFt8goB6d9yMZ+ndJ/Y8=; b=0FHkO8FlxFjxNzFyrZVnjLvPuZwtATvgrR1sDY321udKJDzSMY1J+B20aEJREO52/F kfPQzSMxdb32HZBONsNurjQUn7u56jCXjYFpRQy2DjMJsbEcHKO78WVhPKFDJom/8QbK jZ4D5nYMwBHuwKW0EFUoyX8KdRmlaktD3Dw5MHLpD3HccVzCBIOaM+9HdPPk6g6TwZxv zZMa8RlJPQaC+XNZJ6uyPqSozl6r9BAsxrRgp9TOdE8cFxTk3LAjM1iwhreXzLVnL9jA JoW2XglVxCLa1FcNm1KkRpFHU8m/QU0KzcmtDsx0uMv2b0lDdeohICeUJsTuitk8lrI2 hXug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719608406; x=1720213206; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LX2k2Odth3Czy1UPzCvu++jrFt8goB6d9yMZ+ndJ/Y8=; b=LctkYRYPD9qoN7hfzq6cCDZ2/8icNx9QtRiZgFUinPHph+uvf/ewsstQ83FpI3pQYR udBAgVWyqop+iBHIpFhCtjQu+PD1xB0sgNR5BLtoZEhrMgbjXhLeifa3qjsW97RaCtIs JRefnp1dsIIz6PkqOcTxRiIUJvoFDL3SPQDooR/ObMt16BPI07jugV0t7Q3qOvXcciXN sYm79ha6gaeXgaZFIKoYfXjCP0VY4axiRVAzpBPoo7HryntwN9rmuVQTvX3H2JxCngod 7B1i14ITFSsCUCdOFmxkK2gF5xF/roqbjcReFIzweg/nYdP2dUMFXJWqiBZ7Ac5tFy3E f3vw== X-Forwarded-Encrypted: i=1; AJvYcCWY/rcjfosT8iopEbpWQNFqiG5MkuoA981Ief/V4c18cDzSiheLZGjAs81L3g75xqacyEHDkjgTLfA88Lg79R3Q/gs= X-Gm-Message-State: AOJu0YwEbFnSnOKYQDGyl7ZDeJ1cJKjyK1Xd4GNq8piYN5uktF84/tWO TIdpXs/BZ/tehKJm4KQRQwsfHmFBtXLrU4BOTuuCvsK52daNem/SzSrUlikOVuWeqFenV1VEMfn PEET0G3f7FQ== X-Google-Smtp-Source: AGHT+IEOnM2DmpIwo9UplyJX5c7ScIunYeQjWO3FSTx8VD2hKPYukIltq7alsOpJeqnRkjeE7/AeNNFxxG+TFA== X-Received: from yjq3.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:272f]) (user=jiaqiyan job=sendgmr) by 2002:a63:7151:0:b0:6e5:9777:4b0a with SMTP id 41be03b00d2f7-71a39d74f05mr42746a12.8.1719608405925; Fri, 28 Jun 2024 14:00:05 -0700 (PDT) Date: Fri, 28 Jun 2024 20:59:57 +0000 In-Reply-To: <20240628205958.2845610-1-jiaqiyan@google.com> Mime-Version: 1.0 References: <20240628205958.2845610-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Message-ID: <20240628205958.2845610-4-jiaqiyan@google.com> Subject: [PATCH v7 3/4] selftest/mm: test enable_soft_offline behaviors From: Jiaqi Yan To: nao.horiguchi@gmail.com, linmiaohe@huawei.com Cc: jane.chu@oracle.com, ioworker0@gmail.com, muchun.song@linux.dev, akpm@linux-foundation.org, shuah@kernel.org, rdunlap@infradead.org, corbet@lwn.net, osalvador@suse.de, rientjes@google.com, duenwen@google.com, fvdl@google.com, ak@linux.intel.com, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, Jiaqi Yan X-Rspamd-Queue-Id: 7C1CFC000E X-Stat-Signature: zdfue5um498ymnw8pxgeewfnsijbu5kf X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1719608407-546361 X-HE-Meta: U2FsdGVkX19MhT2c2+t8qeFafC8iLKrUp+vU+sIwfqjIvB2Xl/P2hjWusXyeSev6urwYBE1CwUVPwbbnY6hZUjbObxK7SoM7Lqsz4YhFZDBgLIaMXFI0rITalZyD5GJzGJ7VcF4P0VVpDGj4vGBZDwYGL6f3l9KilN/q/ogdxX2bmjlXRt8sm5OYenug452hDDr22H400R9Ge9N4RW5NCnPa0VrUxGwJ9rHm+ySwI4zolC32se8yO2TRUjaIigEl7EsVv9omlc7nkYtha87pFrVs1qMfQFLUtM9sEQulpbFs613D+mNybLprq3CZ0enpd8OfYGSBv5i4LjGyH5crOetWhgW36/UHpe3VcrG9y6vgQbJ5GRIIT1HZnxPCcRxmSyUSRYrGtplL/R6fya+a/M+Jfod6dj8yk+oX7ac9ChSPKar9OzuQO9XQ3L3QVHsidEupTUwCjHCeh3U1KEQ4vUKIq79c3ci9kYkrevkaHEt7LsGX2LS6XnGKXVvp7uP9dmjRCeJUgnrLV+Ek0VqXs5HTyyfitcu4G4xBubhFUv55bErJK8PQhdIbPsSo3pgubqLCSvEm0yVKB7b/HuT03jz3JmshE7yhBulRjJt4dkUdh9G4O3XqInYY7XO0zJFHNRSfVjFPcNIUGUcelMVXsEgc3fOSPIf/JUFO66CUQGy8fLyWtxUQDkQ0z7HuK3i08T4VAa8hep8bzJY4aphcBMEyoVBThjzvbPPHg/GnBiRuRVRrH3CwD5pa0c0WxpoDJBc7hpB70Y5OVELwyBAyhN262LYPzXwWyvnJ3Hg3p0qL7bc+juXgovt3W8xKYD8e0cpAlsQ/T4SQMgkEMqMCdxvQ3+F1KCh1OJdJabD/je03CmsZ/DWkkQo5xw46BShziQsBg5JssvCBmkbmvSxVGL3g/ixRMCl2AaHRkPTh1oFu5Cmu2a+1DKY7pVFtl0peFsxffLEcScTC53KD9bE zusIHUOq AxcNYhjMPkS++2jirDXvcrQWJWgpnwjYIWn6hCGk5JzVzaHajbhfXsTE74sH5WaBhSAfW65e3Lj82+UxdBE2b6iTd9amPSpEw5aI4G5RNevzY+2/lqjda7TiGewiLL65zWx3hKK3jnu+w3OSr0LlNZhm6gqO/hhm6AUafE9pD24FPniY9WNlEukG4CJUN4NJtC7jHzjWvDDt7H3DAMxMdl5eq4wU2Pc/QMyg0oNxkVjOWYiwrbe0VAfhnPWeds4s9iwSSYfHCHe1zi3RCfsT9yE8VZOP8Q53/PNLZw0hH7QrBF+SuaD4wwZSwPgPjflITkWPzoe+ffEGyxHKSBNjhCg2voW6uU6HJe+4yEaK8nRPMIjcj0nWP0TBfTChyRSCLGXYtaQXiNIRiXCorRNST1t5L6hZfuYxJvgUKUdUkAlqjOyLFJh6g05GfPj2AO5YmdXb+JV24IOn14JnD0xmm69F65asMS1kj/NXvMP2/5FwzEuYiSdBZzWr5GpAO8V9E5MfmMrYl2qbkPZII4iV1R8vMlhIJHu4VVneJx59KtmV4wRBI82A3lNkwOUz6MAZL2T6FzdWoZVZXvH2+QpZ1/8QIgBfRB+TgmhiB3CwSBVLf/LJoG94C4gAzvux5SclLRu94tr6Dui3Nt/0VjY4VbFF+qv2T2aV4YkcQSP8sm51z98w= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Add regression and new tests when hugepage has correctable memory errors, and how userspace wants to deal with it: * if enable_soft_offline=1, mapped hugepage is soft offlined * if enable_soft_offline=0, mapped hugepage is intact Free hugepages case is not explicitly covered by the tests. Hugepage having corrected memory errors is emulated with MADV_SOFT_OFFLINE. Acked-by: Miaohe Lin Signed-off-by: Jiaqi Yan Acked-by: David Rientjes --- tools/testing/selftests/mm/.gitignore | 1 + tools/testing/selftests/mm/Makefile | 1 + .../selftests/mm/hugetlb-soft-offline.c | 228 ++++++++++++++++++ tools/testing/selftests/mm/run_vmtests.sh | 6 + 4 files changed, 236 insertions(+) create mode 100644 tools/testing/selftests/mm/hugetlb-soft-offline.c diff --git a/tools/testing/selftests/mm/.gitignore b/tools/testing/selftests/mm/.gitignore index 0b9ab987601c..064e7b125643 100644 --- a/tools/testing/selftests/mm/.gitignore +++ b/tools/testing/selftests/mm/.gitignore @@ -6,6 +6,7 @@ hugepage-shm hugepage-vmemmap hugetlb-madvise hugetlb-read-hwpoison +hugetlb-soft-offline khugepaged map_hugetlb map_populate diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile index 0d96c6123636..e1aa09ddaa3d 100644 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -43,6 +43,7 @@ TEST_GEN_FILES += gup_test TEST_GEN_FILES += hmm-tests TEST_GEN_FILES += hugetlb-madvise TEST_GEN_FILES += hugetlb-read-hwpoison +TEST_GEN_FILES += hugetlb-soft-offline TEST_GEN_FILES += hugepage-mmap TEST_GEN_FILES += hugepage-mremap TEST_GEN_FILES += hugepage-shm diff --git a/tools/testing/selftests/mm/hugetlb-soft-offline.c b/tools/testing/selftests/mm/hugetlb-soft-offline.c new file mode 100644 index 000000000000..f086f0e04756 --- /dev/null +++ b/tools/testing/selftests/mm/hugetlb-soft-offline.c @@ -0,0 +1,228 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Test soft offline behavior for HugeTLB pages: + * - if enable_soft_offline = 0, hugepages should stay intact and soft + * offlining failed with EOPNOTSUPP. + * - if enable_soft_offline = 1, a hugepage should be dissolved and + * nr_hugepages/free_hugepages should be reduced by 1. + * + * Before running, make sure more than 2 hugepages of default_hugepagesz + * are allocated. For example, if /proc/meminfo/Hugepagesize is 2048kB: + * echo 8 > /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "../kselftest.h" + +#ifndef MADV_SOFT_OFFLINE +#define MADV_SOFT_OFFLINE 101 +#endif + +#define EPREFIX " !!! " + +static int do_soft_offline(int fd, size_t len, int expect_errno) +{ + char *filemap = NULL; + char *hwp_addr = NULL; + const unsigned long pagesize = getpagesize(); + int ret = 0; + + if (ftruncate(fd, len) < 0) { + ksft_perror(EPREFIX "ftruncate to len failed"); + return -1; + } + + filemap = mmap(NULL, len, PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_POPULATE, fd, 0); + if (filemap == MAP_FAILED) { + ksft_perror(EPREFIX "mmap failed"); + ret = -1; + goto untruncate; + } + + memset(filemap, 0xab, len); + ksft_print_msg("Allocated %#lx bytes of hugetlb pages\n", len); + + hwp_addr = filemap + len / 2; + ret = madvise(hwp_addr, pagesize, MADV_SOFT_OFFLINE); + ksft_print_msg("MADV_SOFT_OFFLINE %p ret=%d, errno=%d\n", + hwp_addr, ret, errno); + if (ret != 0) + ksft_perror(EPREFIX "madvise failed"); + + if (errno == expect_errno) + ret = 0; + else { + ksft_print_msg("MADV_SOFT_OFFLINE should ret %d\n", + expect_errno); + ret = -1; + } + + munmap(filemap, len); +untruncate: + if (ftruncate(fd, 0) < 0) + ksft_perror(EPREFIX "ftruncate back to 0 failed"); + + return ret; +} + +static int set_enable_soft_offline(int value) +{ + char cmd[256] = {0}; + FILE *cmdfile = NULL; + + if (value != 0 && value != 1) + return -EINVAL; + + sprintf(cmd, "echo %d > /proc/sys/vm/enable_soft_offline", value); + cmdfile = popen(cmd, "r"); + + if (cmdfile) + ksft_print_msg("enable_soft_offline => %d\n", value); + else { + ksft_perror(EPREFIX "failed to set enable_soft_offline"); + return errno; + } + + pclose(cmdfile); + return 0; +} + +static int read_nr_hugepages(unsigned long hugepage_size, + unsigned long *nr_hugepages) +{ + char buffer[256] = {0}; + char cmd[256] = {0}; + + sprintf(cmd, "cat /sys/kernel/mm/hugepages/hugepages-%ldkB/nr_hugepages", + hugepage_size); + FILE *cmdfile = popen(cmd, "r"); + + if (cmdfile == NULL) { + ksft_perror(EPREFIX "failed to popen nr_hugepages"); + return -1; + } + + if (!fgets(buffer, sizeof(buffer), cmdfile)) { + ksft_perror(EPREFIX "failed to read nr_hugepages"); + pclose(cmdfile); + return -1; + } + + *nr_hugepages = atoll(buffer); + pclose(cmdfile); + return 0; +} + +static int create_hugetlbfs_file(struct statfs *file_stat) +{ + int fd; + + fd = memfd_create("hugetlb_tmp", MFD_HUGETLB); + if (fd < 0) { + ksft_perror(EPREFIX "could not open hugetlbfs file"); + return -1; + } + + memset(file_stat, 0, sizeof(*file_stat)); + if (fstatfs(fd, file_stat)) { + ksft_perror(EPREFIX "fstatfs failed"); + goto close; + } + if (file_stat->f_type != HUGETLBFS_MAGIC) { + ksft_print_msg(EPREFIX "not hugetlbfs file\n"); + goto close; + } + + return fd; +close: + close(fd); + return -1; +} + +static void test_soft_offline_common(int enable_soft_offline) +{ + int fd; + int expect_errno = enable_soft_offline ? 0 : EOPNOTSUPP; + struct statfs file_stat; + unsigned long hugepagesize_kb = 0; + unsigned long nr_hugepages_before = 0; + unsigned long nr_hugepages_after = 0; + int ret; + + ksft_print_msg("Test soft-offline when enabled_soft_offline=%d\n", + enable_soft_offline); + + fd = create_hugetlbfs_file(&file_stat); + if (fd < 0) + ksft_exit_fail_msg("Failed to create hugetlbfs file\n"); + + hugepagesize_kb = file_stat.f_bsize / 1024; + ksft_print_msg("Hugepagesize is %ldkB\n", hugepagesize_kb); + + if (set_enable_soft_offline(enable_soft_offline) != 0) { + close(fd); + ksft_exit_fail_msg("Failed to set enable_soft_offline\n"); + } + + if (read_nr_hugepages(hugepagesize_kb, &nr_hugepages_before) != 0) { + close(fd); + ksft_exit_fail_msg("Failed to read nr_hugepages\n"); + } + + ksft_print_msg("Before MADV_SOFT_OFFLINE nr_hugepages=%ld\n", + nr_hugepages_before); + + ret = do_soft_offline(fd, 2 * file_stat.f_bsize, expect_errno); + + if (read_nr_hugepages(hugepagesize_kb, &nr_hugepages_after) != 0) { + close(fd); + ksft_exit_fail_msg("Failed to read nr_hugepages\n"); + } + + ksft_print_msg("After MADV_SOFT_OFFLINE nr_hugepages=%ld\n", + nr_hugepages_after); + + // No need for the hugetlbfs file from now on. + close(fd); + + if (enable_soft_offline) { + if (nr_hugepages_before != nr_hugepages_after + 1) { + ksft_test_result_fail("MADV_SOFT_OFFLINE should reduced 1 hugepage\n"); + return; + } + } else { + if (nr_hugepages_before != nr_hugepages_after) { + ksft_test_result_fail("MADV_SOFT_OFFLINE reduced %lu hugepages\n", + nr_hugepages_before - nr_hugepages_after); + return; + } + } + + ksft_test_result(ret == 0, + "Test soft-offline when enabled_soft_offline=%d\n", + enable_soft_offline); +} + +int main(int argc, char **argv) +{ + ksft_print_header(); + ksft_set_plan(2); + + test_soft_offline_common(1); + test_soft_offline_common(0); + + ksft_finished(); +} diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index 5698d519170d..03ac4f2e1cce 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -332,6 +332,12 @@ CATEGORY="hugetlb" run_test ./thuge-gen CATEGORY="hugetlb" run_test ./charge_reserved_hugetlb.sh -cgroup-v2 CATEGORY="hugetlb" run_test ./hugetlb_reparenting_test.sh -cgroup-v2 if $RUN_DESTRUCTIVE; then +nr_hugepages_tmp=$(cat /proc/sys/vm/nr_hugepages) +enable_soft_offline=$(cat /proc/sys/vm/enable_soft_offline) +echo 8 > /proc/sys/vm/nr_hugepages +CATEGORY="hugetlb" run_test ./hugetlb-soft-offline +echo "$nr_hugepages_tmp" > /proc/sys/vm/nr_hugepages +echo "$enable_soft_offline" > /proc/sys/vm/enable_soft_offline CATEGORY="hugetlb" run_test ./hugetlb-read-hwpoison fi