From nobody Fri Sep 25 10:36:59 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E04534BFE8D; Thu, 24 Sep 2026 19:11:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790277096; cv=none; b=hGpMkR065IQvvekblQ0PAcQg3NmKPXGRSVGAwdasIYodRWesSmGjQo0/dYXT/+g6jB2Nsy6+Xx+MBv37+rYZpKJ92IBCbYjrWDkSho+7oEZunjkdDNDBUB2wVoUUp9CmxlfuuXwqGC8+hnm8Kk1dD/Nk4XBD9Tx4DaiqM+8Q5ic= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790277096; c=relaxed/simple; bh=Cp04Flq0uAtUr4B5wboFRQwEJBDejnd6LVB0IHI+q3A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GjPHpPtzSB4QNC+FweT5nZAMpEdxRvEyRjhmp41J/QeEpMmW9sSPy4uqj0gOSrUYERQLkuF2XZbnNA1hnYBXh6Pfjrp7jcKVWArFcGHLlOiT1LX3ivOnt6HlfDE16L7SiNLovng1oQA7bQIDg9aPeCMSgcgeXr2N4ZiBW3gX1TY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=LBHSCsIo; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="LBHSCsIo" Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B4DCB1E8D; Thu, 24 Sep 2026 12:11:29 -0700 (PDT) Received: from e129823.arm.com (e129823.arm.com [10.2.213.3]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DE7FC3F86F; Thu, 24 Sep 2026 12:11:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1790277093; bh=Cp04Flq0uAtUr4B5wboFRQwEJBDejnd6LVB0IHI+q3A=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=LBHSCsIovix4NKw2QVz9ASL0qMoTQSCzI/HtXhZN1rnUVLy/HckTBXKlMu7oSmxhv LBhZh+4Cp2BaUS1ZvfBbrQFQ+K+r+00tZJRMnxLWbrqj+kEVcKay3Ah1vmsSGJMGN4 HDWR0b2QRs4sTRc5zU+jVPOFwW/b0XYggwieCYkc= From: Yeoreum Yun Date: Thu, 24 Sep 2026 20:11:16 +0100 Subject: [PATCH v8 1/4] kselftest: mm: prevent random failure of huge page split for khugepaged Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260924-fix_split-v8-1-cba7359d882a@arm.com> References: <20260924-fix_split-v8-0-cba7359d882a@arm.com> In-Reply-To: <20260924-fix_split-v8-0-cba7359d882a@arm.com> To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Usama Arif , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , Kevin Brodsky Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Yeoreum Yun X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2770; i=yeoreum.yun@arm.com; h=from:subject:message-id; bh=Cp04Flq0uAtUr4B5wboFRQwEJBDejnd6LVB0IHI+q3A=; b=owEB7QES/pANAwAKAW3Vw9FaxTEzAcsmYgBqtXXcbujZXi+XpYIK57ZqF2h1gdqKzbbdnd1tc /WPH1DdxI+JAbMEAAEKAB0WIQQtg+CS3QUzuFh1pJ1t1cPRWsUxMwUCarV13AAKCRBt1cPRWsUx M8E5DAC0eBy5F+3A6LbX3CvhUrMPz514WgNRmJz6yMM1DmIcrO7HnAvnTU5LrUm1sFNxjaOxsHF Ocg7mTwtnP6axffBSXJbyo8NmCs8YY1iDpbLSeigMOg2Jw3IHcr6XYELBb0N8cGuiW4HlbAuXc1 lkNvBqOeNgKaomCSOv7Rgo+iPVkPM/z+DVpeeEh8a3j8AOuShl2vPcmlyaQRdkhNvtJNee68WcG KwudWeAIVwT1JdokYRp4/m+bMBL4O4z8laxQoacJkAfkC1vsUYdrXhPm8b+p8JEMXOBlAupxPyC bFpUiNleofMa99dxQQHXo6El1xYgUDVLHS45V05E+eoaXPlfGI8BgHJa1odRzv9J/EjiwDgv1Ft 2zUmDRpY1iHc3y9hDmCdb3H3JmH81dNXppXP82mz2a6/vYixcVbxzZUqNPj8Aey9FMiLmTfkPnD SBHwFTvyyInl2c4MuI+7rIsXwBLuZmROBR6DieFJGbn755fOeWCcjuoSImQlauiE599BQ= X-Developer-Key: i=yeoreum.yun@arm.com; a=openpgp; fpr=2D83E092DD0533B85875A49D6DD5C3D15AC53133 There're some random failure for split_huge_page_test when khugepaged collapses pages into pmd again which had split by the test. Prevent the khugepaged's collapses for split page by setting the mapped pmd-huge-page with MADV_NOHUGEPAGE before split. Suggested-by: Kevin Brodsky Suggested-by: Lorenzo Stoakes (ARM) Reviewed-by: Lorenzo Stoakes (ARM) Reviewed-by: Zi Yan Acked-by: David Hildenbrand (Arm) Signed-off-by: Yeoreum Yun --- tools/testing/selftests/mm/split_huge_page_test.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/test= ing/selftests/mm/split_huge_page_test.c index c5d96a4b1db3..ef4058662b91 100644 --- a/tools/testing/selftests/mm/split_huge_page_test.c +++ b/tools/testing/selftests/mm/split_huge_page_test.c @@ -108,6 +108,18 @@ static char *allocate_zero_filled_hugepage(size_t len) return result; } =20 +static void disable_khugepaged(void *addr, size_t len) +{ + /* + * Disables khugepaged from collapsing THPs in range, existing THP + * pages remain. + */ + if (!madvise(addr, len, MADV_NOHUGEPAGE)) + return; + + ksft_exit_fail_msg("MADV_NOHUGEPAGE failed, err=3D%d\n", errno); +} + static void verify_rss_anon_split_huge_page_all_zeroes(char *one_page, int= nr_hpages, size_t len) { unsigned long rss_anon_before, rss_anon_after; @@ -120,6 +132,8 @@ static void verify_rss_anon_split_huge_page_all_zeroes(= char *one_page, int nr_hp if (!rss_anon_before) ksft_exit_fail_msg("No RssAnon is allocated before split\n"); =20 + disable_khugepaged(one_page, len); + /* split all THPs */ write_debugfs(PID_FMT, getpid(), (uint64_t)one_page, (uint64_t)one_page + len, 0); @@ -167,6 +181,8 @@ static void split_pmd_thp_to_order(int order) if (!check_huge_anon(one_page, 4 * pmd_pagesize, 4, pmd_pagesize)) ksft_exit_fail_msg("No THP is allocated\n"); =20 + disable_khugepaged(one_page, len); + /* split all THPs */ write_debugfs(PID_FMT, getpid(), (uint64_t)one_page, (uint64_t)one_page + len, order); @@ -215,6 +231,8 @@ static void split_pte_mapped_thp(void) goto out; } =20 + disable_khugepaged(thp_area, thp_area_size); + /* * To challenge spitting code, we will mremap a single page of each * THP (page[i] of thp[i]) in the thp_area into page_area. This will @@ -482,6 +500,7 @@ static int create_pagecache_thp_and_fd(const char *test= file, size_t fd_size, ksft_test_result_skip("Pagecache folio split skipped\n"); return -2; } + disable_khugepaged(*addr, fd_size); return 0; err_out_close: close(*fd); --=20 2.43.0 From nobody Fri Sep 25 10:36:59 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 981A34C4F79; Thu, 24 Sep 2026 19:11:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790277100; cv=none; b=glR7wOfmNQ+J9Cdbj03Cs93csy3RTMKW8qAY8SMazq/5vL8WCbjGm4zyR0iwJ8nXBXSHww+HvL/vQNjr6SZiVDvbIx+0GOKYl5+Ku5Mhwc3Du5n6q29iGgiiPYvDEe3Q5j0rmFB5U9mzbdDV+QoRpWoYXJC7JJxSzvatUmbb4Dg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790277100; c=relaxed/simple; bh=NJ9TsBzPv0Oz4pphqp12ZqEYe9odIvfqK7qCBWhEW7c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OeMcwMF46EjuP1H05hshPJTVPCkoty3N+y7sTLtNS1N3fT2pp/mQGRGXTBFE4MRC2cXJoBQfnLPXlI1l/YuIG8HRiNo8xhzEXTdtLLuWRX24VrRc9AAoOcbOKu4kLBbnsQpzLnPGlUpbhinMrImZtLRP8cJFD4IiRZMT7FgbrJQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=PTmpeLUu; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="PTmpeLUu" Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 723ED1E5E; Thu, 24 Sep 2026 12:11:33 -0700 (PDT) Received: from e129823.arm.com (e129823.arm.com [10.2.213.3]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 90C143F86F; Thu, 24 Sep 2026 12:11:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1790277096; bh=NJ9TsBzPv0Oz4pphqp12ZqEYe9odIvfqK7qCBWhEW7c=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=PTmpeLUu4wyIj1VaQQTuEqD6nqge3tOzbX7ZJEZqdDH2SUBv0TNPzoNuP4aFLj8ws NuixyaR/Zh+VrabD50dyp6o5Nde9QnXJq+506g0M4rcRVtyl7BJVoVKo81cD40gWX8 RRNePOKqfC+x7r/TLFVFmUk+xTXjnvFXg/U/swmc= From: Yeoreum Yun Date: Thu, 24 Sep 2026 20:11:17 +0100 Subject: [PATCH v8 2/4] kselftest: mm: replace usage of /proc/self/smaps for __check_pmd_huge() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260924-fix_split-v8-2-cba7359d882a@arm.com> References: <20260924-fix_split-v8-0-cba7359d882a@arm.com> In-Reply-To: <20260924-fix_split-v8-0-cba7359d882a@arm.com> To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Usama Arif , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , Kevin Brodsky Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Yeoreum Yun X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5190; i=yeoreum.yun@arm.com; h=from:subject:message-id; bh=NJ9TsBzPv0Oz4pphqp12ZqEYe9odIvfqK7qCBWhEW7c=; b=owEB7QES/pANAwAKAW3Vw9FaxTEzAcsmYgBqtXXc8ibPfv6vH/GOhPDJPfprZtHargXZrqKwL CAek8ul5gqJAbMEAAEKAB0WIQQtg+CS3QUzuFh1pJ1t1cPRWsUxMwUCarV13AAKCRBt1cPRWsUx M6qoC/49e4gLA4pQqDOKPjaqBhxn+g5q+qvt/d44hJ9I+Arzn03Yuoe6sCrJEOTDTbis86jDTIN qn6AUEmWUsmnamdtCWPy/9lc9ZDc87rKcOi8I1hBazFT4QncxIK7i3pO0VGvKLv2StKRyQRKjlo +PUp59Aq2TYvcVTM6k4nqyL1xq1k2vK/DjTBf7d8gArMI57xLzWyTDKDRWs0Ar41NmpqadNnSpU 7BNPwRWlBMINyTIPnjc50oeVpAlYgZ6O+Ty66x/w/cOWSe5yLsEGWRsRijwqzEUvkzuCPUU0t4u F+Ri6/qv/xX2MhniPrP8edl86i2EgOyk8uj4P75mPF1vnUpwbIO4xErnIdVasc0WSjK04Ul8CM7 k6c+fYYwe+QMDfjjrZb68gnTcdHdw/cnCkxFSBSR626PSNXGpvtfPtuPIHhHoLjrAMuYpnJxA0a Ci/nxP4ViurmzAsPs13TohS6XB4nAmN/xONoNXe3ZtUjW6wWIsq+8ql0dLO+uZOlLCi0U= X-Developer-Key: i=yeoreum.yun@arm.com; a=openpgp; fpr=2D83E092DD0533B85875A49D6DD5C3D15AC53133 Since glibc commit 321e1fc73f (=E2=80=9Cmalloc: Enable 2MB THP by default o= n AArch64=E2=80=9D), glibc may call madvise(MADV_HUGEPAGE) for sufficiently large allocations made by memalign(). The underlying VMA may start at a different address from the aligned address returned by memalign(). Furthermore, a subsequent madvise(MADV_HUGEPAGE) call does not split the VMA because the flag is already set. This causes split_huge_page_test to fail because the check_pmd_huge() helpers incorrectly require the address returned by memalign() to match the VMA start address reported in /proc/self/smaps. Instead of relying on /proc/self/smaps, use /proc/self/pagemap and /proc/kpageflags to detect huge-page mappings checking PAGE_IS_HUGE and PAGE_IS_FILE accroding to type of huge page. Since shmem pages are also file-backed, simply check whether the page is file-backed. Fixes: 642bc52aed9 ("selftests: vm: bring common functions to a new file") Suggested-by: David Hildenbrand (Arm) Signed-off-by: Yeoreum Yun --- tools/testing/selftests/mm/vm_util.c | 78 ++++++++++++++++++++++----------= ---- 1 file changed, 49 insertions(+), 29 deletions(-) diff --git a/tools/testing/selftests/mm/vm_util.c b/tools/testing/selftests= /mm/vm_util.c index a0ab78ceedb1..969d7202500c 100644 --- a/tools/testing/selftests/mm/vm_util.c +++ b/tools/testing/selftests/mm/vm_util.c @@ -351,24 +351,6 @@ char *__get_smap_entry(void *addr, const char *pattern= , char *buf, size_t len) return entry; } =20 -static bool __check_pmd_huge(void *addr, char *pattern, int nr_hpages, - uint64_t hpage_size) -{ - char buffer[MAX_LINE_LENGTH]; - uint64_t thp =3D -1; - char *entry; - - entry =3D __get_smap_entry(addr, pattern, buffer, sizeof(buffer)); - if (!entry) - goto err_out; - - if (sscanf(entry, "%9" SCNu64 " kB", &thp) !=3D 1) - ksft_exit_fail_msg("Reading smap error\n"); - -err_out: - return thp =3D=3D (nr_hpages * (hpage_size >> 10)); -} - static bool check_large_folios(void *addr, size_t len, int nr_hpages, uint64_t hpage_size) { @@ -410,20 +392,51 @@ static bool check_large_folios(void *addr, size_t len= , int nr_hpages, return ret; } =20 -bool check_huge_anon(void *addr, size_t len, int nr_hpages, uint64_t hpage= _size) +enum check_huge_type { + CHECK_HUGE_ANON, + CHECK_HUGE_FILE, +}; + +static bool check_huge_type(uint64_t categories, enum check_huge_type type) { - uint64_t pmd_pagesize =3D read_pmd_pagesize(); + const bool file =3D categories & PAGE_IS_FILE; =20 - if (!pmd_pagesize) - ksft_exit_fail_msg("reading PMD pagesize failed\n"); + switch (type) { + case CHECK_HUGE_ANON: + return !file; + case CHECK_HUGE_FILE: + return file; + } =20 - if (hpage_size =3D=3D pmd_pagesize) - return __check_pmd_huge(addr, "AnonHugePages: ", nr_hpages, hpage_size); + return false; +} =20 - return check_large_folios(addr, len, nr_hpages, hpage_size); +static bool __check_pmd_huge(void *addr, size_t len, int nr_hpages, + uint64_t hpage_size, enum check_huge_type type) +{ + int pagemap_fd; + int nr_pmd_mappings =3D 0; + uint64_t categories; + char *start =3D addr; + char *end =3D start + len; + + pagemap_fd =3D open(PAGEMAP_PATH, O_RDONLY); + if (pagemap_fd < 0) + ksft_exit_fail_msg("open pagemap fail\n"); + + for (; start < end; start +=3D hpage_size) { + categories =3D pagemap_scan_get_categories(pagemap_fd, start); + if (!(categories & PAGE_IS_HUGE)) + continue; + if (check_huge_type(categories, type)) + nr_pmd_mappings++; + } + close(pagemap_fd); + + return nr_hpages =3D=3D nr_pmd_mappings; } =20 -bool check_huge_file(void *addr, size_t len, int nr_hpages, uint64_t hpage= _size) +bool check_huge_anon(void *addr, size_t len, int nr_hpages, uint64_t hpage= _size) { uint64_t pmd_pagesize =3D read_pmd_pagesize(); =20 @@ -431,12 +444,13 @@ bool check_huge_file(void *addr, size_t len, int nr_h= pages, uint64_t hpage_size) ksft_exit_fail_msg("reading PMD pagesize failed\n"); =20 if (hpage_size =3D=3D pmd_pagesize) - return __check_pmd_huge(addr, "FilePmdMapped:", nr_hpages, hpage_size); + return __check_pmd_huge(addr, len, nr_hpages, hpage_size, + CHECK_HUGE_ANON); =20 return check_large_folios(addr, len, nr_hpages, hpage_size); } =20 -bool check_huge_shmem(void *addr, size_t len, int nr_hpages, uint64_t hpag= e_size) +bool check_huge_file(void *addr, size_t len, int nr_hpages, uint64_t hpage= _size) { uint64_t pmd_pagesize =3D read_pmd_pagesize(); =20 @@ -444,11 +458,17 @@ bool check_huge_shmem(void *addr, size_t len, int nr_= hpages, uint64_t hpage_size ksft_exit_fail_msg("reading PMD pagesize failed\n"); =20 if (hpage_size =3D=3D pmd_pagesize) - return __check_pmd_huge(addr, "ShmemPmdMapped:", nr_hpages, hpage_size); + return __check_pmd_huge(addr, len, nr_hpages, hpage_size, + CHECK_HUGE_FILE); =20 return check_large_folios(addr, len, nr_hpages, hpage_size); } =20 +bool check_huge_shmem(void *addr, size_t len, int nr_hpages, uint64_t hpag= e_size) +{ + return check_huge_file(addr, len, nr_hpages, hpage_size); +} + int64_t allocate_transhuge(void *ptr, int pagemap_fd) { uint64_t ent[2]; --=20 2.43.0 From nobody Fri Sep 25 10:36:59 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 56B314C4F5F; Thu, 24 Sep 2026 19:11:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790277104; cv=none; b=jAiU8q0CoG/oTBHpbPvBbPJw/ia4Xzv3uDtltjPOoeIoqRASq4FbId7890fneCyWcS54Keo/0tk3Isl+zo5VPyu6QhMDZhGUTVFXIV5SSLc9e/VkmvU99LlBDA8OV9dTKuZ0H90SA174Bv0oTShad1dpIU67UAtxSTPt8uZUlVE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790277104; c=relaxed/simple; bh=fDkgRwO1bSLmE20FjTBQYz0rSMBZdZYYVM8/o1IT0V4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LR3VtUIbM7FZxBF5C+IBfGxq823yZUSuNnnfe/6KtNxtlKIsEthK1U48efeA8JrRweYo/ka4OyKcEe8bkbVnoGloDtYsq4VepcRG63mVwMjupB+NaisK03jyXLxrLGi+aStD1EHuhGoWinW3LdQNT/D2yM80ad9hzb0sa9f9HFQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=GPAlFBAt; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="GPAlFBAt" Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 20B191E8D; Thu, 24 Sep 2026 12:11:37 -0700 (PDT) Received: from e129823.arm.com (e129823.arm.com [10.2.213.3]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4A3FD3F86F; Thu, 24 Sep 2026 12:11:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1790277100; bh=fDkgRwO1bSLmE20FjTBQYz0rSMBZdZYYVM8/o1IT0V4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=GPAlFBAtX8ns+cMS2XIw5tZow6WHg72k4VFEyV6SkkghzKJFEdeA4MwPWujeARwwX WHTSoYp31utUWywI4YXgdM92JadbgT5/3flyNZll9HugogFacVdYI6YSYagDNKcDJR NgGXNwDMLiXBih0iLFB3vjRRZEjR7V86oRFlDw7I= From: Yeoreum Yun Date: Thu, 24 Sep 2026 20:11:18 +0100 Subject: [PATCH v8 3/4] kselftest: mm: integrate huge page checks Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260924-fix_split-v8-3-cba7359d882a@arm.com> References: <20260924-fix_split-v8-0-cba7359d882a@arm.com> In-Reply-To: <20260924-fix_split-v8-0-cba7359d882a@arm.com> To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Usama Arif , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , Kevin Brodsky Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Yeoreum Yun X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5654; i=yeoreum.yun@arm.com; h=from:subject:message-id; bh=fDkgRwO1bSLmE20FjTBQYz0rSMBZdZYYVM8/o1IT0V4=; b=owEB7QES/pANAwAKAW3Vw9FaxTEzAcsmYgBqtXXdGx79YGZps9yF/7wwsZToJptGpYy5CgrtL IzLraqJp8OJAbMEAAEKAB0WIQQtg+CS3QUzuFh1pJ1t1cPRWsUxMwUCarV13QAKCRBt1cPRWsUx MxmeDACqgTanCs17S883JUW3jGlxbmdTTM/Q/vfT2y70PDaDDj6zs2IIJge5avkyEHFkFRzjjhl lrZs18knmquEo7LScoOxvCtD/k/4GC2dgLE+zii+8zQVq/i22heDazpK5cEn9akOYYEGa5pqgfG rvUUujhX3CZyp+255kwmohH49zdRBwjAJ0+pwdepOYEc20ec8mLaHYmjVCxK5Jqf6kdxDP5B+Zs D+hthXo/gwSpie9UCbQlBEWV67Gbax8c4Rr8lLi17MkCaqlR4x+9FJE8+Cm6OsTuGCdYhM6/TRW oz4draSDkVDIdT/5d7/ZAMtVKrtVx/lvu6f4ORS4ebdD3CB+ke0vXpCPJiZbjHVqTMqDqrFa0Bd ORy4/fjuBSZgO8qggOzcuXTzHCSpa2SRESBJ/agHV/hMlRKEoT2C6djkje817gCmk++tGxCMipQ jLLh4QSRcjr2eNVFFHF+nI+mTKfu4H2MPtouU2JYK7U+I7PQnp5asZDhQvzizbBKNhOIY= X-Developer-Key: i=yeoreum.yun@arm.com; a=openpgp; fpr=2D83E092DD0533B85875A49D6DD5C3D15AC53133 check_large_folios() only checks for large folios without distinguishing between anonymous and file-backed huge pages. To add huge page type checking, integrate the huge page checks into __check_huge(): 1. If hpage_size =3D=3D pmd_pagesize, check PAGE_IS_HUGE instead of using check_large_folios(), since only the mapping type matters. This identifies PMD-mapped huge pages. 2. Otherwise, use check_large_folios() to detect large folios. This covers mTHP cases. 3. Check the folio flags according to the huge page type. Suggested-by: David Hildenbrand (Arm) Suggested-by: Zi Yan Signed-off-by: Yeoreum Yun --- tools/testing/selftests/mm/vm_util.c | 90 +++++++++++++++++++-------------= ---- 1 file changed, 48 insertions(+), 42 deletions(-) diff --git a/tools/testing/selftests/mm/vm_util.c b/tools/testing/selftests= /mm/vm_util.c index 969d7202500c..7d23038af1df 100644 --- a/tools/testing/selftests/mm/vm_util.c +++ b/tools/testing/selftests/mm/vm_util.c @@ -351,13 +351,13 @@ char *__get_smap_entry(void *addr, const char *patter= n, char *buf, size_t len) return entry; } =20 -static bool check_large_folios(void *addr, size_t len, int nr_hpages, +static bool check_large_folios(int pagemap_fd, int kpageflags_fd, + void *addr, size_t len, int nr_hpages, uint64_t hpage_size) { int order =3D 0, pagesize =3D getpagesize(); unsigned int nr_pages =3D hpage_size / pagesize; int orders[MAX_NR_ORDERS], status; - int pagemap_fd, kpageflags_fd; bool ret =3D false; =20 if (!nr_pages) @@ -368,15 +368,6 @@ static bool check_large_folios(void *addr, size_t len,= int nr_hpages, ksft_exit_fail_msg("invalid order\n"); =20 memset(orders, 0, sizeof(int) * MAX_NR_ORDERS); - pagemap_fd =3D open(PAGEMAP_PATH, O_RDONLY); - if (pagemap_fd =3D=3D -1) - ksft_exit_fail_msg("read pagemap fail\n"); - - kpageflags_fd =3D open(KPAGEFLAGS_PATH, O_RDONLY); - if (kpageflags_fd =3D=3D -1) { - close(pagemap_fd); - ksft_exit_fail_msg("read kpageflags fail\n"); - } =20 status =3D gather_folio_orders(addr, len, pagemap_fd, kpageflags_fd, orders, MAX_NR_ORDERS); @@ -387,8 +378,6 @@ static bool check_large_folios(void *addr, size_t len, = int nr_hpages, ret =3D true; =20 out: - close(pagemap_fd); - close(kpageflags_fd); return ret; } =20 @@ -411,57 +400,74 @@ static bool check_huge_type(uint64_t categories, enum= check_huge_type type) return false; } =20 -static bool __check_pmd_huge(void *addr, size_t len, int nr_hpages, - uint64_t hpage_size, enum check_huge_type type) +static bool __check_huge(void *addr, size_t len, int nr_hpages, + uint64_t hpage_size, enum check_huge_type type) { - int pagemap_fd; + bool ret =3D false; + int pagemap_fd, kpageflags_fd; int nr_pmd_mappings =3D 0; + uint64_t pmd_pagesize, scan_mapping_size; uint64_t categories; + unsigned long pfn; + bool check_pmd_mapping, allow_nonpresent; char *start =3D addr; char *end =3D start + len; =20 + pmd_pagesize =3D read_pmd_pagesize(); + if (!pmd_pagesize) + ksft_exit_fail_msg("reading PMD pagesize failed\n"); + + check_pmd_mapping =3D hpage_size =3D=3D pmd_pagesize; + scan_mapping_size =3D (nr_hpages > 0) ? hpage_size : psize(); + /* Some mTHP tests check a partially populated PMD-sized range. */ + allow_nonpresent =3D (uint64_t)nr_hpages * hpage_size < len; + pagemap_fd =3D open(PAGEMAP_PATH, O_RDONLY); if (pagemap_fd < 0) ksft_exit_fail_msg("open pagemap fail\n"); =20 - for (; start < end; start +=3D hpage_size) { + kpageflags_fd =3D open(KPAGEFLAGS_PATH, O_RDONLY); + if (kpageflags_fd < 0) + ksft_exit_fail_msg("open kpageflags fail\n"); + + if (!check_pmd_mapping && + !check_large_folios(pagemap_fd, kpageflags_fd, + addr, len, nr_hpages, hpage_size)) + goto out; + + for (; start < end; start +=3D scan_mapping_size) { categories =3D pagemap_scan_get_categories(pagemap_fd, start); - if (!(categories & PAGE_IS_HUGE)) - continue; - if (check_huge_type(categories, type)) + pfn =3D pagemap_get_pfn(pagemap_fd, start); + if (pfn =3D=3D -1UL) { + if (!allow_nonpresent) + goto out; + else + continue; + } + if (check_pmd_mapping && (categories & PAGE_IS_HUGE)) nr_pmd_mappings++; + if (!check_huge_type(categories, type)) + goto out; } - close(pagemap_fd); =20 - return nr_hpages =3D=3D nr_pmd_mappings; + if (check_pmd_mapping && (nr_pmd_mappings !=3D nr_hpages)) + goto out; + ret =3D true; + +out: + close(pagemap_fd); + close(kpageflags_fd); + return ret; } =20 bool check_huge_anon(void *addr, size_t len, int nr_hpages, uint64_t hpage= _size) { - uint64_t pmd_pagesize =3D read_pmd_pagesize(); - - if (!pmd_pagesize) - ksft_exit_fail_msg("reading PMD pagesize failed\n"); - - if (hpage_size =3D=3D pmd_pagesize) - return __check_pmd_huge(addr, len, nr_hpages, hpage_size, - CHECK_HUGE_ANON); - - return check_large_folios(addr, len, nr_hpages, hpage_size); + return __check_huge(addr, len, nr_hpages, hpage_size, CHECK_HUGE_ANON); } =20 bool check_huge_file(void *addr, size_t len, int nr_hpages, uint64_t hpage= _size) { - uint64_t pmd_pagesize =3D read_pmd_pagesize(); - - if (!pmd_pagesize) - ksft_exit_fail_msg("reading PMD pagesize failed\n"); - - if (hpage_size =3D=3D pmd_pagesize) - return __check_pmd_huge(addr, len, nr_hpages, hpage_size, - CHECK_HUGE_FILE); - - return check_large_folios(addr, len, nr_hpages, hpage_size); + return __check_huge(addr, len, nr_hpages, hpage_size, CHECK_HUGE_FILE); } =20 bool check_huge_shmem(void *addr, size_t len, int nr_hpages, uint64_t hpag= e_size) --=20 2.43.0 From nobody Fri Sep 25 10:36:59 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DDF684C1504; Thu, 24 Sep 2026 19:11:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790277107; cv=none; b=lz573PBo4VExdBSj5KG24jmx/IBwmEf7f9eqQLh9u6sMXqQA6ng7o/Ls7NPeEB1a7qJ/68MsWNLNmxaVGjPzNdUE8qcRfujlg89H0n8G5iYL8M19kDFPGbH2IvI8oJu77XJDTASj5WmUdoSdpsdJvJqBnTSYmspTM5HKfYC+Mwg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790277107; c=relaxed/simple; bh=g3AhOUqfUFRDC8KW+TFZcN4eqAIWIuTzDwCjFRxwO7U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bbb8lrGLgNS3ZQjXbjnTSZyJwteo9ZhVmwBJcJb7Ttr3wD0zVJOPdl6mlbFXZelUQ1xprE+eDl4Od92fbBkqS2z7KdXZYk5tc6v7Rl9muS3JASAuM6dSDty0mXyRF/yTTa4WVeY1opQ8ViTGj6YY4vZZOSrm2FiV6STIe79gHbI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=eV3bZfMr; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="eV3bZfMr" Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C74511EA6; Thu, 24 Sep 2026 12:11:40 -0700 (PDT) Received: from e129823.arm.com (e129823.arm.com [10.2.213.3]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EF9D63F86F; Thu, 24 Sep 2026 12:11:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1790277104; bh=g3AhOUqfUFRDC8KW+TFZcN4eqAIWIuTzDwCjFRxwO7U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eV3bZfMr8N5DtL4R4+zm/kgood6J/egHPdyIW7Mu7W7490GvTmwQv2ogFYif42fEv g7ZKemF5kKNsDqEQk4Q3xazuZ7XAcQ9Q5qtx9jMs8q1x/hQFureb93zsNsJT1DXg2q /Tq4/EZ3ptEdIYexJngZK57m3sSx0/kiWP6kp4dI= From: Yeoreum Yun Date: Thu, 24 Sep 2026 20:11:19 +0100 Subject: [PATCH v8 4/4] kselftest: mm: remove check_huge_shmem() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260924-fix_split-v8-4-cba7359d882a@arm.com> References: <20260924-fix_split-v8-0-cba7359d882a@arm.com> In-Reply-To: <20260924-fix_split-v8-0-cba7359d882a@arm.com> To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Usama Arif , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , Kevin Brodsky Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Yeoreum Yun X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=7410; i=yeoreum.yun@arm.com; h=from:subject:message-id; bh=g3AhOUqfUFRDC8KW+TFZcN4eqAIWIuTzDwCjFRxwO7U=; b=owEB7QES/pANAwAKAW3Vw9FaxTEzAcsmYgBqtXXdRG/ZRP34qhtVmLPDZhRSrGb+H+F+e/i8n jEdR9g5IeCJAbMEAAEKAB0WIQQtg+CS3QUzuFh1pJ1t1cPRWsUxMwUCarV13QAKCRBt1cPRWsUx MwOYC/9vRpci1QI5FsM/WJwnN7ZWxWHc/mjdn1hZusyRlx03RGyrjLFLeQjEgzE6ZSFczbjGdOv gWW2P604/+MdOh1Xb6PQPZCH1O2xzql7JaE9EBlU9qRzVKCARbmyMZGZ3GaHGOF6uN7RSpNPbks UrxAlTSG7TuVscxbxS0c0y21c+b18Qx4p519OC60Uwh4uHQEFU4hTOODNLjBtC3XqtlK4oXHP5Q rTdZPM/M04KQAmbdgro6/UNnQ5I5+DspzRPdimw1yAAww72TSoZ2ZsEpqh5stJzmE+7xRZm5kaH Iwa7vqvF8QtftBKKsTtsqg5Ugq6dhbbmDTDqFlTSmRhH3rtcEGS2D/dtQmht8d4I0bwY07+DGY8 EjMeJqidjTnkl5u2sJ0qVewmNAZfTQNXB8LCaYau1oLIUa7lVaYIklF9cYsw0/idXBoGa5QIoE4 aCq8N5CTzeAthmIPJ53RO/qg/q6FoZB+ljdQf0M/XkiY17b9sA4C64kaoCs7QTcVOEdVw= X-Developer-Key: i=yeoreum.yun@arm.com; a=openpgp; fpr=2D83E092DD0533B85875A49D6DD5C3D15AC53133 check_huge_shmem() was required to distinguish shmem huge pages because /proc/self/smaps reports them using a dedicated =E2=80=9CShmemPmdMapped=E2= =80=9D entry, as opposed to =E2=80=9CFilePmdMapped=E2=80=9D for file-backed huge pages. Now that /proc/self/smaps is no longer used to detect huge pages and /proc/kpageflags is used instead, it is sufficient to distinguish between file-backed and anonymous pages since the ShmemPmdMapped is also kind of file-backed. Therefore, remove check_huge_shmem() and use check_huge_file() instead and cleanup khugepaged's check_huge operation in mem_ops. Suggested-by: David Hildenbrand (Arm) Reviewed-by: Baolin Wang Acked-by: Zi Yan Acked-by: Lorenzo Stoakes (ARM) Acked-by: David Hildenbrand (Arm) Signed-off-by: Yeoreum Yun --- tools/testing/selftests/mm/folio_split_race_test.c | 2 +- tools/testing/selftests/mm/khugepaged.c | 38 ++++--------------= ---- tools/testing/selftests/mm/uffd-common.c | 4 +-- tools/testing/selftests/mm/vm_util.c | 5 --- tools/testing/selftests/mm/vm_util.h | 1 - 5 files changed, 9 insertions(+), 41 deletions(-) diff --git a/tools/testing/selftests/mm/folio_split_race_test.c b/tools/tes= ting/selftests/mm/folio_split_race_test.c index e4660bf89b62..1a9840b73e61 100644 --- a/tools/testing/selftests/mm/folio_split_race_test.c +++ b/tools/testing/selftests/mm/folio_split_race_test.c @@ -181,7 +181,7 @@ static uint64_t run_iteration(void) for (i =3D 0; i < TOTAL_PAGES; i++) fill_page(mmap_base, i); =20 - if (!check_huge_shmem(mmap_base, FILE_SIZE, NR_PMD_PAGE, pmd_pagesize)) + if (!check_huge_file(mmap_base, FILE_SIZE, NR_PMD_PAGE, pmd_pagesize)) ksft_exit_fail_msg("No shmem THP is allocated\n"); =20 if (pthread_barrier_init(&ctl.barrier, NULL, NUM_READER_THREADS + 1) !=3D= 0) diff --git a/tools/testing/selftests/mm/khugepaged.c b/tools/testing/selfte= sts/mm/khugepaged.c index bdc0c7c117d9..73d6ab404430 100644 --- a/tools/testing/selftests/mm/khugepaged.c +++ b/tools/testing/selftests/mm/khugepaged.c @@ -57,7 +57,7 @@ struct mem_ops { void *(*setup_area)(int nr_hpages); void (*cleanup_area)(void *p, unsigned long size); void (*fault)(void *p, unsigned long start, unsigned long end); - bool (*check_huge)(void *addr, size_t len, int nr_hpages, unsigned long h= page_size); + bool (*check_huge)(void *addr, size_t len, int nr_hpages, uint64_t hpage_= size); const char *name; }; =20 @@ -343,12 +343,6 @@ static void anon_fault(void *p, unsigned long start, u= nsigned long end) fill_memory(p, start, end); } =20 -static bool anon_check_huge(void *addr, size_t len, int nr_hpages, - unsigned long hpage_size) -{ - return check_huge_anon(addr, len, nr_hpages, hpage_size); -} - static void *file_setup_area_common(int nr_hpages, enum file_setup_ops set= up) { const int open_opt =3D setup =3D=3D FILE_SETUP_READ_ONLY_FS ? O_RDONLY : = O_RDWR; @@ -444,20 +438,6 @@ static void file_fault_write(void *p, unsigned long st= art, unsigned long end) ksft_exit_fail_perror("madvise(MADV_POPULATE_WRITE)"); } =20 -static bool file_check_huge(void *addr, size_t len, int nr_hpages, - unsigned long hpage_size) -{ - switch (finfo.type) { - case VMA_FILE: - return check_huge_file(addr, len, nr_hpages, hpage_size); - case VMA_SHMEM: - return check_huge_shmem(addr, len, nr_hpages, hpage_size); - default: - ksft_exit_fail_msg("Unknown VMA type\n"); - return false; - } -} - static void *shmem_setup_area(int nr_hpages) { void *p; @@ -481,17 +461,11 @@ static void shmem_cleanup_area(void *p, unsigned long= size) close(finfo.fd); } =20 -static bool shmem_check_huge(void *addr, size_t len, int nr_hpages, - unsigned long hpage_size) -{ - return check_huge_shmem(addr, len, nr_hpages, hpage_size); -} - static struct mem_ops __anon_ops =3D { .setup_area =3D &anon_setup_area, .cleanup_area =3D &anon_cleanup_area, .fault =3D &anon_fault, - .check_huge =3D &anon_check_huge, + .check_huge =3D &check_huge_anon, .name =3D "anon", }; =20 @@ -499,7 +473,7 @@ static struct mem_ops __read_only_file_ops =3D { .setup_area =3D &file_setup_read_only_area, .cleanup_area =3D &file_cleanup_area, .fault =3D &file_fault_read, - .check_huge =3D &file_check_huge, + .check_huge =3D &check_huge_file, .name =3D "file", }; =20 @@ -507,7 +481,7 @@ static struct mem_ops __read_write_file_read_ops =3D { .setup_area =3D &file_setup_read_write_fs_read_area, .cleanup_area =3D &file_cleanup_area, .fault =3D &file_fault_read_and_flush, - .check_huge =3D &file_check_huge, + .check_huge =3D &check_huge_file, .name =3D "file", }; =20 @@ -515,7 +489,7 @@ static struct mem_ops __read_write_file_write_ops =3D { .setup_area =3D &file_setup_read_write_fs_write_area, .cleanup_area =3D &file_cleanup_area, .fault =3D &file_fault_write, - .check_huge =3D &file_check_huge, + .check_huge =3D &check_huge_file, .name =3D "file", }; =20 @@ -523,7 +497,7 @@ static struct mem_ops __shmem_ops =3D { .setup_area =3D &shmem_setup_area, .cleanup_area =3D &shmem_cleanup_area, .fault =3D &anon_fault, - .check_huge =3D &shmem_check_huge, + .check_huge =3D &check_huge_file, .name =3D "shmem", }; =20 diff --git a/tools/testing/selftests/mm/uffd-common.c b/tools/testing/selft= ests/mm/uffd-common.c index 1fb967ef4985..a76851aced4d 100644 --- a/tools/testing/selftests/mm/uffd-common.c +++ b/tools/testing/selftests/mm/uffd-common.c @@ -196,8 +196,8 @@ static void shmem_check_pmd_mapping(uffd_global_test_op= ts_t *gopts, void *p, int { size_t len =3D expect_nr_hpages * read_pmd_pagesize(); =20 - if (!check_huge_shmem(gopts->area_dst_alias, len, expect_nr_hpages, - read_pmd_pagesize())) + if (!check_huge_file(gopts->area_dst_alias, len, expect_nr_hpages, + read_pmd_pagesize())) err("Did not find expected %d number of hugepages", expect_nr_hpages); } diff --git a/tools/testing/selftests/mm/vm_util.c b/tools/testing/selftests= /mm/vm_util.c index 7d23038af1df..65bc4761d1c9 100644 --- a/tools/testing/selftests/mm/vm_util.c +++ b/tools/testing/selftests/mm/vm_util.c @@ -470,11 +470,6 @@ bool check_huge_file(void *addr, size_t len, int nr_hp= ages, uint64_t hpage_size) return __check_huge(addr, len, nr_hpages, hpage_size, CHECK_HUGE_FILE); } =20 -bool check_huge_shmem(void *addr, size_t len, int nr_hpages, uint64_t hpag= e_size) -{ - return check_huge_file(addr, len, nr_hpages, hpage_size); -} - int64_t allocate_transhuge(void *ptr, int pagemap_fd) { uint64_t ent[2]; diff --git a/tools/testing/selftests/mm/vm_util.h b/tools/testing/selftests= /mm/vm_util.h index 072a6c756c51..b5d59729d432 100644 --- a/tools/testing/selftests/mm/vm_util.h +++ b/tools/testing/selftests/mm/vm_util.h @@ -96,7 +96,6 @@ uint64_t read_pmd_pagesize(void); unsigned long rss_anon(void); bool check_huge_anon(void *addr, size_t len, int nr_hpages, uint64_t hpage= _size); bool check_huge_file(void *addr, size_t len, int nr_hpages, uint64_t hpage= _size); -bool check_huge_shmem(void *addr, size_t len, int nr_hpages, uint64_t hpag= e_size); int64_t allocate_transhuge(void *ptr, int pagemap_fd); int pageflags_get(unsigned long pfn, int kpageflags_fd, uint64_t *flags); int gather_folio_orders(char *vaddr_start, size_t len, --=20 2.43.0