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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8BEDFFF885A for ; Tue, 28 Apr 2026 20:45:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 056AD6B00C6; Tue, 28 Apr 2026 16:45:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 02E836B00C8; Tue, 28 Apr 2026 16:45:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E87436B00C9; Tue, 28 Apr 2026 16:45:45 -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 D37E26B00C6 for ; Tue, 28 Apr 2026 16:45:45 -0400 (EDT) Received: from smtpin12.hostedemail.com (lb01a-stub [10.200.18.249]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8D273160417 for ; Tue, 28 Apr 2026 20:45:45 +0000 (UTC) X-FDA: 84709145850.12.C4774E8 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf26.hostedemail.com (Postfix) with ESMTP id BB141140009 for ; Tue, 28 Apr 2026 20:45:43 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=V+4Vny5l; spf=pass (imf26.hostedemail.com: domain of rppt@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1777409143; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=HmaUvHDAKcCRseeJrg1xeCJxe/RzWwwd0KNM+8O6JtY=; b=UmelgGP7vlMn137/HziDq6yGvLWRcyFU15/YgvjRoKlp43/SvoHvqErlaTA697wpJYm1Zl DdunZg7zflWjmtetCpNRnDuQxQx4bBCAxDAmJkHAYJ1GFDe6fJ68VFYCQ8kitx4xIkbgBV wFFoqVTwMhVxc3isklUIDE7Z1wU418E= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1777409144; a=rsa-sha256; cv=none; b=rb5j8iQl12jY+/dHtG122TZVhTi9rGFpJS2sBuAhwqcy+0q4hy13aqjzP3nI7glMNLcizD lJ3cV4FF93f5ox9zl4qIUOWi0IuJXHWwySA5tC19x9q8kF0zyFmHwS1vF5pOiGZmqB3q1y +XZUB5h0BYDohlylHKyWnTyD/j4FxRY= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=V+4Vny5l; spf=pass (imf26.hostedemail.com: domain of rppt@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id B6E9641A90; Tue, 28 Apr 2026 20:45:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89FAEC2BCAF; Tue, 28 Apr 2026 20:45:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777409142; bh=jAQxw9MbYkXsl544OFupWFjq2DLx0d+HujNgYQfq/0c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V+4Vny5lUCOs29DUa+TMA1hirYtTwid7QaRPEsnAPG62zvxRp5MURNS0bKB60YaD2 chTPM8zaivb1d3pSwMsyJQxeryhrR246XjgWmy0/dZZ55AkiJuezn5oWPf4IDNUNBP P4K00tKgjHiHaxBcb7PBJoXwoP52y/ce4SEIO/YJqpuZPmgPByQbdwnKH8tnt1eU10 GUnLK9G8HN1iKbmrKYPTGvuVNlOsExVu6PVl0Rfr8xYpg2/grLZ29C+oY2XpK258Vl YqL0ceMsB1/C3TM1c8CRjtkpddQKnz17y4Wq1+q6zEd2gQT7T/z6Nxq7QB0wTjC3VE 0gMgCjCN/hssg== From: Mike Rapoport To: Andrew Morton , David Hildenbrand Cc: Baolin Wang , Barry Song , Dev Jain , Donet Tom , Jason Gunthorpe , John Hubbard , "Liam R. Howlett" , Lance Yang , Leon Romanovsky , Lorenzo Stoakes , Luiz Capitulino , Mark Brown , Michal Hocko , Mike Rapoport , Nico Pache , Peter Xu , Ryan Roberts , Sarthak Sharma , Shuah Khan , Suren Baghdasaryan , Vlastimil Babka , Zi Yan , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v3 26/54] selftests/mm: hugepage_settings: rename get_free_hugepages() Date: Tue, 28 Apr 2026 23:42:12 +0300 Message-ID: <20260428204240.1924129-27-rppt@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260428204240.1924129-1-rppt@kernel.org> References: <20260428204240.1924129-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: BB141140009 X-Stat-Signature: bwxmpaecgx1httyp5mn3drxhnocrk71o X-Rspam-User: X-HE-Tag: 1777409143-431943 X-HE-Meta: U2FsdGVkX19107I4HAVbdiMzy0m5UAO9hcpzfSA3LX7xbDFOe0FZ9iro+5HkT5NwLcUo76xTr7FOIsOJwEDJLOj+8pqE3mSTVi4frDf7ZxHbw1K5gc+DSLk6IOyxTi9pTwwTFkAUjpOkyBi2fo9rAptuK8DrPc9r+b9rI3O4UMVWYUCrVFkoUxEsmtbaKRmogdhxpilLSQfkCBibeQA/CmImHsUkqVnKAXfN723w+M0nBWH6cz9fXdL3ek9nLzbyqCwdUrM+DtmVngNmSSWXpsSS5Gi9c25p9ZFXRVtF5IKZlbPFFtVEX2ZuzJT+/6kDapKfVAhqcfKsj76lwcdlyh9ruOMogOPAih6+rBTKq9UWaaAq9mMJjxru2LQN+pXw0itGItc+iMSUVtuJ+As7+K6D1X+ot7ixxIF4cY1AqWXV5eK7N55PsMK1WEZ2xa/6E0dneEr+pioIYT8bcwVdWNE8Hk5P41eYBIq2v35e4xYtCxjki4iQxAcl2VYSViMGzMpx7CwCMlorxNEMQJjfdKAG8/ka99BOpfvXI2hPI/U5otXZIkdk+HewQMcW/BYg4zFhJOJQSFgRC0wk7Apm/AUuHdkZxn+GZWjLryNQuS18T7oNpi1dGtZJcbXUflYKlbYe2hcZtEQIInaoZ6O/rb/txVIizfCpubW9OMXEGenfjYThmbIDqvdoJH/Nato91VaGd8uEZcOtgIHlySSOqShl5Um1jAXt9KRRuCjjWI9h7hL+dVLd+lDrxzKNiACJveYQnPiWEvYjpBdD5EK7VFHEw+DaAh+wBSc2kbxvKUp9A4vNl20BJPhj5TdEM9Y/zDnKSgJ6rd1BmL3kmuIxtvM3xor3qIkhOHNOPstMZ6R0sFo6+rziTz4ezExq9mYYHaN2kLoi4Reo29CFhf2w8R5ZLB6+RChRgr8s3llcReEEGEYDOkpcjW07ep7BC5bcWfP0xP/iXonpMM53S4n ugfTv2YG ljPhDhucpuXRcTwy9lQQERcBufygARlqvFu6BCMGvtJkjj1Z3uYJR7cKnriBxQJKvw8jBnKKO1MlSBaWNqdvC2sWUiwIdma8hCTjOhNHJk0PErBdlxHRYzKY+SVcOhNozNX17aEZTKh4I1XccXoJr/eokEesp7/2b3c6xkDZmsP6GwUI3R0D0fohoXUaU17b3KjwzgRNvgvsZStqJohfQtrGS19HUOd06Vp7hNyOIcloQrqMsI2BpfNZ6GAd2KOhTI1n2f6gO4R2/AyzBUHr+Kz9spfbl/oyMFXJx Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Mike Rapoport (Microsoft)" ... to hugetlb_free_default_hugepages() for consistency with hugetlb_nr_default_pages(). Signed-off-by: Mike Rapoport (Microsoft) --- .../testing/selftests/mm/hugepage_settings.c | 28 ++++++------------- .../testing/selftests/mm/hugepage_settings.h | 12 +++++++- tools/testing/selftests/mm/hugetlb-madvise.c | 4 +-- tools/testing/selftests/mm/hugetlb_dio.c | 6 ++-- .../selftests/mm/hugetlb_fault_after_madv.c | 2 +- .../selftests/mm/hugetlb_madv_vs_map.c | 2 +- tools/testing/selftests/mm/uffd-stress.c | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/tools/testing/selftests/mm/hugepage_settings.c b/tools/testing/selftests/mm/hugepage_settings.c index 5961229b9931..4ae7332b5e1b 100644 --- a/tools/testing/selftests/mm/hugepage_settings.c +++ b/tools/testing/selftests/mm/hugepage_settings.c @@ -446,25 +446,6 @@ unsigned long default_huge_page_size(void) return hps; } -unsigned long get_free_hugepages(void) -{ - unsigned long fhp = 0; - char *line = NULL; - size_t linelen = 0; - FILE *f = fopen("/proc/meminfo", "r"); - - if (!f) - return fhp; - while (getline(&line, &linelen, f) > 0) { - if (sscanf(line, "HugePages_Free: %lu", &fhp) == 1) - break; - } - - free(line); - fclose(f); - return fhp; -} - static void hugetlb_sysfs_path(char *buf, size_t buflen, unsigned long size, const char *attr) { @@ -489,3 +470,12 @@ void hugetlb_set_nr_pages(unsigned long size, unsigned long nr) write_num(path, nr); } + +unsigned long hugetlb_free_pages(unsigned long size) +{ + char path[PATH_MAX]; + + hugetlb_sysfs_path(path, sizeof(path), size, "free_hugepages"); + + return read_num(path); +} diff --git a/tools/testing/selftests/mm/hugepage_settings.h b/tools/testing/selftests/mm/hugepage_settings.h index d6f41a45e8ee..57fbf2f57e13 100644 --- a/tools/testing/selftests/mm/hugepage_settings.h +++ b/tools/testing/selftests/mm/hugepage_settings.h @@ -92,10 +92,10 @@ bool thp_is_enabled(void); int detect_hugetlb_page_sizes(unsigned long sizes[], int max); unsigned long default_huge_page_size(void); -unsigned long get_free_hugepages(void); unsigned long hugetlb_nr_pages(unsigned long size); void hugetlb_set_nr_pages(unsigned long size, unsigned long nr); +unsigned long hugetlb_free_pages(unsigned long size); static inline unsigned long hugetlb_nr_default_pages(void) { @@ -117,4 +117,14 @@ static inline void hugetlb_set_nr_default_pages(unsigned long nr) hugetlb_set_nr_pages(size, nr); } +static inline unsigned long hugetlb_free_default_pages(void) +{ + unsigned long size = default_huge_page_size(); + + if (!size) + return 0; + + return hugetlb_free_pages(size); +} + #endif /* __THP_SETTINGS_H__ */ diff --git a/tools/testing/selftests/mm/hugetlb-madvise.c b/tools/testing/selftests/mm/hugetlb-madvise.c index 316384d919db..3c08eb6db6a2 100644 --- a/tools/testing/selftests/mm/hugetlb-madvise.c +++ b/tools/testing/selftests/mm/hugetlb-madvise.c @@ -27,7 +27,7 @@ #define validate_free_pages(exp_free) \ do { \ - unsigned long fhp = get_free_hugepages(); \ + unsigned long fhp = hugetlb_free_default_pages(); \ if (fhp != (exp_free)) \ ksft_exit_fail_msg("Unexpected number of free " \ "huge pages %ld, expected %ld line %d\n", \ @@ -68,7 +68,7 @@ int main(int argc, char **argv) if (!base_page_size) ksft_exit_fail_msg("Unable to determine base page size\n"); - free_hugepages = get_free_hugepages(); + free_hugepages = hugetlb_free_default_pages(); if (free_hugepages < MIN_FREE_PAGES) ksft_exit_skip("Not enough free huge pages (have %lu, need %d)\n", free_hugepages, MIN_FREE_PAGES); diff --git a/tools/testing/selftests/mm/hugetlb_dio.c b/tools/testing/selftests/mm/hugetlb_dio.c index 81e3f7bc8e76..47019433ddaf 100644 --- a/tools/testing/selftests/mm/hugetlb_dio.c +++ b/tools/testing/selftests/mm/hugetlb_dio.c @@ -93,7 +93,7 @@ static void run_dio_using_hugetlb(int fd, unsigned int start_off, ksft_exit_fail_perror("lseek failed\n"); /* Get the free huge pages before allocation */ - free_hpage_b = get_free_hugepages(); + free_hpage_b = hugetlb_free_default_pages(); if (free_hpage_b == 0) { close(fd); ksft_exit_skip("No free hugepage, exiting!\n"); @@ -121,7 +121,7 @@ static void run_dio_using_hugetlb(int fd, unsigned int start_off, munmap(orig_buffer, h_pagesize); /* Get the free huge pages after unmap*/ - free_hpage_a = get_free_hugepages(); + free_hpage_a = hugetlb_free_default_pages(); ksft_print_msg("No. Free pages before allocation : %d\n", free_hpage_b); ksft_print_msg("No. Free pages after munmap : %d\n", free_hpage_a); @@ -142,7 +142,7 @@ int main(void) ksft_print_header(); /* Check if huge pages are free */ - if (!get_free_hugepages()) + if (!hugetlb_free_default_pages()) ksft_exit_skip("No free hugepage, exiting\n"); fd = open("/tmp", O_TMPFILE | O_RDWR | O_DIRECT, 0664); diff --git a/tools/testing/selftests/mm/hugetlb_fault_after_madv.c b/tools/testing/selftests/mm/hugetlb_fault_after_madv.c index abc3904c5268..c718dd065d53 100644 --- a/tools/testing/selftests/mm/hugetlb_fault_after_madv.c +++ b/tools/testing/selftests/mm/hugetlb_fault_after_madv.c @@ -78,7 +78,7 @@ int main(void) ksft_print_msg("[INFO] detected default hugetlb page size: %zu KiB\n", huge_page_size / 1024); - free_hugepages = get_free_hugepages(); + free_hugepages = hugetlb_free_default_pages(); if (free_hugepages != 1) { ksft_exit_skip("This test needs one and only one page to execute. Got %lu\n", free_hugepages); diff --git a/tools/testing/selftests/mm/hugetlb_madv_vs_map.c b/tools/testing/selftests/mm/hugetlb_madv_vs_map.c index ac60b4f18784..dfbd71a7f709 100644 --- a/tools/testing/selftests/mm/hugetlb_madv_vs_map.c +++ b/tools/testing/selftests/mm/hugetlb_madv_vs_map.c @@ -89,7 +89,7 @@ int main(void) ksft_print_header(); ksft_set_plan(1); - free_hugepages = get_free_hugepages(); + free_hugepages = hugetlb_free_default_pages(); if (free_hugepages != 1) ksft_exit_skip("This test needs one and only one page to execute. Got %lu\n", diff --git a/tools/testing/selftests/mm/uffd-stress.c b/tools/testing/selftests/mm/uffd-stress.c index e92a85463eb1..7e37cf3d27f6 100644 --- a/tools/testing/selftests/mm/uffd-stress.c +++ b/tools/testing/selftests/mm/uffd-stress.c @@ -480,7 +480,7 @@ int main(int argc, char **argv) * for racy extra reservation of hugepages. */ if (gopts->test_type == TEST_HUGETLB && - get_free_hugepages() < 2 * (bytes / gopts->page_size) + gopts->nr_parallel - 1) + hugetlb_free_default_pages() < 2 * (bytes / gopts->page_size) + gopts->nr_parallel - 1) ksft_exit_skip("Skipping userfaultfd... not enough hugepages\n"); gopts->nr_pages_per_cpu = bytes / gopts->page_size / gopts->nr_parallel; -- 2.53.0