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 3CC11C2BBCA for ; Wed, 26 Jun 2024 01:54:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 51FEB6B0083; Tue, 25 Jun 2024 21:54:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4CF956B0085; Tue, 25 Jun 2024 21:54:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 34CC76B0088; Tue, 25 Jun 2024 21:54:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 164636B0083 for ; Tue, 25 Jun 2024 21:54:18 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 830BD1A071F for ; Wed, 26 Jun 2024 01:54:17 +0000 (UTC) X-FDA: 82271369754.24.22A9687 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf19.hostedemail.com (Postfix) with ESMTP id CDB121A0011 for ; Wed, 26 Jun 2024 01:54:13 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; spf=pass (imf19.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 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=1719366840; 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=n99ahGUBP87+VI+gMnqX/+0rniY4WpqrrPd7+6F6TZ4=; b=kw2FvBuAnOtjxUYnJlCovQCV4OGR9acSX102bnaKhGLq8YeAvxhqMZp+x913Vtoaz1paU7 uLyJV8/rNqfN20a1T2REzGXV54lIjUZoCUsCNTMDtPOEZPyickY6ai2I9iLf/wxjnBK0AZ LIDm1IsTT62dLrKV+M6FiKtdTtwxmeU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719366840; a=rsa-sha256; cv=none; b=XEl1xm7zRZryeKI3mdRLNQqxNlNtkCq/zOPHVJ97ujH54EHwziI4cW7wASp6sLOXqjjgiM y0TJVmU6X3EhCf+NzOEKSzf52b0kH2dCgHowLK3iQFdsUthwzfGcMVf+qSw1aV1ny1yNrw bSK+Z2G1HLDztHcqRN/W9ZaNDYSdZ5M= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; spf=pass (imf19.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4W84Vz5ZltznXXc; Wed, 26 Jun 2024 09:54:03 +0800 (CST) Received: from kwepemd200019.china.huawei.com (unknown [7.221.188.193]) by mail.maildlp.com (Postfix) with ESMTPS id 6717C140443; Wed, 26 Jun 2024 09:54:09 +0800 (CST) Received: from [10.173.127.72] (10.173.127.72) by kwepemd200019.china.huawei.com (7.221.188.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Wed, 26 Jun 2024 09:54:08 +0800 Subject: Re: [PATCH v5 3/4] selftest/mm: test enable_soft_offline behaviors To: Jiaqi Yan CC: , , , , , , , , , , , , , References: <20240624163348.1751454-1-jiaqiyan@google.com> <20240624163348.1751454-4-jiaqiyan@google.com> <609062d2-977c-4229-8c66-d15bb8e47eb8@huawei.com> From: Miaohe Lin Message-ID: <6afa8830-1a58-5e57-7d73-9601768bcda0@huawei.com> Date: Wed, 26 Jun 2024 09:54:07 +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: Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [10.173.127.72] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemd200019.china.huawei.com (7.221.188.193) X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: CDB121A0011 X-Stat-Signature: w6fep1kkk794g68tadqoub7bwbczfs6t X-HE-Tag: 1719366853-4050 X-HE-Meta: U2FsdGVkX19q3AR4S5DHyuJkI/iaozyZcbxwN4Ke8AxrbJpEbw+Q5XT/HfFYSnhHe8Qx2LmPyK57gT8wIs8eXPMWlZjhQ8LJL3ZQw2/+rrM7vxDywmmkZ7VICn6vUawmjSP5Y+rI/737nhCzi7XWoycqcq/5VbOqgiofrXFWyPy85F8tJh3XcEnXoNgOJxfS4vYB/J3l0QE70MMXZHKrjqlIL07ICqf7GjnOYcZo6J9UGGh6i65BP7CAJO2X+J/pI3EUE3I7iSCnatB6OlWXvCuoY4OEfW4V/mXaGKrAJHPGgBzEJNAI+x0UzbvRCyP2Vt08rSUesLmKYRY3fvPyB2QCmv7pI+Iiwx/IliAXMky/drXECEmMrMqMQzEq5k+g9mSbt6splpius+bLcXo3cWF3PifkMkYrE5chm9LV6jSzQz6s4J2hFMxai2D9ubFtkJ2l+Bg1wL/4TNsjFQ6vNcCIL1RSo5Bz38hgFLMam6LfwWmgCE5Mt+U/evAY5rBiPdTE3uEZEV9HYokYBWMtRN5zfricImRCD99WR9WNlnD1cxxWolGOjIXbZL+p778hACPVLG+P2wRCDfGoOTcvb1BPwoxxhmxZInzc2ROrpR2Jvd8GUAknrDJlks29mZCzA83YxYTaa9OBdtV9Zqndh1XFpK3zZPf3DHW/LNsW7F/M0pky5CnwJ6yg/r08HL5YCm6eZ3FCO/YgbaV0rfSgRD6o9XwAIX1UWlD+SwC61W2cSyDjv2fbfC1wtNSalLUdOAYPVQFtwk0uiOgPqrBXMGyyF+phF4JXYCEp95xArLLta1CmgEPSpUy9R/V/qFIjzY32uJCH71q6KNcsrJpVv1MKT4lDcHfAfXhiplu/PHxEVk8wYFtE7OZUZp+FhIc4fiYRNR25jJL2JNZxg4js3U2fwyNAYX6EyNm+ZxaZYSaBR+HDp92Mlb6nT0iNiSttkYKB+jtH7eHIW15avF0 AHNSDQ6L 0+VPi27tjEo96QGwNnkvjhdTXrzFt1tE7POUWTdTu9Y1RDHT+j/aOpxXATuPwwVtdHrIa69DiEjTHCd5mafaERpeNzK69NlsI4TO1aI4izHkPrI2ygTUwkoBqRtniBnCpx8YLLCFwkTfAp4xEODLJ39jvGjqpDWQqMwgLQt5bhiVO+FpvJoMfPT+2JzfKJmiJIOh4hdd6XSSSYLI+21nFJwEvi/pPVsqV+fJrV1kPEqr0wYqsUzobwCdBwR78phSpqEVZd24Y71plzlbNyHSfJN4iqsvQ5+trILE1/pR5UCFJwAQ= 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/26 7:57, Jiaqi Yan wrote: > On Tue, Jun 25, 2024 at 12:05 AM Miaohe Lin wrote: >> >> On 2024/6/25 0:33, Jiaqi Yan wrote: >>> Add regression and new tests when hugepage has correctable memory >> ... >>> 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..16fe52f972e2 >>> --- /dev/null >>> +++ b/tools/testing/selftests/mm/hugetlb-soft-offline.c >>> @@ -0,0 +1,227 @@ >>> +// 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. >> >> s/failed with EINVAL/failed with EOPNOTSUPP/g > > To be fixed in v6. > >> >>> + * - 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 >>> + */ >>> + >> ... >>> +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"); >>> + return; >>> + } >>> + >>> + hugepagesize_kb = file_stat.f_bsize / 1024; >>> + ksft_print_msg("Hugepagesize is %ldkB\n", hugepagesize_kb); >>> + >>> + if (set_enable_soft_offline(enable_soft_offline)) { >>> + ksft_exit_fail_msg("Failed to set enable_soft_offline\n"); >> >> Call destroy_hugetlbfs_file() in error path? > > As the counterpart of destroy_hugetlbfs_file, I think the test only > needs to close(fd). Will add it in v6. > >> >>> + return; >>> + } >>> + >>> + if (read_nr_hugepages(hugepagesize_kb, &nr_hugepages_before) != 0) { >>> + ksft_exit_fail_msg("Failed to read nr_hugepages\n"); >>> + return; >>> + } >>> + >>> + 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) { >>> + ksft_exit_fail_msg("Failed to read nr_hugepages\n"); >>> + return; >>> + } >>> + >>> + ksft_print_msg("After MADV_SOFT_OFFLINE nr_hugepages=%ld\n", >>> + nr_hugepages_after); >>> + >>> + 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); >> >> Call destroy_hugetlbfs_file() when test finished ? > > Test can just close(fd) once nr_hugepages_after is read. I'm sorry but I can't find the code to call close(fd) after nr_hugepages_after is read. IMO create_hugetlbfs_file() would fail to create a new hugetlb file later if close(fd) is not called when testing previous enable_soft_offline = 1 testcase. Because a hugetlb file with same name is already there. But I might miss something. Thanks. .