From patchwork Fri Apr 12 18:21:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sidhartha Kumar X-Patchwork-Id: 13628230 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 0C777C04FF8 for ; Fri, 12 Apr 2024 18:22:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6362E6B0087; Fri, 12 Apr 2024 14:22:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5BDFA6B0093; Fri, 12 Apr 2024 14:22:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C24F6B0095; Fri, 12 Apr 2024 14:22:16 -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 1A7626B0087 for ; Fri, 12 Apr 2024 14:22:16 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C0CB8160FAB for ; Fri, 12 Apr 2024 18:22:15 +0000 (UTC) X-FDA: 82001699430.20.6A8CD6B Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf24.hostedemail.com (Postfix) with ESMTP id 71222180004 for ; Fri, 12 Apr 2024 18:22:11 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b="jUKST0/k"; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=UHIHk3wM; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=quarantine) header.from=oracle.com; spf=pass (imf24.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=sidhartha.kumar@oracle.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1712946131; a=rsa-sha256; cv=pass; b=cGEdqykhgDNCu0w61YJ9mlpU3ZBp10Usjf234UE8NXH0wgDyvWlhqDd1273KQP2O7jIWdZ fu0C4DGAbEMzBgaQL0gfUky5bjNjTFgSyNXFci99U2xo6SHN4YQZ9As7tnQaqidQuQXyRY N9Eq/QPKxEb0D52h/tdF5FWykulD8Vs= ARC-Authentication-Results: i=2; imf24.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b="jUKST0/k"; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=UHIHk3wM; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=quarantine) header.from=oracle.com; spf=pass (imf24.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=sidhartha.kumar@oracle.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712946131; 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: references:dkim-signature; bh=vA4YLOAyQ9xtjctU+acsQ0fDCbQX0dFxfmWmHAYHdf4=; b=020nyMQN+yUm9feAMEa3+V0irwfZtEs2YXVKuABvd8IDalSyoNyBxWc7wDGnzq0FbsnWb9 W+lj3kbyCBuostEbzKK5NHZxEJCHBqUnuXe7QdEgD/YWUEHK2CiV34hhyVocRyYxKIVtBJ xTBU185dHfhz2gC/k8IQQgKY+r0+fpY= Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43CI9hZL026998; Fri, 12 Apr 2024 18:21:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=vA4YLOAyQ9xtjctU+acsQ0fDCbQX0dFxfmWmHAYHdf4=; b=jUKST0/krdyneCqrGpXRwvmK8KPvshjFheYeNhK40nBxhSkT1s6/UO1HTDytaDyJd8Iv vFPaZDysglkQNtKoswzKfchVVt/3kLKJD8730DCHmzRXsAyqeWVS5N6BzcjSWg7UGifd brcsCYGVMbszR48W2o8KVwML9NClrgkmkAkx7cJ89G4L0Xpc4JMAffXmBhs0nb6TadRy gwmgo3CacNDqZibpFFyAQm5yvduVF/dQycwl6wc2+Qrascdf7C/3LRO+n7G3/l0p0+Rx E/gA7jN1SsAwrwYQ9fFCy0h8xhWD8+gjiwh8HR7iZq0ZwfA4/b6f0LSa0p/wINUwMzxZ PQ== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xaw02ckmr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Apr 2024 18:21:50 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43CHoaFl008048; Fri, 12 Apr 2024 18:21:50 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2041.outbound.protection.outlook.com [104.47.51.41]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xavubb4nm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Apr 2024 18:21:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G5RL9oniyVG/cTeakegf7x3/Dc0K9W138K0R9sQAYUwO3pe4BiomkZQC1YONRUt3vf9HQkFuLZhZMuGuriFGHeZuweDm/kFNQ2/Wqu/le127dn1++D/DfQcHjmtuk/i6AI1tbV0Dvt0cHbFsTOqa3VfrprPPD1xb1xR/lfUVqbRqum+rQPpDVwa0ebFt9mvjl2M6+15GRH6v69cM5Q5/Ij6OHp9Ru8Hm8iKnwR2bEvk4cgknAPZbHB4+7o4TFU9Ab76wq4C1l4l6IqHLIHksBHwrlsnCf4M5NjPM5d2XcN5Fxuc5ESk/JVtN6wmOE2P/h9T3qRX1prvZL93tFl50+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vA4YLOAyQ9xtjctU+acsQ0fDCbQX0dFxfmWmHAYHdf4=; b=PuIC2GOGDp04Ap1zGMVL8AdMhisLrQZdI+p1paXan2V1qhkXI5ZF8Q8SRFVYTLMB0aeiROaK5VvZCEo+s+3rZ29oKTxmwBX/hYRuN8w1duRkFVkuR8IuWkykjV10veILMtGxdYIDMDv9OGVYrh2Owsd6nr3asqU/iqXP1gaYRdrMS+Zksqk/1qGQDX0Zpj59pIUp1JPk4EL6biZx0EbxeaqPYfR3k8vM6z20d33XqJwY+BfKtRyQ9Zqgli6s9CZAuSjeyIibhJ7tJLPPMP7LiNeeowfvDEVeGN+c9KPtku/93posYtXgYCsPKs6vDdZNe0sHdyaa9csIfFMRl1muiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vA4YLOAyQ9xtjctU+acsQ0fDCbQX0dFxfmWmHAYHdf4=; b=UHIHk3wMzBDMzVsvA+NjV7M8MrjerinmsLMhSO9Afwe0vH9c8P78paFpGr3Z+39ags2s05q841ciBqvUhOTKIb+QUnmeD0XXUsLQR0Jy69gdnNxbsFLrbG553UV0xU8/Y165cG8fFVIpEcEOVPgtSnbETEPVpKoRskWN7opKPb0= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by CO1PR10MB4785.namprd10.prod.outlook.com (2603:10b6:303:95::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Fri, 12 Apr 2024 18:21:47 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::6573:ea04:fecc:cc68]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::6573:ea04:fecc:cc68%5]) with mapi id 15.20.7409.042; Fri, 12 Apr 2024 18:21:47 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, willy@infradead.org, linmiaohe@huawei.com, jane.chu@oracle.com, muchun.song@linux.dev, nao.horiguchi@gmail.com, osalvador@suse.de, Sidhartha Kumar Subject: [PATCH v2 1/2] mm/hugetlb: convert dissolve_free_huge_pages() to folios Date: Fri, 12 Apr 2024 11:21:38 -0700 Message-ID: <20240412182139.120871-1-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.44.0 X-ClientProxiedBy: MW4PR03CA0184.namprd03.prod.outlook.com (2603:10b6:303:b8::9) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|CO1PR10MB4785:EE_ X-MS-Office365-Filtering-Correlation-Id: c2c79d0d-aafe-4bd0-6602-08dc5b1d6a32 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H+CeL5NOvTTx1hMbacFJiHwpjJbJkgUImRRnjB86Q7UHEq6k1/znTpUql0Mrgbi+yBSxScxPicKpsopNpvRfjhOcv50X7U3zyIVTy5LZZgyZ9GOp43jp1/+QY+aMX6Kk+VWmTlhcAgwVUoFzmwZzsjYCRurhNKeHBzOa8xP7XrEgOrR0SgfkVG1yafgvRgXRL/B3C9mu+GbyXU8NDEuYEvZPcYKNcqKBEwckg1z83T2+WVGkE6RhItkq4aTAy8RgZnUI3eo0C0dYLJTL9fbztD8YtjlvM/Ti8b7L94+lXbPxGZ15ktOCk0h8H3swiSoD7L9EQTiZ+V9pJgygAzzJBqzQz4Qy6fptgYfwETuDeNmYNeQMSoyaReOXKTIjdtZv7fIJ2E1LuH1nfpqCNwg6dO7POWz7v+yJhDL51iA6j3P0NLWirg7Jdckxyx3UGT2NZv2ja7NUHBB/fmrab+e0S5lpsuld77plex5qOJ7owG1maZGdHOg1exjLBTPubiHjN0BIBwxVGepf0AyMPdg5rNmX59ieMoL7MCsIkPZO4tlQCZx6BUskFt8A+d6rj3tATkDSRARpK7Vri6KmJG5oUCb/eZ+3Z1qWVR2MHXM1SCMVb3el/P9UYuHNHWlzfLpbccMns8RSetHq3PLJugw/Qj7UTXTu8Ndr+wtkU3NUhlw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366007)(376005)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PxzAdf7CW5193iZvN6vfeNele+JZSiIJwj1VSi243DEaqQQyfTLcq65OC67X+xSC0eqHH/Rj+qtBfoMU6f4eVTRDl6+BFBP3FFREABCVbKHKGbUzgK/swlJ1A5Yg5+HoaJOa8v94Gpif1GA52nAhldUsHbgXKxra5lUgfxvAVjmoj1qbbKw9rx3TS0/6F0Ncg0zfmGQkNOuGuxa+tKqeYixEw2lKIdFV4il5ExQJcQhQSBFYpg7kZgkA8a7areEqobtN/esp3xpGEpJKdql/82UKyiutOmw0tHTN/2GBG3k7LsFJUFEs+CJU9amBaefyhQC84avc1C2GOQGsfi+U8S0P5GloFYuRr3SOlL9KPvD8JQQrOHtd+FxixCfQFnHKdd0SQAUMcCBp0rsqvE663s/I03fG2EXhDx57yqESf+ferIYoVv9SMvAEtZ034N2MfNnLo2kzUaOXe2gvtorlyUmDTWtn1Vd+rrqdoEoaeD41ohijYv36eXXBrsMfeniR9bnuFfMvRlzPJ25Zo2G0qbzdGIGrFjQpcNeOxXR2dRhnoPz28cYFQZ03h4+wmxIYrJ9MKEKdQCq4eglt9yWsnwoD4/m+GBNttgruVHk71gbuGD+kZtNjF5k2S0FI1z+pSjbVUjoDj0F+aICc8dU3dIA7CC823IRloqp2BSVL0NT6mlCtA8H7hBBSUJbcefTdL/4rmBc8Dcggu7Pj31/4K2brk2vF3iKLBj0hXWAwzB29UH0DLDlNjMbol8tuE4x+BibzkiyRQymYFOu6OP6tRL3lH0QuRqTBX0ZrzqkZMRyHd5hZq8yq848WoD9gIRohjABnBX4Bpo0GT4GB/IKMzfA/jEmudpptkOgkrRVgEsyx/HGZagoHJFW3H26TP6qHjBOfjvC6udnsVeEZgq2K/o57J8FnOdl32QyaD4UJWrcKFDBKWX4/5ONi2JLTmL6JFbqI/xEY4MnlfKrm/3wmwnPXlZHnZiLIIpwNG2mXEmwyC9ZjiA0wV4xKQDovonXuW2DQ2CPYcyD/6nBXfbgW1DVPX0Bz4vq0pdYxN8gVst9ePxgF58pQU30nzdrseg30dGuqbs1+Q5ZrOPrqtYnfCH1+XA+AI+yYmkWfnsvXwcp/3BExRPJ0acCL5CjhVrRQTnS9e+lkv21h3Y9TNZJ6k/6JCg/ZDI9noOshSzYXXpfuL3GD7X3/7LGRRKCxRqga4I37o8lkNvup40xIo5EBsTIDEpYgB4ABHTAkkXFwrKq8DULV5Vp8p7aClF0tGqfUI/Iyuq68hnvxGYv1MC/p4rk+EaoVc0ODMLs6qUDhFw3MO7nX/DNh68Gh0yARpAtX8hU3cGEsIpqYcFvVvE890rneELPw5j3UmnkAeXM+AUxXS42P2AHDo46kGWQAjzawzYydjCf3L179NEkYlOzknrpe0/0BdYyAPXQNAX0OliS0QBHukl7OqiJCt/esuSzyWpNL16+Ap/gym84s5Lt2AxwcEKtHKIFrQCfl3Dv+YSwhCAAefuO8Ah64wNpPgpscLPEbB83cxlJFn6GTiiE2LOuQk0VvFd1YRWNom059ee0TQM32JBfF3uClzD1VtZOZcsBu8PRIccCJ3WKjl2sQHL6D0AD2PZn3tE8qEaxbtZA= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: dhnCS13Ru9KJQiZV/ysz6G9twMpLWS42d9VZmoaB1xDTODI7zKPlwPWT3QD5oyvug9qulozqi4g1eZpqq7idDf1cEguSubFm2TlfOHF2p7UAlC6n7cQTlc/sSioNS88f9TOSAKEZ1xHlUiItg5oc60rn27DhqdUNAWrnPmVSs/y2kwUjA+XiLB1SUBWiARxtYkIt9dWEV6VEcJiAzt9RnvgQZBMNZa/BAc2Kl0YJT8dDxNvISM4M7ii212hob6ZNO2R4kn8jC6jKF78DMv096CTwoVVB158H+0HJe0BjzX9TdigNt1ToV2k8BMGBOTeQ2SRPA97XnU+dOQRRcG3e6ENmo6veCbDx+LaP1yegH5oTu5kBX7aY28lkU0n8DE5LEdoJiuVaxSg8A8aYn6iHtmzer3BdGDbadDcMGtIkJeGkVrXHGHAGlJNKK/xqSykvvdoibG6h7R4ks+R35meG1lLF0S2LEsVBjqpwK22wp/RGFM4l8r3OLvRvPNmujw0CeIUhwPU6CuRbecuBqQ0kaCAjxiA6d4R9nhrAvCq8QP1JDeXYK8/pOWIw/34JjYM/eOu1Dc+cA2Z3xZx6COnRWRSvtSCJCKfj4Uz/vT+ZJfY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2c79d0d-aafe-4bd0-6602-08dc5b1d6a32 X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2024 18:21:47.6504 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2CiacuYTcFimOE0p1deNnK4IHXCjIpq641IoDkNXn8w6kPPfOrUHipaK2pna+eLmUJIIx7NJxjY8Uq3wnK781xVrCXJ/Ke0pvH7wYHkpvZ8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4785 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-12_14,2024-04-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 mlxscore=0 adultscore=0 phishscore=0 bulkscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404120135 X-Proofpoint-ORIG-GUID: K643jE3cifWuy7VSwqMOYResIwd-7T42 X-Proofpoint-GUID: K643jE3cifWuy7VSwqMOYResIwd-7T42 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 71222180004 X-Stat-Signature: ccpzsfwcroie94yxna1wystdfbot44uz X-HE-Tag: 1712946131-691785 X-HE-Meta: U2FsdGVkX1+Tu+NdYCcH2yNCmKgD8tRaCP7GrTjcTtv75SO0kG5srvkJKWfjPBd/A+J107oHCVy7d/OmZQ/LuDJylluhLb+ErHCbU8yW5eueNDYbiir1CuyoETpJ4Bnk0JSQcBK18VVco6H9ibF4mEGvfDPaIPCHxgfH5o6trCpLivhMivn4xGoZHTwuCGRF9wCPT3nnZNRK21z6rEN7lWSkyn7W0yBqu1wzx7wFMi+/pQtJiQMjdsIk4Q81YL5rPwmUdrnTHt2aR/1VMDDUrfvjR0tmujU/h5TvcPO9iX7JE3zcLlkr2B5jof4zwqkD0P8j+RyPMeLZQW3sm+Laa8wnz1sSohUXu4zpsISJ5XTWzxTFZb7axiE7nzHFgWtXLzmjh0Bi4tl/aeCD5GSaF2rO+at2zHGhX74+qeQHMxWiyMaNvYKDeJQqw9R7uVeGXsGZRrqAZ09nIanXAhuTkmD1Bj9DRnC4xQ/aNUQXFgRnqVHO30spnW1Ftln6+58mlFXd6GGsv3PYkhnZl5K2L9JgQGnpezcWf9GnkTZyEuUDyYq1gzupiC+T1tLuUlCnRPM6VYjRm3McnjLXOgzVZQQw9b7YSvMsSvHUxXPQrbf9Ch5RxWNaVHINW/jDo6GMPW58B6s8SUFsbL3BBAm0WTAbrSH45SxJ0zyrDY8QIZ16Rcbm09kgN+JDE3NkCMwmgkPZoOCpw7WVo4tjZceDg9zxIwAOBpuOVoC3HeVwisSo2UFZTpB/+s/0c5nen1Rntyro7CnKJ5yoruO/oOCF1MjQNSLEXfgAPENsGSDYkqHtdU4LUMndVRuV5J/fIMoPJzgef1RswANPb213uMLRy2DHK2n2mtLG2gendNP6zVqg3hnClu6FczM3WrrzWVtECykhbgoFxpElhTY5SXl4yiysERyP8nIJllGqW3QrCZurWWlIaX0oxE+Eijz8XBXSYq2r/nW4Z2mnEnZRwZy mMVL2YRF HuORuJEnG+H/0h9C7e2iOhJFCbtTVka9xOV+b8JfxiBPq38STlFU1PH8U6tT2dUEWdEDMSXlDMYi3k2SMGz3EWYgAF+2HpM2uNXgCSgL1SCGidih71tzVRwfxLhiwz0jUKUeUPOxUYbsgpUJrAV+Ewp63A9LV7aoc/vJ3XKf4mfIwBXEPKM+us4XtVqQ+DjVyWa9qWHbfgXy6ohzc+u94ePH1QQ+MQaSkRBGNyPM8xLu7LC7BsBpWzHb56Y6oHbMXFjszaB/tqiBU+sekvWoJR1CUJ+nIWiHSM28JLwN8G/yUU6dWSNkNgndL1n3CwqWU6NippyPimXzZEnlQA51Hz5oeQuH9UDHd8fPY5X4mJOSUDrr7vB0VW9ZR803wHtd8O5+5D8gVYIIDTYIXHLbAAj5yAHwhKSaq3AmgeLPV8uZJBryaXgWtZ0qaTjSwPVLBe08uLSXDfxlqgzeBw3Nl+9XnX2VnK/aqvU6oKiqiqNIyTrg2MfwETFY0g8hSisBISjRhfVV+vzOLG2vXq/ST8KLKTD3lBPmQAr/i 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: Allows us to rename dissolve_free_huge_pages() to dissolve_free_hugetlb_folio(). Convert one caller to pass in a folio directly and use page_folio() to convert the caller in mm/memory-failure. Signed-off-by: Sidhartha Kumar Reviewed-by: Oscar Salvador Reviewed-by: Vishal Moola (Oracle) Reviewed-by: Miaohe Lin --- v1 -> v2: - Change additional comments which reference hugepages to hugetlb folios per Miaohe Lin. - introduce patch 2 include/linux/hugetlb.h | 4 ++-- mm/hugetlb.c | 17 ++++++++--------- mm/memory-failure.c | 8 ++++---- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 3f3e628802792..f4191b10345d6 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -861,7 +861,7 @@ static inline int hstate_index(struct hstate *h) return h - hstates; } -extern int dissolve_free_huge_page(struct page *page); +extern int dissolve_free_hugetlb_folio(struct folio *folio); extern int dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn); @@ -1148,7 +1148,7 @@ static inline int hstate_index(struct hstate *h) return 0; } -static inline int dissolve_free_huge_page(struct page *page) +static inline int dissolve_free_hugetlb_folio(struct folio *folio) { return 0; } diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 454900c84b303..f6dd5f597df16 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2377,8 +2377,8 @@ static struct folio *remove_pool_hugetlb_folio(struct hstate *h, } /* - * Dissolve a given free hugepage into free buddy pages. This function does - * nothing for in-use hugepages and non-hugepages. + * Dissolve a given free hugetlb folio into free buddy pages. This function + * does nothing for in-use hugetlb folios and non-hugetlb folios. * This function returns values like below: * * -ENOMEM: failed to allocate vmemmap pages to free the freed hugepages @@ -2390,10 +2390,9 @@ static struct folio *remove_pool_hugetlb_folio(struct hstate *h, * 0: successfully dissolved free hugepages or the page is not a * hugepage (considered as already dissolved) */ -int dissolve_free_huge_page(struct page *page) +int dissolve_free_hugetlb_folio(struct folio *folio) { int rc = -EBUSY; - struct folio *folio = page_folio(page); retry: /* Not to disrupt normal path by vainly holding hugetlb_lock */ @@ -2470,13 +2469,13 @@ int dissolve_free_huge_page(struct page *page) * make specified memory blocks removable from the system. * Note that this will dissolve a free gigantic hugepage completely, if any * part of it lies within the given range. - * Also note that if dissolve_free_huge_page() returns with an error, all - * free hugepages that were dissolved before that error are lost. + * Also note that if dissolve_free_hugetlb_folio() returns with an error, all + * free hugetlb folios that were dissolved before that error are lost. */ int dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn) { unsigned long pfn; - struct page *page; + struct folio *folio; int rc = 0; unsigned int order; struct hstate *h; @@ -2489,8 +2488,8 @@ int dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn) order = min(order, huge_page_order(h)); for (pfn = start_pfn; pfn < end_pfn; pfn += 1 << order) { - page = pfn_to_page(pfn); - rc = dissolve_free_huge_page(page); + folio = pfn_folio(pfn); + rc = dissolve_free_hugetlb_folio(folio); if (rc) break; } diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 88359a185c5f9..8cc91aa1a3f47 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -155,11 +155,11 @@ static int __page_handle_poison(struct page *page) /* * zone_pcp_disable() can't be used here. It will hold pcp_batch_high_lock and - * dissolve_free_huge_page() might hold cpu_hotplug_lock via static_key_slow_dec() + * dissolve_free_hugetlb_folio() might hold cpu_hotplug_lock via static_key_slow_dec() * when hugetlb vmemmap optimization is enabled. This will break current lock * dependency chain and leads to deadlock. */ - ret = dissolve_free_huge_page(page); + ret = dissolve_free_hugetlb_folio(page_folio(page)); if (!ret) { drain_all_pages(page_zone(page)); ret = take_page_off_buddy(page); @@ -172,8 +172,8 @@ static bool page_handle_poison(struct page *page, bool hugepage_or_freepage, boo { if (hugepage_or_freepage) { /* - * Doing this check for free pages is also fine since dissolve_free_huge_page - * returns 0 for non-hugetlb pages as well. + * Doing this check for free pages is also fine since + * dissolve_free_hugetlb_folio() returns 0 for non-hugetlb folios as well. */ if (__page_handle_poison(page) <= 0) /* From patchwork Fri Apr 12 18:21:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sidhartha Kumar X-Patchwork-Id: 13628231 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 1E812C4345F for ; Fri, 12 Apr 2024 18:22:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E9B996B0093; Fri, 12 Apr 2024 14:22:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E4BDD6B009B; Fri, 12 Apr 2024 14:22:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C12156B0093; Fri, 12 Apr 2024 14:22:16 -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 A2B4F6B0093 for ; Fri, 12 Apr 2024 14:22:16 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 30FB5A0E3E for ; Fri, 12 Apr 2024 18:22:16 +0000 (UTC) X-FDA: 82001699472.14.ED0A4F3 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf29.hostedemail.com (Postfix) with ESMTP id CCC1E120009 for ; Fri, 12 Apr 2024 18:22:12 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=DbZwOCtl; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b="GQg+9FA/"; dmarc=pass (policy=quarantine) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf29.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=sidhartha.kumar@oracle.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712946133; 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=KP68T40J5TUww6lgZMCWokKpEGUxjhNzGRaHsY4aY3I=; b=3NztSLR+FYJdFl/EMWwfK10Sb+8WCuqW+PhOSpigQKCa9zyw8hq6cbvbzR8+q58mGbwwMC RtE/bA9vhDmvxtbjAiayzJtW6yqPqizyTwfZodJ8iN0iSffDTJk2KkVGl4mqbf39iD4txm aKYzh3m0Ao2XEAMEUCtfNqpLrIbU/tc= ARC-Authentication-Results: i=2; imf29.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=DbZwOCtl; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b="GQg+9FA/"; dmarc=pass (policy=quarantine) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf29.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=sidhartha.kumar@oracle.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1712946133; a=rsa-sha256; cv=pass; b=M46o1c0I4DvMzYj1WEZn8A7bkQQNUZl4qHgwSh98torDOKbeIUBUtMHuC/jgP2Y8gYajoh WQn0GzRq6ZbyjMP8liOvZE1IouKEPcq2Z3yo3SdMXZGOv8ple5mH7NzWpg/6FbCeYfxHL/ MbE5NBrhkEWTyNslxrh4GApw72gcsqY= Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43CHVc5U023414; Fri, 12 Apr 2024 18:22:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=KP68T40J5TUww6lgZMCWokKpEGUxjhNzGRaHsY4aY3I=; b=DbZwOCtlxKbAUewWeIjZEfs/AQfBUYExGpc5As2r5t+NFDVDjmc/vmrE8tToTQduF399 AQ6QCMT6LyWkReSGmGKFrjJR3sBefar9nFzxoBoSGqBD4j9hlY5hQ6rn2JceN5JXRtjv RUFW1ex7H/mURF7oumQgki474RBU+SKQGNfao8TtQ/27/vpBbo5Ic9FKnzGFC05wl9U9 8VxWB82iARjpFg7XX+Hjcz0b0dt8UlCe/B0FkWacKE2wBSqSVYUXQ4RvJGzuIclyayZO NFfFWFore2iY/jGglBwGyWevg/YzmqPWv0RTJfYkFSnGONluISocPu1ymvNBHYGS1HOY pg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xaxxvmjcn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Apr 2024 18:22:02 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43CGlCcY008023; Fri, 12 Apr 2024 18:22:01 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xavubb4uc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Apr 2024 18:22:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KNlmYj5cRXXFMk8hlDviWWrnSNChu+/sdo7Qwt4q8tWA7y82VAxqJgZjoR4P6EqA8cHuztefsFutPn67WojlESaqPpKywQQsGn+9Y6Po9Ls5mGls22/rUp9vql8hd3yUGCpc4p7L/Hf61gHF7ECG2Axp2gpdqY7Aoi0hFocVhwkF/yUxddjGVmQ9ft+BVV1hn59N04htrpPdJ4aHML604LMr/zyrBpAG3StIeDK7ZXW9WqZB/PNDqhBKbwc+f6+4uYc0ZpIVKvyicfVn0PuPznB5w8YeOGejVdEMwkFOWjpCZpaW0gyyHUpiCpT+nTqqiAu+zHIR6LjNCOM2ElHd6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KP68T40J5TUww6lgZMCWokKpEGUxjhNzGRaHsY4aY3I=; b=eKH5ckmQa+CFvs8Tb/E4nzVIO9kwOIIvmWsjBlvR/xlOWfCt7YImcipXd8SmiUtsrpb9IKaTJdI4lnvX3x0NV3PBCI4Z3SDOhl/u4lee6AodSlWoqT+MNPGsfyv4UFxaZbKrhCyoprzFHyr1M3+zI5BavDl4qLDu1sWIpDQouSVFy8YQp7+lvk7CDT9Y3TSxj2Ma/70BXx371JT3ruYV1JOohHollGds7u2joyxTMmFkZ1XpWjUo5AxF68d/al5It+eDOOW/ihExx1k64jWXESUVKrDGu82OXZ4VUaOMFnilVlllaIBDqWwWwxuHVMuowbZ00RYGqXJ5lomCpnZ/6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KP68T40J5TUww6lgZMCWokKpEGUxjhNzGRaHsY4aY3I=; b=GQg+9FA/8Vosrub7dO3kMYquSfnrefsR/FLdcS9b+Lk+oCVLn6uUB9PDl6p+5cH1rpbnUGLXciU5nZ26NcbfdFz6CHw4Q4p3navYJUOVldQuqSfE+e7Pl7wJCLQLsHJieg2s1JQCBGpTF9k1yDRceq518rcombgf0opru5ZlLjU= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by SN7PR10MB6500.namprd10.prod.outlook.com (2603:10b6:806:2a7::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Fri, 12 Apr 2024 18:21:56 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::6573:ea04:fecc:cc68]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::6573:ea04:fecc:cc68%5]) with mapi id 15.20.7409.042; Fri, 12 Apr 2024 18:21:51 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, willy@infradead.org, linmiaohe@huawei.com, jane.chu@oracle.com, muchun.song@linux.dev, nao.horiguchi@gmail.com, osalvador@suse.de, Sidhartha Kumar Subject: [PATCH v2 2/2] mm/hugetlb: rename dissolve_free_huge_pages() to dissolve_free_hugetlb_folios() Date: Fri, 12 Apr 2024 11:21:39 -0700 Message-ID: <20240412182139.120871-2-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240412182139.120871-1-sidhartha.kumar@oracle.com> References: <20240412182139.120871-1-sidhartha.kumar@oracle.com> X-ClientProxiedBy: BYAPR11CA0070.namprd11.prod.outlook.com (2603:10b6:a03:80::47) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|SN7PR10MB6500:EE_ X-MS-Office365-Filtering-Correlation-Id: 9e89d317-7d31-412a-ad84-08dc5b1d6c9c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hIwINZdLb+QUXn1/QAQ3/+zcCqdjxgpIX6mFTWQrOzDGzRf7YSYL9Do9y9809oQVoq+Yzaef6DttKU2P/8/d+92Ng9vh2xkGAyeVLocB0rHxxOB1iGnPUFfGs3j7BA10omPRh1M9OuDebHB0xdbDUlrqe/PjtI8KIviwxIRxLesCmKN+mV6ZuETu51QWqeDeEv02pau7MVcyIV8OOnSPbSdkaN+ZgHhzhuSLvGZbelf20JJdPsGBXY0+3z5ipDRd7uRNmXdbRHtB8PcPQVpkbnMvgThhQ+RpKc3xwvME7bn5WNR30LBtrvb4mCwpW6szz8ordNJJ3hMvY1JruhHmDMBbHN0kUEy6SLXohHw57zI7JHeAf8al2LVAm5Pnk0Nlt0Z0H6mIdf78eAs6eTYSAqUwEKuhxgDGGthLn0Ia1ADY8jlrzGqHaANH0EPr/DoyPK/8mvg9KxuNmaEg7OQx8THXEKGuuth4O0T7afQ7nsU3ztVGG2fC+1nboVeMW8sme0j3HqieAq0AB860lMGzVHRQReBrDrn7TQH6uSJIdkOlr+GReg1UnawIuvKCywt503e5XuqoaBe4+Yp4NGqqIhW0tlrRnjD/8ze8IUKEMRC/OhJviesYa3fmmOT2r9K8MrfifowbyiGBBaYcIoplTeql588S66Ks3y+6bgHmYl0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005)(366007)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0FxkmCbnLajc9G0j1hVNzQhgQYfm04MhnXar+Ad2VRjzzBjeytPic7ZCTCAJzRAwyp5g6SRr51mWKZcI0YoLSltdIfq4P1sC8bQztqYWphKlR0tZisNHPURVgukr8sFgqOFRSBoGYupPjRniIy3CHDA1Jt7Bl17fP8Dm/Lt2L/J/+bq6rV2y45VsZghB/uqUJpVhTcVlfP1M1xUxv/fgY4luQRHbNORFwOUIOS6lEBXNl+cSEUMo4U2P9aurOcwsgblq1E5/4EFK4dseAB6x90HRSzVT5GYFBM8uBDZfK8WK6lAn76DbcUE15A054u9RJC73+LnkqocEGMqgAA0FZ0tgAl4pq+xkNu3AOMs6RQhimQRKLE2LHCC4WO1NcVZKjZwLyZ2Rj/No6EdRJusGese5r/TJ7oQm0nZS+lnafK/fAYgcUK/9k26gnpXYfTLB1GDWVQoU13mAT64XqY1w2p/zADnt9o1nV7dAEn9lFSvvV0pYkhKr0oKTRfCvl6ro2fiEFq0F+z0ItpVWa9vjVVqSWVEHYM7D+eddOpTtK8kdQWdRnnvQtkm3BbjoEzdZlC0/z+cWnZ/uaDxskaMs+GMQ7JPNTWpc0RXo6/x2DHD4teLIocRbCcm4p1I58P2b/HDaYXcqsX7v8SBNErN/HzUTqDv6VteU1WG0TgN35f931fV5hFiqbo3u7r4iXTtx0nimgu+b+HKPM6TiA4uWnpjRjCp7fzkWUm6rnCDMVp8fqE7LuYQpxIYkkvHVT1sXcwkWGz3DkL4WbEgXZONoDJEIj6Kj8c/z9QLfcpgkfjJ+rKJQgR1KZRVru9eChHzJwg8bqI+WKkOBAE0x/WqaMYJ1dbAUNOWel0PMRiMqY+PTcLuvs2+obwTq9Ilie88uz4cGcny2ksBKeiihQg+RUtEvlVxJ35yFOssmYhNbOsUfFNpdmxhFwC2ek01mEV13oKSJQrPNv9rFP3GD4GbCjg0EFZWsOk+czKA7Zeu6yzyQy5j0sKleuQsKc7v7xD7KDg9XYgCUcK+XSH2qspm4nMyzfjlFYJlyyUQhLVuSMu73Vh5YW5yYyLL0uwP/J4s8rSuLyTnx7DkZB3o4DSpROMTzrsUn6Lil+CO91o43p8s/crCE9VO1w2QAne77mRaiasPnJLyS46DbjGxqflc8VuyyiQj+YmZLm2hNSdG3yAslQvyebQOLPAqGj7BPxZHtebqhw2SMmxBK+bdNmCoOM/z8ED+7bc/mTbl8WTFdatosYU2iqxrNGTjDfbc1zAzWg9BDuEECFAfEIiJmKkjISgk+v6mUAlzlj5+FhAAAMhanCqBGhGIcf6+bIBwZcy7I9BUOc84uJiVlC8NxVqOxTmR0k9CIkAPaUkyTKnWDMfjcbNe0BQ+eG3Lz3R5XJ30xzRafRW6/lUbaTXUWK+x6DY+yIJrf7Rg2QB0zx0MVFir0ovz7ogMGQDyzMRBl5bwhYQrssssXlVmqUrAM/GUHs0J3CeWOF/U9LNDgA+2fuLZk4N7rLfk4m82zF9RgsAwy9SIsnw/gGQTfNAiR6RBNtf2q+dEk0/C5C3O1WFWIxoIyjxErugdTOOCb1BLKCWXeB3Yq25uPIcnN6tOYzOJVOBiIfO6CTrNyYaQOGUghARY= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: dqfDmTFI2zhJvJswE07YsxxgT3z4F4G3Lq6kU5L+26DMZGqbZHh5hH2YSkAX79PeP+/Fsxi2UhAi2G0uiJsfXPDxT/+VqHp64x2ul5k9J7+V+1wvP0xXaFTpdSpwESdJcx9yhk7oYMzl3hvjGJdkBmZLwBdzVXtOhpMf0HOBuGf7Ox7NYaglXbpUCf30eudhXfifVLCjs+e77MIEYt2HprHXP9gcLbg4CZ8eS7iss+Qa/rpZK/So3tQIfKBrXyDyv8/T6EsUQGZz1FUYJi299vxCZocZQFvPlClknVh1WyWBr+q/taHc/bziEEbQW7SYFULAcD93Yw1TIP4koalVJf+prhfNZWcFjkg+K4U96HIntWy/oxkfOxhgrvt4el4tDBNXce+jMupchdLtYou2HizH0IOn2qrjVWWZo0u+gg328oSqMG7EnJ7RPRLF9PHcB5eIx9/doJTwynwmVbVGfM+HHfLKKhL10EVVf8GSe2cFf9pjGdTr9hdI1i+j1pJ5ZK0MBh1NjUGp6I7lE63a7ABrFMuzwFtyvAkTiTpIFjtq4Nc1y74zvcfD/0hbrz6jxvDxbX5Jh+OLrq5RTCWYRHLLftCCreECRAeIVWdma40= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e89d317-7d31-412a-ad84-08dc5b1d6c9c X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2024 18:21:51.5391 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: X5QWKQDzMiKHo0WbS0mXj+Y6bK3R06iB4hUFBkJM0ya5bFMMBbh8Q1XdgDJc91eq3xi5tqclUJAzfb62nCV3viIUCZ0DM6W9VOZSXjUxwXw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB6500 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-12_14,2024-04-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=874 suspectscore=0 mlxscore=0 adultscore=0 phishscore=0 bulkscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404120135 X-Proofpoint-ORIG-GUID: 6RP7bwFo1oyJXyfop7EHaO4ltTXWlf2S X-Proofpoint-GUID: 6RP7bwFo1oyJXyfop7EHaO4ltTXWlf2S X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: CCC1E120009 X-Stat-Signature: iyrbqup9u6ozinorz1ky6zc6ix5uy775 X-HE-Tag: 1712946132-52300 X-HE-Meta: U2FsdGVkX1/Xz9NxTgygRmyVrKACDsLvq8krasbS+mDLN9l+O75QaYBY+/XgEaB7mo+grE//7YFeZ94bTKB8rQA7LUJAh86gBk93uoz/+2hiTkAl1YMfZFeiPqYEeJPtCvEK2jqerPgQw13XO4PJh4UgwGGyGUg0QriiSYc7Jbjfzfx/VSfPb3M2hNK5+fqZRTF9zCxPY8L0QwON4N7ZFQuQZf4T10X86M+YvSXK/uDv9n6BFcuBRbo93W6sTXw9lTJ5Dfh+6WnwK8h9eJEEo80rl/MMKDDGpc12Ah0OzO/8zJpoLlo6m/O26kdE1PN4coykce7zcr5MpmlBEPPMju/UfGww2C0otJgriYovmkIgahsoOm3ZTlk6T22On7k0pi/uS+3Ra3j/l3JSMPYF+4Dex01HakjBz21YZGA/uR5y3Qs6tlkHorWXpO0THXEWIaFRKNJo1TNzKvU/0+eC3Uz4cIm8KH+SnavQUboR0FqNyQYZ0jWRCMKQr80GblGmGbHp6AP0ob0b8wxSaJSgWuk3NRGYR5B82iz0kwE0KCwYR3iiJI4OKd4epzDWhhSRbB9OUDSndUzbuxFrxcr5xvjn/iCqfHG0WsP2sidr+mOqmrOGFu5w51bwkQRdgFlfdPRSkAeNGw0JE3kWZ5NkPOr/DLaFk6GgJiwe7zflQAOpNuP+2UuhHgEUHKTS2aUX6el0l4pFV5IWD8okjJG0od2ssoPg8rblYJojNDzWY7R+KaQUgnUMjIq+yhuWnHQp8/ee6D4hNih5e0jk9oLmw2IAfKgcNTURQv7zOECqTWOMs5nHpUDdCIVWTKxkmmD/X5FiAylqtLS8insz07CftHvjI3JtmgcodxS4RpO97PikV/iB6ORuQjHUWxuGsXFS+4EbwMCzv4v906D7eg93/ptpep8aLymXIU/RH6tHGc0B0kMB+kUcFvffjK8BmlcJTSnXtLPR24oXZgjod17 ejb8V7dJ p1kYH4eWJ7DMl03UEyrNfw0aQa1LdDnPsmKrauGQjWApvtZWck8+VUz8Fm2ok0aLLnuNdrKRQjEM87SGU87YWtlK9dTm9mB+SDPhHOkdpLTRSKoXK1By6fmvSXDtCbfcOk0hkZL3YOV1xTBCxPtPkzUbOlTYxohHda88GMfqEbbc4CXKAu8CZyAnCxeik/WMws5YWNKQLJN7aBd5mIKJcaNNqoutKy154ySxEtebC0736iJSqogr9bmnjXR51pMjd24b8UkmIRF4chyvJl9KOtYxZKK1/z3A7EfKi40EL9JCQWJVqmsrdD/ezkc1qspZK4l5urEzKxWn3y93xFpE2qkHOzR5VGzFcCwDt1bcjUC5eMvY8CFRg/VdYtWpPDOy1fnegrDcP4qiG0CLs1IJlFuKkfKjoL78X3hDd1DeKenmgzqZgMfqy9B7kCuGfZbTf4SIuBnKKVMFdvCapYAxe/4L3xRuGsUqzoABP0xmvCzWgcS4aqV/IFkHEdqLUISyCgHUvKKTMu1JbwmPtMyAz3YXN3F6m3O3Qi7OO 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: dissolve_free_huge_pages() only uses folios internally, rename it to dissolve_free_hugetlb_folios() and change the comments which reference it. Signed-off-by: Sidhartha Kumar Reviewed-by: Vishal Moola (Oracle) Reviewed-by: Miaohe Lin --- include/linux/hugetlb.h | 4 ++-- mm/hugetlb.c | 2 +- mm/memory_hotplug.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index f4191b10345d6..9ad7b97069cda 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -862,7 +862,7 @@ static inline int hstate_index(struct hstate *h) } extern int dissolve_free_hugetlb_folio(struct folio *folio); -extern int dissolve_free_huge_pages(unsigned long start_pfn, +extern int dissolve_free_hugetlb_folios(unsigned long start_pfn, unsigned long end_pfn); #ifdef CONFIG_MEMORY_FAILURE @@ -1153,7 +1153,7 @@ static inline int dissolve_free_hugetlb_folio(struct folio *folio) return 0; } -static inline int dissolve_free_huge_pages(unsigned long start_pfn, +static inline int dissolve_free_hugetlb_folios(unsigned long start_pfn, unsigned long end_pfn) { return 0; diff --git a/mm/hugetlb.c b/mm/hugetlb.c index f6dd5f597df16..51665b20d90f9 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2472,7 +2472,7 @@ int dissolve_free_hugetlb_folio(struct folio *folio) * Also note that if dissolve_free_hugetlb_folio() returns with an error, all * free hugetlb folios that were dissolved before that error are lost. */ -int dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn) +int dissolve_free_hugetlb_folios(unsigned long start_pfn, unsigned long end_pfn) { unsigned long pfn; struct folio *folio; diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index b79ba36e09e03..431b1f6753c0b 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -2051,11 +2051,11 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages, } /* - * Dissolve free hugepages in the memory block before doing + * Dissolve free hugetlb folios in the memory block before doing * offlining actually in order to make hugetlbfs's object * counting consistent. */ - ret = dissolve_free_huge_pages(start_pfn, end_pfn); + ret = dissolve_free_hugetlb_folios(start_pfn, end_pfn); if (ret) { reason = "failure to dissolve huge pages"; goto failed_removal_isolated;