From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0E20B4C33C8; Thu, 1 Oct 2026 21:18:16 +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=1790889499; cv=none; b=ipdxUnTg+mzBtUvz3Bl/TO3CmZoKE693IftSJ9Tv+8zLsHhZPo+K3XvxlmlbEyX1zydECitPm5eoRZNQIlhNRdtIdXKERR49AowsPBMdD78bk/YAy9PvKP3XWHYEpJaQxwYwjLc1vJVtYqPR/6l8gXT8MbQd2NouMBVd96ndXXQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790889499; c=relaxed/simple; bh=2X2FQ5S7yrfALnr5wL0BPfM4xpUXDIjXutG9mQQGSqY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=anlKxCgCps76dyjsWhMjqHfziyNUKgSzlrqz9k7MGUKysJVwGZy0IHX+hFttUFgLGdEVNeYuMMs5BL5M+f7zP/3FyRbKFQbj5tWHkFm5IsegQUeM+1nwx4hvXTN2Qzu+1mo/9tF5s0pqS+TudY0zIh+aCMXvSrO69n2hcAIe9FA= 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=Jyc8ZHCL; 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="Jyc8ZHCL" 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 E28FC175A; Thu, 1 Oct 2026 14:18:12 -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 760703F86F; Thu, 1 Oct 2026 14:18:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1790889496; bh=2X2FQ5S7yrfALnr5wL0BPfM4xpUXDIjXutG9mQQGSqY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Jyc8ZHCLLwHG7ZAjNektnsZz+9/XDYtttWyz6ywgnTwFBdgk0KDILlPvQJCT3DS0v pZCjTNEgpZPtI86+8WsM91u0rdSQnJJmQSoEw4qwZYx7f2P7/SfK2pgbMxw7eT9Ssi VCHpcdrkBuiWBq9B6kC/UNGfNwJaAJHaYaTfsz7I= From: Yeoreum Yun Date: Thu, 01 Oct 2026 22:17:53 +0100 Subject: [PATCH v9 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: 7bit Message-Id: <20261001-fix_split-v9-3-0f4ba8bbdbdf@arm.com> References: <20261001-fix_split-v9-0-0f4ba8bbdbdf@arm.com> In-Reply-To: <20261001-fix_split-v9-0-0f4ba8bbdbdf@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=4868; i=yeoreum.yun@arm.com; h=from:subject:message-id; bh=2X2FQ5S7yrfALnr5wL0BPfM4xpUXDIjXutG9mQQGSqY=; b=owEB7QES/pANAwAKAW3Vw9FaxTEzAcsmYgBqvs4KL+VYw6FuAkln8r6pGcnUOji7ghXv/E3by IiMsp4UQWqJAbMEAAEKAB0WIQQtg+CS3QUzuFh1pJ1t1cPRWsUxMwUCar7OCgAKCRBt1cPRWsUx M0jIC/9Oy3YDlqMQOhtpXmcTDqbmS5SkuMsJsSQegOcTd3+vfXfZqnpayi20cf+I5ubDV4o26nt zR1Nhof1I4hMA2nEwK31tHk/BoP/2RsUCE1RYnn3R89XHG3+XiPf9LsnADGoNmNu24a0P4VokFf wZmO8/OJOvcmjaaQTNEuEx6zXtjwixBF02wAajUwx+Qrgy6qGxeLvABPIMLfX90lYg6ZXlYedgD OluxL6Tuquk3RF3i4jE2i7DdPnf6XAvpumDRVCoTrfwpH0JXq2iP3OWtcxpn4CeJkJXerkinXqu Hms/moyVKy+DM5tj95L7n3YgBBvRJz84O+grm3hrcEhk89cZdbMkVAApzZAsdOrUAOXkapDUB9C ezyJvUABMz5LbRWu0avPrt+Gz86J5UsnYhXGQYFwtiKSVoeRdSVH7ulYohSYocg6a33DCNyUZol o1QyLj9+m/C/Q3N2zbyknCrTAjbVZEnDiFZrEFBGrkF4bl5sIBQjHWduISVQ9Nw+K1M10= 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() and __check_type(): 1. If hpage_size == 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 via __check_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, 56 insertions(+), 34 deletions(-) diff --git a/tools/testing/selftests/mm/vm_util.c b/tools/testing/selftests/mm/vm_util.c index a3c3a2706c22..65c06e17c326 100644 --- a/tools/testing/selftests/mm/vm_util.c +++ b/tools/testing/selftests/mm/vm_util.c @@ -392,76 +392,98 @@ static bool check_large_folios(void *addr, size_t len, int nr_hpages, return ret; } -enum check_huge_type { - CHECK_HUGE_ANON, - CHECK_HUGE_FILE, +enum check_type { + CHECK_TYPE_ANON, + CHECK_TYPE_FILE, }; -static bool check_huge_type(uint64_t categories, enum check_huge_type type) +static bool __check_type(void *addr, size_t len, uint64_t page_size, + enum check_type type) { - const bool file = categories & PAGE_IS_FILE; + bool ret = false; + int pagemap_fd; + char *start = addr; + char *end = start + len; + uint64_t categories; - switch (type) { - case CHECK_HUGE_ANON: - return !file; - case CHECK_HUGE_FILE: - return file; + pagemap_fd = open(PAGEMAP_PATH, O_RDONLY); + if (pagemap_fd < 0) + ksft_exit_fail_perror("open pagemap"); + + for (; start < end; start += page_size) { + categories = pagemap_scan_get_categories(pagemap_fd, start); + if ((categories & PAGE_IS_PRESENT) != PAGE_IS_PRESENT) + continue; + + if ((type == CHECK_TYPE_FILE) != !!(categories & PAGE_IS_FILE)) + goto out; } - return false; + ret = true; + +out: + close(pagemap_fd); + return ret; } -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) { + bool ret = false; int pagemap_fd; int nr_pmd_mappings = 0; + uint64_t pmd_pagesize; uint64_t categories; char *start = addr; char *end = start + len; + pmd_pagesize = read_pmd_pagesize(); + if (!pmd_pagesize) + ksft_exit_fail_msg("reading PMD pagesize failed\n"); + pagemap_fd = open(PAGEMAP_PATH, O_RDONLY); if (pagemap_fd < 0) ksft_exit_fail_perror("open pagemap"); + if (hpage_size != pmd_pagesize) { + ret = check_large_folios(addr, len, nr_hpages, hpage_size); + goto out; + } + for (; start < end; start += hpage_size) { categories = pagemap_scan_get_categories(pagemap_fd, start); - if (!(categories & PAGE_IS_HUGE)) - continue; - if (check_huge_type(categories, type)) + if (categories & PAGE_IS_HUGE) nr_pmd_mappings++; } - close(pagemap_fd); - return nr_hpages == nr_pmd_mappings; + if (nr_pmd_mappings != nr_hpages) + goto out; + + ret = true; + +out: + close(pagemap_fd); + return ret; } bool check_huge_anon(void *addr, size_t len, int nr_hpages, uint64_t hpage_size) { - uint64_t pmd_pagesize = read_pmd_pagesize(); - - if (!pmd_pagesize) - ksft_exit_fail_msg("reading PMD pagesize failed\n"); + const uint64_t scan_mapping_size = (nr_hpages > 0) ? hpage_size : psize(); - if (hpage_size == pmd_pagesize) - return __check_pmd_huge(addr, len, nr_hpages, hpage_size, - CHECK_HUGE_ANON); + if (!__check_huge(addr, len, nr_hpages, hpage_size)) + return false; - return check_large_folios(addr, len, nr_hpages, hpage_size); + return __check_type(addr, len, scan_mapping_size, CHECK_TYPE_ANON); } bool check_huge_file(void *addr, size_t len, int nr_hpages, uint64_t hpage_size) { - uint64_t pmd_pagesize = read_pmd_pagesize(); + const uint64_t scan_mapping_size = (nr_hpages > 0) ? hpage_size : psize(); - if (!pmd_pagesize) - ksft_exit_fail_msg("reading PMD pagesize failed\n"); - - if (hpage_size == pmd_pagesize) - return __check_pmd_huge(addr, len, nr_hpages, hpage_size, - CHECK_HUGE_FILE); + if (!__check_huge(addr, len, nr_hpages, hpage_size)) + return false; - return check_large_folios(addr, len, nr_hpages, hpage_size); + return __check_type(addr, len, scan_mapping_size, CHECK_TYPE_FILE); } bool check_huge_shmem(void *addr, size_t len, int nr_hpages, uint64_t hpage_size) -- 2.43.0