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 CEF56C83030 for ; Thu, 3 Jul 2025 08:59:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 53B736B00F6; Thu, 3 Jul 2025 04:59:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4ECA46B00FB; Thu, 3 Jul 2025 04:59:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3DAF66B00F8; Thu, 3 Jul 2025 04:59:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 2AE606B00F6 for ; Thu, 3 Jul 2025 04:59:20 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C7A941246F8 for ; Thu, 3 Jul 2025 08:59:19 +0000 (UTC) X-FDA: 83622354438.02.7EFEFAA Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf07.hostedemail.com (Postfix) with ESMTP id 4252C40009 for ; Thu, 3 Jul 2025 08:59:17 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=HTJP139q; spf=pass (imf07.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=donettom@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=1751533157; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ijgdEyp9oBh3emRjFv1X4HIGEpnqZYi0vcjkbkMBVns=; b=1+bH4n+q45QXo+w38ydZLmlnUe5r/vJaUn3ojsWZeB4+MVSIFNmgrecXhlVuaHFVlzshKe SB9odrcOcqbpPAfg7OahnH5e1rFWAzhULRul/xfPvwsFjYjQYUofqURJLVzBF6it/zhoq5 dUo8wja44zguxZ/9quOwaNRa4GugfUk= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=HTJP139q; spf=pass (imf07.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751533157; a=rsa-sha256; cv=none; b=G/k+qWDVclsNK9jzKb1xhq17naY64rBy250tKXYU1xSbZMBit6FIbJ446ob6g2gm1om5Ta tinhp1/zbWjw9w/EiB0oBGHL6HPgLVzeJVEJwF7bu3mYRwWCnRglmS2Z60hffTtRKajGbV YIJixF3kw01CQzzzCV8TaGF6W/JJXRU= 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 5630lqfm001087; Thu, 3 Jul 2025 08:59:09 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=ijgdEy p9oBh3emRjFv1X4HIGEpnqZYi0vcjkbkMBVns=; b=HTJP139qyHfv/hGUOLcaeK ZZ3Ju4ayGfiuISIyBly4q0SR0qDVHgZCeVZY/1vOMhQbLvl00Kcw1JGhMwbsKvd5 usc7kgW70K1vJvcnG0OTYJahQQ7scEUZkyixRpKkQh4d9gyF8SMQM1zn4ffHo110 GDzfnMHlDdbU1CtkwTzV6+tCGlMNPn51qE20VJwxcEp9dMM+7iWxrF7Q9Fv9K16V XGCDbnuAYTFB9ctYbULN3NrQfqal7mKGhKJQ8NP3qjnW1Kb+LW3P6yh+CiN6m/ne 9b88rnKR6kU1BErVtTwMaRBeqag9NPGvS+d5IxTvdkmvDB5kpGjIdrdxs+4T2jrA == Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 47j84djkda-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 03 Jul 2025 08:59:09 +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 5638x8LE023111; Thu, 3 Jul 2025 08:59:08 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 47j84djkd3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 03 Jul 2025 08:59:08 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5636oGCJ011803; Thu, 3 Jul 2025 08:59:07 GMT Received: from smtprelay03.dal12v.mail.ibm.com ([172.16.1.5]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 47jv7n3uux-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 03 Jul 2025 08:59:07 +0000 Received: from smtpav06.dal12v.mail.ibm.com (smtpav06.dal12v.mail.ibm.com [10.241.53.105]) by smtprelay03.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5638x6T919530424 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 3 Jul 2025 08:59:06 GMT Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 43CF35805E; Thu, 3 Jul 2025 08:59:06 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BFFF158055; Thu, 3 Jul 2025 08:59:00 +0000 (GMT) Received: from [9.109.245.113] (unknown [9.109.245.113]) by smtpav06.dal12v.mail.ibm.com (Postfix) with ESMTP; Thu, 3 Jul 2025 08:59:00 +0000 (GMT) Message-ID: <0e099baa-0a36-4ffd-821f-a7a4856fd52f@linux.ibm.com> Date: Thu, 3 Jul 2025 14:28:59 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 4/7] mm/selftests: Fix split_huge_page_test failure on systems with 64KB page size To: David Hildenbrand , Aboorva Devarajan , akpm@linux-foundation.org, Liam.Howlett@oracle.com, lorenzo.stoakes@oracle.com, shuah@kernel.org, pfalcato@suse.de, 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, ritesh.list@gmail.com References: <20250703060656.54345-1-aboorvad@linux.ibm.com> <20250703060656.54345-5-aboorvad@linux.ibm.com> Content-Language: en-US From: Donet Tom In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: LPheNdXG_tUaEuOhX85dEf3eZPoepz7X X-Proofpoint-GUID: yNNsKARGwUDr6NdDQvgDzez_yiDBzCMR X-Authority-Analysis: v=2.4 cv=Ib6HWXqa c=1 sm=1 tr=0 ts=6866465d cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=VnNF1IyMAAAA:8 a=HZMDwHG8fRVm9kfh3eUA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzAzMDA3MSBTYWx0ZWRfX9r5CEUJSHzAF F5/c/4q3wTH5zdjl1t/7nw7NP3Ts9RLeQcxebvS41SQU1BaYsl7Vlyku06mmN9Qr9m18YzlYiT7 Rz++529kJpM7Fs0/ZnTt0+MBeTizcpls50hloqvsyX+XTIU8Swp14fJ43XLuksr0tjbpPkxeAUv o9l2IALjwXLCCKKOYbivu8i1BM6SuploWkMounpHdzUWRhecJRfeB+owhMNzmevNI4dZhjyT/vN 3ei3BhfhP9jN5VSYsrf7c7Z0LIORoHMJK72NT7ASDMn0ONpam3smmkRklDtwl0fI124h7fnEU1U WpZqxwTd3yjzNEeq9UPc2PFcw7xELB+260WqIw2NB02Qlmue0JCASxAJuqTfF+63Xiau966NSab IA7fBpKiZEGMHL0nCwPE1uwDJ1YDvnfn7kmyb8bjGMFU9SgVD9sJ/VVzsMdhgs5bp+2QxFiD 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_02,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-2507030071 X-Stat-Signature: u1hyp47y8mbfgb9goctuapyi3x8oq83u X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 4252C40009 X-Rspam-User: X-HE-Tag: 1751533157-459460 X-HE-Meta: U2FsdGVkX1+yZrUyX4K6Ir6XeoTh8ZQTcD9fIOGU+xeKd/Us4ZP1BNMlCYaXEwtbrSP4mZtnG3GuqdHrd+e9ERsLlVphJdCjByJIzck4oeY81g9TXx+iUZ6HOsGozUDzfEV/z9+7pF7Wd3UDc+Z+jRWITCG3+GrLIQ6UJO5EGWII5IUXzbpYHBQ4yEzUSAfKcXOqomBBKcTx4VksFT9+rzv9wTNUDQHOxgZTOVzsphfJcbkzOuH7FwO80O2TJsvOrSOCuO62cDFWkw++QTb3mgabuBpCngDNEnrN/koRt3ZF2MeIQHFT3ArHy2u1dZQHS2T97yGLdPw/BAodqUNTPcMcAMXts8tcTy16tAT2kvPA7XnBex6RAgnmDjBbm2iGjTZpDhuMKozqY4I6mdxv5X5B0kJQk/KnAZ+jkMZXDGlxQwqLXU1nZf5T9TJQ5ExGmBdlaGSLogJaY2SQ27o3102WSbbWxWyqs+V2yEwgRphQFpIMmlDIesravO039TxS4lXvW8AULIa4cUuUaiBxKH6rFKcibqo2kVoEGqFHBHdk+xngQRuqxU1VhxoLqsTUBrqRhf06T3DA3jIkBheJRyVkLb1HeWq82Iyij7Fphu4pZXWd5Q6Dk+LhcPiQRx21RIo/pacdiBnc7SufXDgkAsPXCEdFFUdZR24NKF3c6Tp5ZnzHuVIQJK5WluS3yMqQywy1wuVl+OhS4IRS32v/0Pb5zHbTtHytH30wCLF4z5tbV6wChZvE3mh8RjRXt8txGjFS7IUGWqWQvbkuuwUonqAZj2qBbXq2kGng8JTyifNznG8hT6rMT5VIAaJ1J9Px2iaoFB9LCpbL4uXm5VtdHfRLvxSSyKpawx53trrhs4cSyCyrbKf19qHFRDDyEA7XuRIWKk8n86eGMY0w6tYq43Qi9oNoTTHrub1F/XsX48u6+827p0lIj6v2aobvKBdmJtfqK6lyT3Uu7LCsGDQ GpLX/pjz vg06Pg3iIZ9plf2hkbyL16MtPlCbIgPxDS0lMuGGWCmtJXnnowKin3qbTN69ZpIVXdiCQ8owxd/8gtMaD8eAMkNIYJidkvM90/hJHWL/EPwWqtDwnwCSrASMrOXzQkh2jFZFplHhIy2vW1WbGVL8TNq1MPkeu3144zraAAEdEep7+LjHnPT3wEvjpJ2Q9GoZUwzicv2S2LxMLC2lZrxMt137B4rY7yfD/v2VmekNrb1mNjnAXmJW7Dj8ZPHxVQegpgAmhI8Pp22NoArkloux0NapSgDjjCejUndk/P9S0QO3752jEPC3j/MHmUFi18F0KEf3FQlJOD1nlzm3Ita7fUzz89f4UIcKiBp8ZjLzRy7qkSD9Al3ejNagdNLkaU5vlX8u31mG+8AM1I4o= 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: On 7/3/25 1:52 PM, David Hildenbrand wrote: > On 03.07.25 08:06, Aboorva Devarajan wrote: >> 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; >> +} > > I think this can simply be > > return 32 - __builtin_clz(pages - 1); > > That mimics what get_order() in the kernel does for BITS_PER_LONG == 32 > > or simpler > > return 31 - __builtin_clz(pages); > > E.g., if pages=512, you get 31-22=9 Sure David, We will  change it. > >> + >>   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); > > Wow. Can we simplify that in any sane way? It is counting test by test. Let me try to simplify it and send the next version. > >> + >>       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--) > > "i = max_order - 1" I will change it. > >> 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)) > >