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 A748FC77B7C for ; Thu, 3 Jul 2025 06:07:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 46FB76B00ED; Thu, 3 Jul 2025 02:07:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 446B46B0118; Thu, 3 Jul 2025 02:07:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 35D856B0119; Thu, 3 Jul 2025 02:07:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 263416B00ED for ; Thu, 3 Jul 2025 02:07:43 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E44CF806B1 for ; Thu, 3 Jul 2025 06:07:42 +0000 (UTC) X-FDA: 83621921964.13.42266CD Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf04.hostedemail.com (Postfix) with ESMTP id 8673E40004 for ; Thu, 3 Jul 2025 06:07:40 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=grsplI4s; spf=pass (imf04.hostedemail.com: domain of aboorvad@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aboorvad@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751522860; 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=WzwP+9sDG+i2wV/yfiWzzrWqUy0HiJfsMxt3u5SMiHM=; b=fInILLW3Xn44vRnZCuSBKBHp9j7/QrBnRCGgyQmbffJi83pOek/FmldJ5/FNDso+CU/NV8 5I9O5X/Hx23uvjQ7YvjDGh7VFzBfmtn763BJQI2BxV26k9WwSSihYxC57X0T8PMM+oNPyB PaSLd8RFRVaS/Ex4kLrdZr1LUVLo3KU= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=grsplI4s; spf=pass (imf04.hostedemail.com: domain of aboorvad@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aboorvad@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751522860; a=rsa-sha256; cv=none; b=V2xjrjfxVufTrsoQlgMmTUs7e1qgW32nKV12HL0rxdbLb9dAy3vwaJQRmmvcazfQ7Z3C9M 4XobKrmDw6wpbYNmAs22JklyTzJRzlVB/tZF5l73Bn6y0u3GFZgxSDoS6M+v1MkKk3b0AQ /yc/OsJWNznJZ4DIyjRK8OXiYsCQPTs= Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 562JEAHr003793; Thu, 3 Jul 2025 06:07:35 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=WzwP+9sDG+i2wV/yf iWzzrWqUy0HiJfsMxt3u5SMiHM=; b=grsplI4sPtuCgzQzjOnxpH7J/4193ic7S IsakgE5U/17WwIVXQ+NfmhprlfrUSNKGUmii6T3iqGAfeG69jvdyvjo0OHS/uL++ oQFVdNkhmyIpPysh9IuqJzLbMyqSVtONo9jwgGDT6LAmMa/H2zbquNSTXjCZtw6E 8OPDlWLu0No3AETxS/ManvTTjg1rXMZ8NCQu3vc9zJ1kQrlkJobyxjqTtOH49r4A 12tABR0ncry2/35CXCfKMhHsxvW3wSjTYna9vl7D4Znwd4XYIlc+ezKtFfzBi/6Z Cm+WMUyd+xNrpJCcn8OsnJEn4O/UOOA7E9d/prfDeeD1mY+GqLNMw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 47j84dhtg0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 03 Jul 2025 06:07:35 +0000 (GMT) Received: from m0356517.ppops.net (m0356517.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 56360Cc3013739; Thu, 3 Jul 2025 06:07:34 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 47j84dhtfq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 03 Jul 2025 06:07:34 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5631n6Fa021928; Thu, 3 Jul 2025 06:07:33 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 47juqpuann-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 03 Jul 2025 06:07:33 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 56367TON52953554 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 3 Jul 2025 06:07:29 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5CE342004B; Thu, 3 Jul 2025 06:07:29 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0354220043; Thu, 3 Jul 2025 06:07:24 +0000 (GMT) Received: from aboo.ibm.com.com (unknown [9.39.26.205]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 3 Jul 2025 06:07:23 +0000 (GMT) From: Aboorva Devarajan To: akpm@linux-foundation.org, Liam.Howlett@oracle.com, lorenzo.stoakes@oracle.com, shuah@kernel.org, pfalcato@suse.de, david@redhat.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, npache@redhat.com, ryan.roberts@arm.com, dev.jain@arm.com, baohua@kernel.org Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, donettom@linux.ibm.com, ritesh.list@gmail.com, aboorvad@linux.ibm.com Subject: [PATCH v2 4/7] mm/selftests: Fix split_huge_page_test failure on systems with 64KB page size Date: Thu, 3 Jul 2025 11:36:53 +0530 Message-ID: <20250703060656.54345-5-aboorvad@linux.ibm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250703060656.54345-1-aboorvad@linux.ibm.com> References: <20250703060656.54345-1-aboorvad@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 19o7swHgACqwZUkAOzAHQED58QoBmdqU X-Proofpoint-GUID: AvOPteWKimfxn-Tf9hFtUKVKH109_3uN X-Authority-Analysis: v=2.4 cv=Ib6HWXqa c=1 sm=1 tr=0 ts=68661e27 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=Wb1JkmetP80A:10 a=VnNF1IyMAAAA:8 a=v8RjUI9D9iq2XQVy_EMA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzAzMDA0NCBTYWx0ZWRfX5RsdTM/QzZ7u 8+IpWqxfj9Pzy1qW4rPzKxIJHBH/S3UHSEpa/g+uL4tpYRm5R4UnK53lI3tgjixzxYhfndMeB/h DPW8PKYgDj++nROqEj8X9GH4dw5LKvgmS+UhZPrPFa2AFqxnAgE0m674M/W2uiubmzHBLAr7eDQ C7JPVU9NxbmqvxNJDKXEdH3SmHuWzd/jw/fgZlC0lL1dPSLA+3fB5M6WknSTXbb33sZhYn91C9S 0jwQRd8O18cR7F+AgmUDsMjvpfhI0bRp7XDRXcK06TTLFYBH0g0pAgN8AqpBNf35EijkNYnFPkY 8RGDzYZy9sQXvMooSUBpw8Y8aj6HFbvEiJHp0zE4CrmAWAZu/kA0jl23Vj8HZltm1rWwczk2n08 JK38MsydOXg1lYnUf5qn/4VJlmICitIE4X8WlC2fCLtMbfu456P7x4oQWG7VlBzJY6eI3BmS X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-03_01,2025-07-02_04,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 suspectscore=0 clxscore=1015 mlxlogscore=999 lowpriorityscore=0 impostorscore=0 mlxscore=0 malwarescore=0 spamscore=0 priorityscore=1501 adultscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507030044 X-Stat-Signature: 9tar8b5d4w7k8wzjxjwny7bo5moktd5j X-Rspamd-Queue-Id: 8673E40004 X-Rspamd-Server: rspam11 X-Rspam-User: X-HE-Tag: 1751522860-698874 X-HE-Meta: U2FsdGVkX1+JTQldjjWYbbNey0Dc7w1+v/S3DJ2xZRJoCN+GjMxrdT1GNTTbFW6rgWt5S+NyNo3QNlbDJi94ALQ3VNk9lL+KbMSYIVf8MwoSvHLwaSIwpju7HD5US5TwUHv629e9AffnhgfOxPz8N7/8ZMAWt+kKxADC4uqtff8lqk7ytBc8KPiOX/rX+/A+3ElZ7Hw8YEiG0FFK+6vSXlVMDuKnpPU5K9Bt2eeIbri8/T5+JchAsYrjjKjFag8NUOVI71zaIDIeD9b6AKLIseBLENeOWeqe/eGcX6fvP8uvE9Rk/1qQi1Qz0B4HGOFGxfudV5mqprdM7hFWuXDijUpBHGQnOAH8mI1Tss5ojHu0etPJ0TrKfDngzJIpKYyMNZvs7RsHpk8NsgbPGC964ia+9azLocoy7yZRYT/eiwK7ZlbILloYcy9o3Bpk2xGWFozz89ItLuo2SSjXnf1ObHzt0TqzFVqxpQgH5TVNakBfIT5thaHysyDWITIO0P/xqxHSekXQkfi0SJ/vDh7KfyYmteNBCVGG5PL8bAViyC+Sv+yC1K9zKyPMGYeItqvNlRPex6WUnfQNBQwjqsrGkAGONtmoMCTZIkTUspTxyTejxMFr9lZSGtDm+sSymZdAHtNfhjXwvtBgmtrmOEj08MANyUDMs+MFnTjTI5VkVCvvQZ3YJVLky7HR7BpyWZgeckEFa6Qgz4lkySIBgsakTusRILUy7PDyZphoY2q/H8w8Byeo4d3dnpwJ6JiaAfVnr/cMM4xJpiCGyAm6ns9b4+nda0oRgQf8F+8TMrBxTX3TNitV0zF5s899ADQmkgbOjL8bTUfWjzdQuBBFgnUqGmn/cYe/vRtmClzr2oTKFGCiW7VQFywTikyhUtSBFB33SWd62m5XHlI4W2DcTHZ18sWXd8G/6RElk4UhcKWKferzUgehwVcoMYhBcLTD5awcqeWZCg2mVlah9uoOSjA btDq8bgk FAEUJHHQiFKK0q/bHmsbNoTELezjswVzlPd5L/97xG51Aa7zh1ZYIjPVgziYNobii8OOtTJeXNHbYzn7T9YLq9ymQ/ShTT33eiZKiftNyx/us/+oCx7780pSoAI1F0WF1nbY9f72E7kUVrrsJj5Qwi4rAx4VJgQY5f2kqm2RuGW1YYj3Re2ZddvPeIwZMEvm9AxPLY2pwud5dDkC7qGGRn+Yl4FMc6h/F0Pq1w1mObtyh5oUxsRi7salT0Euna/QkdYLDdfkB5bNlyLyyLwwDMAMiRXZr2iFu0TMIxapbUgK6kZjD7crEv6doOz8rCATwqclZ 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: From: Donet Tom The split_huge_page_test fails on systems with a 64KB base page size. This is because the order of a 2MB huge page is different: On 64KB systems, the order is 5. On 4KB systems, it's 9. The test currently assumes a maximum huge page order of 9, which is only valid for 4KB base page systems. On systems with 64KB pages, attempting to split huge pages beyond their actual order (5) causes the test to fail. In this patch, we calculate the huge page order based on the system's base page size. With this change, the tests now run successfully on both 64KB and 4KB page size systems. Fixes: fa6c02315f745 ("mm: huge_memory: a new debugfs interface for splitting THP tests") Signed-off-by: Donet Tom Signed-off-by: Aboorva Devarajan --- .../selftests/mm/split_huge_page_test.c | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/testing/selftests/mm/split_huge_page_test.c index aa7400ed0e99..38296a758330 100644 --- a/tools/testing/selftests/mm/split_huge_page_test.c +++ b/tools/testing/selftests/mm/split_huge_page_test.c @@ -514,6 +514,15 @@ void split_thp_in_pagecache_to_order_at(size_t fd_size, const char *fs_loc, } } +static unsigned int get_order(unsigned int pages) +{ + unsigned int order = 0; + + while ((1U << order) < pages) + order++; + return order; +} + int main(int argc, char **argv) { int i; @@ -523,6 +532,7 @@ int main(int argc, char **argv) const char *fs_loc; bool created_tmp; int offset; + unsigned int max_order; ksft_print_header(); @@ -534,32 +544,33 @@ int main(int argc, char **argv) if (argc > 1) optional_xfs_path = argv[1]; - ksft_set_plan(1+8+1+9+9+8*4+2); - pagesize = getpagesize(); pageshift = ffs(pagesize) - 1; pmd_pagesize = read_pmd_pagesize(); if (!pmd_pagesize) ksft_exit_fail_msg("Reading PMD pagesize failed\n"); + max_order = get_order(pmd_pagesize/pagesize); + ksft_set_plan(1+(max_order-1)+1+max_order+max_order+(max_order-1)*4+2); + fd_size = 2 * pmd_pagesize; split_pmd_zero_pages(); - for (i = 0; i < 9; i++) + for (i = 0; i < max_order; i++) if (i != 1) split_pmd_thp_to_order(i); split_pte_mapped_thp(); - for (i = 0; i < 9; i++) + for (i = 0; i < max_order; i++) split_file_backed_thp(i); created_tmp = prepare_thp_fs(optional_xfs_path, fs_loc_template, &fs_loc); - for (i = 8; i >= 0; i--) + for (i = (max_order-1); i >= 0; i--) split_thp_in_pagecache_to_order_at(fd_size, fs_loc, i, -1); - for (i = 0; i < 9; i++) + for (i = 0; i < max_order; i++) for (offset = 0; offset < pmd_pagesize / pagesize; offset += MAX(pmd_pagesize / pagesize / 4, 1 << i)) -- 2.43.5