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 525B9F99C7C for ; Sat, 18 Apr 2026 10:56:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC6636B0202; Sat, 18 Apr 2026 06:56:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A76036B0204; Sat, 18 Apr 2026 06:56:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 964A26B0205; Sat, 18 Apr 2026 06:56:22 -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 801726B0202 for ; Sat, 18 Apr 2026 06:56:22 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 131E18B99E for ; Sat, 18 Apr 2026 10:56:22 +0000 (UTC) X-FDA: 84671372604.12.B3B0AB0 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf22.hostedemail.com (Postfix) with ESMTP id 54700C000C for ; Sat, 18 Apr 2026 10:56:20 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UuOiLE1Y; spf=pass (imf22.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1776509780; a=rsa-sha256; cv=none; b=QKfJ5Vy6sKpp1Z0KJeT/0JARxRwrNWMkKZVaQJEUQBl32W4vLid3JDUQaSdqF/Qp4OtmkK b+t3Tw6euNvdC0jklq+zp4jEeq8OVmGnuoXeVcCfJoFsvOj0xsnc6olmK8T9W4EoV/ckye JAHLG6IXzUC16N6H5i9VQwYEURHABsE= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UuOiLE1Y; spf=pass (imf22.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=1776509780; 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=TBbtFQKemcQYEiD09GRvB0D+mfge8hSfkvYtaKsW+cc=; b=mdQLwIBK6u0Sw/bG17w1hFiFfSaudsEZsDjdHpgbWOf/gAlYX4QnwSrMN3+o9MWHcgKp07 Colx1Gk7aEjn14qfEZdiHLAsstzeNPUH94I0MiOVONehemiFXXIHajXivllSPAJ7eefYT0 obvKIwR4bCGNu5vUpLrDKHKmynbE+Sc= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 57B16405A4; Sat, 18 Apr 2026 10:56:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89964C19424; Sat, 18 Apr 2026 10:56:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776509779; bh=Fr0kyXYk2xRt80VlbLqe4p6gzc/iMlB0QPGC0D5qumg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UuOiLE1Yw6gyneQiEK/aWhjWN219KKw3iox+CiteZWW648ce0EyU3fFdj/ucSjGZX 1TJGPUORIJ18jbPIHYi4MJbyhxK88a4zINgts4hfXxGpqM4Lp7vCYSEinCPZ90WKHg XbF36Slz/Z90neiADD8pHa3neRo4ZxHku//PLtG918b2vp7OUMQqf35nbf9JLJBNEb hwCy12WjYMBbu5AnWGzwJABX01mJU2DqkzT5N2Qx3JERVvmQpPCk+j/o+BDxxaqPh0 ONuNq/fn9nVHP4gGLGvkxECcj2X5ayP1oywVaOCFDX3pNIrg2flz6Kr9i+M7Vj3/nK bPxon4f26G7JA== 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 , 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 v2 05/53] selftests/mm: merge map_hugetlb into hugepage-mmap Date: Sat, 18 Apr 2026 13:54:50 +0300 Message-ID: <20260418105539.1261536-6-rppt@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260418105539.1261536-1-rppt@kernel.org> References: <20260418105539.1261536-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 54700C000C X-Stat-Signature: m68gcmucrsu7x4hit5m9xqsaz1xiqbsh X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1776509780-860251 X-HE-Meta: U2FsdGVkX1+EH99q4kSTY8RJ7v+pU6FVf2x5bcrI6UtavxE0GnCcotHDUAd37axQhlvjLfXhAlKxKo/CpVrsGSiwX+OdIqZj1rsVUswE0bMmmY14kemhwmWlxw8BJqhCiNDqst1KEiFHmQC3UAfOmFdC72C1H14iXCl7lIsMc2EXrst+xER331vqjXVyIAXjuuPV60drwy/j1B+StL2+aZLXrahlUMbujQrx96a7hPG1nc/YQBDNH25S1XonihpcYjvhAMnjsQ5rSEVSbZY5varuj7wUlkp6Rd7YZwMwsYPEYF6p2ROxSy7pp84SXrp+5Zrz+C5GSmM0PxtN5bi8cmxBbP1AjbVal7vPaufrCxK9Kz53WKD3YSdjxEFcYllaKoXGAh44joztuyq7S1cN1xW7N6KEQYQvsXHx6VbA+3ILMEAqQVODqZvqxjpS/vgMKXhGpynKahWiaC5kLItU/1lAyLKgqt+7ZNCWqIwv+LNNiXTxj1ACTYdULhCXnGbah4jBfY/b4ANY6FdkxRiupv07bcIlhibOXc5jhGccUw52mWv1SKcv0Stt4TAyXgEyYVAPeW+iEEDNHcRtVWIB7pX9slh99JeW25C2P5nGVtGI3Yj9b1go111zfRWbG6sSKE2pKdNRyGRp2JhVeneM7sGiHxwVu6AMrsBC70326eAtzA0Bi5xw1d2ipvPEBSguIgpXK1d4Jo4KbRpcizur9sDanxSUL8HoyJocFcbAwekT+pPpn6DC/NcdCZgf3cpeTgwXNbIZEMZrq5PcB1gZuub8rPVwtG2xturYb7+pom2TbC3UOMG1TFmhEM6E0AORCDQbg1UIVJko4Gld+wgueYbh+/Zed7HAVC1LYxNai37L5lWEpdHoI6Ky9WVe2cY+8LHp9xg7rrGtInZ2jb2BBwwHdcwdU5d0rlZOCJrk1GEwrI3Xoh414ihPPVNhXsm4+GLrirFlLQdDoa1KhS5 8wMOWVTk sKnGO4FB7bzONtTxI6ebTxlNdQn7t+rQln2GUIPPQKYhAz/uxCgJ+YhryUy8n0sPnS9AWL1M8vSyefsNEttSiwSADx9WItYWnhGqa6BDhkwq8YuXbqrocxbbQiykHQAzymfPjjcFsZF8k6vzj5W+6aIv+9dGPTsFJU2CShXtyz4b3lRw0Rcr5IdYlR1R8BD5nrxofuN709VTOx0r8NU4IftC8tJyF5aaUOkN79SoF1fj3kMohsBEdOKdZZ0bsv0q2Qv6Dcswj5tZX2inmZSKIvSyGYoH0Wi8kwMiD Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Mike Rapoport (Microsoft)" Both tests create a hugettlb mapping, fill it with data and verify the data, the only difference is that one uses file-backed memory and another one uses anonymous memory. Merge both tests into a single file. Signed-off-by: Mike Rapoport (Microsoft) --- tools/testing/selftests/mm/Makefile | 1 - tools/testing/selftests/mm/hugepage-mmap.c | 112 ++++++++++++++++----- tools/testing/selftests/mm/map_hugetlb.c | 88 ---------------- tools/testing/selftests/mm/run_vmtests.sh | 1 - 4 files changed, 85 insertions(+), 117 deletions(-) delete mode 100644 tools/testing/selftests/mm/map_hugetlb.c diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile index cd24596cdd27..cbda989f6b6a 100644 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -70,7 +70,6 @@ TEST_GEN_FILES += hugepage-vmemmap TEST_GEN_FILES += khugepaged TEST_GEN_FILES += madv_populate TEST_GEN_FILES += map_fixed_noreplace -TEST_GEN_FILES += map_hugetlb TEST_GEN_FILES += map_populate ifneq (,$(filter $(ARCH),arm64 riscv riscv64 x86 x86_64 loongarch32 loongarch64)) TEST_GEN_FILES += memfd_secret diff --git a/tools/testing/selftests/mm/hugepage-mmap.c b/tools/testing/selftests/mm/hugepage-mmap.c index d543419de040..f4fcc7c45875 100644 --- a/tools/testing/selftests/mm/hugepage-mmap.c +++ b/tools/testing/selftests/mm/hugepage-mmap.c @@ -15,6 +15,7 @@ #include #include #include +#include "vm_util.h" #include "kselftest.h" #define LENGTH (256UL*1024*1024) @@ -25,54 +26,111 @@ static void check_bytes(char *addr) ksft_print_msg("First hex is %x\n", *((unsigned int *)addr)); } -static void write_bytes(char *addr) +static void write_bytes(char *addr, size_t length) { unsigned long i; - for (i = 0; i < LENGTH; i++) + for (i = 0; i < length; i++) *(addr + i) = (char)i; } -static int read_bytes(char *addr) +static bool verify_bytes(char *addr, size_t length) { unsigned long i; check_bytes(addr); - for (i = 0; i < LENGTH; i++) - if (*(addr + i) != (char)i) { - ksft_print_msg("Error: Mismatch at %lu\n", i); - return 1; - } - return 0; + for (i = 0; i < length; i++) + if (*(addr + i) != (char)i) + return false; + + return true; } -int main(void) +static bool test_mmap(size_t length, int mmap_flags, int fd, + const char *test_name) { void *addr; - int fd, ret; - ksft_print_header(); - ksft_set_plan(1); + addr = mmap(NULL, length, PROTECTION, mmap_flags, fd, 0); + if (addr == MAP_FAILED) + ksft_exit_fail_perror("mmap"); + + ksft_print_msg("Returned address is %p\n", addr); + check_bytes(addr); + write_bytes(addr, length); + if (!verify_bytes(addr, length)) + ksft_exit_fail_msg("%s\n", test_name); + + /* munmap() length of MAP_HUGETLB memory must be hugepage aligned */ + if (munmap(addr, length)) + ksft_exit_fail_perror("munmap"); + + return true; +} + +static void test_anon_mmap(size_t length, int shift) +{ + const char *test_name = "hugetlb anonymous mmap"; + int mmap_flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB; + bool passed; + + if (shift) + mmap_flags |= (shift & MAP_HUGE_MASK) << MAP_HUGE_SHIFT; + + passed = test_mmap(length, mmap_flags, -1, test_name); + ksft_test_result(passed, "%s\n", test_name); +} + +static void test_file_mmap(size_t length, int shift) +{ + const char *test_name = "hugetlb file mmap"; + int mmap_flags = MAP_SHARED; + bool passed; + int fd; + + if (shift) + mmap_flags |= (shift & MAP_HUGE_MASK) << MAP_HUGE_SHIFT; - fd = memfd_create("hugepage-mmap", MFD_HUGETLB); + fd = memfd_create("hugetlb-mmap", MFD_HUGETLB); if (fd < 0) - ksft_exit_fail_msg("memfd_create() failed: %s\n", strerror(errno)); + ksft_exit_fail_perror("memfd_create"); + + passed = test_mmap(length, mmap_flags, fd, test_name); + + close(fd); + ksft_test_result(passed, "%s\n", test_name); +} + +int main(int argc, char **argv) +{ + size_t hugepage_size; + size_t length = LENGTH; + int shift = 0; + + ksft_print_header(); + ksft_set_plan(2); + + if (argc > 1) + length = atol(argv[1]) << 20; + if (argc > 2) + shift = atoi(argv[2]); - addr = mmap(NULL, LENGTH, PROTECTION, MAP_SHARED, fd, 0); - if (addr == MAP_FAILED) { - close(fd); - ksft_exit_fail_msg("mmap(): %s\n", strerror(errno)); + if (shift) { + hugepage_size = (1 << shift); + ksft_print_msg("%u kB hugepages\n", 1 << (shift - 10)); + } else { + hugepage_size = default_huge_page_size(); + ksft_print_msg("Default size hugepages (%lu Kb)\n", hugepage_size >> 10); } - ksft_print_msg("Returned address is %p\n", addr); - check_bytes(addr); - write_bytes(addr); - ret = read_bytes(addr); + /* munmap with fail if the length is not page aligned */ + if (hugepage_size > length) + length = hugepage_size; - munmap(addr, LENGTH); - close(fd); + ksft_print_msg("Mapping %lu Mbytes\n", (unsigned long)length >> 20); - ksft_test_result(!ret, "Read same data\n"); + test_anon_mmap(length, shift); + test_file_mmap(length, shift); - ksft_exit(!ret); + ksft_finished(); } diff --git a/tools/testing/selftests/mm/map_hugetlb.c b/tools/testing/selftests/mm/map_hugetlb.c deleted file mode 100644 index aa409107611b..000000000000 --- a/tools/testing/selftests/mm/map_hugetlb.c +++ /dev/null @@ -1,88 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Example of using hugepage memory in a user application using the mmap - * system call with MAP_HUGETLB flag. Before running this program make - * sure the administrator has allocated enough default sized huge pages - * to cover the 256 MB allocation. - */ -#include -#include -#include -#include -#include -#include "vm_util.h" -#include "kselftest.h" - -#define LENGTH (256UL*1024*1024) -#define PROTECTION (PROT_READ | PROT_WRITE) - -static void check_bytes(char *addr) -{ - ksft_print_msg("First hex is %x\n", *((unsigned int *)addr)); -} - -static void write_bytes(char *addr, size_t length) -{ - unsigned long i; - - for (i = 0; i < length; i++) - *(addr + i) = (char)i; -} - -static void read_bytes(char *addr, size_t length) -{ - unsigned long i; - - check_bytes(addr); - for (i = 0; i < length; i++) - if (*(addr + i) != (char)i) - ksft_exit_fail_msg("Mismatch at %lu\n", i); - - ksft_test_result_pass("Read correct data\n"); -} - -int main(int argc, char **argv) -{ - void *addr; - size_t hugepage_size; - size_t length = LENGTH; - int flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB; - int shift = 0; - - hugepage_size = default_huge_page_size(); - /* munmap with fail if the length is not page aligned */ - if (hugepage_size > length) - length = hugepage_size; - - ksft_print_header(); - ksft_set_plan(1); - - if (argc > 1) - length = atol(argv[1]) << 20; - if (argc > 2) { - shift = atoi(argv[2]); - if (shift) - flags |= (shift & MAP_HUGE_MASK) << MAP_HUGE_SHIFT; - } - - if (shift) - ksft_print_msg("%u kB hugepages\n", 1 << (shift - 10)); - else - ksft_print_msg("Default size hugepages\n"); - ksft_print_msg("Mapping %lu Mbytes\n", (unsigned long)length >> 20); - - addr = mmap(NULL, length, PROTECTION, flags, -1, 0); - if (addr == MAP_FAILED) - ksft_exit_fail_msg("mmap: %s\n", strerror(errno)); - - ksft_print_msg("Returned address is %p\n", addr); - check_bytes(addr); - write_bytes(addr, length); - read_bytes(addr, length); - - /* munmap() length of MAP_HUGETLB memory must be hugepage aligned */ - if (munmap(addr, length)) - ksft_exit_fail_msg("munmap: %s\n", strerror(errno)); - - ksft_finished(); -} diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index e2dc9ac87bfc..61b450032af8 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -292,7 +292,6 @@ CATEGORY="hugetlb" run_test ./hugepage-shm echo "$shmmax" > /proc/sys/kernel/shmmax echo "$shmall" > /proc/sys/kernel/shmall -CATEGORY="hugetlb" run_test ./map_hugetlb CATEGORY="hugetlb" run_test ./hugepage-mremap CATEGORY="hugetlb" run_test ./hugepage-vmemmap CATEGORY="hugetlb" run_test ./hugetlb-madvise -- 2.53.0