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 157B9C27C79 for ; Thu, 20 Jun 2024 18:49:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A45668D00D4; Thu, 20 Jun 2024 14:49:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9CBE48D00A7; Thu, 20 Jun 2024 14:49:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 75C158D00D4; Thu, 20 Jun 2024 14:49:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 51A368D00A7 for ; Thu, 20 Jun 2024 14:49:07 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 19EBC1C0CCC for ; Thu, 20 Jun 2024 18:49:07 +0000 (UTC) X-FDA: 82252154334.21.23E9593 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf20.hostedemail.com (Postfix) with ESMTP id 4D2D41C0013 for ; Thu, 20 Jun 2024 18:49:05 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=IVI7hklN; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf20.hostedemail.com: domain of 3oHl0ZggKCJ8IH9PHX9MFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--jiaqiyan.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3oHl0ZggKCJ8IH9PHX9MFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--jiaqiyan.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718909334; 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=GluUuYGnYPAXtY8McTJbn0uUkSxMlhx0gcn6TfPCvPM=; b=eZNic+GcVux1QL62957YzWPwWerjKVsZTf4ALM74Bhjj5TKjT7UVa9TYM+8Ckeh0r0HPlY Pw8zQOl4T3Du4QcXjsMfoYBzYN0rg4AoxlFjby5eLOsefmL7tgEqbD5b/2TSCBPdku2HGX cJ3YqPFng9sEGRnfK1eHKQ3ClcO8Vgo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718909334; a=rsa-sha256; cv=none; b=GFBY2vNcJBlOWwETSDrouGAwN6njBInvnM7FDAac6bJMbnBbKiCW8JPk6YbDd7Tm28kOoC 8fyoXOUHbOSQwZP6qQnUMk6bIoriLCLX8EEu6cEn+Ev9/dXuJz/ahCQz/7Op7mKz3dX6l8 j96tMftjdkT4lZzJhponG+aUYPPB0WM= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=IVI7hklN; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf20.hostedemail.com: domain of 3oHl0ZggKCJ8IH9PHX9MFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--jiaqiyan.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3oHl0ZggKCJ8IH9PHX9MFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--jiaqiyan.bounces.google.com Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-63bab20bf5fso24434877b3.0 for ; Thu, 20 Jun 2024 11:49:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718909344; x=1719514144; 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=GluUuYGnYPAXtY8McTJbn0uUkSxMlhx0gcn6TfPCvPM=; b=IVI7hklNCOJstsePvic/1uItRxmGXhONAQQ9WOpMjRA+GKdMFHXf7am9siRdaZghrN zR/zywA0Yif/4ZCJy9VyQOflwh9v45cCgf3Nhw7HG6Bixlxyh3zG7nq8JXm6z6RSHfcg HU/CbCnXaVmOpmRzxQl2tK7b6C35qM81MbhiytGAtgXhJm8S8yf6zstqNls4XzUmrqjc pYB1F0CtBR5KECzIj8rdl+J9SkkzZns6rWhLTsEL/59mltEulELxx2iGuJJuujYI1RHL p2lOccLUH+6jqkZt+YjubzKBUBSBPn0G9EL5aC4L2CujYTpBPNA1BiKFjMAHo+wM05r1 9yUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718909344; x=1719514144; 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=GluUuYGnYPAXtY8McTJbn0uUkSxMlhx0gcn6TfPCvPM=; b=VSDuguHEPbIHOEatHRbO7RIgpvhaipWiL5fGNZl9UU2PCR+qI0WT6IgXS8IgQsf+j+ KemAFcRqbmmmvuCdN2W97isOvljF0cyxeCyhI9p7w/OKPRnfFlGe3iU3suHbcK/8WgI1 YG2qK3Kxtn4h4ZKdIQ6NjRKV/xlBowBsNmK/dOZHxQW2ASNhklLqFI/FJU+i40lC0rU4 Z7K6+rC8XUGZzNWeF1fFRsamHFiqxqZNYdV91nnV+F3+8SUxTB7kgxY1qUzjEjtZp58D 95I8HPN6sVj9qWSHIZXqD5eKBPAB1Ht4AGduMsSpt9GzOX40kOv2YZsoNFTaMVag5NPj BtGw== X-Forwarded-Encrypted: i=1; AJvYcCV6Uqf+W/3eWqFj7mBqJ+2qb1z8FJxbkxlPxLUdBcrYmLfvfaEcCWv52A/eUkH8fdH0l50HUe9NQOkU0HfAPjAui8U= X-Gm-Message-State: AOJu0YxGBatv586dB+DX5uUaEzydXddcIPNMrATf5ovjY43hoRPSKcPq t0txRJ1drR//vWn8j+Q3tIlmb1jnHqjGX3BqLclQDGktkVds3LcXoahlNTKBj4Q9B0mEIoz5Ga8 +MJAJnSQRUg== X-Google-Smtp-Source: AGHT+IH1H+EEho9ZhLrcfQe/2XQyLnmAe5O5gbj7AWpcOeZHKlVhg5MrlWvruN4X+wKm4dHo2f19KpMHsWqWLQ== X-Received: from yjq3.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:272f]) (user=jiaqiyan job=sendgmr) by 2002:a05:690c:4b06:b0:62a:564d:aed1 with SMTP id 00721157ae682-63a8f9fa0d5mr11257047b3.8.1718909344302; Thu, 20 Jun 2024 11:49:04 -0700 (PDT) Date: Thu, 20 Jun 2024 18:48:55 +0000 In-Reply-To: <20240620184856.600717-1-jiaqiyan@google.com> Mime-Version: 1.0 References: <20240620184856.600717-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Message-ID: <20240620184856.600717-4-jiaqiyan@google.com> Subject: [PATCH v4 3/4] selftest/mm: test enable_soft_offline behaviors From: Jiaqi Yan To: nao.horiguchi@gmail.com, linmiaohe@huawei.com, jane.chu@oracle.com, osalvador@suse.de Cc: muchun.song@linux.dev, akpm@linux-foundation.org, shuah@kernel.org, corbet@lwn.net, 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 Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4D2D41C0013 X-Stat-Signature: bdy4gc148y3ukrbf5c55qqyx4ife5qxi X-Rspam-User: X-HE-Tag: 1718909345-772713 X-HE-Meta: U2FsdGVkX1/Fad7cSw9Yj5Oz8FSOZdCijwEieHFI3QlxZOnraGZ+6LtV4vQ89PhhECq2vVLAmPa8+WS/jYHJgZCiGJ/H2TFH7efKRJBUv/jIslthdr3u437RbrMSsQdn0ycb/HY44W66Gy/IoU0TseWydDH2hTfZizz9jR9X6wV5dlkAQ09KpRehEysW2NFZvMXPHwNfMiYpQusqbY2TPrhlHShIeABoHzDn3DE2Znh2DGhqGtCFNLb46fUo35049ulDyqHJrdWTj/7IMrPKZEC1SIc+QOp2WWrCuV9IA7oPMagpWWTs8D0DUyshPsnJJCC7ItO89qWjPyIYExu1snf8jydupN7Bm3nXtWE3yRQC1bSPKF8zwkZo5msoUmi3ZFajX1wT/5t42JGpWy2PizcM1HIsDJk2iLDKm1Hnbi0LUemYkDHsIsHqKmeKc8O7/d0lzuZyAcFjuLFZqXn3Zt8vFCGyN6LxlWs85NIhyEo8upbL4EyI1JzQmzUq4dwzVsbaEMmvISkbNwcrsnwMNPOAWRJsQXw23d7edoNZmSBACnpDeWItI4jiWE6InEqmc7+dncmvvCQIsUdB61TIChj451CrQR71kOJcmKJrHekZc2jvujs7wMKhfJz3+4ugguc7nWfDNdRtgtfBGMfT47uAcO6LhYiNNUKrMEFsNqT+pA8tmuIRrGv04OFUZleHg4Fs8IKteUt04at3ebbUnXPfSSYn03RdKLvbCweKLOZevaQQV9cnmdVM0bDrgmZD5ZvZHCLmcbFJRZnvhLIIl1st78l9jG5Qqj+WYW7nCJve4Q7ygah/g0y3w0c8wYo7Sv9qXlT9HW/YvTYg3hH2pqbQd3/5kkJbFqShza6T9KWTTTmkKv/AyHlhdW54FUOEPAyIM2k2LPk+E3WFeSdalWKkgpuzEpc72sSIXbaov830FkXrQUqnLWAosCiyZN9rQ6EvB5BcI12LeTmj7Fk A4eJpvDi ucreoLFMO9Dz8n3+gU0AAlYSIMq86DBVqXCIaDhEACw1IZsH4vf/T0ZM85vNAA9mKo8QCsL3yMhwkpMeCs2nIAfrx90+jVPRfMTi9THNZHcJvcFZdFa+aE8/kEC3isCbtMD4DNIJmCjsIaFNj44gH7nz9cCrJqZzwstvSXFPV4XW9ooeQUyRKJvGRruDA413k6+APQ4+BOb25CB+XzZubdp6N+V+WGjHPvO/QodeZAa6BwxhHRKaH3d6BLQHhJcljBKALRa8Oz0pyDDfSUdP2vRHBzHUl0zw7vFJUS09mj6HZ98sEk24yzHqyvo+8MFVSvpwO8FGQr8cRik+du7Je+6WLOVexy6znuS90FLietMn1uoU8/5RQuFa7w6yQ6gi7oexYXID+Af00VgI6pWLuuv0oBP6qZDCUryva3tBNUWcJ5pHd8OzsWntBFcrSUN3TqBU9c9GdNGBoCdsQywG0E7uaoKYAicnX29ojTqNoyCLdy8N++NlL1OaV2TyWtTWWVFGjgXLjdJhiQu9HkDlq2+FSd3j6W5uvVkMwHp0lDHe8OfHOADSO18oKZA8wcGrqV80RFT38HvwSiSVku7e7kMPl1xUOpQrFXCcJI+ZxTDaDvJCUIdRwyvRg+CQA/kBaPmhnbo1odi8le6sTUgiIibhpeA== 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 -- 2.45.2.741.gdbec12cfda-goog