From patchwork Mon Jun 17 17:05:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqi Yan X-Patchwork-Id: 13701091 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 895D8C2BA18 for ; Mon, 17 Jun 2024 17:05:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 798AA6B024E; Mon, 17 Jun 2024 13:05:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 721F66B0250; Mon, 17 Jun 2024 13:05:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 54B8E6B0251; Mon, 17 Jun 2024 13:05:56 -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 2B4526B024E for ; Mon, 17 Jun 2024 13:05:56 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9FDF9141953 for ; Mon, 17 Jun 2024 17:05:55 +0000 (UTC) X-FDA: 82241007870.21.2EA18A3 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf06.hostedemail.com (Postfix) with ESMTP id BA61618000B for ; Mon, 17 Jun 2024 17:05:53 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=COm3SxIH; spf=pass (imf06.hostedemail.com: domain of 38GxwZggKCMUutl1t9lyrzzrwp.nzxwty58-xxv6lnv.z2r@flex--jiaqiyan.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=38GxwZggKCMUutl1t9lyrzzrwp.nzxwty58-xxv6lnv.z2r@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718643950; a=rsa-sha256; cv=none; b=nGvqbKT6TKEKxRB+DJ4lTTMykUNXgezoUA+gvBFfYOnfNa7dNL6/hL1I8Vqpmer0OA0J7M xzZcGs4o/U6DjFqh/BH3oGQ/r3DVyPacR04Vj86shus2uudeRYc/XRYhhvKxNwMXAi/Trb 6wmuiqtiTzlsbTHqz6zoeAYiwOCTu48= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=COm3SxIH; spf=pass (imf06.hostedemail.com: domain of 38GxwZggKCMUutl1t9lyrzzrwp.nzxwty58-xxv6lnv.z2r@flex--jiaqiyan.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=38GxwZggKCMUutl1t9lyrzzrwp.nzxwty58-xxv6lnv.z2r@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=1718643950; 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=1tevmA1HCzsTVLfVkW48VuStWY2+98Ib3ji+6cFhdVU=; b=hnjCBXcMpHia8mFYG8Di6D1nwq3o3+yzfmQwLgka2uU2od4S3lhWXaFQ2O9/7orQA3q2gS GX8qdJpQ5zG/nlJe/sbsaR7EjAWy9236xIpCZFO30uxwOP2FFVoXfsVNHp9OHOkRoyGinE bN2JAhQxNbJW2IGlxOzJSsvZJrtB2Ik= Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dfeac23fe6eso8976023276.0 for ; Mon, 17 Jun 2024 10:05:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718643952; x=1719248752; 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=1tevmA1HCzsTVLfVkW48VuStWY2+98Ib3ji+6cFhdVU=; b=COm3SxIHP4U7onT3Yju893LAlS41gRbKT/fbqn59NS1joayfaShmdZUvFWkK8C39tH /EO0Yb4KhNschF5lHR0cEepg7a+MVU/lCS45Yj5ktQq9R/3GVjo0X1SfPvkcChOA6JWg 7CSYHueID9gG4Lt4PGvGrtiysyDVHpVmixe4b+kVPLMYG6zTku965iVjU9UH7zDuvbCD 5wbMZc//1y22RMqtTkj5ySrfLH3mkfpTyBt4C2xXtBAmXOHSeWfeGe9Yq1Uhj/QT6EM/ dJFf0lv+BrMVMuWDpGUFh5U+KdAV2WvIaerT4+LMo2U3buOmEs9smB3O7Ju0+BHZhK1b UxnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718643952; x=1719248752; 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=1tevmA1HCzsTVLfVkW48VuStWY2+98Ib3ji+6cFhdVU=; b=KueyMajz3nOcnLU/rLnw7E6LT9gPj9haWWjhROtMHcxeTA8zj8GO40useS2A07qwKq BzFPwAXT/ubMP0+bQGDa4PMdoHKAczoCoZxGAUiQeJ6BOuDsdOMEZwMVUA5Ka9sySekY 2e0I0nRCTioRYWpo9nEPPPl6BxJz+dI7hUb7U6iTiO2gyf7AQvZBlFXY0uj69CMYJsM2 AnBVQE5p0p/1cYBHYr6KSS/dsZM9NsFuU+2VBcX3etPSFTxQPALx/jqqMeOlWSHcOI1c 0NrEMHtdthetMgtI0m/EuGgqMmM/lXJiNonWwu4YVrj3oVWWD0p5EeZZWT9HCgzlB71u GXtg== X-Forwarded-Encrypted: i=1; AJvYcCXZd/5zOYDw6vXzyxWCuxPKZkFdqx3Co4Et9ne+nRKXc5N2BLeBpNi7UR19xs9+ZVlxQRymTN8JitRAS41Cb/iIcbs= X-Gm-Message-State: AOJu0Yy1Q5jef2gg56NNLa7wLfcD2kwEfAZj5Qa4fOEpPKT8F9wJ029F qMfF3WigqBorlQ/gKH1x728skqfn7Db7Ni0I3H7sP2fgda2GCMkT7dv5G4pTKZM9Ql7lRpQPyPt BgAJc01tKZw== X-Google-Smtp-Source: AGHT+IHaPH860LoxB8KdOgFhvqZSzGViBlD2JGwLQiFXTHzuc4xC+T3rNtkWpuJIT3TcVn/I2RZqtycsHAYZ7w== X-Received: from yjq3.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:272f]) (user=jiaqiyan job=sendgmr) by 2002:a05:6902:110e:b0:dfa:b2ca:7a9e with SMTP id 3f1490d57ef6-dff15456ffbmr3225706276.8.1718643952522; Mon, 17 Jun 2024 10:05:52 -0700 (PDT) Date: Mon, 17 Jun 2024 17:05:44 +0000 In-Reply-To: <20240617170545.3820912-1-jiaqiyan@google.com> Mime-Version: 1.0 References: <20240617170545.3820912-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.45.2.627.g7a2c4fd464-goog Message-ID: <20240617170545.3820912-3-jiaqiyan@google.com> Subject: [PATCH v3 2/3] selftest/mm: test enable_soft_offline behaviors From: Jiaqi Yan To: nao.horiguchi@gmail.com, linmiaohe@huawei.com, jane.chu@oracle.com, ioworker0@gmail.com Cc: muchun.song@linux.dev, akpm@linux-foundation.org, shuah@kernel.org, corbet@lwn.net, osalvador@suse.de, rientjes@google.com, duenwen@google.com, fvdl@google.com, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, Jiaqi Yan X-Stat-Signature: f6midkr1gx4aepohefza4bn3nkwt6e3y X-Rspamd-Queue-Id: BA61618000B X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1718643953-130825 X-HE-Meta: U2FsdGVkX1/pcNopjeKxPh6sbyCmb253cz19JHwBjF87rkhBuP/dXYyMzFyJdQI40ILLOpl90fog83TlnCY0umd/8j9LTs65ZxztmMnq6L7KAM9GwczqZ1Ru9m8G8osQWUnnr/JyWY/TVFXNHjX3GI6geoRyWOeawEnZKwsFqswmMGOuJTsPMZSkzH6QQ6DVO6a3NwcLlmnl2XaM/m8Af6+psJaOa3RRWsAzUbOGGlvrAuRFvPSd9CcIneiNUatrr80hgmcN+nvB+TSKZwlOcXH3ndjRupziv1D+m+sthivr5Sa0QQuLeX1iAxjLMAUZCMWLCoxEGAPFx0lZf/p6VzzJrtMNXJx0PoVDBcnJVqrLdKfoFvBJRuL3Y9ZRpVx/BY9VYoeH/26mMlMz4GSF46k9suk7Heg1ZaDTf0WNDQ4q3mJ9MxsPRBdiGhY8VnNkhnDjgG5BfUQtnV7r69Noh2P3S6tOAmlbZ7ZrlgZ4RpybbGJY748p4ucui0A8pA455jhorPfteDYqZTaZlVdZAXHcJlfBgs7DmYl7edVbbvp+N9upxu2ef0eiAimJ3caeoZNpsVSJZ3dPq8W6HAVChC1W84Kis5RgN9H9srKkQVC+S+TBkTcD7XVeMY3l8YV3n2nTtXqvOA+JJecqTTHwS2w8mpbWAcrUwU2yYa6Hf4tpiR5BZ+2WUPohfWhFwOf7SLyxuxgmYKnAyphga+JsCKsdzOfomtmztfyhF/4gsJwylYa7iLbR65fBfTrLzhpf4KDTJAHoG06OSj684aXVYXO7NwY3IlYb+e0YkzhtTVK39YmvBMk3Oeu1OIOpuGX4t7sYL3dU3PsCMomBho2zHz9LfaEO+cr4xLlO3dlE4zhwtUBv9luwtmvfPK+2XenUYeVJsVAX21Umdd8ui+cfzWbpT0vZEjU8xFZjfEnhWg8kUF3ZMSQUXujujpAOi7t+sEfNfcrwocYkYqKxKyN /Etp6+7D mzi1qsVDFF2Y7sRkGc3PN0s/QacKCYCCOJ4hpcTC1AFuYey3vPfiov7/vl4VgkaY/VSxmkkhDAX2SkQtqx4jceO+FqK3DVUIhXeyJ5gMhhkKlUaijIdqXRY6OnksxBDr84VspM3TXpHLgK+LbTDT3qAA2DejnZP6jQX1UxKUMFm+PxVKXvvPslMpNB2BhzuJoMaVejcqWbMRvX50FI5obdOR40xMerMmuWoJYuvkKBBUxqIIu9vvI9Ze15/c+/BqcMxpCFOUHoF3wP6OXLhAW0GYpkHdMXTIu9uL/XmX+UyuAEOGL397gPYNfFHQ+K8oV5yXAWEcdkLb7Zz6j2IyLjt9UXbf7FTYjDl3Q3ZywNOnITT0yX7KQyUB3dNjazTbWwFzP/ATKtIRH247o0UeKgRTW9AdyZ5sUGTprzh6eJqpwYEtjnTBd59zSoLvKtcUZnaTl6KR+zp3My7yktgHqTSDr2VvEafBJZlpqbsh6pZ3B/nmwro9cz3sQdijexMl1kkcBpBB6p2SbGMhnAgydAVz2GHeFaCuWlUqk01Btws0ce4UiSZrGWLFatiJYGex/7sx00iPv79iW/c87YG0C9nt1KPGyuE8wm77dZFSoW4WFHAYt0vYfDZJD38cJX9f2N3kJr0nGidsBtWcHaqFu4LeSoQ== 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. Signed-off-by: Jiaqi Yan --- tools/testing/selftests/mm/.gitignore | 1 + tools/testing/selftests/mm/Makefile | 1 + .../selftests/mm/hugetlb-soft-offline.c | 229 ++++++++++++++++++ tools/testing/selftests/mm/run_vmtests.sh | 4 + 4 files changed, 235 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..5701eea4ee48 --- /dev/null +++ b/tools/testing/selftests/mm/hugetlb-soft-offline.c @@ -0,0 +1,229 @@ +// 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) + printf(PREFIX "enable_soft_offline => %d\n", value); + else { + 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) { + perror(EPREFIX "failed to popen nr_hugepages"); + return -1; + } + + 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_common(int enable_soft_offline) +{ + int fd; + int expect_ret = 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; + enum test_status status = TEST_SKIPPED; + + printf("Test soft-offline when enabled_soft_offline=%d\n", + enable_soft_offline); + + 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(enable_soft_offline)) + 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); + + 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 (enable_soft_offline) { + if (nr_hugepages_before != nr_hugepages_after + 1) { + printf(EPREFIX "MADV_SOFT_OFFLINE should reduced 1 hugepage\n"); + return TEST_FAILED; + } + } else { + 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; +} + +int main(void) +{ + enum test_status status; + + status = test_soft_offline_common(1); + if (status != TEST_PASS) + return status; + + status = test_soft_offline_common(0); + if (status != TEST_PASS) + return status; + + printf("Soft-offline tests all good!\n"); + return TEST_PASS; +} diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index 3157204b9047..781117fac1ba 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -331,6 +331,10 @@ 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) +echo 8 > /proc/sys/vm/nr_hugepages +CATEGORY="hugetlb" run_test ./hugetlb-soft-offline +echo "$nr_hugepages_tmp" > /proc/sys/vm/nr_hugepages CATEGORY="hugetlb" run_test ./hugetlb-read-hwpoison fi