From mboxrd@z Thu Jan 1 00:00:00 1970 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 89CEEC27C7B for ; Fri, 14 Jun 2024 03:50:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DDD126B00FF; Thu, 13 Jun 2024 23:50:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D8C436B0100; Thu, 13 Jun 2024 23:50:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C542D6B0101; Thu, 13 Jun 2024 23:50:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A65B56B00FF for ; Thu, 13 Jun 2024 23:50:46 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 47ACB4043D for ; Fri, 14 Jun 2024 03:50:46 +0000 (UTC) X-FDA: 82228117692.28.E3478F2 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf17.hostedemail.com (Postfix) with ESMTP id 5BE4F40004 for ; Fri, 14 Jun 2024 03:50:42 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718337043; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=63rlNoWmH4eMpjqAJAjfaRrfo7ulfKDg2SA6qcCO+CI=; b=jWOfg/nBoSn2ZwcVVFXXNHa9XckJZ/NvjLTZkr9LVC6Bl9pySup17+tf5DZ88bd6niCpUe MQ4kr7jt35yhU4u2Y9igHzfLtq0HU9dsXqw1skB2ku7zUN2ABZErXjU7XKElQp/GH5DYbP 9URU3ogUVXCNHU0cqKuGPMIf+4adX8Y= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718337043; a=rsa-sha256; cv=none; b=gflwDWrcv9lVgbXrIJekdMinESI+CtehzfJ+VLyQnWQCJ1WTU6xefX0Y3yduYaQ1jGNd10 SLjX7eQvN9W6xJM8vDfkR/AKHMfYVs+J3/6Hjx5pHt86I2p/+TLyK29WTQCpniLA37l048 WScm/I8ImZkwyMUmAX4UVFOE64KWloY= Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4W0lZG4wZvzwQ3H; Fri, 14 Jun 2024 11:46:30 +0800 (CST) Received: from canpemm500002.china.huawei.com (unknown [7.192.104.244]) by mail.maildlp.com (Postfix) with ESMTPS id C189418007C; Fri, 14 Jun 2024 11:50:38 +0800 (CST) Received: from [10.173.127.72] (10.173.127.72) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Fri, 14 Jun 2024 11:50:38 +0800 Subject: Re: [PATCH v2 2/3] selftest/mm: test enable_soft_offline behaviors To: Jiaqi Yan CC: , , , , , , , , , , , , References: <20240611215544.2105970-1-jiaqiyan@google.com> <20240611215544.2105970-3-jiaqiyan@google.com> From: Miaohe Lin Message-ID: <5c97ee26-754f-c94c-6888-952b45b43558@huawei.com> Date: Fri, 14 Jun 2024 11:50:37 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20240611215544.2105970-3-jiaqiyan@google.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.173.127.72] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To canpemm500002.china.huawei.com (7.192.104.244) X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 5BE4F40004 X-Stat-Signature: eadsrzh3ryjmh3rwtdrbgzdxtyjnqob7 X-HE-Tag: 1718337042-950114 X-HE-Meta: U2FsdGVkX18pVJap4kjQahnoIKqhI2LoJw2o8GtPQavTGIvfbfgTPXlLUM147SuapeZd5Syv955KhvU/6X49KPtPKog9kw0lybROW0o93otI9sAqYIlMoZIgUamX/hhSEC2rRiJ9TOVOuuMovxjux/fBpxddfo/OIram9DvxqxZzL9VfNCYA9MyJ0+GW1ZWHZNWYWEeidDUA+6ixm/7rgLRt84For6e6hnMKNbh38lZ5ulIyOFh1MlU3dsiqDH6BRBZGU2HfGYMwCWRnSG86VJtEjZ/3+j2EN1OsougR4FRjCDipWYy6ucGnVkRVgdPTbd14pioaGzwR5n7scoduufelkmEnQgjXGWDCiEYXC9TnLxXuagfPMJ+G6T4QLkTy9F2l2Yf+s8jijVreUJV4kWHlhGPy4MV9OBifZoBL2Bx7bSLcqux2yFEY9qfudd9svyI2Am5Yq2HKulqHrkIHZI78Etcx3/9eG93MPSoDS+k5w4l7ZduJ9W86i+qjHuxSgK0vAf6jZj7pR1Tchv+SXrT9wOHHJsjQ8Yo0OjelqQjLMnSKSqnvxhTzaaL1oFc82FDcW6NbVI1LVxf7weQY8OA6EXfr4kbXLwQcaIsHHv/faxllfHl0BJL6vjLvWxvzfk8NXPsWru63k0tXK5XeVMrBYCasJOTv3tSIM2iwqS8k5CKIcbahsx2O+7xOgyk7TVe6G1iSobOMHNzy3Rfjrp5MROHIrbX6mkXCntnl4RQqxdaYEsfsF2CFPbktv1Spprck8r86197IrMl4pmKqCRXjnvUu4/UG+s56YK2lCbGXNPx6yqRhbhkILR2o+H8tnQWWK5U4dVrxJoqSCjkHEGvCoeXfh2xy3rvvFEbUlrvQK1MKnYBTqpnF4IZKpMm+gbZATCNZQMHNZwWkOX7UNycHZMf2zF0H56JA3rDO9z8i5lo5DCOcqDjQaDDbajLve9TtmbuRtwnEPMMItmO VjG5cv8+ 5x6fX4h2scxH4ym2C0j+a1L1PA4YcpfF7FL+2b01QNHykUfXXZl6vcm3yUgHwq57uEky4Y4PrytwdqdDVFfdAQg2Rxn96oBAyGnq/7QMNhZbQJqqO/DxowcBr+Wg59MNkQt35/C83p8G7DAUvGkTuBaBQZPEAmJCrJF6Sw+R6l/hQQrGDLYHS0UO8QZwuXpZu/KH1jtupxuwPLOifQLo12z32P1UDfABWhtKmTeiPks00a5rWnTc5jDc3H3JhwNDkrh8+C4Cm7G4YKsJEPNblKfeQlC73NPRPJ9iIIknR/8QeIsyeNDSJLJQimA== 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: On 2024/6/12 5:55, Jiaqi Yan wrote: > Add regression and new tests when hugepage has correctable memory > errors, and how userspace wants to deal with it: > * if enable_soft_offline=0, mapped hugepage is soft offlined > * if enable_soft_offline=1, mapped hugepage is intact This shoule be something like below ? if enable_soft_offline=0, mapped hugepage is intact if enable_soft_offline=1, mapped hugepage is soft offlined > > Free hugepages case is not explicitly covered by the tests. > > Hugepage having corrected memory errors is emulated with > MADV_SOFT_OFFLINE. > > Signed-off-by: Jiaqi Yan > --- > tools/testing/selftests/mm/.gitignore | 1 + > tools/testing/selftests/mm/Makefile | 1 + > .../selftests/mm/hugetlb-soft-offline.c | 258 ++++++++++++++++++ > tools/testing/selftests/mm/run_vmtests.sh | 4 + > 4 files changed, 264 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 3b49bc3d0a3b..d166067d75ef 100644 > --- a/tools/testing/selftests/mm/Makefile > +++ b/tools/testing/selftests/mm/Makefile > @@ -42,6 +42,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..d37d68a433e7 > --- /dev/null > +++ b/tools/testing/selftests/mm/hugetlb-soft-offline.c > @@ -0,0 +1,258 @@ > +// 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 EINVAL. > + * - 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 > + > +#ifndef MADV_SOFT_OFFLINE > +#define MADV_SOFT_OFFLINE 101 > +#endif > + > +#define PREFIX " ... " > +#define EPREFIX " !!! " > + > +enum test_status { > + TEST_PASS = 0, > + TEST_FAILED = 1, > + // From ${ksft_skip} in run_vmtests.sh. > + TEST_SKIPPED = 4, > +}; > + > +static enum test_status do_soft_offline(int fd, size_t len, int expect_ret) > +{ > + char *filemap = NULL; > + char *hwp_addr = NULL; > + const unsigned long pagesize = getpagesize(); > + int ret = 0; > + enum test_status status = TEST_SKIPPED; > + > + if (ftruncate(fd, len) < 0) { > + perror(EPREFIX "ftruncate to len failed"); > + return status; > + } > + > + filemap = mmap(NULL, len, PROT_READ | PROT_WRITE, > + MAP_SHARED | MAP_POPULATE, fd, 0); > + if (filemap == MAP_FAILED) { > + perror(EPREFIX "mmap failed"); > + goto untruncate; > + } > + > + memset(filemap, 0xab, len); > + printf(PREFIX "Allocated %#lx bytes of hugetlb pages\n", len); > + > + hwp_addr = filemap + len / 2; > + ret = madvise(hwp_addr, pagesize, MADV_SOFT_OFFLINE); > + printf(PREFIX "MADV_SOFT_OFFLINE %p ret=%d, errno=%d\n", > + hwp_addr, ret, errno); > + if (ret != 0) > + perror(EPREFIX "madvise failed"); > + > + if (errno == expect_ret) > + status = TEST_PASS; > + else { > + printf(EPREFIX "MADV_SOFT_OFFLINE should ret %d\n", expect_ret); > + status = TEST_FAILED; > + } > + > + munmap(filemap, len); > +untruncate: > + if (ftruncate(fd, 0) < 0) > + perror(EPREFIX "ftruncate back to 0 failed"); > + > + return status; > +} > + > +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 == NULL) > + perror(EPREFIX "failed to set enable_soft_offline"); If fails to set enable_soft_offline, should we return errno here? > + else > + printf(PREFIX "enable_soft_offline => %d\n", value); > + > + 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"); Check cmdfile against NULL? > + > + if (!fgets(buffer, sizeof(buffer), cmdfile)) { > + 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) { > + perror(EPREFIX "could not open hugetlbfs file"); > + return -1; > + } > + > + memset(file_stat, 0, sizeof(*file_stat)); > + if (fstatfs(fd, file_stat)) { > + perror(EPREFIX "fstatfs failed"); > + goto close; > + } > + if (file_stat->f_type != HUGETLBFS_MAGIC) { > + printf(EPREFIX "not hugetlbfs file\n"); > + goto close; > + } > + > + return fd; > +close: > + close(fd); > + return -1; > +} > + > +static enum test_status test_soft_offline(void) > +{ > + int fd; > + struct statfs file_stat; > + unsigned long hugepagesize_kb = 0; > + unsigned long nr_hugepages_before = 0; > + unsigned long nr_hugepages_after = 0; > + enum test_status status = TEST_SKIPPED; > + > + printf("Test Soft Offline When softoffline_corrected_errors=1\n"); > + > + fd = create_hugetlbfs_file(&file_stat); > + if (fd < 0) { > + printf(EPREFIX "Failed to create hugetlbfs file\n"); > + return status; > + } > + > + hugepagesize_kb = file_stat.f_bsize / 1024; > + printf(PREFIX "Hugepagesize is %ldkB\n", hugepagesize_kb); > + > + if (set_enable_soft_offline(1)) > + return TEST_FAILED; > + > + if (read_nr_hugepages(hugepagesize_kb, &nr_hugepages_before) != 0) > + return TEST_FAILED; > + > + printf(PREFIX "Before MADV_SOFT_OFFLINE nr_hugepages=%ld\n", > + nr_hugepages_before); > + > + status = do_soft_offline(fd, 2 * file_stat.f_bsize, /*expect_ret=*/0); > + > + if (read_nr_hugepages(hugepagesize_kb, &nr_hugepages_after) != 0) > + return TEST_FAILED; > + > + printf(PREFIX "After MADV_SOFT_OFFLINE nr_hugepages=%ld\n", > + nr_hugepages_after); > + > + if (nr_hugepages_before != nr_hugepages_after + 1) { > + printf(EPREFIX "MADV_SOFT_OFFLINE should reduced 1 hugepage\n"); > + return TEST_FAILED; > + } > + > + return status; > +} > + > +static enum test_status test_disable_soft_offline(void) > +{ > + int fd; > + struct statfs file_stat; > + unsigned long hugepagesize_kb = 0; > + unsigned long nr_hugepages_before = 0; > + unsigned long nr_hugepages_after = 0; > + enum test_status status = TEST_SKIPPED; > + > + printf("Test Soft Offline When softoffline_corrected_errors=0\n"); > + > + fd = create_hugetlbfs_file(&file_stat); > + if (fd < 0) { > + printf(EPREFIX "Failed to create hugetlbfs file\n"); > + return status; > + } > + > + hugepagesize_kb = file_stat.f_bsize / 1024; > + printf(PREFIX "Hugepagesize is %ldkB\n", hugepagesize_kb); > + > + if (set_enable_soft_offline(0)) > + return TEST_FAILED; > + > + if (read_nr_hugepages(hugepagesize_kb, &nr_hugepages_before) != 0) > + return TEST_FAILED; > + > + printf(PREFIX "Before MADV_SOFT_OFFLINE nr_hugepages=%ld\n", > + nr_hugepages_before); > + > + status = do_soft_offline(fd, 2 * file_stat.f_bsize, /*expect_ret=*/EINVAL); > + > + if (read_nr_hugepages(hugepagesize_kb, &nr_hugepages_after) != 0) > + return TEST_FAILED; > + > + printf(PREFIX "After MADV_SOFT_OFFLINE nr_hugepages=%ld\n", > + nr_hugepages_after); > + > + if (nr_hugepages_before != nr_hugepages_after) { > + printf(EPREFIX "MADV_SOFT_OFFLINE reduced %lu hugepages\n", > + nr_hugepages_before - nr_hugepages_after); > + return TEST_FAILED; > + } > + > + return status; > +} test_disable_soft_offline is almost same with test_soft_offline. Shall we extract the common pattern? Thanks. .