From nobody Tue Dec 16 21:58:58 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5EEB6CDB483 for ; Thu, 19 Oct 2023 02:32:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232466AbjJSCcU (ORCPT ); Wed, 18 Oct 2023 22:32:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232387AbjJSCcS (ORCPT ); Wed, 18 Oct 2023 22:32:18 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FD8E125 for ; Wed, 18 Oct 2023 19:32:16 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39IIn3Cn027685; Thu, 19 Oct 2023 02:31:23 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-03-30; bh=aj9XYBvc1umDA4dSHKq8Dgaza9nvmhLjC3NH0H6MDKA=; b=e9YEpOuccwTjeZWuQ1t3MT5hXeGQMLPTfONh/qmXjzwXA1hqm1Jnq7L1VCznDFent1DN ZUNRmUSzeRzcn5Q2AZzm7wYLHIUokQoFIKIrWft7BkBVfDPXZqWKrlCHr/Z6l8i81En0 Sl5MAOVFrSpx9Z45rlwm5llvdiRMQXgeeEsMcYgxZgDWKdQz0CyjSEVrlrQlcDmfmxet aSwXS+jxELMuOsMqxb21FWzRTIMcnFcOmLTuwgzFtZkbbVkSs7DW7IOyEtwPEZwOpTdf trTZTu8eqYjGD96+Kc3QYyMj+3vqI0MY0s01tBjeJ6T5h+b773WhsNQW8TJf2/ozd6ir 6A== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3tqk1bs38e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:23 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 39J1r0c0040448; Thu, 19 Oct 2023 02:31:22 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2041.outbound.protection.outlook.com [104.47.66.41]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3trfypjxg9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V1KBugUHc2dqKT3skjw0iTR5kvxNa9vUvVOizhCJmK6tcfGuFXfs8oiSFnmUUgx4/mZN9rwKr8C+bw92CaWUeP7UT3rtZMcFfiV20PDpJpGUsNuSfY6GUPpnuj2/mNthLqg6eD1vpU4xqh9zFjbe/rQYPWdevSbV+nW2/wiO40Sw8yze33KuPykK2mwat16WCf9YlE7vFgHtSeIPZF4BFLY50DCeAVOaTLhTyh68sBoLWnqDEEja5SiT75iUoP66BDfJXptE3yRxA3xJtNn0/cYnwY+kzLymtJEhOb0xRyxAG6IeTfLmNlJhKUPqXXzT5eWrRK9XVIH7jL0w1i9eFg== 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=aj9XYBvc1umDA4dSHKq8Dgaza9nvmhLjC3NH0H6MDKA=; b=aUzUQGyg5EnH8vjtgyBJAwTFTKpP8JVQMdO3Yy3dSjqEZh3DZd7VrXnQMNqzhOkb76Noc6etKyvTgJR6foOYt0kPaMvhy3emBNzZ6+lPo2+lCQgFSYlBCAKCUkNyRwkKbTMuWUYXcAekuLOdSM/aU8dr+3Fy5P1Qchh5geaqa7SEWIOtG3YE/c1mSykPviionqdaqE6M0TrBf4UR+KtgGdpX0zplreWy6IJYAssQyLKsoXzf3DlxFpJOAUKspZLeYSB6oNIqV/dgdwc8t4CuNEprcImc5YoLIRd3V7825QrdDIy10f4w8iHM+aesk9ToNpMJkVF61OKztggrrJ3TjA== 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=aj9XYBvc1umDA4dSHKq8Dgaza9nvmhLjC3NH0H6MDKA=; b=VcQCFtKW4NsanTqwEm6ZfCfG9AI1qkuivUrX4HA7zuVm+qMrQ7zIwDNGJem+9ADm83qZC0slUz2fIlBp089N6G/yrTneP0N4c+78LSSJSF+RoRtzZvNtyisWVDl74LKk4zJ+IVb8kx4P47pQkfhe3nGFjfxTSMqfEVg6pYnNxQw= Received: from BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) by CY8PR10MB7123.namprd10.prod.outlook.com (2603:10b6:930:74::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Thu, 19 Oct 2023 02:31:20 +0000 Received: from BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2]) by BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2%6]) with mapi id 15.20.6863.032; Thu, 19 Oct 2023 02:31:20 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Muchun Song , Joao Martins , Konrad Dybcio , Oscar Salvador , David Hildenbrand , Miaohe Lin , David Rientjes , Anshuman Khandual , Naoya Horiguchi , Barry Song <21cnbao@gmail.com>, Michal Hocko , Matthew Wilcox , Xiongchun Duan , Sergey Senozhatsky , Usama Arif , Andrew Morton , Mike Kravetz , James Houghton Subject: [PATCH v8 1/8] hugetlb: optimize update_and_free_pages_bulk to avoid lock cycles Date: Wed, 18 Oct 2023 19:31:03 -0700 Message-ID: <20231019023113.345257-2-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019023113.345257-1-mike.kravetz@oracle.com> References: <20231019023113.345257-1-mike.kravetz@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MW4PR03CA0095.namprd03.prod.outlook.com (2603:10b6:303:b7::10) To BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4196:EE_|CY8PR10MB7123:EE_ X-MS-Office365-Filtering-Correlation-Id: 3497091d-d510-4766-32d6-08dbd04b7a93 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sCBmrf6FWGXnnDYsdXozTxR5k4OK2ZxgIhBrJ3FW41L34aAa5ooKgOUAnrJ7StqROYXGkh13gqVVs+LYd92/kUpRkpTNdsu4/7F76TfA6+x/KeX47A1lFmqyPVAhAMskubQxKagE30MIzvavNrCbqNaMNy/7GCe1CQwkGT0TRYsKtH28SEoVyzR9dI1RRBbNt4Ah8nH81eV9O91w/E1nZ8BtXuFsTx48t/11qi0jhSF0ebbyBZ/MQ1FeQlCxrqi4+lWh0Qi/5trG6jabOUyLoKAzwVzyAs0WnR+1eVFQZMwy/70H0qQu6p6pgligr/ocPsijAh4pNLA9N/44qwxh1n3X1orTj1PDoNA9VHmUDcFD8P+KMaJa84tZX7tonForh689luxqWpzdf98ZquAb9w+vd8csxKKP/PTZMf/+CyNXUMMEKd3HFVTSfNMxLXb6os/ji33fZHQNKfQisyr5QBzh9I79NvN2k5q475a+TGiS3rd6T9kTSUAEXRnsvzwWNvkKH4Pybx+6nBDQPi75sQKdjhWBxO+1BKSlGzX8I29XY2OeKHCSMoMQWUrANjfy X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4196.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(136003)(346002)(396003)(366004)(230922051799003)(1800799009)(186009)(64100799003)(451199024)(478600001)(54906003)(316002)(66946007)(66476007)(6486002)(66556008)(6666004)(1076003)(86362001)(2616005)(26005)(6506007)(36756003)(6512007)(8936002)(2906002)(4326008)(15650500001)(8676002)(7416002)(44832011)(41300700001)(83380400001)(5660300002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fDX8WngwI5tItkRa0jsEXfz2RznQjt4vANh2q3dj8ewmTU7d/aj6aB9CNdRg?= =?us-ascii?Q?mmCgenBkSxEY/elEnJh0faJBn/w1RUZkG+evHtHcLCPAcAJ/RZdAfOqctvUC?= =?us-ascii?Q?Epg0wmUhY7ME/RocfUb0Y2KmPLfMODXQ9KvAPhhvxiIYrCk7tNxjWYPBarOk?= =?us-ascii?Q?HMte00sBQQ7BAA+jfeHw7v8Siplr0hZ8rvWr8Vi9cjXPNdlkASrQPTv4uW+a?= =?us-ascii?Q?8SHr6ooS2gw32EHP01lOTfdqBHIReiRdu1PKav6aBLd0jr92GR1b+I1W6+0r?= =?us-ascii?Q?oLkxDDaLWHcDqxGmggR1HAYUxpZOfBnxe71KAx6ZcvoYAdTH3DRKPFufaWNc?= =?us-ascii?Q?zcCBX8wApPi2yO5gfqprAy3Zq/VqMCJE6tRWwcYuxge/yKz/Q7Y3i0w/1xdd?= =?us-ascii?Q?RnWdRUFwWfUae+FViDStOzSYtouXeNyJC4CI09XRA+FZlZ5Ku/w2Lm+kH4vE?= =?us-ascii?Q?UFoBFFqP6cliwc3iwF3rzulGPfkCTM6/DEdLpfrUGaQp5EJyhQqSvCzhJc+b?= =?us-ascii?Q?VQ92+tm5d+ybFQmYqKtYaLN0ug3ekjgo9IhMn0FYIED2z1ud5JIvM96RVC2T?= =?us-ascii?Q?CBA39xDcKB+pbTU7eK4Hd15mb4Wb1afSsRqIyVaKDlgNA/RYFffLFbkK/Wtv?= =?us-ascii?Q?pKq4WM91RsmyO7IbyVpXxzIRCJOS/esReAMayde0PnWY1iMo8q6VyBvukbaE?= =?us-ascii?Q?t3XkC2o3C7uKZxdJHugVDt06EFMsMbBg7HsYrXHBNVfTowYd/XtkJHCNvTS7?= =?us-ascii?Q?/3h0DG1N39X4OLP/4PHQBxAoCSinZklAR230mJaYv+90YSrQ4+dX6nKwwA0F?= =?us-ascii?Q?beOLPYsp/jQJTvoPfPRK9BR1nbLWNga7Y4MgJc9z4FUA4lz2kpliEs8Zg1rB?= =?us-ascii?Q?9vqvPMXaDbLC6MmEXdHXMWR1YWUgk1/pqiQqthitTnYf+4YQz5OuOKn4j+xT?= =?us-ascii?Q?RVyqO9uFP8B69pjp4ySJLdcyYaoU3KBCKABNx54Ay8VxastoGlwGHOhOgB9h?= =?us-ascii?Q?AhI1+NZAXzSkShq28ujZCLhHZ/3DMOuYyknYjJVfyLVByjpBGh6fdpcZUmz9?= =?us-ascii?Q?mbnP/hedF5s/D84yD6d/HG1awcPkX8nLCGhYl4EFCmJwu3gN1D/4B1Z4Tw+J?= =?us-ascii?Q?NVubrwC43B5jqLnXmvelEU6tUgZaDAB5FuASdJnU1VzNXXxclkamL0chSuGJ?= =?us-ascii?Q?AKY6Dc19x2wNDfTUD+Vu4+X275yWIFlq/EdG/3flt5/D9mnXgKPPaO934adf?= =?us-ascii?Q?yN1O5jZSxqfuXXn0bpzjHBKsur8gCsQwqs8xAy6OkAT6tJDajdWw18phNe0N?= =?us-ascii?Q?sOT9KLSJYXfOYInlahIYw7F3xXYm8152xmE0qcW93hiLrIxAyjFGPlNUtT0l?= =?us-ascii?Q?kHghMwNc1EVoVkh7vcZiaAjUeDbDP/zHsjJ2etT1fWxrMDQb4ZDdkhZf9Yst?= =?us-ascii?Q?CyvkDpbSknMUapHxkwbpUcjVatVKVjsI06x7RCOKwggdEty5yN1y79BlWac1?= =?us-ascii?Q?2CA8gXbKg7kq7GLk8ETUu+RPFKo03LfQMHMUCKlXEC6fBOFw3I/XQuf8KqlU?= =?us-ascii?Q?QRIE46+MK41cQ08aa+AeNNGo2PUb5FUxg7KvzI/Wr0+HSX/xE1Ch8Y99QcIH?= =?us-ascii?Q?nQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?u05OtFiN+b2Z/V5/d6o9tBg2EYRGdopbGya8sv3u8cowCnNv03RIqY8C2KDG?= =?us-ascii?Q?kF7Sw52UHlFigtowWI56Em3znndJ8UKqbqPIzeHBkln8nX8BZAtpFfqezSRm?= =?us-ascii?Q?5vWH6dgj7NskUmy8SZOA6fV0b9UMy7GCjBT8TLVwrvQb+iravV4df3eeAVyK?= =?us-ascii?Q?FIMFcti+PYmTsQ2zwlgHiCm1rc/mLdq4887gDD1Srgxg/8HfZ7d+iKrSDIaW?= =?us-ascii?Q?B739gIp+3J5eOdZBaPAp4/B0IJNGbb2RSyRoE7AZFvnMFmEpFsIZSiBYCvK2?= =?us-ascii?Q?0ERQAaV3oJ4p//EjbkYORNh1thw2/OYjev+WUIkStMAHILuwgZ0D8jfHNvSQ?= =?us-ascii?Q?HEkfjVs/KPDQmWjKBbUSZ5asg0d/FEmEzFBQX0Om6/AfkWCVjmRYroVPc59M?= =?us-ascii?Q?hbFPHUC6YHaFRyVFfGd6EmdPSNqllRKi4KI8sHVq4IoX0sm6ePMbZoKkvvP6?= =?us-ascii?Q?HbPMoT/TC2A/hYhzzcNIKd78pjZNLECabWQ/dXI+T4gpW34dS3lP7FmUP9DC?= =?us-ascii?Q?lrYeexkixlH8BgPuUfFCeSHCtNCEL/BDMXAW9lASYnT6Cg3VIPisIpFa9auA?= =?us-ascii?Q?ePZQYhL7qAayTSnHG3Pvjya9oH6BnMOBLpouONFTuabhcHrIC3EJlUfFev05?= =?us-ascii?Q?RWBZu8jze7KOnYFmgfXWmYyTmZXDMMV8A2+d+4r+KYPp1PxEGjLPyq/brIDW?= =?us-ascii?Q?MqrafgoKMdCX8r+lAzZFc0BnQaWCeaNQz3WqVnfttyBo5nH7v0hGrugTiVtd?= =?us-ascii?Q?A/BFOUlvP6UwgpfVwCqIrI3Z0Iz1t7K5zunZhvdDIIDZ5jxoi6C+kb2Z4yN1?= =?us-ascii?Q?lP480eNqx5N2W1BPR3Cw99OX32CSB+BQaJgYflXw+OzmiSYQ3a9qt61zNkd5?= =?us-ascii?Q?+9z6oCaae5jQdBXDwcSFJQXLztg8SwpEQiyy2PBnp630JyjhMlUFIpxeVquV?= =?us-ascii?Q?cnU5n9o+QB/ZyfgDiWgT34lKFtIwWDW+IhdYKiECqDauaq6+rAcBfSn3/8jt?= =?us-ascii?Q?xxQQ4NsrF0xncITXzzDEGYcfdRRX769fjgVLnjRF198QqVO5Zqlsmfmseba0?= =?us-ascii?Q?o0WM0nmZFy7FW39+8uwVFFs0isxpTXsBkWHx9b+At3qSMbf8vZHlC92q95qO?= =?us-ascii?Q?1yvH2iPZ1nSq5GLYrhUIHPNAeqTKHzk26bqMS73uj3m01Pt5Tv1TcULYed8G?= =?us-ascii?Q?q3WMtyJ/juAYN09k?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3497091d-d510-4766-32d6-08dbd04b7a93 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2023 02:31:20.1867 (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: e0La7n9nhs6MV2VIaz83dp3QI3MlRcpJngx4sj4Et+DTJMf9+zb7beJJszoYD1PFOthBchx9vnrp7lARveidkg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7123 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-19_02,2023-10-18_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 phishscore=0 spamscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310190019 X-Proofpoint-GUID: eVSFDYN1w36MvDUeeE3XEksew9_kiHYQ X-Proofpoint-ORIG-GUID: eVSFDYN1w36MvDUeeE3XEksew9_kiHYQ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" update_and_free_pages_bulk is designed to free a list of hugetlb pages back to their associated lower level allocators. This may require allocating vmemmmap pages associated with each hugetlb page. The hugetlb page destructor must be changed before pages are freed to lower level allocators. However, the destructor must be changed under the hugetlb lock. This means there is potentially one lock cycle per page. Minimize the number of lock cycles in update_and_free_pages_bulk by: 1) allocating necessary vmemmap for all hugetlb pages on the list 2) take hugetlb lock and clear destructor for all pages on the list 3) free all pages on list back to low level allocators Signed-off-by: Mike Kravetz Reviewed-by: Muchun Song Acked-by: James Houghton --- mm/hugetlb.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index da6f85b7db88..b839080a2a6b 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1862,7 +1862,46 @@ static void update_and_free_hugetlb_folio(struct hst= ate *h, struct folio *folio, static void update_and_free_pages_bulk(struct hstate *h, struct list_head = *list) { struct folio *folio, *t_folio; + bool clear_dtor =3D false; =20 + /* + * First allocate required vmemmmap (if necessary) for all folios on + * list. If vmemmap can not be allocated, we can not free folio to + * lower level allocator, so add back as hugetlb surplus page. + * add_hugetlb_folio() removes the page from THIS list. + * Use clear_dtor to note if vmemmap was successfully allocated for + * ANY page on the list. + */ + list_for_each_entry_safe(folio, t_folio, list, lru) { + if (folio_test_hugetlb_vmemmap_optimized(folio)) { + if (hugetlb_vmemmap_restore(h, &folio->page)) { + spin_lock_irq(&hugetlb_lock); + add_hugetlb_folio(h, folio, true); + spin_unlock_irq(&hugetlb_lock); + } else + clear_dtor =3D true; + } + } + + /* + * If vmemmmap allocation was performed on any folio above, take lock + * to clear destructor of all folios on list. This avoids the need to + * lock/unlock for each individual folio. + * The assumption is vmemmap allocation was performed on all or none + * of the folios on the list. This is true expect in VERY rare cases. + */ + if (clear_dtor) { + spin_lock_irq(&hugetlb_lock); + list_for_each_entry(folio, list, lru) + __clear_hugetlb_destructor(h, folio); + spin_unlock_irq(&hugetlb_lock); + } + + /* + * Free folios back to low level allocators. vmemmap and destructors + * were taken care of above, so update_and_free_hugetlb_folio will + * not need to take hugetlb lock. + */ list_for_each_entry_safe(folio, t_folio, list, lru) { update_and_free_hugetlb_folio(h, folio, false); cond_resched(); --=20 2.41.0 From nobody Tue Dec 16 21:58:58 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90F78CDB483 for ; Thu, 19 Oct 2023 02:32:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232431AbjJSCcS (ORCPT ); Wed, 18 Oct 2023 22:32:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229632AbjJSCcQ (ORCPT ); Wed, 18 Oct 2023 22:32:16 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 813A4115 for ; Wed, 18 Oct 2023 19:32:12 -0700 (PDT) Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39IIn0SC011269; Thu, 19 Oct 2023 02:31:25 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-03-30; bh=4c5IqZK42Vm4yM8Bv7kR1mooPI8YiFYT1J97EnWLS/s=; b=EO6vk6+nT+OVnb2cK7NRyIYUEN//yGWZkXom88RGvrSs3wNKw2Ncv7Py0aAF6d97Se7r 9yhmcD325I6WKslWcglpA8ZPfxyntyJoZS0dxrK6IlzMFScpMfDcT3a333xdT/es1w0R EpKpRTWx63jhK7ziglPPAcqQSPCOgSwbcrroWrWDZeN2Pwg9evdUqtOmqkc0TNY1FkAZ dc0l7way+yQ+NBCxy6QUJLJkwPjazTMm5rM8ddS5Y9ZP3Z+MSbU/KN4LJifgpUsU6YlM Z3jVFjcgyFfiQCkq1PvYcUZRRtT1tvkDT+E7VsMWyWpeKz8qsjFZ482yudfcDkD/dT6q HQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3tqk1chapk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:25 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 39J1Fj28040559; Thu, 19 Oct 2023 02:31:24 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2169.outbound.protection.outlook.com [104.47.55.169]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3trfypjxhn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V/nhgas79P7pP71Nxgs0aUU1PQkE9YrVvyzTq97LRA1yUa9TNG5nSmpuR9hJmaDLqgIL0oz5e4SslC6Rl3gHNwIuiCDwc/uufwj2Vi5L7eFtBgGKIpbBF5i5Vs4H15CDF9LOnXY4WdIaSk2zqT1s4s94j00LbgcBbHCHPajLv0IxLQAxGygJw0IJwD9kEOcWW1WOa4UYBK0A0vhV35WTkLHQxd47ug3/BhW1ynfVuTUsWHGNNaLCX4bICb8amX0ynSzDhiNuToggSqTqGwCxoriQ+jtNKxI8VIPZb9krUwfGPRMaqDL7cxKGV2WxtZ6YhyXtwfwH/MaB83wxrGpCRQ== 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=4c5IqZK42Vm4yM8Bv7kR1mooPI8YiFYT1J97EnWLS/s=; b=UOHHqA2BLD9KMdN3faPB5yOzQtzSByeIqM74Q6jJEZjwXl5/M38y22MAI+zuAFfKKzfRWVyVi7N0rwC+o8rgHDGCe5I37eOKneW41i25ARZE1F0SodS0drrVQfmuWz9ohawG0RjEjsariMzKvG6HydMvX+7pxVd435C3E+wcrTvU9dSpEf8PXwj2pWkEEh5rsLUl34AcD+QNPSZk0La6wIUfFHYHX/mhhIgE68qDnRYrHQuCPzAnpUiN/2nVunnj9ApQqkOLvGTXuFX01MVLU+IEw5Vk8njNAseqYfi1UM3fBr72zuVFw9zqkqyukylLF+CJsYLMqcAL5FIspuviXw== 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=4c5IqZK42Vm4yM8Bv7kR1mooPI8YiFYT1J97EnWLS/s=; b=dEq+5mg78AiS8N6cx4JtjHRAU5xjt6rEZG5Ca0fOl3hkRip5+XB7dZeerisXy+mk73jV3q3uwVzsjvYvt2TpFiVJL3vKi/D6QbnHjATxrmSeI9BjyM3+ke5a+/SeNqzHPJ15KAXCCGRGQRw5Ld41RVpsSKTTjgZhpUecCRRR52U= Received: from BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) by CY8PR10MB7123.namprd10.prod.outlook.com (2603:10b6:930:74::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Thu, 19 Oct 2023 02:31:22 +0000 Received: from BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2]) by BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2%6]) with mapi id 15.20.6863.032; Thu, 19 Oct 2023 02:31:22 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Muchun Song , Joao Martins , Konrad Dybcio , Oscar Salvador , David Hildenbrand , Miaohe Lin , David Rientjes , Anshuman Khandual , Naoya Horiguchi , Barry Song <21cnbao@gmail.com>, Michal Hocko , Matthew Wilcox , Xiongchun Duan , Sergey Senozhatsky , Usama Arif , Andrew Morton , Mike Kravetz Subject: [PATCH v8 2/8] hugetlb: restructure pool allocations Date: Wed, 18 Oct 2023 19:31:04 -0700 Message-ID: <20231019023113.345257-3-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019023113.345257-1-mike.kravetz@oracle.com> References: <20231019023113.345257-1-mike.kravetz@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MW4PR03CA0141.namprd03.prod.outlook.com (2603:10b6:303:8c::26) To BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4196:EE_|CY8PR10MB7123:EE_ X-MS-Office365-Filtering-Correlation-Id: 6512acbd-ea0c-436c-d4ed-08dbd04b7c0b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ol85U+C30utmZk6axs3LWe3ZV+1SheXMaAwL/GXzh9Tnx6v3CzwWgcIlJv61w2etIyH5e0mJmVZkPWRSfxyiZ67SmYJwo+uXw2FKqOAzzp8GnpwwbHgX49bHfnm5k2e5RfZAnBGU7p0SKUV0cGYxMmhEfIY9fGEDADzHgvYA93yvTnGhrLNvNbFLKYWYbWYlDZz2hvv8xPF754Nk79CAeEmSr+8TmBvjsnPSsgNNoQs/GydDxT3ZBA+KeSu7WO2GLL4AWPegBz7BsqyGr47z38cn0EO0w4jh8xFvUhsQccnAaSD54spQIvog0SkHPCJT27nSliJnomiYtuwUDt5ruOoNT5UrB2DGrJEv34texTDNP0qa5x5S2RQS5ORy2Yx8tb3WKxddd8cHPYzCYXpEaD9oCfF06TS6J3Pz27WMarHkv8h1bz29kCUgtM0FgwRwFtbGLTh9gklmYScb6n6nHGMRVy5Z8GnMzwWzPy0cLat1ocr6ojfZcnFL+ckcLAK/9LKNBxYQDtYkLdK+H6bGk2nEV8lqHKRJLI3H7IMkJSOoBVmozaeRv4n2dD5VaJsb X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4196.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(136003)(346002)(396003)(366004)(230922051799003)(1800799009)(186009)(64100799003)(451199024)(478600001)(54906003)(316002)(66946007)(66476007)(6486002)(66556008)(6666004)(1076003)(86362001)(2616005)(26005)(6506007)(36756003)(107886003)(6512007)(8936002)(2906002)(4326008)(8676002)(7416002)(44832011)(41300700001)(30864003)(83380400001)(5660300002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zLKhoMdufj/dKhbKKHuCbeaa+NtT89uOFRPNwyTTokAiC9a/QTFDRyLmUVmq?= =?us-ascii?Q?wt4djdy+PKweyBU2cbuzZ3AUVPqOZ75DlchxGuPKsWMdfUzbXrthmhd1G4gk?= =?us-ascii?Q?6BAvSeitsM2GIm9yxQmZO8VaECw1hKzLgd+yOd9o9IVMRpnxBbgZlM/DJ28w?= =?us-ascii?Q?pTDq/PGZnG4lYgTV3al4OHfBXJgCPCBP4A3BOc3Bme/dQbaFsCWS97n/UUK5?= =?us-ascii?Q?5WoWe9nqzgzMFPnoAzNlFAtd8LmMO9skAX8+bEyjNtxczgN/Y0G8N4ibfQzL?= =?us-ascii?Q?PCnf/K2vykWNbn+nWHKeDuzDbaoSn2ujBQIYH8U7K3Fhx3wT0x+sh0GcrVhS?= =?us-ascii?Q?XSjAE8yGeZStUNzrAq92yQEW0RNT7dkp4SZPTuPrzPeQctezDfBjwCHm491/?= =?us-ascii?Q?oaNutOj7zRsnTD/gB6vVYh3cVG2cONHPkiMsfUfxgaWGZqYMYILqMG5rueaK?= =?us-ascii?Q?0Xu0kYwu/Rh53IM3seXwtWgb0y/nU4cDZc6QbN6XNdxIB5Iz5qkwvkGQ1YKe?= =?us-ascii?Q?k5lXBSG42SnYr49mCTHKnxk3e+GjnVHtv31iE3+NLNOEXZO7Ax43N8nxgKtu?= =?us-ascii?Q?IciNpIWJGJpLU1UGr/+0rn4TBUstlE5Px4CPz8T76o3NJMZtNCrmurZ3abf9?= =?us-ascii?Q?mOs3HQXtWVEOQ1xN5PdsFRzWDWp3XYoduPe6Pm9iO6rONHDqDcak+dBa3Y/H?= =?us-ascii?Q?9ocivZ3LpZgxkM/0JITgwpeeMFj14S5V74TkK/d4M6czxHxHRdkwA4FsPG27?= =?us-ascii?Q?QZ0v6J+pfnp66lY5UArBcHivSBkdK+CwKhQHqDC7tinLiIeD2x/Jor03Czst?= =?us-ascii?Q?Kc+w0EIy+Kb6h5l0hFsnBctawAs8cGs1a3sHJVC5Gjq+RcqUEuV1ajMkLpQe?= =?us-ascii?Q?8LYIwb+P4OXGQ2wVSwAOCSsydi/GoOU7JTJAg7Ei4+VAlqP5af665RY1RSqa?= =?us-ascii?Q?fztNpt3smGv3cMJ2yc48AqkSDkUM891OEqkzQ9RdLFW9KvOQdFzHdOyaR8du?= =?us-ascii?Q?Av2ehItETT/5M4K2GSDAo0S6kYEvn7VRuDgBV1R5lJDEYtaY5JlMRgQ053FB?= =?us-ascii?Q?FmtL5CiiOOMarmHBMYVAi+MaYYvXVPHw3GjdGQV0sHcCIBGzEFyVA/MBKy7O?= =?us-ascii?Q?MLKzWr2uLSMQqomoMj6r8p3UWao+Qcli78Q5iGngvOGAIps4VZ+XPc4iWAFc?= =?us-ascii?Q?/qkg+eVBG/OKwWjjJzQcdDIq1t1/9MUz/T2TGQVdaedKj2Q0zQ4bcZEy/xHC?= =?us-ascii?Q?UNduZdc1PmN9rixHAvip6aW759Y+/yBjbUJhqiM0dKKNFYlbnQsQ9QwktiR6?= =?us-ascii?Q?GLtj2mQ92kRfzUY9tAyzGMQBJ+55teDnJS4r391FNMJg2GVkLGmGiYGxxHgc?= =?us-ascii?Q?83bjIVus9kKnUSQGmU9wyIsXGCNkf39NsrqeA5tfmYcDcx3uRJiqucTiv+yY?= =?us-ascii?Q?jJQDgmwaAj9KPNN21iZlYCZq1MZ6vbQNPA4ts3UXhhLdEuB0S5p3cvd32CBd?= =?us-ascii?Q?uyne1rzByuGwwEooxw+3ihCZfPzwAI4NUZ7oFIxwgbQhN5vPwXq6sHzKmZ60?= =?us-ascii?Q?DTBJL9i7IgzyDnHm/HA6UtyZhNwi978POE0ZOVPJ?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?mnj6MpeR0U9sJzeW6LbJC5hPgflG65vWl9Wo8/cA92riv/0imsI7npI9GH0Q?= =?us-ascii?Q?2efrC0B+45XCXMSfAC/6vT0mD0IrCN/8fCkFfWm2O+d7gOb/tDykkgGOAPYW?= =?us-ascii?Q?djvd9yrAVnNRSwMLK4W7a9ViHPvVbakKNqxTbRd1UZ05qO/DdH7bklGHhx97?= =?us-ascii?Q?txzxzhF3uGm6ygHh86WQ64AD6RUjCjCnAuSjkHVvOEIosTWeaw7Sw5IK8kZd?= =?us-ascii?Q?M5AJe6Sgeh4AeOuXVKFp4N/hZAVVMhEuJ6UQKvz0pnME6E5dBuz3Semh1tdi?= =?us-ascii?Q?3lrV15lYSf4DUYvuzNRbEm9BxzA72zog0UbsiGiORzgagblBgIKQQNoHHhND?= =?us-ascii?Q?YnBhG8dbTtCgG0CFeYW9dNSWTSU8j5D+WCtlh1YRWVdBiwaD2LYUQEP1+mUN?= =?us-ascii?Q?SwSuTXfg/QEKITaUEs2f/PpUpsft2w23y1Yr1tq17QboCOgeWdQN/NkrLak8?= =?us-ascii?Q?pP3N4LAqpMvxWmBFGOqLbv2wCeBkS9itSHrelJEgr4YSIn1FoyX6rLs77hkm?= =?us-ascii?Q?ZyyWayMBskUJBySqpXaFGfeRg0iB2+u6fmi/QP0Ree5qjpgzRBSoKy0e6/5P?= =?us-ascii?Q?w417op5umg8SpEuP+OGChgPMtYiGwhoWwyPYmb2Nx5/iE7IxbsFAmqKHjV7c?= =?us-ascii?Q?SRR4n0sLltrl+XalUDT9PIrZXwQ8RAXfpXdBteclIdHcXwUjRksEKtz18yS5?= =?us-ascii?Q?gGg7qFzPSYNt6Q2vaYUlRT7PpCLqAyFBu10xURcD8ehaaCnZlbToAxSMT1Sr?= =?us-ascii?Q?rfMaOVDt/HmzQWEbkCNSYcXmwCQ+53xDdZnsnXnpj2cs906TR10j80pPiWpu?= =?us-ascii?Q?TmqhRgwT7C+kcXt0kw/33R9kMq1/flHL/9KCr9qGKpk2szREfhr49vEvXvGZ?= =?us-ascii?Q?Tk3SRwqUaQnP49xgYSAK/u5ki0hymzZ3TFzo6E/ioTjNyyExd05OjTVl2UGD?= =?us-ascii?Q?SauqIF5Ohu0OekZYLawR6Y9fgHYzJRvvANODG69WKavWOWeTewvYrNiaB0ps?= =?us-ascii?Q?F7GCEDM4HAd9xSYCdf12gb4+ktuypyN9UtZviMCM7fsbObFL89+XXgwlTKQl?= =?us-ascii?Q?aicGVUAt49KgXxrzpedIq1S3hfwUK+XdKpr4GN58Asm3iT9Ik05/AiAcHBNY?= =?us-ascii?Q?qnbbZTsM4c8nJPCmy1eodKOP8pPhqJD7e6X+VMpjJLWQMCtCzk0Uwl1ZKqfJ?= =?us-ascii?Q?mCNV4gfqcbuPuucS?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6512acbd-ea0c-436c-d4ed-08dbd04b7c0b X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2023 02:31:22.6696 (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: tk4ynaWvObqcydkrhGU2hFVuKGxNUWM6W2VTurn3eJGusykMsppbQ/fYlbLTTElTQkLAdx4LlvEha29cnIshpw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7123 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-19_02,2023-10-18_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 phishscore=0 spamscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310190019 X-Proofpoint-ORIG-GUID: QLupo6s24mFW_aaMYypAYrj67L93WNE2 X-Proofpoint-GUID: QLupo6s24mFW_aaMYypAYrj67L93WNE2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Allocation of a hugetlb page for the hugetlb pool is done by the routine alloc_pool_huge_page. This routine will allocate contiguous pages from a low level allocator, prep the pages for usage as a hugetlb page and then add the resulting hugetlb page to the pool. In the 'prep' stage, optional vmemmap optimization is done. For performance reasons we want to perform vmemmap optimization on multiple hugetlb pages at once. To do this, restructure the hugetlb pool allocation code such that vmemmap optimization can be isolated and later batched. The code to allocate hugetlb pages from bootmem was also modified to allow batching. No functional changes, only code restructure. Signed-off-by: Mike Kravetz Reviewed-by: Muchun Song Tested-by: Sergey Senozhatsky --- mm/hugetlb.c | 180 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 141 insertions(+), 39 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index b839080a2a6b..559f7c71c596 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1996,16 +1996,21 @@ static void __prep_account_new_huge_page(struct hst= ate *h, int nid) h->nr_huge_pages_node[nid]++; } =20 -static void __prep_new_hugetlb_folio(struct hstate *h, struct folio *folio) +static void init_new_hugetlb_folio(struct hstate *h, struct folio *folio) { folio_set_hugetlb(folio); - hugetlb_vmemmap_optimize(h, &folio->page); INIT_LIST_HEAD(&folio->lru); hugetlb_set_folio_subpool(folio, NULL); set_hugetlb_cgroup(folio, NULL); set_hugetlb_cgroup_rsvd(folio, NULL); } =20 +static void __prep_new_hugetlb_folio(struct hstate *h, struct folio *folio) +{ + init_new_hugetlb_folio(h, folio); + hugetlb_vmemmap_optimize(h, &folio->page); +} + static void prep_new_hugetlb_folio(struct hstate *h, struct folio *folio, = int nid) { __prep_new_hugetlb_folio(h, folio); @@ -2202,16 +2207,9 @@ static struct folio *alloc_buddy_hugetlb_folio(struc= t hstate *h, return page_folio(page); } =20 -/* - * Common helper to allocate a fresh hugetlb page. All specific allocators - * should use this function to get new hugetlb pages - * - * Note that returned page is 'frozen': ref count of head page and all ta= il - * pages is zero. - */ -static struct folio *alloc_fresh_hugetlb_folio(struct hstate *h, - gfp_t gfp_mask, int nid, nodemask_t *nmask, - nodemask_t *node_alloc_noretry) +static struct folio *__alloc_fresh_hugetlb_folio(struct hstate *h, + gfp_t gfp_mask, int nid, nodemask_t *nmask, + nodemask_t *node_alloc_noretry) { struct folio *folio; bool retry =3D false; @@ -2224,6 +2222,7 @@ static struct folio *alloc_fresh_hugetlb_folio(struct= hstate *h, nid, nmask, node_alloc_noretry); if (!folio) return NULL; + if (hstate_is_gigantic(h)) { if (!prep_compound_gigantic_folio(folio, huge_page_order(h))) { /* @@ -2238,32 +2237,81 @@ static struct folio *alloc_fresh_hugetlb_folio(stru= ct hstate *h, return NULL; } } - prep_new_hugetlb_folio(h, folio, folio_nid(folio)); =20 return folio; } =20 +static struct folio *only_alloc_fresh_hugetlb_folio(struct hstate *h, + gfp_t gfp_mask, int nid, nodemask_t *nmask, + nodemask_t *node_alloc_noretry) +{ + struct folio *folio; + + folio =3D __alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, + node_alloc_noretry); + if (folio) + init_new_hugetlb_folio(h, folio); + return folio; +} + /* - * Allocates a fresh page to the hugetlb allocator pool in the node interl= eaved - * manner. + * Common helper to allocate a fresh hugetlb page. All specific allocators + * should use this function to get new hugetlb pages + * + * Note that returned page is 'frozen': ref count of head page and all ta= il + * pages is zero. */ -static int alloc_pool_huge_page(struct hstate *h, nodemask_t *nodes_allowe= d, - nodemask_t *node_alloc_noretry) +static struct folio *alloc_fresh_hugetlb_folio(struct hstate *h, + gfp_t gfp_mask, int nid, nodemask_t *nmask, + nodemask_t *node_alloc_noretry) { struct folio *folio; - int nr_nodes, node; + + folio =3D __alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, + node_alloc_noretry); + if (!folio) + return NULL; + + prep_new_hugetlb_folio(h, folio, folio_nid(folio)); + return folio; +} + +static void prep_and_add_allocated_folios(struct hstate *h, + struct list_head *folio_list) +{ + unsigned long flags; + struct folio *folio, *tmp_f; + + /* Add all new pool pages to free lists in one lock cycle */ + spin_lock_irqsave(&hugetlb_lock, flags); + list_for_each_entry_safe(folio, tmp_f, folio_list, lru) { + __prep_account_new_huge_page(h, folio_nid(folio)); + enqueue_hugetlb_folio(h, folio); + } + spin_unlock_irqrestore(&hugetlb_lock, flags); +} + +/* + * Allocates a fresh hugetlb page in a node interleaved manner. The page + * will later be added to the appropriate hugetlb pool. + */ +static struct folio *alloc_pool_huge_folio(struct hstate *h, + nodemask_t *nodes_allowed, + nodemask_t *node_alloc_noretry) +{ gfp_t gfp_mask =3D htlb_alloc_mask(h) | __GFP_THISNODE; + int nr_nodes, node; =20 for_each_node_mask_to_alloc(h, nr_nodes, node, nodes_allowed) { - folio =3D alloc_fresh_hugetlb_folio(h, gfp_mask, node, + struct folio *folio; + + folio =3D only_alloc_fresh_hugetlb_folio(h, gfp_mask, node, nodes_allowed, node_alloc_noretry); - if (folio) { - free_huge_folio(folio); /* free it into the hugepage allocator */ - return 1; - } + if (folio) + return folio; } =20 - return 0; + return NULL; } =20 /* @@ -3302,25 +3350,35 @@ static void __init hugetlb_folio_init_vmemmap(struc= t folio *folio, */ static void __init gather_bootmem_prealloc(void) { + LIST_HEAD(folio_list); struct huge_bootmem_page *m; + struct hstate *h =3D NULL, *prev_h =3D NULL; =20 list_for_each_entry(m, &huge_boot_pages, list) { struct page *page =3D virt_to_page(m); struct folio *folio =3D (void *)page; - struct hstate *h =3D m->hstate; + + h =3D m->hstate; + /* + * It is possible to have multiple huge page sizes (hstates) + * in this list. If so, process each size separately. + */ + if (h !=3D prev_h && prev_h !=3D NULL) + prep_and_add_allocated_folios(prev_h, &folio_list); + prev_h =3D h; =20 VM_BUG_ON(!hstate_is_gigantic(h)); WARN_ON(folio_ref_count(folio) !=3D 1); =20 hugetlb_folio_init_vmemmap(folio, h, HUGETLB_VMEMMAP_RESERVE_PAGES); - prep_new_hugetlb_folio(h, folio, folio_nid(folio)); + __prep_new_hugetlb_folio(h, folio); /* If HVO fails, initialize all tail struct pages */ if (!HPageVmemmapOptimized(&folio->page)) hugetlb_folio_init_tail_vmemmap(folio, HUGETLB_VMEMMAP_RESERVE_PAGES, pages_per_huge_page(h)); - free_huge_folio(folio); /* add to the hugepage allocator */ + list_add(&folio->lru, &folio_list); =20 /* * We need to restore the 'stolen' pages to totalram_pages @@ -3330,6 +3388,8 @@ static void __init gather_bootmem_prealloc(void) adjust_managed_page_count(page, pages_per_huge_page(h)); cond_resched(); } + + prep_and_add_allocated_folios(h, &folio_list); } =20 static void __init hugetlb_hstate_alloc_pages_onenode(struct hstate *h, in= t nid) @@ -3363,9 +3423,22 @@ static void __init hugetlb_hstate_alloc_pages_onenod= e(struct hstate *h, int nid) h->max_huge_pages_node[nid] =3D i; } =20 +/* + * NOTE: this routine is called in different contexts for gigantic and + * non-gigantic pages. + * - For gigantic pages, this is called early in the boot process and + * pages are allocated from memblock allocated or something similar. + * Gigantic pages are actually added to pools later with the routine + * gather_bootmem_prealloc. + * - For non-gigantic pages, this is called later in the boot process after + * all of mm is up and functional. Pages are allocated from buddy and + * then added to hugetlb pools. + */ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) { unsigned long i; + struct folio *folio; + LIST_HEAD(folio_list); nodemask_t *node_alloc_noretry; bool node_specific_alloc =3D false; =20 @@ -3407,14 +3480,25 @@ static void __init hugetlb_hstate_alloc_pages(struc= t hstate *h) =20 for (i =3D 0; i < h->max_huge_pages; ++i) { if (hstate_is_gigantic(h)) { + /* + * gigantic pages not added to list as they are not + * added to pools now. + */ if (!alloc_bootmem_huge_page(h, NUMA_NO_NODE)) break; - } else if (!alloc_pool_huge_page(h, - &node_states[N_MEMORY], - node_alloc_noretry)) - break; + } else { + folio =3D alloc_pool_huge_folio(h, &node_states[N_MEMORY], + node_alloc_noretry); + if (!folio) + break; + list_add(&folio->lru, &folio_list); + } cond_resched(); } + + /* list will be empty if hstate_is_gigantic */ + prep_and_add_allocated_folios(h, &folio_list); + if (i < h->max_huge_pages) { char buf[32]; =20 @@ -3548,7 +3632,9 @@ static int adjust_pool_surplus(struct hstate *h, node= mask_t *nodes_allowed, static int set_max_huge_pages(struct hstate *h, unsigned long count, int n= id, nodemask_t *nodes_allowed) { - unsigned long min_count, ret; + unsigned long min_count; + unsigned long allocated; + struct folio *folio; LIST_HEAD(page_list); NODEMASK_ALLOC(nodemask_t, node_alloc_noretry, GFP_KERNEL); =20 @@ -3625,7 +3711,8 @@ static int set_max_huge_pages(struct hstate *h, unsig= ned long count, int nid, break; } =20 - while (count > persistent_huge_pages(h)) { + allocated =3D 0; + while (count > (persistent_huge_pages(h) + allocated)) { /* * If this allocation races such that we no longer need the * page, free_huge_folio will handle it by freeing the page @@ -3636,15 +3723,32 @@ static int set_max_huge_pages(struct hstate *h, uns= igned long count, int nid, /* yield cpu to avoid soft lockup */ cond_resched(); =20 - ret =3D alloc_pool_huge_page(h, nodes_allowed, + folio =3D alloc_pool_huge_folio(h, nodes_allowed, node_alloc_noretry); - spin_lock_irq(&hugetlb_lock); - if (!ret) + if (!folio) { + prep_and_add_allocated_folios(h, &page_list); + spin_lock_irq(&hugetlb_lock); goto out; + } + + list_add(&folio->lru, &page_list); + allocated++; =20 /* Bail for signals. Probably ctrl-c from user */ - if (signal_pending(current)) + if (signal_pending(current)) { + prep_and_add_allocated_folios(h, &page_list); + spin_lock_irq(&hugetlb_lock); goto out; + } + + spin_lock_irq(&hugetlb_lock); + } + + /* Add allocated pages to the pool */ + if (!list_empty(&page_list)) { + spin_unlock_irq(&hugetlb_lock); + prep_and_add_allocated_folios(h, &page_list); + spin_lock_irq(&hugetlb_lock); } =20 /* @@ -3670,8 +3774,6 @@ static int set_max_huge_pages(struct hstate *h, unsig= ned long count, int nid, * Collect pages to be removed on list without dropping lock */ while (min_count < persistent_huge_pages(h)) { - struct folio *folio; - folio =3D remove_pool_hugetlb_folio(h, nodes_allowed, 0); if (!folio) break; --=20 2.41.0 From nobody Tue Dec 16 21:58:58 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBCDECDB47E for ; Thu, 19 Oct 2023 02:32:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232490AbjJSCcb (ORCPT ); Wed, 18 Oct 2023 22:32:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232480AbjJSCcV (ORCPT ); Wed, 18 Oct 2023 22:32:21 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BCF0AB for ; Wed, 18 Oct 2023 19:32:16 -0700 (PDT) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39IIp68H019566; Thu, 19 Oct 2023 02:31:28 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-03-30; bh=8r2l1Or7Qj9qRoidjA9mZu05EoMF0cTpWPoXgE8Q2W4=; b=mNVJ2XFBwfNoTmTbxzmvibG6lEp74QnqfHwO71GmtuPumdaUbCo/arLA28m73DEnbKX5 E9U2jT1HSmnQM++Ykbk4EMedsyBfWwBJBtkhp0hXF4tx2wVZHxpXDYZSktUonRsUmQsf Q6vv1bmYoqXMX+paJmlhbiwN5yWkNjpUAOXpeXl5ku0XMISvjVXxIihF2zjegHSwFDJo M8jPQhAjuJkmgYvrbCOIGdPP7+hNkB03nL5ylh0otJVX8RUSo39vKxvTTxu/21ws+6UI Yvn+lE4yAedqv6Bsq7l+MrJ/enXUbrqtQm/3qEOnuZG+JaS5IPQQAfNWBxBtRRGDvmfI pg== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3tqjy1h57f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:28 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 39J1v2ei021568; Thu, 19 Oct 2023 02:31:27 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2169.outbound.protection.outlook.com [104.47.55.169]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3trg539w05-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QMTVGVYc+lUFA3ppGBDmczb0kuK/MAuJKFFcM/TZw5q6L9KpF865slyDve6xgRvGZ7C2fDP9OzE0o8+Qvv0lkmRYcNl2Isp2/vLdIXQaiQc25s1AgXQRMBxChsKL7X8Ss0STtTsrUL0+4ORaH2xIAdEdtCvM55TPpicC0eQsJl0337c4PMgaoJeZe9kDrdwlBjY+pGbfZueqNFEkbr8/nG4i/had85k0S1mVWFOO1MyjUAcqIAOSnDjhZ9v+l7co+WYYruTEPUbO81ogRPlmTHE0Ds+ylWMuiUGx2IExlDm7533lkYBTzWsBxAzWwue08TB3umzVjyqRbTAcDTzcvg== 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=8r2l1Or7Qj9qRoidjA9mZu05EoMF0cTpWPoXgE8Q2W4=; b=ipiWpJc4WWwTyJmV+cNH5JG/EEkq0HhHdMq3s3dNOYX3BojVTd2v5fnxW4XDw9ovAoxEUIylNfOdKgz+/T0sh3F3jzSckFSXR8SZh8u/87n7piNLcxp8NupaXonSW/axRfOvJrCGmphUU57xzqKSUwwfSd4w537uCAgPfdDX7tBSXlzLCLMeWD2g0xxzfXJ3bQvjRHgSLXjkuI/Lu1IJjrp+28sgUsRB2k2TENuZZRwiFW4v6tdO0SYNNqMTSe1yRxG8EHhIpK3xr+iwBVu/nuP7Wgkv4upwH8g36chU933zNVMW4ll5xpTssRQwS8Regxnu258LpRIj/UWJ/305bw== 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=8r2l1Or7Qj9qRoidjA9mZu05EoMF0cTpWPoXgE8Q2W4=; b=aQSKQ9mo8ZEdeNH5nZ1T7zrpw6WNL2c079P2GHNil0hS02qc8y3oTQgpnO2hOtLkW1GClusfoVlrjvXcWM4IkAkoDRqLWjPAb3pm21F3ZDAP8f99dhkxqw84A90OQA7jIGEGK4W5vCCea7GxpxiU+gEWW6XXN5czYz+7kTdCUr8= Received: from BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) by CY8PR10MB7123.namprd10.prod.outlook.com (2603:10b6:930:74::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Thu, 19 Oct 2023 02:31:25 +0000 Received: from BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2]) by BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2%6]) with mapi id 15.20.6863.032; Thu, 19 Oct 2023 02:31:25 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Muchun Song , Joao Martins , Konrad Dybcio , Oscar Salvador , David Hildenbrand , Miaohe Lin , David Rientjes , Anshuman Khandual , Naoya Horiguchi , Barry Song <21cnbao@gmail.com>, Michal Hocko , Matthew Wilcox , Xiongchun Duan , Sergey Senozhatsky , Usama Arif , Andrew Morton , Mike Kravetz Subject: [PATCH v8 3/8] hugetlb: perform vmemmap optimization on a list of pages Date: Wed, 18 Oct 2023 19:31:05 -0700 Message-ID: <20231019023113.345257-4-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019023113.345257-1-mike.kravetz@oracle.com> References: <20231019023113.345257-1-mike.kravetz@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MW4PR04CA0322.namprd04.prod.outlook.com (2603:10b6:303:82::27) To BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4196:EE_|CY8PR10MB7123:EE_ X-MS-Office365-Filtering-Correlation-Id: 25acd7a6-c705-4aca-d65d-08dbd04b7da5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4dBZAFNB3bSmlIzfck9KyqlwHScQhvOzLzbSYo4nTk8My5BNBMOgAcufArANNvufEqX9GUDVYlr56vcCKwm8JZuMc8+6d/sq4w4k1relyi1aekFdZYjFLbjvsuHljzWcbPGU0VUFvp7CjtHSmdW1z1NzIjFc+C+2hJUyPV/AqgFt4rONLycNgPfkoJ4Y4T6+aUTY2qB2VuJxwEzOPy0sMOVCAfIMdy8d+1t8m4ITAhnelaWr8UlZljnUzPEXTly5mQbVUaDyrw8lZxCJ/wBrNEB///ghKkKb5r2UVQ7niOOxSyhcYKFxJpCxMCjVaTlK2axpm9A3tmxyIIDmkB1pqYmZYY7AG9TqJ7GTnsnwYlIWuVCYGNxuPDedednSf6MaOMF4x79G3qGW9ewyFTQ/7ZvkxHcQ/oxKvtLV5brvGBAQ3J8hUziQkrDfy3/v8MhykKRyQmk4Tdc/60u793CkS8AS96dm++oCN4upwbgk7awBxsFyiBNs0+EHx2cBhdu8zdg0nWqKIXdn3xyZsf7a1rYh/vPu5Tmf5Q8T5pguis9KHf+KNCY+7IBfk9gU2Oyg X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4196.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(136003)(346002)(396003)(366004)(230922051799003)(1800799009)(186009)(64100799003)(451199024)(478600001)(54906003)(316002)(66946007)(66476007)(6486002)(66556008)(6666004)(1076003)(86362001)(2616005)(26005)(6506007)(36756003)(107886003)(6512007)(8936002)(2906002)(4326008)(8676002)(7416002)(44832011)(41300700001)(83380400001)(5660300002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/EG/6gl6/mWFNXw0eiqCmPlHYfNUhG+MLrxZx6JTkM8fzDW4dgfkkB9PNPUv?= =?us-ascii?Q?Ptn8xp2vmlK22QlcPyN3xvUqBrMBvBk1y+EFOBxRzCQJRMqW4XYM4lkIy27O?= =?us-ascii?Q?SaI1Ss2MFK6XP2uV5ZR35HhBbtfM7y0rU1rQfLvaEcJhrEZvvepa3XCSsH+K?= =?us-ascii?Q?4EvhDWj2hWc3fDjGKuAivBwyE9kobjG8WBjlBayRcH/ce0zuU7MuX5NzzmwW?= =?us-ascii?Q?/jiRm0hiYcsY2QJFbTEKF7fqy4wIUk198HGhGdy7LFIJSfVMUGaZU0h0yfyW?= =?us-ascii?Q?M9mv+xHRFwXptbmmC0YaTfQ5BEcfBq0ZCs3dFOX3iC8vD33Bl966GP4I2Mtc?= =?us-ascii?Q?JFGHTIFb5PlzeHrNLtf/MZWwtNJ/ugKI8AOVrxGbLkQCz3VULTG+X1es0GFz?= =?us-ascii?Q?OFX+oIF1PPZ9leheIEWuRAL1QqIYgbgM/S5DeKBOG7OkZYc3a4Nu4J8++Ogv?= =?us-ascii?Q?c7AhpYXcq9ZKUbPwZ4t4EppfNm2EADPyxD5Hcby/yeW98TLzp12YLj2Q3hZa?= =?us-ascii?Q?vP+cTWp4mmtdgSjqz7KtI7Z/++lvjgCGy9pIMQpSkV424pXSznifaNJDfV1T?= =?us-ascii?Q?blFNkGbEqdTZsx9OZcbv1DmhkK07izHl7H3JPY+0UQdfQeeqPIHfxSaDV6jR?= =?us-ascii?Q?u5c4g2xUwe5U0IxWj4PF6I7GgVa+kaL4rOAjMgTtg3w/fCQIlWq+sHMew5wE?= =?us-ascii?Q?fGju4wlYmKwdEzGExPRJ/H0Sh9FV/J//zMlQgnJtbxVEYGSyiYUIAHY8v8Kh?= =?us-ascii?Q?6rStjjbFo77fr8GT0RiNhFIZIJOrp79A1Q0hdwY9yu8WsADc2p4ePL/xrj91?= =?us-ascii?Q?7I/Zn1jWx+KqLvzpiHyRvGl19S0/jwhDWLBYFax64//GHNZhA/o/jzfRNawr?= =?us-ascii?Q?obqGtvr9d0hXcAh1O5yjBVC7h+fkX5Q/JXl2k0jbatutbYgSfppE3ZsCTuDp?= =?us-ascii?Q?Q4UHepFpXQCN6vS2QMdmt8AEA+3lA0dMZawf1OtmaiViRGDmPv3eGKiKv6tR?= =?us-ascii?Q?nVRywdrTjmGNtNSQP1vwcTuk1eBlMpijyIfkg/DwAyJZnce74dAnMAhX47hA?= =?us-ascii?Q?S+OsSMg8N2z8yS67nnLxuciP6sz+5/pnje1/zYX8gQfAGzcINqARHsYOL0of?= =?us-ascii?Q?eEmQLAwd3BM3TU2amwVdwUVfGCV8wBojwrBBnsvtkqGjWU6ez1Pk7nZ8odSQ?= =?us-ascii?Q?P2kXNP7vZW5eYAnRdYnJIcKB9UKE4d4flzxV8Aa+v2QI3YPcf+nOvkSf/L7J?= =?us-ascii?Q?Y9JIlAmwi0fBxNwFyqIabrB1AxPDyIJrfKi91yMdWyCAN6EXS0CCpm84oEe3?= =?us-ascii?Q?YVm5o685cWzRQCdS1dSVoxvr3RdCxGYZB7V0/m2nR8k2ac6hxy1aBEi+wPAj?= =?us-ascii?Q?Jxouc7iQroQu1Rzoylkf+QdAmP2uo8lhpYKj+Br3gr7hdL/lXLKxe9QJFVDK?= =?us-ascii?Q?48PzWX/8gCVROYMYSdBMhT+jQUR68LPKF++/llkFj3Umi/HQ55x5JlY9dIcj?= =?us-ascii?Q?LRgXq8esPijCjWxjRo1StE1veIInRZyASt7QCEmd+aij8ZM9e/pPtXJGU7us?= =?us-ascii?Q?+foYLSgxTJd7Hr6t0/DkWNWYuBUc7v1ShOSZFxTQ?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?ocGngHMWx+ZJ+sFS0QWrHCgIzIY2gZTM2f0xozHLCBOrkTPo1BuicFmY16QO?= =?us-ascii?Q?ge5Njlg8FWgP4KTBXI/AkMOliHs1ILoYfQSfrWhTYAX6g7USWbjDlGiB19GE?= =?us-ascii?Q?bxc9iSJPuEDRS50Xmnac0P8B2km4nFqflSltiH8Rb0lFhEM4nNOpI5QpiU4Q?= =?us-ascii?Q?7kBY6y26b7zbyYNGmB6ncJEvPgjjJQbVAFiKHESOHnur3fQvqd8c1xseNla7?= =?us-ascii?Q?+F2RkJyXm7LJs1Pusgkyd6pUxL0jhUTBVhBOuOhALWEJGbvJxgj2QkGVunYV?= =?us-ascii?Q?C8v1TSSHYHzXd5N8ve6lCVyS1IGLU6yNH5xnCsG1iSiF5WepXUCqU7Rqnddu?= =?us-ascii?Q?hfxurg/7hnYFcjtE7J0rLhx1SxYbeDGj/iVm8zIuYy24UAXTuqTRsn14k3Dy?= =?us-ascii?Q?Et/W2IPbGd51FfcwARSZRu6QHH+aiANGg+nqMOfGq6pd5OuSpLxCauB+XzNP?= =?us-ascii?Q?nYsZ4PJX3ycP6jYnS3MMh5HwRnoBU/tmr7TYnLuH9o5IdLT1yWK99+/zwrqR?= =?us-ascii?Q?2ORHZ0Dina1usV8gT04HUvaL1iyinlQRFGZ1MqCk1bL6mhZtPM9G2w1mP2qb?= =?us-ascii?Q?8Zu6+fT/3rA7h3O3FNXVMPVNZebk/CR4YcnrzLdM+Fw8josU4mzMyc76X3/z?= =?us-ascii?Q?bcFnSwaG2qFx/W9KjK5d0oosIUwOlFCiq5Rqi5g6ePSqDVUxq1DReDSv/hrt?= =?us-ascii?Q?mzbdOAYWmVVvn2awt5yOrz6mG5etEgOGogh0ytIHglY29qVyHVSJEvHfutOr?= =?us-ascii?Q?y47yQVRdmi+Alo5iFsReldOQ79834wmo1wpGHqRswenob1UzP4wjBvmZKqS5?= =?us-ascii?Q?SqpvKBHtMWEVbPiKlGFGFwetkW9unCHJ/BjYuqdLc3NY9KyJjeS0uqTNG3LF?= =?us-ascii?Q?H5DjN1vgShDu+Lf61zJdn/RgWYVRKHUHnbm0BkIC9mBADo+pRsgTWPvOlpbM?= =?us-ascii?Q?Zz/b8bjWvCUKUof2EIAhpMt0XKxUWCUVpMAOPjPF9epmVWh9lfBnqwKYz+7j?= =?us-ascii?Q?jQUmgD+/8n3YavRtC7VHBoqR6BU+s/Otnj/69Finq9nYRO05kjoAKbDucWK/?= =?us-ascii?Q?PRZfEI09+IxXgiAZRWJ8Xb6+0/0ggbxYyftADgH17Y2mL7iSKUsZSlSiYekg?= =?us-ascii?Q?lcpktP07g8WvhLkz+uFOyDvOBqo4CPigzDCjMBLlc/LGUPhgbnWf00+qSCZT?= =?us-ascii?Q?FSV5vZ+AfxI5bzDm?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25acd7a6-c705-4aca-d65d-08dbd04b7da5 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2023 02:31:25.3289 (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: 913NOzdLuCmNHf9Cn7zKvVS643QaZsgmNYQPV4aMnT3yI8TZeBFsWBQOC+61rSqhImYtiZtNtbgH9NCB1vl7Jg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7123 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-19_02,2023-10-18_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 adultscore=0 spamscore=0 mlxscore=0 phishscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310190019 X-Proofpoint-GUID: _fw7hiRPovR_TVqvzHA3Wm3k3Mm_F8Ij X-Proofpoint-ORIG-GUID: _fw7hiRPovR_TVqvzHA3Wm3k3Mm_F8Ij Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When adding hugetlb pages to the pool, we first create a list of the allocated pages before adding to the pool. Pass this list of pages to a new routine hugetlb_vmemmap_optimize_folios() for vmemmap optimization. Due to significant differences in vmemmmap initialization for bootmem allocated hugetlb pages, a new routine prep_and_add_bootmem_folios is created. We also modify the routine vmemmap_should_optimize() to check for pages that are already optimized. There are code paths that might request vmemmap optimization twice and we want to make sure this is not attempted. Signed-off-by: Mike Kravetz Reviewed-by: Muchun Song --- mm/hugetlb.c | 43 +++++++++++++++++++++++++++++++++++-------- mm/hugetlb_vmemmap.c | 11 +++++++++++ mm/hugetlb_vmemmap.h | 5 +++++ 3 files changed, 51 insertions(+), 8 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 559f7c71c596..8b171f866d0a 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2282,6 +2282,9 @@ static void prep_and_add_allocated_folios(struct hsta= te *h, unsigned long flags; struct folio *folio, *tmp_f; =20 + /* Send list for bulk vmemmap optimization processing */ + hugetlb_vmemmap_optimize_folios(h, folio_list); + /* Add all new pool pages to free lists in one lock cycle */ spin_lock_irqsave(&hugetlb_lock, flags); list_for_each_entry_safe(folio, tmp_f, folio_list, lru) { @@ -3344,6 +3347,35 @@ static void __init hugetlb_folio_init_vmemmap(struct= folio *folio, prep_compound_head((struct page *)folio, huge_page_order(h)); } =20 +static void __init prep_and_add_bootmem_folios(struct hstate *h, + struct list_head *folio_list) +{ + unsigned long flags; + struct folio *folio, *tmp_f; + + /* Send list for bulk vmemmap optimization processing */ + hugetlb_vmemmap_optimize_folios(h, folio_list); + + /* Add all new pool pages to free lists in one lock cycle */ + spin_lock_irqsave(&hugetlb_lock, flags); + list_for_each_entry_safe(folio, tmp_f, folio_list, lru) { + if (!folio_test_hugetlb_vmemmap_optimized(folio)) { + /* + * If HVO fails, initialize all tail struct pages + * We do not worry about potential long lock hold + * time as this is early in boot and there should + * be no contention. + */ + hugetlb_folio_init_tail_vmemmap(folio, + HUGETLB_VMEMMAP_RESERVE_PAGES, + pages_per_huge_page(h)); + } + __prep_account_new_huge_page(h, folio_nid(folio)); + enqueue_hugetlb_folio(h, folio); + } + spin_unlock_irqrestore(&hugetlb_lock, flags); +} + /* * Put bootmem huge pages into the standard lists after mem_map is up. * Note: This only applies to gigantic (order > MAX_ORDER) pages. @@ -3364,7 +3396,7 @@ static void __init gather_bootmem_prealloc(void) * in this list. If so, process each size separately. */ if (h !=3D prev_h && prev_h !=3D NULL) - prep_and_add_allocated_folios(prev_h, &folio_list); + prep_and_add_bootmem_folios(prev_h, &folio_list); prev_h =3D h; =20 VM_BUG_ON(!hstate_is_gigantic(h)); @@ -3372,12 +3404,7 @@ static void __init gather_bootmem_prealloc(void) =20 hugetlb_folio_init_vmemmap(folio, h, HUGETLB_VMEMMAP_RESERVE_PAGES); - __prep_new_hugetlb_folio(h, folio); - /* If HVO fails, initialize all tail struct pages */ - if (!HPageVmemmapOptimized(&folio->page)) - hugetlb_folio_init_tail_vmemmap(folio, - HUGETLB_VMEMMAP_RESERVE_PAGES, - pages_per_huge_page(h)); + init_new_hugetlb_folio(h, folio); list_add(&folio->lru, &folio_list); =20 /* @@ -3389,7 +3416,7 @@ static void __init gather_bootmem_prealloc(void) cond_resched(); } =20 - prep_and_add_allocated_folios(h, &folio_list); + prep_and_add_bootmem_folios(h, &folio_list); } =20 static void __init hugetlb_hstate_alloc_pages_onenode(struct hstate *h, in= t nid) diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 76682d1d79a7..4558b814ffab 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -483,6 +483,9 @@ int hugetlb_vmemmap_restore(const struct hstate *h, str= uct page *head) /* Return true iff a HugeTLB whose vmemmap should and can be optimized. */ static bool vmemmap_should_optimize(const struct hstate *h, const struct p= age *head) { + if (HPageVmemmapOptimized((struct page *)head)) + return false; + if (!READ_ONCE(vmemmap_optimize_enabled)) return false; =20 @@ -572,6 +575,14 @@ void hugetlb_vmemmap_optimize(const struct hstate *h, = struct page *head) SetHPageVmemmapOptimized(head); } =20 +void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *f= olio_list) +{ + struct folio *folio; + + list_for_each_entry(folio, folio_list, lru) + hugetlb_vmemmap_optimize(h, &folio->page); +} + static struct ctl_table hugetlb_vmemmap_sysctls[] =3D { { .procname =3D "hugetlb_optimize_vmemmap", diff --git a/mm/hugetlb_vmemmap.h b/mm/hugetlb_vmemmap.h index 4573899855d7..c512e388dbb4 100644 --- a/mm/hugetlb_vmemmap.h +++ b/mm/hugetlb_vmemmap.h @@ -20,6 +20,7 @@ #ifdef CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP int hugetlb_vmemmap_restore(const struct hstate *h, struct page *head); void hugetlb_vmemmap_optimize(const struct hstate *h, struct page *head); +void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *f= olio_list); =20 static inline unsigned int hugetlb_vmemmap_size(const struct hstate *h) { @@ -48,6 +49,10 @@ static inline void hugetlb_vmemmap_optimize(const struct= hstate *h, struct page { } =20 +static inline void hugetlb_vmemmap_optimize_folios(struct hstate *h, struc= t list_head *folio_list) +{ +} + static inline unsigned int hugetlb_vmemmap_optimizable_size(const struct h= state *h) { return 0; --=20 2.41.0 From nobody Tue Dec 16 21:58:58 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6850CDB47E for ; Thu, 19 Oct 2023 02:32:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232561AbjJSCc2 (ORCPT ); Wed, 18 Oct 2023 22:32:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232420AbjJSCcS (ORCPT ); Wed, 18 Oct 2023 22:32:18 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1E6911D for ; Wed, 18 Oct 2023 19:32:15 -0700 (PDT) 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 39IIp6nE018131; Thu, 19 Oct 2023 02:31:33 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-03-30; bh=F7HOzsss5pD7Ha2I86cR52DxAyPm8ftvPm1KZ647UUc=; b=0rn0oKPZCd5LEFplhcFa+6zdjZCWGJtGUrUpAw+jP30KfjkM8l30lLfdXNihZ5fwVHj7 lDZ9NzpICfZff8Z76dt3UQq89B9VMRcsYTmVPi4yXbc2eSXdZER2SlUVT7dNok289Bb3 0KOqmBPQWOB9SEat8YAN6iqiIJoCDUj3yDMPIlu5RduCdwrDY1LH2dpRvWKGM8jdZvqN NSn46lrHuRiqHygHWXe8EW2p2AkmnGfaPOjRvOvc3agdmxNBiJlPTdEGqSqBFMuCTysX m38eEp4cvLhjDGz2Wd3YBUIgz8MDjhzOaYGHGvnDwWKLACXjjcfysHVVadTiaXGUAgGJ bg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3tqkhu993a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:33 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 39J0lDbK009825; Thu, 19 Oct 2023 02:31:31 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2041.outbound.protection.outlook.com [104.47.66.41]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3trg0q30gr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dhtCihzeYcANU4Objz1xO03a1QTczQpsTqX1XfEvYEj18uDXAp/9lPPjkDtu7hqMrUmK3lbdOqyqZiVQiVSopeQMOLlb98Q3qNqf5U8ThXq3QiJujlytmz7sKAkcieDR8s/UD9ostJedkiqaqHZheaXrfKqqsALy7wboD0SxB/MRoRAm04JWQhitydcTZZjGScYEgTJsPs+VLsmBQ1Rg8mVZk5JKQRjo1EtO6eRZm+kAPJOYZroi3+q/2ZA9Tl6Ludir7w+LyKWtZwR6WncZiKv86pX91yLuZZdRdE/tBMen201Vw8XD2lGDpUziXsW7hOdwReD/SOY3tWlnsEDj+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=F7HOzsss5pD7Ha2I86cR52DxAyPm8ftvPm1KZ647UUc=; b=XGIfBjqxOq59H5myVxxT8kSqsenHU9WaydgVDnte9XMcvZjWfWDlUEKUg7Z8rxvVKOHwxBYZ9GWGHziJcdP862bojI1EkbbDtfhBpyFXZiQKzEsrFigssSWWWNt796xNSniWPLBbQIb1gE5NFEZjlRD3CGbCpQ8uMAQ628vOIv82q11hUE9h1TzEoU/Tgz+w+chDZIL0dgeKVLFLNWSsx07eC7vKeaHc2VAQ0w+Kn86YDhnW+IDb7VNQa+LYpeSqTJCMjQWQ98cJ2ckLRgWnJC9G1biJQwpGmNkM22kI/99qa3Ozan1fvvCxcEuHBVXQfjDRv4iX4cN2zRxE8RF3Og== 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=F7HOzsss5pD7Ha2I86cR52DxAyPm8ftvPm1KZ647UUc=; b=y7X0EuUqT/0Jr2U4J/TR2wdC5/zgHRN9nA/Kmli1jCtM9cXxrzC/3MY0PnrldTpbah0ru1Jw/GeRBMWn/C/gABm4hf2Nf6SFnzBt3ZYsGi/3nhqOiORq0kQu8+XoPoy4mhfibnUO1q+kAyqNvd8GKYrNu2ZXaVIZNbL3k4KX4YY= Received: from BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) by CY8PR10MB7123.namprd10.prod.outlook.com (2603:10b6:930:74::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Thu, 19 Oct 2023 02:31:29 +0000 Received: from BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2]) by BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2%6]) with mapi id 15.20.6863.032; Thu, 19 Oct 2023 02:31:29 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Muchun Song , Joao Martins , Konrad Dybcio , Oscar Salvador , David Hildenbrand , Miaohe Lin , David Rientjes , Anshuman Khandual , Naoya Horiguchi , Barry Song <21cnbao@gmail.com>, Michal Hocko , Matthew Wilcox , Xiongchun Duan , Sergey Senozhatsky , Usama Arif , Andrew Morton , Mike Kravetz Subject: [PATCH v8 4/8] hugetlb: perform vmemmap restoration on a list of pages Date: Wed, 18 Oct 2023 19:31:06 -0700 Message-ID: <20231019023113.345257-5-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019023113.345257-1-mike.kravetz@oracle.com> References: <20231019023113.345257-1-mike.kravetz@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MW4PR04CA0188.namprd04.prod.outlook.com (2603:10b6:303:86::13) To BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4196:EE_|CY8PR10MB7123:EE_ X-MS-Office365-Filtering-Correlation-Id: ff2fed62-3252-440e-8b11-08dbd04b7ffe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wJDSH4W6/HwrGXXwlO43hqe2b0Q34iQctJ9S7FmovMQD1JTTzPE/mKSWCqSKLVMNmI2SKWVcox5BQVzwRoSSU8qsDwLzYKG8/s5Hk/sEsHH2Fofe/KrILtMzKLD6n9Kpwvi118QE/6ZL6VBReWAE4Jx+5LwozECwkwSA6vqeeRS4Hq9PNmnymF+atlNSlsmjqeRdwGzg7snlVTwv1e9D01A9mH7ujo+6N/1eKB/XPfX2QyzVx6QQjOfAIgQWksF/v3tlgAnF4yncjmvFESFiVZZm6VC+00hrFKKJHKrxVvK86vrJdLZAkl8hChNRAdoldGks6fFc/ViIo/IX9A6UjWL1VomjikTzoip6Zxky+oYyLQep3O5SVMkxvRDCAc6m/Nlf52jOfdRwDVmzAP+wQId9kgq0Dg4sCnZCvNTtVdnJUBOinO1XhBR4rjANvg6L9rWy7zVrsJUfbtP8JgBIXP/kSRl4q1TrnzDTNcTbG+FMKj/pmOeCNgEaDdbegko1oVnB+a6w/omWxBcFNXPO1TjZw4x+BGJM8rMVwjqpRQSiB1EtiC5S+yVdHIvtQjd/ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4196.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(136003)(346002)(396003)(366004)(230922051799003)(1800799009)(186009)(64100799003)(451199024)(478600001)(54906003)(316002)(66946007)(66476007)(6486002)(66556008)(6666004)(1076003)(86362001)(2616005)(26005)(6506007)(36756003)(107886003)(6512007)(8936002)(2906002)(4326008)(8676002)(7416002)(44832011)(41300700001)(83380400001)(5660300002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VlgxpEHMsI7AZl69NOXbqzxL/IBUyjl/zvY3A6jOpAsaHlaQ+jI5M2oxJkcu?= =?us-ascii?Q?gdpi5OgBItI16aUdEbCk6LQYLMGW3LllKOhrkuI0mfxPzHP2kAwP2EfB3usb?= =?us-ascii?Q?aT2M/4NZyJr2R+4iWW3CzneKNKWbgU0ZGC5AJ4dy8/qne3eu24dwUcUVnm5K?= =?us-ascii?Q?bkC09DlJU1zLjhCxmRloMCIY+r+DT6OGNRCXluWdaS0wOdFKl4TvmmqNbAjp?= =?us-ascii?Q?TCPD+TOjqvohFJ4aRI3IFBzpVdavLH12W0+21AupjCsDbE+bRgphm4QWQoOU?= =?us-ascii?Q?xUKrQNjZe/gd58anWI9JPTK84atLTZjuOnppdAJFQNzGA4JDMI2tm3GuE1MA?= =?us-ascii?Q?IbGcfi7mVTaapA13evYklH3ACH4FW25tNYscGgf8VegGHOG4yO+ENRfINj/H?= =?us-ascii?Q?K9L7chEzjjiUMXIyu1uIR6Kh43Dg2sSuqOKXyupcd7L5cUZAcyigY7booy88?= =?us-ascii?Q?/DjV1WKXGTcX6teTZXh/Xt1Ozvhdve9iyoLqmgBhjZhAJ8UFnf17nK+gqcic?= =?us-ascii?Q?4kU+FcqTrW+f7x+VcflgvVUJK6K93iDkH7Y1vmXp5v5XesVoKkuJv0hnlLDP?= =?us-ascii?Q?4F1E/m5WxEd4hEqW0FB02yZtM4rFOgcSY3yRloTXTg5jiLgFhYHWfwyzodaq?= =?us-ascii?Q?mhiSqSYtZ4kR+yQ5HoTBWboZAFItDgnowM8hM+PQd3qRGyUjo9PD320J7x+6?= =?us-ascii?Q?xhs0mLS/SX9wKHm5cplQWbamD+uMV/zBqZV8eTxtETZcycMbowGO0jCQaJOH?= =?us-ascii?Q?niTuOoS4NgV6Es3gUsGikk3Qce9D9xIPSggbEBVWq4dDuDsblsfauuJii+x9?= =?us-ascii?Q?WXeEfH0qXcl3CnV7TGKNqHX0c7CyRmfOWtD0cSOaMaXdb5QrJZLU3jypP8Wf?= =?us-ascii?Q?OA+80ls7e6S7wCyqDiaNxNyF1prT04nRhq9z2yBR7wdCZ4etvMQfbPhnD2Ip?= =?us-ascii?Q?ojtpXoMR/4ckS6/56qwdz9I4eDFPqLUq3VNDPEpUw5ZFPFY3uDYp3BZ09Otc?= =?us-ascii?Q?oijaGfJQK7q0qk3bWRMVndj3Uh1TLeMP7Biw14F77BS0t4qDnNzRVvdd6vkP?= =?us-ascii?Q?W/LZxusBeJ/4CBLNikeWra/fIsvAtIc65yjlrFsARtiW5zcvf0BZTJbC3sLz?= =?us-ascii?Q?XLLJieg3Y3dsIIp7sA/d2fkr7ZQ+atEgGP11zKRVgmQrVCTFHIcsrWfWr0w5?= =?us-ascii?Q?ofg0rbGa9pOxUt/x4HAM5y8yG4SS5eL9LFThTraHUdyANAYknX09uAZ03o3T?= =?us-ascii?Q?LyMDEYwrshSofookSDrES83OMJOhOQ1I9vb9UdjkIQh9pUyfLQn15QvGCxE9?= =?us-ascii?Q?66Z+Q7bIyGuarRi2xmVkeyNiuGniloazahab7ZXLF19US33zNorqWgbomeis?= =?us-ascii?Q?aRimy5QxvyLePrXATf7EQ9wD9nxdeNDE4GEmdCYLuYr5w57TRcfMYZhsIYv7?= =?us-ascii?Q?3YyDKTcqjC6R8sqfwiv9x/SsidZ3VVJUWd5Y/PEtCX9tXhtZMizTA30O9+Jz?= =?us-ascii?Q?XanDor9ZROr6Ny/j21MXog1NMFU8+vqrLgeqHxs5cbj0hBSvaPM/hJ7pSg3g?= =?us-ascii?Q?3h+/jrtVzNSPvq/yM2UZwcThQwxR1+s3r3eFZzZnzO7xMb/xzQ+8hjnNhq+K?= =?us-ascii?Q?gw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?yAvtgVevPX6cv2jRFB/LDiomVPD3Mmk6t3JiUqepD74rAj+5eXQ8Mtkmm+4x?= =?us-ascii?Q?v5YWcyVJaB/RfuwXHdJ35o158ZXPGyBv5+I2hDDif/niBbVkpmYRAdCpZ7dp?= =?us-ascii?Q?XQH8otM5kFlhfi5fRDBNZrpgg7vtpxsksTU20dL6CKaD3+FoaR8vIQxJPOBb?= =?us-ascii?Q?Vs5TjmQBe43EfbXppordvMi7HcBfVNtqrnqggIJeoz89bW8aTadpGiezTXi/?= =?us-ascii?Q?vrzN6qpPyjQJibaKs+OjBY4FofI+HMWCDW/WKxNqIvJoxv9LX1Zs1olVefwE?= =?us-ascii?Q?Fd2LxKZyiirhC8itFlG2CfuaTsG1CE38SR0l4PgsKx7rAG94+uDibliKnsCL?= =?us-ascii?Q?l553bdXXTxXKcDCBCIew6uo6/rgiFy3aFjDj7CVLdHRxd4+63+ctPPz/XH74?= =?us-ascii?Q?J9t5+oCLb6pu4tft1waYT1G4JoBEkpS9GQvVrgX4F5fMvvLdEW8P27pjJyQ1?= =?us-ascii?Q?ZgKk7SNcmJiErELrEaKMRA2zvmLTkmMmdXFoijtHRhgCDeQKqxCRTDsFg4p9?= =?us-ascii?Q?2yUT/KSQ1FWyopb96K3SsN6JzyuUSUcGA6c+a0F7WyREf8P6Q85eZ9SuOeZr?= =?us-ascii?Q?M+29b0UBRcLckQImPyOk9qbBgLv1VDRlEYqTf6hAzl5R0ynN9ISW8wtTGagO?= =?us-ascii?Q?/Zxcu9zBr8xme9fQylzonw5KtqjUedaMSAlSc9yVDPyNkklRpN/vuouTQ92K?= =?us-ascii?Q?QG4N1GrViL/rHQRr3kW0ydvbJ7Tz/QTi21UXiLbmKlvEglmocIDNmdb9XJoL?= =?us-ascii?Q?z/aVcVBi3MfAf/D3HFhAAIzBeKvzQuYkU0yugXRmXclVDgyFCEt529RIHPlU?= =?us-ascii?Q?1HoRsrJGl7zniL1CEvMSAr0GRmIkMellMQ6GDwc9YCPKkBLS20Wa4Fbe2SzV?= =?us-ascii?Q?t5TYHDOfuIfck02Pi1iUTncVHyYPnbhVzK8ELrI4X1AD/UlaQ39lCtdJgwYv?= =?us-ascii?Q?31isdT2a0OmV4aehYdU3I9DtTsAqs/ecfDjRS7a4WC3lfSd/2z2oECtNXqY9?= =?us-ascii?Q?CMh3GdZ/JAGHqV2t4hdScxvtD1+l6PECXGiUeOQSlEp1ckeLBWe7sffLqw/U?= =?us-ascii?Q?v+j+JkgOYJm6kKD0F26voEQ38CU4QSQ+h2kPElgp+TXd+T8FPwaEPGt1H9IL?= =?us-ascii?Q?NdTLBMyTjde1sL2QHK7YAGGzy5RUbZrBXDeBMd+1wW11zKGhLfkP2pPDbYLI?= =?us-ascii?Q?zCZx0BGi7yQ/zH/y?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff2fed62-3252-440e-8b11-08dbd04b7ffe X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2023 02:31:29.2612 (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: Nmab/6qFqW3Wh+Bc2tpQw28muoJCUzd2aPOULvOT0uY1mhWj170DEqyftMuZCfHOV8i7J5xxS85BXLRjvV9P0A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7123 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-19_02,2023-10-18_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310190019 X-Proofpoint-GUID: Sn2pgpwYgNkYxnsJNThS7AaSogg-IlYB X-Proofpoint-ORIG-GUID: Sn2pgpwYgNkYxnsJNThS7AaSogg-IlYB Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The routine update_and_free_pages_bulk already performs vmemmap restoration on the list of hugetlb pages in a separate step. In preparation for more functionality to be added in this step, create a new routine hugetlb_vmemmap_restore_folios() that will restore vmemmap for a list of folios. This new routine must provide sufficient feedback about errors and actual restoration performed so that update_and_free_pages_bulk can perform optimally. Special care must be taken when encountering an error from hugetlb_vmemmap_restore_folios. We want to continue making as much forward progress as possible. A new routine bulk_vmemmap_restore_error handles this specific situation. Signed-off-by: Mike Kravetz Reviewed-by: Muchun Song --- mm/hugetlb.c | 99 +++++++++++++++++++++++++++++++------------- mm/hugetlb_vmemmap.c | 38 +++++++++++++++++ mm/hugetlb_vmemmap.h | 11 +++++ 3 files changed, 120 insertions(+), 28 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 8b171f866d0a..cf834bb7f820 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1859,50 +1859,93 @@ static void update_and_free_hugetlb_folio(struct hs= tate *h, struct folio *folio, schedule_work(&free_hpage_work); } =20 -static void update_and_free_pages_bulk(struct hstate *h, struct list_head = *list) +static void bulk_vmemmap_restore_error(struct hstate *h, + struct list_head *folio_list, + struct list_head *non_hvo_folios) { struct folio *folio, *t_folio; - bool clear_dtor =3D false; =20 - /* - * First allocate required vmemmmap (if necessary) for all folios on - * list. If vmemmap can not be allocated, we can not free folio to - * lower level allocator, so add back as hugetlb surplus page. - * add_hugetlb_folio() removes the page from THIS list. - * Use clear_dtor to note if vmemmap was successfully allocated for - * ANY page on the list. - */ - list_for_each_entry_safe(folio, t_folio, list, lru) { - if (folio_test_hugetlb_vmemmap_optimized(folio)) { + if (!list_empty(non_hvo_folios)) { + /* + * Free any restored hugetlb pages so that restore of the + * entire list can be retried. + * The idea is that in the common case of ENOMEM errors freeing + * hugetlb pages with vmemmap we will free up memory so that we + * can allocate vmemmap for more hugetlb pages. + */ + list_for_each_entry_safe(folio, t_folio, non_hvo_folios, lru) { + list_del(&folio->lru); + spin_lock_irq(&hugetlb_lock); + __clear_hugetlb_destructor(h, folio); + spin_unlock_irq(&hugetlb_lock); + update_and_free_hugetlb_folio(h, folio, false); + cond_resched(); + } + } else { + /* + * In the case where there are no folios which can be + * immediately freed, we loop through the list trying to restore + * vmemmap individually in the hope that someone elsewhere may + * have done something to cause success (such as freeing some + * memory). If unable to restore a hugetlb page, the hugetlb + * page is made a surplus page and removed from the list. + * If are able to restore vmemmap and free one hugetlb page, we + * quit processing the list to retry the bulk operation. + */ + list_for_each_entry_safe(folio, t_folio, folio_list, lru) if (hugetlb_vmemmap_restore(h, &folio->page)) { + list_del(&folio->lru); spin_lock_irq(&hugetlb_lock); add_hugetlb_folio(h, folio, true); spin_unlock_irq(&hugetlb_lock); - } else - clear_dtor =3D true; - } + } else { + list_del(&folio->lru); + spin_lock_irq(&hugetlb_lock); + __clear_hugetlb_destructor(h, folio); + spin_unlock_irq(&hugetlb_lock); + update_and_free_hugetlb_folio(h, folio, false); + cond_resched(); + break; + } } +} + +static void update_and_free_pages_bulk(struct hstate *h, + struct list_head *folio_list) +{ + long ret; + struct folio *folio, *t_folio; + LIST_HEAD(non_hvo_folios); =20 /* - * If vmemmmap allocation was performed on any folio above, take lock - * to clear destructor of all folios on list. This avoids the need to - * lock/unlock for each individual folio. - * The assumption is vmemmap allocation was performed on all or none - * of the folios on the list. This is true expect in VERY rare cases. + * First allocate required vmemmmap (if necessary) for all folios. + * Carefully handle errors and free up any available hugetlb pages + * in an effort to make forward progress. */ - if (clear_dtor) { +retry: + ret =3D hugetlb_vmemmap_restore_folios(h, folio_list, &non_hvo_folios); + if (ret < 0) { + bulk_vmemmap_restore_error(h, folio_list, &non_hvo_folios); + goto retry; + } + + /* + * At this point, list should be empty, ret should be >=3D 0 and there + * should only be pages on the non_hvo_folios list. + * Do note that the non_hvo_folios list could be empty. + * Without HVO enabled, ret will be 0 and there is no need to call + * __clear_hugetlb_destructor as this was done previously. + */ + VM_WARN_ON(!list_empty(folio_list)); + VM_WARN_ON(ret < 0); + if (!list_empty(&non_hvo_folios) && ret) { spin_lock_irq(&hugetlb_lock); - list_for_each_entry(folio, list, lru) + list_for_each_entry(folio, &non_hvo_folios, lru) __clear_hugetlb_destructor(h, folio); spin_unlock_irq(&hugetlb_lock); } =20 - /* - * Free folios back to low level allocators. vmemmap and destructors - * were taken care of above, so update_and_free_hugetlb_folio will - * not need to take hugetlb lock. - */ - list_for_each_entry_safe(folio, t_folio, list, lru) { + list_for_each_entry_safe(folio, t_folio, &non_hvo_folios, lru) { update_and_free_hugetlb_folio(h, folio, false); cond_resched(); } diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 4558b814ffab..77f44b81ff01 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -480,6 +480,44 @@ int hugetlb_vmemmap_restore(const struct hstate *h, st= ruct page *head) return ret; } =20 +/** + * hugetlb_vmemmap_restore_folios - restore vmemmap for every folio on the= list. + * @h: hstate. + * @folio_list: list of folios. + * @non_hvo_folios: Output list of folios for which vmemmap exists. + * + * Return: number of folios for which vmemmap was restored, or an error co= de + * if an error was encountered restoring vmemmap for a folio. + * Folios that have vmemmap are moved to the non_hvo_folios + * list. Processing of entries stops when the first error is + * encountered. The folio that experienced the error and all + * non-processed folios will remain on folio_list. + */ +long hugetlb_vmemmap_restore_folios(const struct hstate *h, + struct list_head *folio_list, + struct list_head *non_hvo_folios) +{ + struct folio *folio, *t_folio; + long restored =3D 0; + long ret =3D 0; + + list_for_each_entry_safe(folio, t_folio, folio_list, lru) { + if (folio_test_hugetlb_vmemmap_optimized(folio)) { + ret =3D hugetlb_vmemmap_restore(h, &folio->page); + if (ret) + break; + restored++; + } + + /* Add non-optimized folios to output list */ + list_move(&folio->lru, non_hvo_folios); + } + + if (!ret) + ret =3D restored; + return ret; +} + /* Return true iff a HugeTLB whose vmemmap should and can be optimized. */ static bool vmemmap_should_optimize(const struct hstate *h, const struct p= age *head) { diff --git a/mm/hugetlb_vmemmap.h b/mm/hugetlb_vmemmap.h index c512e388dbb4..a0dcf49f46ba 100644 --- a/mm/hugetlb_vmemmap.h +++ b/mm/hugetlb_vmemmap.h @@ -19,6 +19,9 @@ =20 #ifdef CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP int hugetlb_vmemmap_restore(const struct hstate *h, struct page *head); +long hugetlb_vmemmap_restore_folios(const struct hstate *h, + struct list_head *folio_list, + struct list_head *non_hvo_folios); void hugetlb_vmemmap_optimize(const struct hstate *h, struct page *head); void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *f= olio_list); =20 @@ -45,6 +48,14 @@ static inline int hugetlb_vmemmap_restore(const struct h= state *h, struct page *h return 0; } =20 +static long hugetlb_vmemmap_restore_folios(const struct hstate *h, + struct list_head *folio_list, + struct list_head *non_hvo_folios) +{ + list_splice_init(folio_list, non_hvo_folios); + return 0; +} + static inline void hugetlb_vmemmap_optimize(const struct hstate *h, struct= page *head) { } --=20 2.41.0 From nobody Tue Dec 16 21:58:58 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F02E5CDB47E for ; Thu, 19 Oct 2023 02:32:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232512AbjJSCce (ORCPT ); Wed, 18 Oct 2023 22:32:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232481AbjJSCcV (ORCPT ); Wed, 18 Oct 2023 22:32:21 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9AA5134 for ; Wed, 18 Oct 2023 19:32:16 -0700 (PDT) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39IInDF3013719; Thu, 19 Oct 2023 02:31:35 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-03-30; bh=o8COXuu6/TtJ5IDPv6UZqVnZDWI+bSmwncS3etnX9L8=; b=CWr//8NbPtQ8BFSSPCDK5rLmVu+pweQzMh5trGMO4dOGK+a3EvJyWH7/5rPMDw3l2zJ0 yxPGkcGJrafwZUBY3zEE8X3u/g+qa1+uaWcW5D0zr61ssuW1KykiIoyvP4OOdaS40kNl huk2/05sEaFu5VyLoorWmU92kJWh8UoeoArYaHsrzyNjtfsQQpo1iBtawxPjLzxT1GE5 itJfDAUOFMATiSdXyNAGzFGSr+XSjNKMwr9FNaIuuOo+l5YtDugkzH3VQIVtm640IFCI jHTPBInmVfaU2qnvIkqZI9yyi1hbXv7zQGw2Nql3tkZKg2R/dBFe3/7ga46r4GZBtD0h 1Q== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3tqk1d167y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:35 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 39J14qq1021602; Thu, 19 Oct 2023 02:31:34 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2041.outbound.protection.outlook.com [104.47.66.41]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3trg539w34-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HNQaGVXTjSRwLWAF1sA3ar7VowNFGMkbZ8LJFSYIRwgzaGjn0cLN3G4KM68VTDJhfJDpmLBq8zHadiuUxIlAtuuSovwaVN9+bs5fMLc/OlOZoXq1GxHkkZUe+iHm6+k11atry/NZN2b2qdwJV5aWs5LxaTTprfAkG9NJ6YkXdwo2PYioiOKClB63HUKTiaNERCjewzug8DVFwWEyOXq30P63/1lGETAkemxiQiOyJWTXDYsJUlhdQut7yrQhAcwsFws3hdcvLsZszyAC/spDz/rdyv1h7598Pky26N8ETeJsml1QTx2VbodLKpz/XXQqDtCS4t72Ge6eqWXYgwjEyw== 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=o8COXuu6/TtJ5IDPv6UZqVnZDWI+bSmwncS3etnX9L8=; b=S3YMEV5Rgs3sAjHBJKtxjIp/wYEiPiSPgAOIvjCr2x4/iisHQfwUALR/bO+NnUwwT+ylGxJT/9XY/yokCaaMLBsBrWylNUvf37/rAqP7RM73VF+oeXphdJX8H6pDvYrAF/PNfljOG70y8CmDSVtIdBaH0adYvMsi07KY1k8m/m5WdJkcXWVV2CLXf/SLFmJAGRE0aRWAucHvpqDOInhcEe6Ae+r0tQbEH7qygFSjc2MfY3+LjZ0NUHSym/7ebk2vr856ETlYPAN+Ic3LVLA7XYtbvqPl9bq9HNJYpnoLSkzU6Vw/XutHT2qJ0u/1FPNum17y3jGinyVObDygRyd6Og== 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=o8COXuu6/TtJ5IDPv6UZqVnZDWI+bSmwncS3etnX9L8=; b=vn3UpKNCZYtYNYs6/3DLU8cDTqssB9F/LlBSND1e265nFSDGlNhxRtduL8WSrPFz2fJ0CUrNW911mP/3qedM7iFDPZfiXNYGnOnnf94bpvRoqJHDdDMqp19xWNtfIXfUYJOZDp+ZRPwbWTLFar1RlF4OloMtvGcPy72IgE4McJA= Received: from BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) by CY8PR10MB7123.namprd10.prod.outlook.com (2603:10b6:930:74::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Thu, 19 Oct 2023 02:31:31 +0000 Received: from BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2]) by BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2%6]) with mapi id 15.20.6863.032; Thu, 19 Oct 2023 02:31:31 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Muchun Song , Joao Martins , Konrad Dybcio , Oscar Salvador , David Hildenbrand , Miaohe Lin , David Rientjes , Anshuman Khandual , Naoya Horiguchi , Barry Song <21cnbao@gmail.com>, Michal Hocko , Matthew Wilcox , Xiongchun Duan , Sergey Senozhatsky , Usama Arif , Andrew Morton , Mike Kravetz Subject: [PATCH v8 5/8] hugetlb: batch freeing of vmemmap pages Date: Wed, 18 Oct 2023 19:31:07 -0700 Message-ID: <20231019023113.345257-6-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019023113.345257-1-mike.kravetz@oracle.com> References: <20231019023113.345257-1-mike.kravetz@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MW4PR04CA0195.namprd04.prod.outlook.com (2603:10b6:303:86::20) To BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4196:EE_|CY8PR10MB7123:EE_ X-MS-Office365-Filtering-Correlation-Id: b3e2d3c6-4fa0-4d09-56b4-08dbd04b815f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tumvawd7qTZvmZpu8YuvwP8PTfpDjhlpCQlIrTNJqRFmAy2DQFO7taA1JxCrcnYCPKE/RdKK9MQ0/wRsly7E6q69YhSHsH7fMIzFL4+b/IClAywGrpU8c7Md67dk20iPrIEvbjK+ty5nGUad8wuPioBN915oN35Z/6sXHwk8IRwM4ZztBlLSY6zIR6O9WcEzgeNI43Mj96e50sgqC/dS9Kvz3Vx+dV1rwaSnjK7RxRIoGB3xP+D6qM2Gj0ki1b1GrSKQYPITtYByaLUdPMMsIPHEEOhiZGwIFtX+3fNg5Ca/AMwfuGvn5lGu2s0ampuYUakrK/ts06CD941E6pDawQ+NmSea7CfenybUHxkPCrllX/NyWa58DMX9tEGCb+dm8x2Qyf7mkOrxVFPBO637TDN2cf0NSHZOmU224ZGyEmOfeNdJP1iQWG2hHbxjnLVYuTcYOlLXsWjMUvqlNm7+OgYTkWvT14eHIHL8XhbPWkhcpLU9Sf86kNvR87ZpAEg/da6gB2naQGMIRPfMRSTv6elj5ric1Qy2eiSBxKyp5PDcBESXFkykuhdifPoE0ywt X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4196.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(136003)(346002)(396003)(366004)(230922051799003)(1800799009)(186009)(64100799003)(451199024)(478600001)(54906003)(316002)(66946007)(66476007)(6486002)(66556008)(6666004)(1076003)(86362001)(2616005)(26005)(6506007)(36756003)(107886003)(6512007)(8936002)(2906002)(4326008)(8676002)(7416002)(44832011)(41300700001)(83380400001)(5660300002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZZW5NNxkHWBabGOytlALlQEt+FutEFkn7+TxdJ1NMgGcAJ9kA4GlsR/78vvm?= =?us-ascii?Q?j2UUsG2WFFJpMQhHkLNQPvFZF8YcmTzHimqs2sHTVtSr+jL1DWsVOjHjaqkK?= =?us-ascii?Q?6nyR72DIM+lBnZrTJ18VvyO/Lwshgjv7LEWTjg/erUQ/FKtBr0UX8cad87me?= =?us-ascii?Q?0MdfPlDUP0z+XimtqHVSTGcPuxEi/yxzXWEpQnPnGPfGXMjGfkn0GwjUMu+9?= =?us-ascii?Q?velMibd37XKIyg0FHzBuoQ8JYn+E2TVsha+K7h6iFuvGLesADTD67ciPn4xM?= =?us-ascii?Q?vZ50M9Lxf2deIYQ2OEz9eiW7fCUihNs4NecWF2LA6M+jnK3e3MCvwHXo/rcZ?= =?us-ascii?Q?ma15AHkAh54+LXNh0JHQSSPSvSSCm2TeEWs+FYKgGjaS/yTzK/ZwA9BKLZTT?= =?us-ascii?Q?/FmjZXfLTv19AJwPhQrSu/4ZBjcwTOSsfc/G9RTrt2GRpwIkOZI7ytFYAZoB?= =?us-ascii?Q?1rLrmI/GBMTvb61/YbKazp0AOJp0Tc4pUZ30UPwuFFZgMRufwfqos/LCYH58?= =?us-ascii?Q?/yCH+H0W+p2/ppauGlHhds3COOjNAg/0ssST/C7laR/AXLT8K++jT/I71+Ri?= =?us-ascii?Q?aIBKhaExX5oD98t34gEqSh/c94bGERMyizVG4JGchLL+Bne5RsC3hbyuMVfv?= =?us-ascii?Q?dtkIZ78WVaj7BREsHTJsxuEy570INKt9DNa1LjPp49fZ63queJ1MZQSPC7Pt?= =?us-ascii?Q?Qq31Uf3yfyQuAge9hRjVxtnJX77mOb+XWkPrjLXJf6NfIt64NRMo/+zn/b9p?= =?us-ascii?Q?I0vI524cixaa16mkHDeECkUs5zVm2sERWiqKEB41hGVs56euYdQ15TAHK7Il?= =?us-ascii?Q?5MmmomwwuDZWId+p/x+ANm25uh5EiJn86OVOflS8iTd6W9/HpOYPTyEEA3jJ?= =?us-ascii?Q?aGxFl5F4s90PqiqJ66UMP7xfADSHIxOkBNm3WSoODN/2/j7t1/zvgzschMTv?= =?us-ascii?Q?u6raFwKJ/7tOQBdr9zlUl7BX3dD5xGGOho2C3qa7RPreeBXhkKFlFc4AzorE?= =?us-ascii?Q?zVgFlsFRs3zuY42YDYY2oJ1arg7KBkgf72f6t/5qZkwBtN/Dw8NmJYxUmOyP?= =?us-ascii?Q?Iefur98p0ieK2kQ2epU0ON4EApT164IZZH/zxxSavAsklK3V2TltwcKgTAxs?= =?us-ascii?Q?DvlR4ViEVT237Qgt0JCYxiiw8cNLFaVkM53HKG7W1QdGa2pBOFZWCBvgmnNj?= =?us-ascii?Q?ZrZwlkF1PdC57RNYjgxXON5dOBPRiTfQq6nAibdQrgx4tsz5U7SR8JlzUCaE?= =?us-ascii?Q?7cyaQt9C1hSdk3U6QDs7O0LIG3xcS6mqLSsayZICMPLraYbpMI3y1hbcPcaD?= =?us-ascii?Q?pfv5nxyBEdwsVsajxlbdYePmTvwC7XSOd/W451YURgc1W/Aq9adOhK3exfwk?= =?us-ascii?Q?/wI/5WSj1wzVRxaL6lfFN+/bJxmIAq8amXR3+EzLOY54WWLuHZXpyX9BQxcq?= =?us-ascii?Q?p2dIAI9U5GxIjyL/zDwOR4g5zTtvApZ5fDE7hi4x7xKIeGssKufrRZQp+MND?= =?us-ascii?Q?21CQBDy7vxc7eW7MAZFhBZjhb7FW1BaXGXcRM/F4L81OqMa7brejZfgEHtY2?= =?us-ascii?Q?LAuwCRk5YuHcwQV2sXWIRvhLmuWtvjz5IDQfWyh80LPeO+qFNp92j24/41Eo?= =?us-ascii?Q?ZA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?FElUXM4pZfVy/zUBleaWpQdiPGSIQhuOTX0AKDDOEZavDTvdbPjXkLKf1aDU?= =?us-ascii?Q?1q6NSUpI50Tx71AGaCwPDom81/JaasjXvPl0WC49i0UlMXK4uulzWRkNOaVz?= =?us-ascii?Q?gbDk0zxSOHYB9SEdbADHqH1eytUBY3f2vhBPcGm4DFcv1PvssSRyIUUAfDTV?= =?us-ascii?Q?w6hlLNk8Bsqk6t8R4ERgCB0/rJqOFJfxW3xjcixF81SJPazRYX6BIOeRNeFa?= =?us-ascii?Q?B+UcjpumoKKTxmtu/PM3pU7Md8eN8ehfFHOSTUqLYruyZMhKPCaBCH0zjMnO?= =?us-ascii?Q?Mto7PyQRx8ddasiQJ2K0xRmWJx046ZnuspzLoHcW3rlHF2ZErc3a0Bf57zl7?= =?us-ascii?Q?YomPtISYwEKrwjZT92bC5z6CbHiOvssKDZZbcA8oj6eexP4F2sV09HeFNzlV?= =?us-ascii?Q?gUe5AIeLmmFyBTaE3V7X1ChaMLOsvCdfVCykYl9jVn/epWDF+Br8CBISI7yB?= =?us-ascii?Q?fVM91hf7og4bs2X3d0G/yeWcmczNv79lxqo1qz4gPO6t6Xw7czqIy8rrWSDs?= =?us-ascii?Q?tbLBK1mjEx0u/NgtYPAKZI9PJ1+qPWkmP2QhpBQtaBRsNo+0ptR1qZqaYZKZ?= =?us-ascii?Q?JoNx/SWTb3ZSA0sYlYaXfLzPJE8mXBbAT/2CjS1MQmrVAawg3oobfRnui/+z?= =?us-ascii?Q?//8E29l0g5dFZl7flMT1swKwqSz/33rS4qLhS+r27HO43c4jVJhLDHFrB1N1?= =?us-ascii?Q?08zG0Plmbko4srD70uwqBxDU1KuWJQtfHncQtekgj4PsCVj7jtzWwt32r5ll?= =?us-ascii?Q?9iRPdMpkXEMyClb3D6tMG/fZF1LntJi/T4UYd1lFf34kfGpYs/hqL3tJQa0d?= =?us-ascii?Q?hmO5EVLe018QQQtyMImrSEfkhzCfc5Nf5CfcCZ8QA6S89cuXZdnQ8KNosxJf?= =?us-ascii?Q?9UowvGgLywEHk1rhrnrY+CEmdc9RHgayXaNbRWPu8QeGzcssyzunNlwM6wmh?= =?us-ascii?Q?2ruvoIPIRruTLWubqrBDYL788hcPxPP0en7/ZtljqtifV1HZGiDy1XiPiIYA?= =?us-ascii?Q?OI4r3H4u9sJhQzIlm/Z5D57ZixTKo1PF9PBq2+aIm9U1Zm4S5WWi5fxk6eBy?= =?us-ascii?Q?MEMP0hPSs9j7gnDda+1Pmb18yB2mKLJG7ZEb4qu8XSum01aY5z3P5EtcmQvs?= =?us-ascii?Q?C7w+u+QL8ZRE5VvRDGiCjmEbCdQtM1tLzlqzIHFuXgoGPLIArupshkXfyRnG?= =?us-ascii?Q?UV3WzXHTEhFYKTF6?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3e2d3c6-4fa0-4d09-56b4-08dbd04b815f X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2023 02:31:31.6623 (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: IB6PUx/72yjRvJu8Yl40s53/JOvfphT1OGtNBDGGov6gUYQV4s4dy4DXdlu17v9gZQnCggOhYjjeDqNXBzHUVQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7123 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-19_02,2023-10-18_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 adultscore=0 spamscore=0 mlxscore=0 phishscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310190019 X-Proofpoint-GUID: CbApSzPz9J45Fy7Qgb_BzFLvIhBy_Iuy X-Proofpoint-ORIG-GUID: CbApSzPz9J45Fy7Qgb_BzFLvIhBy_Iuy Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Now that batching of hugetlb vmemmap optimization processing is possible, batch the freeing of vmemmap pages. When freeing vmemmap pages for a hugetlb page, we add them to a list that is freed after the entire batch has been processed. This enhances the ability to return contiguous ranges of memory to the low level allocators. Signed-off-by: Mike Kravetz Reviewed-by: Muchun Song --- mm/hugetlb_vmemmap.c | 82 ++++++++++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 26 deletions(-) diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 77f44b81ff01..4ac521e596db 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -251,7 +251,7 @@ static void vmemmap_remap_pte(pte_t *pte, unsigned long= addr, } =20 entry =3D mk_pte(walk->reuse_page, pgprot); - list_add_tail(&page->lru, walk->vmemmap_pages); + list_add(&page->lru, walk->vmemmap_pages); set_pte_at(&init_mm, addr, pte, entry); } =20 @@ -306,18 +306,20 @@ static void vmemmap_restore_pte(pte_t *pte, unsigned = long addr, * @end: end address of the vmemmap virtual address range that we want to * remap. * @reuse: reuse address. + * @vmemmap_pages: list to deposit vmemmap pages to be freed. It is calle= rs + * responsibility to free pages. * * Return: %0 on success, negative error code otherwise. */ static int vmemmap_remap_free(unsigned long start, unsigned long end, - unsigned long reuse) + unsigned long reuse, + struct list_head *vmemmap_pages) { int ret; - LIST_HEAD(vmemmap_pages); struct vmemmap_remap_walk walk =3D { .remap_pte =3D vmemmap_remap_pte, .reuse_addr =3D reuse, - .vmemmap_pages =3D &vmemmap_pages, + .vmemmap_pages =3D vmemmap_pages, }; int nid =3D page_to_nid((struct page *)reuse); gfp_t gfp_mask =3D GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN; @@ -334,7 +336,7 @@ static int vmemmap_remap_free(unsigned long start, unsi= gned long end, if (walk.reuse_page) { copy_page(page_to_virt(walk.reuse_page), (void *)walk.reuse_addr); - list_add(&walk.reuse_page->lru, &vmemmap_pages); + list_add(&walk.reuse_page->lru, vmemmap_pages); } =20 /* @@ -365,15 +367,13 @@ static int vmemmap_remap_free(unsigned long start, un= signed long end, walk =3D (struct vmemmap_remap_walk) { .remap_pte =3D vmemmap_restore_pte, .reuse_addr =3D reuse, - .vmemmap_pages =3D &vmemmap_pages, + .vmemmap_pages =3D vmemmap_pages, }; =20 vmemmap_remap_range(reuse, end, &walk); } mmap_read_unlock(&init_mm); =20 - free_vmemmap_page_list(&vmemmap_pages); - return ret; } =20 @@ -389,7 +389,7 @@ static int alloc_vmemmap_page_list(unsigned long start,= unsigned long end, page =3D alloc_pages_node(nid, gfp_mask, 0); if (!page) goto out; - list_add_tail(&page->lru, list); + list_add(&page->lru, list); } =20 return 0; @@ -577,24 +577,17 @@ static bool vmemmap_should_optimize(const struct hsta= te *h, const struct page *h return true; } =20 -/** - * hugetlb_vmemmap_optimize - optimize @head page's vmemmap pages. - * @h: struct hstate. - * @head: the head page whose vmemmap pages will be optimized. - * - * This function only tries to optimize @head's vmemmap pages and does not - * guarantee that the optimization will succeed after it returns. The call= er - * can use HPageVmemmapOptimized(@head) to detect if @head's vmemmap pages - * have been optimized. - */ -void hugetlb_vmemmap_optimize(const struct hstate *h, struct page *head) +static int __hugetlb_vmemmap_optimize(const struct hstate *h, + struct page *head, + struct list_head *vmemmap_pages) { + int ret =3D 0; unsigned long vmemmap_start =3D (unsigned long)head, vmemmap_end; unsigned long vmemmap_reuse; =20 VM_WARN_ON_ONCE(!PageHuge(head)); if (!vmemmap_should_optimize(h, head)) - return; + return ret; =20 static_branch_inc(&hugetlb_optimize_vmemmap_key); =20 @@ -604,21 +597,58 @@ void hugetlb_vmemmap_optimize(const struct hstate *h,= struct page *head) =20 /* * Remap the vmemmap virtual address range [@vmemmap_start, @vmemmap_end) - * to the page which @vmemmap_reuse is mapped to, then free the pages - * which the range [@vmemmap_start, @vmemmap_end] is mapped to. + * to the page which @vmemmap_reuse is mapped to. Add pages previously + * mapping the range to vmemmap_pages list so that they can be freed by + * the caller. */ - if (vmemmap_remap_free(vmemmap_start, vmemmap_end, vmemmap_reuse)) + ret =3D vmemmap_remap_free(vmemmap_start, vmemmap_end, vmemmap_reuse, vme= mmap_pages); + if (ret) static_branch_dec(&hugetlb_optimize_vmemmap_key); else SetHPageVmemmapOptimized(head); + + return ret; +} + +/** + * hugetlb_vmemmap_optimize - optimize @head page's vmemmap pages. + * @h: struct hstate. + * @head: the head page whose vmemmap pages will be optimized. + * + * This function only tries to optimize @head's vmemmap pages and does not + * guarantee that the optimization will succeed after it returns. The call= er + * can use HPageVmemmapOptimized(@head) to detect if @head's vmemmap pages + * have been optimized. + */ +void hugetlb_vmemmap_optimize(const struct hstate *h, struct page *head) +{ + LIST_HEAD(vmemmap_pages); + + __hugetlb_vmemmap_optimize(h, head, &vmemmap_pages); + free_vmemmap_page_list(&vmemmap_pages); } =20 void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *f= olio_list) { struct folio *folio; + LIST_HEAD(vmemmap_pages); + + list_for_each_entry(folio, folio_list, lru) { + int ret =3D __hugetlb_vmemmap_optimize(h, &folio->page, + &vmemmap_pages); + + /* + * Pages to be freed may have been accumulated. If we + * encounter an ENOMEM, free what we have and try again. + */ + if (ret =3D=3D -ENOMEM && !list_empty(&vmemmap_pages)) { + free_vmemmap_page_list(&vmemmap_pages); + INIT_LIST_HEAD(&vmemmap_pages); + __hugetlb_vmemmap_optimize(h, &folio->page, &vmemmap_pages); + } + } =20 - list_for_each_entry(folio, folio_list, lru) - hugetlb_vmemmap_optimize(h, &folio->page); + free_vmemmap_page_list(&vmemmap_pages); } =20 static struct ctl_table hugetlb_vmemmap_sysctls[] =3D { --=20 2.41.0 From nobody Tue Dec 16 21:58:58 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17AC5CDB47E for ; Thu, 19 Oct 2023 02:32:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232484AbjJSCcY (ORCPT ); Wed, 18 Oct 2023 22:32:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232419AbjJSCcS (ORCPT ); Wed, 18 Oct 2023 22:32:18 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 952B8119 for ; Wed, 18 Oct 2023 19:32:15 -0700 (PDT) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39IImvgx006156; Thu, 19 Oct 2023 02:31:38 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-03-30; bh=3vbONjsZvravfMZFWf/jFmc0JqQCVqxQwTo9QP2uYlc=; b=zIzRzaEFJL3VttvyiJzJuePNjkl9xmkcG5Vgx47RGq9Oyk8IO6QiaIr7q1kGbPT3en75 bZ9FyjtBc/mZE5VLtdQEn6M1G+/TZoLd3x2jo0dRPyf19gk3fM2PybsQQHHSC2SNoKwb quMJo4aIsfJ5llP49wCs/8hdaLGwRDk/Zq42uZvYPLIS8VdFJuQRWgrcRolRdNQDsXxj 9orz8oriyVZZflsCEoFToW45f8CVQkfJv9O09+cjqGK6Q5/mujNaz0hXVfeD9ySdbHGZ bAR62paulj5wO2KWSE+AIlFw9tvZ2/Zsj6TX5slEuZoBrUwmatdznTvZtSbe+Ft5u9VI zA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3tqjynh6qq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:37 +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 39J1XXA0028424; Thu, 19 Oct 2023 02:31:36 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2040.outbound.protection.outlook.com [104.47.66.40]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3trfy5uuq0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nwSXRct84p7n3qNmcCpXrgiXVwhWOM9oyE9HzBUyQ62z6IHYipGHSNjXe+Nqt8dX0CRKx0+sF1VXwqKK+SSR0epWi12efiTQdJe+zM2NRvvwszNxta4hlSBOgjmCu/JAARD4hROOsMDT25klxGSnnRN4juhI95w+L8wf2udOOhcf3Iiou23uZ9fj3Y0lMnrC+l8d1jpTp1VQ5tcDQSF3HmL79yO/kXNhxjNVdaWUwgDU6rPGkzDO1qSWJLnmGJ0JPDK771hXOjbYkLk2AnMxUGl1OMWJVZOqFlODeJlA1UIraQYAXhBhbDMwhi3Mo5gUbNu/qJDqF3IXACQog/PNbA== 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=3vbONjsZvravfMZFWf/jFmc0JqQCVqxQwTo9QP2uYlc=; b=gy8NHHJVKnRJXgT637IGI8p416sOAD7RTVxZu64gp6TWx/I6r6vZRj3C+mnLJdV6Blaw4xB0Yaw5COo5u/1Di3NA0axKJjqbD7v0PnwmnFzvL8G53GyS4PVaV6vdfpt+eqaHC3QhqU5/LS4JEpbVPbhpT4OpLTOKmpbO5s9R2JDMEuVEPVn2FjsdyrC2FAm1pMVKTDmWAu59IGMPSViCP4Jvs4RuHbCSOh6y0EMVfh/VxXKWTOhuh7apK1CPa99pQcKdgapQ8Dqw6iaScQ0qOvHj3z7FQ+Z8N8sc6ecRUJwQ0dwP22RQzv9+lZbDReDRito+R0bkD+KaM9M1sN4KQw== 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=3vbONjsZvravfMZFWf/jFmc0JqQCVqxQwTo9QP2uYlc=; b=Ts6a96pA8vZshVxeWlSNKv9+d4JA1ceBGvSEyy/3yr8QYK2p3AVIqIz0r7Bnjrz7YUjvuT0ZERBAx/05KBJe1rR/44Uou6xSXnG/wGwYExqtFENfXmg+h7A0UEqHduhim1pq1vAEt9S8eDHTjLs1jIA6hUrVOxw0FclRCGkD4rA= Received: from BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) by CY8PR10MB7123.namprd10.prod.outlook.com (2603:10b6:930:74::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Thu, 19 Oct 2023 02:31:34 +0000 Received: from BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2]) by BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2%6]) with mapi id 15.20.6863.032; Thu, 19 Oct 2023 02:31:34 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Muchun Song , Joao Martins , Konrad Dybcio , Oscar Salvador , David Hildenbrand , Miaohe Lin , David Rientjes , Anshuman Khandual , Naoya Horiguchi , Barry Song <21cnbao@gmail.com>, Michal Hocko , Matthew Wilcox , Xiongchun Duan , Sergey Senozhatsky , Usama Arif , Andrew Morton , Mike Kravetz Subject: [PATCH v8 6/8] hugetlb: batch PMD split for bulk vmemmap dedup Date: Wed, 18 Oct 2023 19:31:08 -0700 Message-ID: <20231019023113.345257-7-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019023113.345257-1-mike.kravetz@oracle.com> References: <20231019023113.345257-1-mike.kravetz@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MW4PR04CA0047.namprd04.prod.outlook.com (2603:10b6:303:6a::22) To BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4196:EE_|CY8PR10MB7123:EE_ X-MS-Office365-Filtering-Correlation-Id: 80db1915-49de-4ed0-a873-08dbd04b82e8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Mt4DXdd1O5jyJOJ6NHLOURIEQbLFAB5IWcJi8J+mthnWBPXuPX78mHGGwLOnXm+K9XR8IglLuMmC46idBYyXhiTIlLp/vkQ1fQABltzkVt71/8anIgu1IGzsA4Bgy6zeX+aTGrRaxJhZBQMITdzVDjdtlX9dDhzNUCtNRn6P73af7sgVQuFdHGNdIvOtNzzyc99c6duqc3lPl91uHh+ef4FFKBhBW0QB4z4N6zugK6WTeraAvvlcD7PIjGYEcm6NrWico57N9SnNfcAizDFAmenTy3azfRncyMpJwACM/7nzVAHQC0N3+NGd54s5+nssTbTf+idPpf9vF1ehCpCO8jS7/6dN55+i0zX9DKN4peRZNJ8noonag8LRZBrcclDXI0iasgsb9qd4jW9j5B7Qwf9EvzMPVHWG5m3GPApalL8osBEtX2H/9twuZLMJogTbNRIh9vZuOpYTwfpUo7Wv3hDGEzz2/N1gxBM6H1EANpO4hp+m7z6qyzpfk1ETdXTGsXJmvGgRvmX2ENQ/BBz81K0jl377VPVKvSrOh+gj/lbFoby1mLEuk8/nu66LuP/n X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4196.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(136003)(346002)(396003)(366004)(230922051799003)(1800799009)(186009)(64100799003)(451199024)(478600001)(54906003)(316002)(66946007)(66476007)(6486002)(66556008)(6666004)(1076003)(86362001)(2616005)(26005)(6506007)(36756003)(107886003)(6512007)(8936002)(2906002)(4326008)(8676002)(7416002)(44832011)(41300700001)(83380400001)(5660300002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xPVPUeohT/zyE+rEBxPr7t11x/0f2Djjl1Yydnusi6N6moH6jfcM1H+unKZT?= =?us-ascii?Q?AoxLTDtH082NcfkQVIf5huaXajnmPiaevsqpRCeAZT4UycGKAvumwVmiy6PP?= =?us-ascii?Q?Ny1hVS/6wvLpyMUwcC03OJOWLR9CfBLU4tlGAVH29ygt8N4U7z/vUSpAVLft?= =?us-ascii?Q?KeZ0X4JfltrxMDuKnMOYrVAMEsG5+elYWgUjdKMrt/SlGvUGbwjrOj0jeQTg?= =?us-ascii?Q?6u8MMd3emxcD3IoN8ojOUKZkT0iTnu3k6ii5gf0BcaHejTu1YzfT+oMzEntS?= =?us-ascii?Q?+t+P+WjV802+XgOtLiIiKVjuTDWWpmVnM/BGA1oS8dFPHRQLlTfMlzGsfIrQ?= =?us-ascii?Q?kvoy8XJ+PsXZspFri6Bt0KBEMVRkvmbfRvGaXrZ6rvtXbiG2U9x6T0LoCvxU?= =?us-ascii?Q?mJ5L/G8sue/8V7r4UPKisIjwEeIVD1b/QZ0lZmh1OUV+E0xZyyLKj2Qy+c5k?= =?us-ascii?Q?dwK5EkzCnPQhlHhELU8yDktE2DCakI2PANQKD/gaIG0ysbuvlAEBKwYQTSCl?= =?us-ascii?Q?cN2wYxXU390+JI80U/FLD5dF6vpg7vaE1qOKUUcKl5lXp0hj8icftjs4g8uv?= =?us-ascii?Q?4tsFPncQmk1TjOt+sMoFsMola+97YMzCxEAuUNGDxEcYORlwFuzprwyUq1Wa?= =?us-ascii?Q?xAUVYAXG1k28rhXQPseAzP1jrgtAFxA11XAl/OIu25jJW/JDRV+X/XNxTa5D?= =?us-ascii?Q?vQ8jC2hqxMAegw0hE/oGPxkeyyzlGP4mwTl/j7MGT16JrpEx8EpU3V+RhhqB?= =?us-ascii?Q?QT1lNOdmoZiobcbRtx6hcCX6ILWFKQG48rbPJ2atTkTo7wqyDtlI/K5vSNIO?= =?us-ascii?Q?Jpz7zD0TJuVFnfWnxxyah//aeLS9N+8nw+Qg+uouhbHwvIbAMlDzPkcVt5yv?= =?us-ascii?Q?MXDAtFCXQocxPjIOCmaJBV/5FmGlaNMTH8RD5Ou1AF2BhmfCuwOZ95P18i+q?= =?us-ascii?Q?fNmO+jR3DMyWLsWCsTq8/nAzBkxn7WJp0BRU2SF6p41uYcaqUMGj7DNBIMJ3?= =?us-ascii?Q?T0uXq/Uxq6b3v/gteyTqj6OrgjXP77zpS/cRki2qYjt6Q/030ilhU54fiOWN?= =?us-ascii?Q?x3hAYF9TYvnsEyUHvzzT+aiJ/kKN5g/Tz77h/gfDhRnbdCDy/855ZpM0JbKw?= =?us-ascii?Q?RTUZQxcWjNeQD5qSApNkZ6V6o4ZdyWw4ssSD4J+vPjyYefjzrKk3CUWNwzpv?= =?us-ascii?Q?MuvAPKkH0kZ+XOhQEYzwKwqj13shWohYT7YuqGW8goQyWM51XJjXODTCgNY1?= =?us-ascii?Q?WY4OiRwQt5PkZuEuKwQv1AAhZbUqNSH//u+PLDYzhfmh0r7gg/YS1OSOwW6x?= =?us-ascii?Q?wwHhdE4ISsM/Y/plb7Z6ym2dUjie3QXs8oI0E5BSWS2EwkwkQn1xOtcfPogb?= =?us-ascii?Q?2Jq2h6FVJ5UQ3K6tAubtzyn01o+kYlm4ac48Vqe8AbRRToA698wZ2ZdqLA8H?= =?us-ascii?Q?9r0mgCkWF9qX1z1asV7LJcT18ZfSCJcuZRlbANxnsKoguTWFwn3q2rZPwRWM?= =?us-ascii?Q?Xc9RlZ43UjZSm1clYicIZtUAyFwFggT9r1LmUtpdj6hXtP+f/3HXa+1JWj8P?= =?us-ascii?Q?HWa3UbzkOgsT5UH67XKyzPT5mwe6ZWIG01LglrMbkXKMDjzeyYKSRVlv/4kf?= =?us-ascii?Q?8A=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?zLJfq2rKPQvzbHitlJhapk+YpZkq8f6Jct+qKJbzzrDfQLQUL2EikCHziBZg?= =?us-ascii?Q?ejVv/1kppEJI/a/F57xSlGEh2h28DgSqIrLT/fIS+hoWNoeNephamM57NUAN?= =?us-ascii?Q?GZWyP2A4PI/awjg8BceAPKnGPhv64CE7UJDxDkux3EazKoHf82HU2AqTzfEx?= =?us-ascii?Q?mbd4LRco4AP0vIa5k5eDxpiUzaQuB3gi6yXcjs2in/wI4AStimf657VhkMDa?= =?us-ascii?Q?ayVy0Wzit2KW9adQYNEc6hUKLYI5839xhCa9yEq8qApGImmmfH9IhQ3NHND7?= =?us-ascii?Q?dQr4yK+LX8DoLIRTTRGFI5gvlmuq1dTs2s8RVa0zSyoNuQv7UnUMPRO1qDiP?= =?us-ascii?Q?AiOwYLgCmlybZOxJEAZE3xgtc9Np60m+qWy7IREvjg+gPpUmsB6NObB9iZNo?= =?us-ascii?Q?cU1YZSkQkwqacB2FREKjCsl7aEHp5g+7nq4No86Jltpog8y+Q20G1Fm9pXwu?= =?us-ascii?Q?4ggF/WZbChEddKTzAf7fMMpNV76gJb0/EwPJ9xPmiPJNPSvpsLWHvaVnLKK6?= =?us-ascii?Q?fY3wyDZYLTLnjyrXwKdRXQTbhsxLcwh7OR7dOT5oRLnRJ7sqbVnqPMzanCYk?= =?us-ascii?Q?/HdIdC8rR24dO0WRJT0voqj2U1FJtgtiwOMF2UoOdHsfl9v0rsJeSx/R2MKT?= =?us-ascii?Q?kDDu5lVvLiKUnb3ixmAdBRCR3wfM7//jVOIretYtzM7Jgm56iYqETAig44+V?= =?us-ascii?Q?Uqr4yZnQIUUt0S00HsL/p/uUj44JlL1C2bcf7ivvle4XKcawwC/i1FY6N5qo?= =?us-ascii?Q?TPRnGQBkPsURzHnHHXNck2f3WMyb2wFNjYVn/8zRtnD8+a/WKYLHjaxz1n7T?= =?us-ascii?Q?7zidOFWkA5pYvadjtmceZaVGuyRnjRnRng44JyBWhZExg9F1ph4fJYsU7h/e?= =?us-ascii?Q?2b+pn9YbCyMg9hI5ub0KcfJ9y/2PoXeAfPS+5yP3B1/VGT5N0d0yga4O/q6u?= =?us-ascii?Q?lvSZQkDqg0rojV81HoElZL6Y9DwPXpaXRo/7QBbReepem0Fvkp8sknY9P1I8?= =?us-ascii?Q?fANksp/6VdNWgXynI0riyChr9jU7tQjDkW2yknZTHL+REYhBUAhKCYtNvr1J?= =?us-ascii?Q?rLMpc6uT+6/NSYvLsgsVR3URRQn6y4lnNJaYIOC76GAv5WIs8sLkMBi/2p5k?= =?us-ascii?Q?WUDwoaCx/LazBi/HnNVQlEtgtOFKdI+WHaq7QFpPHJovR0xHkQYJYoQz28MR?= =?us-ascii?Q?XF3RkDqg85H/4dEW?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80db1915-49de-4ed0-a873-08dbd04b82e8 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2023 02:31:34.1443 (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: RhIs/Kb3+DgxgGTivRYasvj4bwFrDrkTI3mOa7JV7MY1lbRfiJOUslW4Tw57YWhQA0D9nx+nK22fOAqbyfaZaw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7123 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-19_02,2023-10-18_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 adultscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 suspectscore=0 malwarescore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310190019 X-Proofpoint-GUID: krOX7uT60MvIF-FgkVyfhW5EeydFm-ud X-Proofpoint-ORIG-GUID: krOX7uT60MvIF-FgkVyfhW5EeydFm-ud Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Joao Martins In an effort to minimize amount of TLB flushes, batch all PMD splits belonging to a range of pages in order to perform only 1 (global) TLB flush. Add a flags field to the walker and pass whether it's a bulk allocation or just a single page to decide to remap. First value (VMEMMAP_SPLIT_NO_TLB_FLUSH) designates the request to not do the TLB flush when we split the PMD. Rebased and updated by Mike Kravetz Signed-off-by: Joao Martins Signed-off-by: Mike Kravetz Reviewed-by: Muchun Song --- mm/hugetlb_vmemmap.c | 92 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 4ac521e596db..10739e4285d5 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -27,6 +27,8 @@ * @reuse_addr: the virtual address of the @reuse_page page. * @vmemmap_pages: the list head of the vmemmap pages that can be freed * or is mapped from. + * @flags: used to modify behavior in vmemmap page table walking + * operations. */ struct vmemmap_remap_walk { void (*remap_pte)(pte_t *pte, unsigned long addr, @@ -35,9 +37,13 @@ struct vmemmap_remap_walk { struct page *reuse_page; unsigned long reuse_addr; struct list_head *vmemmap_pages; + +/* Skip the TLB flush when we split the PMD */ +#define VMEMMAP_SPLIT_NO_TLB_FLUSH BIT(0) + unsigned long flags; }; =20 -static int split_vmemmap_huge_pmd(pmd_t *pmd, unsigned long start) +static int split_vmemmap_huge_pmd(pmd_t *pmd, unsigned long start, bool fl= ush) { pmd_t __pmd; int i; @@ -80,7 +86,8 @@ static int split_vmemmap_huge_pmd(pmd_t *pmd, unsigned lo= ng start) /* Make pte visible before pmd. See comment in pmd_install(). */ smp_wmb(); pmd_populate_kernel(&init_mm, pmd, pgtable); - flush_tlb_kernel_range(start, start + PMD_SIZE); + if (flush) + flush_tlb_kernel_range(start, start + PMD_SIZE); } else { pte_free_kernel(&init_mm, pgtable); } @@ -127,11 +134,20 @@ static int vmemmap_pmd_range(pud_t *pud, unsigned lon= g addr, do { int ret; =20 - ret =3D split_vmemmap_huge_pmd(pmd, addr & PMD_MASK); + ret =3D split_vmemmap_huge_pmd(pmd, addr & PMD_MASK, + !(walk->flags & VMEMMAP_SPLIT_NO_TLB_FLUSH)); if (ret) return ret; =20 next =3D pmd_addr_end(addr, end); + + /* + * We are only splitting, not remapping the hugetlb vmemmap + * pages. + */ + if (!walk->remap_pte) + continue; + vmemmap_pte_range(pmd, addr, next, walk); } while (pmd++, addr =3D next, addr !=3D end); =20 @@ -198,7 +214,8 @@ static int vmemmap_remap_range(unsigned long start, uns= igned long end, return ret; } while (pgd++, addr =3D next, addr !=3D end); =20 - flush_tlb_kernel_range(start, end); + if (walk->remap_pte) + flush_tlb_kernel_range(start, end); =20 return 0; } @@ -297,6 +314,36 @@ static void vmemmap_restore_pte(pte_t *pte, unsigned l= ong addr, set_pte_at(&init_mm, addr, pte, mk_pte(page, pgprot)); } =20 +/** + * vmemmap_remap_split - split the vmemmap virtual address range [@start, = @end) + * backing PMDs of the directmap into PTEs + * @start: start address of the vmemmap virtual address range that we = want + * to remap. + * @end: end address of the vmemmap virtual address range that we wa= nt to + * remap. + * @reuse: reuse address. + * + * Return: %0 on success, negative error code otherwise. + */ +static int vmemmap_remap_split(unsigned long start, unsigned long end, + unsigned long reuse) +{ + int ret; + struct vmemmap_remap_walk walk =3D { + .remap_pte =3D NULL, + .flags =3D VMEMMAP_SPLIT_NO_TLB_FLUSH, + }; + + /* See the comment in the vmemmap_remap_free(). */ + BUG_ON(start - reuse !=3D PAGE_SIZE); + + mmap_read_lock(&init_mm); + ret =3D vmemmap_remap_range(reuse, end, &walk); + mmap_read_unlock(&init_mm); + + return ret; +} + /** * vmemmap_remap_free - remap the vmemmap virtual address range [@start, @= end) * to the page which @reuse is mapped to, then free vmemmap @@ -320,6 +367,7 @@ static int vmemmap_remap_free(unsigned long start, unsi= gned long end, .remap_pte =3D vmemmap_remap_pte, .reuse_addr =3D reuse, .vmemmap_pages =3D vmemmap_pages, + .flags =3D 0, }; int nid =3D page_to_nid((struct page *)reuse); gfp_t gfp_mask =3D GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN; @@ -368,6 +416,7 @@ static int vmemmap_remap_free(unsigned long start, unsi= gned long end, .remap_pte =3D vmemmap_restore_pte, .reuse_addr =3D reuse, .vmemmap_pages =3D vmemmap_pages, + .flags =3D 0, }; =20 vmemmap_remap_range(reuse, end, &walk); @@ -419,6 +468,7 @@ static int vmemmap_remap_alloc(unsigned long start, uns= igned long end, .remap_pte =3D vmemmap_restore_pte, .reuse_addr =3D reuse, .vmemmap_pages =3D &vmemmap_pages, + .flags =3D 0, }; =20 /* See the comment in the vmemmap_remap_free(). */ @@ -628,11 +678,45 @@ void hugetlb_vmemmap_optimize(const struct hstate *h,= struct page *head) free_vmemmap_page_list(&vmemmap_pages); } =20 +static int hugetlb_vmemmap_split(const struct hstate *h, struct page *head) +{ + unsigned long vmemmap_start =3D (unsigned long)head, vmemmap_end; + unsigned long vmemmap_reuse; + + if (!vmemmap_should_optimize(h, head)) + return 0; + + vmemmap_end =3D vmemmap_start + hugetlb_vmemmap_size(h); + vmemmap_reuse =3D vmemmap_start; + vmemmap_start +=3D HUGETLB_VMEMMAP_RESERVE_SIZE; + + /* + * Split PMDs on the vmemmap virtual address range [@vmemmap_start, + * @vmemmap_end] + */ + return vmemmap_remap_split(vmemmap_start, vmemmap_end, vmemmap_reuse); +} + void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *f= olio_list) { struct folio *folio; LIST_HEAD(vmemmap_pages); =20 + list_for_each_entry(folio, folio_list, lru) { + int ret =3D hugetlb_vmemmap_split(h, &folio->page); + + /* + * Spliting the PMD requires allocating a page, thus lets fail + * early once we encounter the first OOM. No point in retrying + * as it can be dynamically done on remap with the memory + * we get back from the vmemmap deduplication. + */ + if (ret =3D=3D -ENOMEM) + break; + } + + flush_tlb_all(); + list_for_each_entry(folio, folio_list, lru) { int ret =3D __hugetlb_vmemmap_optimize(h, &folio->page, &vmemmap_pages); --=20 2.41.0 From nobody Tue Dec 16 21:58:58 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF8C8CDB47E for ; Thu, 19 Oct 2023 02:32:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232603AbjJSCci (ORCPT ); Wed, 18 Oct 2023 22:32:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232479AbjJSCcV (ORCPT ); Wed, 18 Oct 2023 22:32:21 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C15A132 for ; Wed, 18 Oct 2023 19:32:16 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39IIn3im027703; Thu, 19 Oct 2023 02:31:40 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-03-30; bh=Tsc70UZvKWYWI+spZQiVZ3u2z8ZAo9dlRTusEOzzs6g=; b=rQpgErTtmdABXRMhNGQQlgg2mX9haPcDZ0EFYfKahihSaYXFLxHX/NS35+lzk81MfcOs FRMxamzwB3sxd69ZvQ2XDeUpNwznTrFIDMuXYOW73F7Dwnw9Zdar51isKl3rBLG0pYav kbijrBFpSCsA/ab9G6wxYDhTk2tdX8Jyk8Kn+Ru0SftYqzKDf8zG00BUWxIiHT8wc8Yg ZX+hpETt/BN8jLpfsx59m+85S1CIZBXiew6jvMM5f24JH7gvwk33r8UPzxmZT41JU4+0 CJp62bS/3Ev9BdA32QT9KnYPzg7mbs5BZvRQS6jjhHZ0hD/thn2MHxidZWcXRFf4GQEa Qw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3tqk1bs38n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:39 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 39J2GJ34021964; Thu, 19 Oct 2023 02:31:38 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2040.outbound.protection.outlook.com [104.47.66.40]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3trg539w5m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nxjOzwliXpJ3e6gfqvgLcy9YtSOFEt/tQATGpXR/vBEcoX1jJJUK5GU92e0HpViDd/OmBx1ontByJKoMkgYs0Q5aXZ31e4weCHJjh3lr7Gu0rf9ci2zPyDhilMF54s/TO46S7sI60tY09eUJn+U5Fwk/m3W1X+JueCsN8mgTdQEnyKnta0goIp8//fzyHlmZq/n7vvlkq6pDxS74mx2ZsHsVq2V6/Fpr4fuYZfNpBkqcG3IBPsQUGKUSkW9NKrBKwEgBb3WJtWRbvY1pcfsHHPD2A3rlYK2jhz3ydMUIlnCGn0lBB1gqczxpEk1K6lTsERkVeB9rY8y3dv2F8v2t5Q== 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=Tsc70UZvKWYWI+spZQiVZ3u2z8ZAo9dlRTusEOzzs6g=; b=NmvNZE0JZjMeBJKSoQI/L2/HdaP1Z/xg9u/p7FjOcrCRRwDiASjT2gKFcBpeL8xYVhjAQjpi+pXeFnIRnAKNwymkOXAxXp83ZGChWdMJ/he6JG921Ys7g2/zRm8PjhAPVHLIVKerGlxyX4/yZPCC0LGiQxYEQ1gw/nOo195BeHvvkw/V4SHHJiqWqEcYWb6BXrhMywCwlcyYhcJmoKc0iw2oTo5MgqUK5ESVtpLlKbPGVWBrquwJK9col5tlI4ipo+f2k/ZNDL00w2HkqD5naMZHBTrS2dkCnQqXucc4V7Aq3g5s+RHj7uorXOBlW0KbIRJM7Nlv8iTbhIyYpz4z8g== 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=Tsc70UZvKWYWI+spZQiVZ3u2z8ZAo9dlRTusEOzzs6g=; b=deC0BAFXrqeOQZfQnHetFtYnVMGxKglo5r5RWLakj69BHUhg8rKeL2Fock4ArMy9G1PtkXUf2CrGCta34vqTld8q+Q01bLy7tabLOfhVjf3LlIliqlDY5nXVKVJJ4H06VH/QyMnfO4tQhn84re3yCOEFXeTnRf0zwAqGY/n8/Ik= Received: from BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) by CY8PR10MB7123.namprd10.prod.outlook.com (2603:10b6:930:74::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Thu, 19 Oct 2023 02:31:36 +0000 Received: from BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2]) by BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2%6]) with mapi id 15.20.6863.032; Thu, 19 Oct 2023 02:31:36 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Muchun Song , Joao Martins , Konrad Dybcio , Oscar Salvador , David Hildenbrand , Miaohe Lin , David Rientjes , Anshuman Khandual , Naoya Horiguchi , Barry Song <21cnbao@gmail.com>, Michal Hocko , Matthew Wilcox , Xiongchun Duan , Sergey Senozhatsky , Usama Arif , Andrew Morton , Mike Kravetz Subject: [PATCH v8 7/8] hugetlb: batch TLB flushes when freeing vmemmap Date: Wed, 18 Oct 2023 19:31:09 -0700 Message-ID: <20231019023113.345257-8-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019023113.345257-1-mike.kravetz@oracle.com> References: <20231019023113.345257-1-mike.kravetz@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MW4PR04CA0242.namprd04.prod.outlook.com (2603:10b6:303:88::7) To BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4196:EE_|CY8PR10MB7123:EE_ X-MS-Office365-Filtering-Correlation-Id: 09962dbe-d9c1-4a59-c18b-08dbd04b8457 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xgms/ZLaft5gG7asQJn6ysNtVgual/rNiT4vGufADxJVbTJPtKs7JLZLKG3ZbvnT2KrDKaeOmP8jdXGlN3wlkYhRABTxT3LgF4P8Fb1XAczMWW8junqSqvdMWbjOG4SOw/GaM44PGRzoCVs36mCXDugS5prvCASfrvi3XZOwgB+gDUVJ9stjQLutc59jB/INmcCUGWNaQFwscpKiCAWwrDnA38CRj2IeaIeo576IBA2kWN8B3iuQ5crQ6BLQiQAEEWqllPidKHlEX92jXvs7lrTwYLvfEeDPaVUvpI9NzuaSC0qav5iDoHO7oeB7Z3Az9H9kYaeduizv1u1tMqGHUq6jsIwZ9QLWQH1YX99BgXH1/U/QNoICtf7gNLWbuLOvOMqi2S3eIWCHa6VfhLcsbqqVXDwNNUYOAPJ2TaIrm1wD+tHnchbGB+I4tG75E+EQnXSVQ0S2VV8ZlOwObwH3gX+qQShdR8QFIAwnXfTIFKHYOVUMLYDgAAHi+x8k5zl94rW0+f76KzmCPB5o0Rc59eEalSnxtpAk94oPpN6Fg7FlhDfsIK2akvYtglPEeeoZ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4196.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(136003)(346002)(396003)(366004)(230922051799003)(1800799009)(186009)(64100799003)(451199024)(478600001)(54906003)(316002)(66946007)(66476007)(6486002)(66556008)(6666004)(1076003)(86362001)(2616005)(26005)(6506007)(36756003)(107886003)(6512007)(8936002)(2906002)(4326008)(8676002)(7416002)(44832011)(41300700001)(83380400001)(5660300002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dhCmC2lRuBxv4R9mgKc22HTaMfDhfefEOMP9tQtZ8VrXt0KE7BmzA+lzeYbV?= =?us-ascii?Q?Cm01BHb3UCRlHaj0ZNhnhXC6n3C+lTV0owMtn91sdu/MhD93AnGk7E0Pgi3a?= =?us-ascii?Q?UpfemfquB2qOsv5AblF1sX0c0Xivc/2kaHSLpP3lNQ5R/dXE2bIJEKr3NaWQ?= =?us-ascii?Q?DBZY4jHVcmNUL0Q/6yQ+HgEc0zruMFFpzBCW/Xui6hrF5CUZKuArzEcSSpyD?= =?us-ascii?Q?etb8j/Gz0qiDesp1w0O9IXftHje0usjEEspQWNyOZ2jQ1jwZTVjd9NjvBA+H?= =?us-ascii?Q?yFQY+CVRKUObCQw8SnZQcP4vByg1h7suZo8zc6YMSo9PJi+s1eFpDV8qVUe2?= =?us-ascii?Q?1QtXkPkVvwPbzmv4UjVn4Khm8ztcBZ3pu0E/D57R0rpKQgIfuCdUyrjM1tQa?= =?us-ascii?Q?PyezbF2sOsckHLq11js37mIi0wNEHdV5aNZYJrEIs/7mj7AGewjlR3gGbBAI?= =?us-ascii?Q?WBCEa8c8E6Ymmha0mrv1JyuVoh/mfvYf2aqNuV5+JnRltHArB0UQgWLKfT1W?= =?us-ascii?Q?yj9kTt37MPZ1/bFyaIFj3Rq+RejAitQ3vDg++vUDijUyRUvEc1G+O51wT9bF?= =?us-ascii?Q?ZEzufGFhZWoqC6D2bvjnZBR534MTvU6PGHmRvUyMSnTyOBomxCTjvIzom3cC?= =?us-ascii?Q?w49tiBxZKBK0Hk8Ijq6O/cN3yNJOdJ0HuYU7zcQe0dO1GSt7+JPk9HZcI4Kq?= =?us-ascii?Q?77NfsCS0Sqxc08NhBkNmlqbvEdd5uDXJqbT6GjiRDk85L6+bgns9Zbhw0Msy?= =?us-ascii?Q?trIOIK+s5D+xehn4oE0qaYGTv+pzYJ4jW9zjs6OrYIWGDEw9gUU5VSCymCqq?= =?us-ascii?Q?kJ+AAty+fDw/PudyPqwb8lt3kCtIibTk88Htuc5bgprNCFOrot92w5s8yLNs?= =?us-ascii?Q?V0tVk30tkjRuEv4XtmOdkcry+idV7pwT9AdPVhEHKRjV+LRaQ1+QG23DY4eV?= =?us-ascii?Q?NblOSlnE9FWdhfCrslQ+H2UYQLSpLKaEdqNNewjuRjK0hyKaqDkeoRT/DKxe?= =?us-ascii?Q?w/mo+NJtJIYkWUSjxuyQ9VnI4JE2atovQucm/M3d1/JXzzC8fB12pngpPhme?= =?us-ascii?Q?YsK4QwCzD4Eto9j1s8X1tvfsALS8q2Z2Rf4Y9nHRGHkt9VIFPLjAbNxPQmBe?= =?us-ascii?Q?BOP3G17xHcvI+yiDO7iUUGeFer7Wn52HOsVW1pAl0VUdmry4Sh149p7maCe4?= =?us-ascii?Q?uIgONYftZuxwZ62XxtClsU3qxbGfw0dXcUc5rknIkExrq9irTe0sbM2tWVRd?= =?us-ascii?Q?RRbEicM1EzCeFQTJt5lsy5lg9GuwvrkUGCin8mgSFEzR4AstKIX1s2GcX4Kc?= =?us-ascii?Q?MLt3mR916rpsqvrpS8Cmx0xT0zr7JlxGGIuzVl32T/t0UvD5N0aH64GOseoL?= =?us-ascii?Q?6IhghGwvX+22De9EGm7Uflj1pXWD7FP41fCTkTtYRKf4PdKXtQkFaaw/9hzs?= =?us-ascii?Q?rEo2yL9vH2nTQjWTtWZzDYMTRrhQWXpHZxnwnpyzV9G2VR8VyDxBuBCnbU7V?= =?us-ascii?Q?bOMHv7ov7Tx2hpscNLgPx2Vi+j2e1Ov0n4GUtv+s1bbaZ8MpgizAzCPgHttU?= =?us-ascii?Q?yGiAzpvE2YqnPK0Sr65y4StB/4u27OxhP0ZIYdF7BopaeGBXVOh6lKGf5TqN?= =?us-ascii?Q?GA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?Ky/o0VFpNmrgFzkWT1wWdEh7/rervw8CWAUUCq1dFz1SFtyjcV6pEjHJPJxI?= =?us-ascii?Q?TU+ilipuMq11tZ5S0+L3bEeSzDnLxiBevABZruoPVMPR40RLL/4LOjmDebLS?= =?us-ascii?Q?6dQalSkkdzHH5LfrQDGKoKp3jVOJr08ZcRRSTR8C6lkeJ4ibszmHb7EMenOl?= =?us-ascii?Q?218iVJhAoqJHc3+tWZ0rn/0ZW1EVLG92/JRo/fc1AyOKQIrUlUV9+tmOwJ8M?= =?us-ascii?Q?nlueUeC20rNDox3czY5kZIqk0n4IfMRkuk/vLdW8z7mm+kV2rm78HkzpDsj/?= =?us-ascii?Q?kAWhbSXaY+m/4i07vY/aKSfxwXtLmTwU5ULR9qmn/dvEeUAeCiCs6BGRjD3j?= =?us-ascii?Q?n1L8T7/rzDttd6mpSG0PN1+HzobRbsrqWtrFDV6SwqU3oLQMTi153/5Yw9dq?= =?us-ascii?Q?hYshnew//eeiz5gE+A+iBf41ZScY2KPvniYwuqD64x2SU7mSy2hz3S0x60Cy?= =?us-ascii?Q?MliOZna5cLOa+65VF6448gmXMQJ8LuRsrqzPfMG+B4EMyEM/8NIDaOLXjf11?= =?us-ascii?Q?GoLrTRLEL65EnOqSOIO6Gcnlt75O6kOlZre0Q6g1ANlcWQLhKpTxLa7IR7ja?= =?us-ascii?Q?NQBy3hghpmeF3OWg5dWXSglInfwDpzKnPt0EAIlN+sefjmvACZs6fWVm/I2p?= =?us-ascii?Q?fkMiu1oLyhWNI3NMLIj3YRU5hUTpJpsXowehe1kj+2w6jH87NkvhKddUTDBh?= =?us-ascii?Q?TDShPNP63iODr8zO6hwdGiudMS/sVn1jslefdzgtRHMCo65TBIyXiQXVK8Ip?= =?us-ascii?Q?9H/z+n5Hf3OU6TbIAm+kRRFfie1/VKdc7B6sRKlPhiausvLkMgusLPBtmFph?= =?us-ascii?Q?fYoUqEoRc6DfHZTQdr1m0CvWSDvODsXjpbYabVj1FHOQgTL0EFdRxmUF+hTc?= =?us-ascii?Q?mWuWo4GBNNHzSqZcNbUKA2Rr9lCvCp32FtODOlqPtchtjLjoIdYS2DWfmm6b?= =?us-ascii?Q?95RtUnQAarNiKBxh4oe4QJF6+mQZ4Mt+xwJJ+3z2Jyhs/qMxv0Ab9GiawalX?= =?us-ascii?Q?G4YuLjaC37TVKaZG0tvYHb5/VxTcJ22uAABT1kzZnvgn1/kNTJ4Fk5auEP6R?= =?us-ascii?Q?tPS0GmS3fHM6gb0TuP6VDo1ON2SzM/0YLfg7+vg8OGdv2MPSE0And/QYhlmk?= =?us-ascii?Q?dRzcMkx6NtEI6drUNWZBylgF37v0ULweK+pNJzKfPtD5APaLt8pLwa8cMxv3?= =?us-ascii?Q?NcftMif0Xw/1zY9q?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09962dbe-d9c1-4a59-c18b-08dbd04b8457 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2023 02:31:36.5959 (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: Q5llty7HKPseEisi7ARisAks16gh5InH6MJJ1W/rkZp/lZDRa0+C5l5oxnmcRuqbZ2dDp2Kp/eERlUxnX9ZPXw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7123 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-19_02,2023-10-18_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 adultscore=0 spamscore=0 mlxscore=0 phishscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310190019 X-Proofpoint-GUID: _s8S4gi8IZCSJ0Jbh6r4D6-DbxfrMNyR X-Proofpoint-ORIG-GUID: _s8S4gi8IZCSJ0Jbh6r4D6-DbxfrMNyR Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Joao Martins Now that a list of pages is deduplicated at once, the TLB flush can be batched for all vmemmap pages that got remapped. Expand the flags field value to pass whether to skip the TLB flush on remap of the PTE. The TLB flush is global as we don't have guarantees from caller that the set of folios is contiguous, or to add complexity in composing a list of kVAs to flush. Modified by Mike Kravetz to perform TLB flush on single folio if an error is encountered. Signed-off-by: Joao Martins Signed-off-by: Mike Kravetz Reviewed-by: Muchun Song --- mm/hugetlb_vmemmap.c | 49 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 10739e4285d5..9df350372046 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -40,6 +40,8 @@ struct vmemmap_remap_walk { =20 /* Skip the TLB flush when we split the PMD */ #define VMEMMAP_SPLIT_NO_TLB_FLUSH BIT(0) +/* Skip the TLB flush when we remap the PTE */ +#define VMEMMAP_REMAP_NO_TLB_FLUSH BIT(1) unsigned long flags; }; =20 @@ -214,7 +216,7 @@ static int vmemmap_remap_range(unsigned long start, uns= igned long end, return ret; } while (pgd++, addr =3D next, addr !=3D end); =20 - if (walk->remap_pte) + if (walk->remap_pte && !(walk->flags & VMEMMAP_REMAP_NO_TLB_FLUSH)) flush_tlb_kernel_range(start, end); =20 return 0; @@ -355,19 +357,21 @@ static int vmemmap_remap_split(unsigned long start, u= nsigned long end, * @reuse: reuse address. * @vmemmap_pages: list to deposit vmemmap pages to be freed. It is calle= rs * responsibility to free pages. + * @flags: modifications to vmemmap_remap_walk flags * * Return: %0 on success, negative error code otherwise. */ static int vmemmap_remap_free(unsigned long start, unsigned long end, unsigned long reuse, - struct list_head *vmemmap_pages) + struct list_head *vmemmap_pages, + unsigned long flags) { int ret; struct vmemmap_remap_walk walk =3D { .remap_pte =3D vmemmap_remap_pte, .reuse_addr =3D reuse, .vmemmap_pages =3D vmemmap_pages, - .flags =3D 0, + .flags =3D flags, }; int nid =3D page_to_nid((struct page *)reuse); gfp_t gfp_mask =3D GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN; @@ -629,7 +633,8 @@ static bool vmemmap_should_optimize(const struct hstate= *h, const struct page *h =20 static int __hugetlb_vmemmap_optimize(const struct hstate *h, struct page *head, - struct list_head *vmemmap_pages) + struct list_head *vmemmap_pages, + unsigned long flags) { int ret =3D 0; unsigned long vmemmap_start =3D (unsigned long)head, vmemmap_end; @@ -640,6 +645,18 @@ static int __hugetlb_vmemmap_optimize(const struct hst= ate *h, return ret; =20 static_branch_inc(&hugetlb_optimize_vmemmap_key); + /* + * Very Subtle + * If VMEMMAP_REMAP_NO_TLB_FLUSH is set, TLB flushing is not performed + * immediately after remapping. As a result, subsequent accesses + * and modifications to struct pages associated with the hugetlb + * page could be to the OLD struct pages. Set the vmemmap optimized + * flag here so that it is copied to the new head page. This keeps + * the old and new struct pages in sync. + * If there is an error during optimization, we will immediately FLUSH + * the TLB and clear the flag below. + */ + SetHPageVmemmapOptimized(head); =20 vmemmap_end =3D vmemmap_start + hugetlb_vmemmap_size(h); vmemmap_reuse =3D vmemmap_start; @@ -651,11 +668,12 @@ static int __hugetlb_vmemmap_optimize(const struct hs= tate *h, * mapping the range to vmemmap_pages list so that they can be freed by * the caller. */ - ret =3D vmemmap_remap_free(vmemmap_start, vmemmap_end, vmemmap_reuse, vme= mmap_pages); - if (ret) + ret =3D vmemmap_remap_free(vmemmap_start, vmemmap_end, vmemmap_reuse, + vmemmap_pages, flags); + if (ret) { static_branch_dec(&hugetlb_optimize_vmemmap_key); - else - SetHPageVmemmapOptimized(head); + ClearHPageVmemmapOptimized(head); + } =20 return ret; } @@ -674,7 +692,7 @@ void hugetlb_vmemmap_optimize(const struct hstate *h, s= truct page *head) { LIST_HEAD(vmemmap_pages); =20 - __hugetlb_vmemmap_optimize(h, head, &vmemmap_pages); + __hugetlb_vmemmap_optimize(h, head, &vmemmap_pages, 0); free_vmemmap_page_list(&vmemmap_pages); } =20 @@ -719,19 +737,28 @@ void hugetlb_vmemmap_optimize_folios(struct hstate *h= , struct list_head *folio_l =20 list_for_each_entry(folio, folio_list, lru) { int ret =3D __hugetlb_vmemmap_optimize(h, &folio->page, - &vmemmap_pages); + &vmemmap_pages, + VMEMMAP_REMAP_NO_TLB_FLUSH); =20 /* * Pages to be freed may have been accumulated. If we * encounter an ENOMEM, free what we have and try again. + * This can occur in the case that both spliting fails + * halfway and head page allocation also failed. In this + * case __hugetlb_vmemmap_optimize() would free memory + * allowing more vmemmap remaps to occur. */ if (ret =3D=3D -ENOMEM && !list_empty(&vmemmap_pages)) { + flush_tlb_all(); free_vmemmap_page_list(&vmemmap_pages); INIT_LIST_HEAD(&vmemmap_pages); - __hugetlb_vmemmap_optimize(h, &folio->page, &vmemmap_pages); + __hugetlb_vmemmap_optimize(h, &folio->page, + &vmemmap_pages, + VMEMMAP_REMAP_NO_TLB_FLUSH); } } =20 + flush_tlb_all(); free_vmemmap_page_list(&vmemmap_pages); } =20 --=20 2.41.0 From nobody Tue Dec 16 21:58:58 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9435ECDB483 for ; Thu, 19 Oct 2023 02:33:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232628AbjJSCdE (ORCPT ); Wed, 18 Oct 2023 22:33:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232576AbjJSCcy (ORCPT ); Wed, 18 Oct 2023 22:32:54 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 278E6D60 for ; Wed, 18 Oct 2023 19:32:31 -0700 (PDT) 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 39IIp6k7018146; Thu, 19 Oct 2023 02:31:43 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-03-30; bh=ts++G+BYdmdUFqdAtNKLn3GW8JSwEPzR7WlqhqbkpgY=; b=AD36YTGeiZWnEukAcKv0QYQWZZxxSHFOc3xkUPoH53ep9B7UFKGHdl4gKR+GO4cqdS1+ fthTbuTNMWGwrisGAWwQOmN1mvGG2U0e5pWUcKoflMQJrWdF4+nnH0vmzQD3Ob/brPp6 urBJAspsynyqCLu5oOUfc9HmA65uHWVoC9JHcGcgrZTYVyBP21mzMqJxK560yRo5yMih XSvyqExDHrOYmDUFXwpvsz7y/XOkFRk+pYcmdb5hqwv91em/Fp9ljnNSAcrvr/uNhKlE Jh0xVogF71GV93f3IwkLVQK1up2TCgvpHelsZz6HwHVnDJzZon8xvY+GZOtKNhJidByX Mg== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3tqkhu993d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:42 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 39J24XwW015185; Thu, 19 Oct 2023 02:31:41 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2041.outbound.protection.outlook.com [104.47.66.41]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3trg1hah69-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 02:31:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A3NquWCZeno14c7qAxUMu9UErDakrtgLvYMlX8sof8frvJd8wEwzsV+De1gXtLd86Z1oecAR6YXQoJ8lkvn1u5h9Bziao3lcvbjuxiFfby8zNWLI2klZm8LKXcuq6wK/h5EZ5VR9vHUYFCULaXoSVyQMGSBQHs2u2rtRUJFsD5Vif1LtPC69edWA5ujqZkdxmXJ8ehWGvgXnxZpW8MYUOACUwcbVEsiZdvXEUOC2121mid+u+6hQcH78NEzgBW8X5PRAkvM6IT6JPSK/0PP1LNcSRDd8PfTmGyTkbMUt135CkczAtixTi/qj4TV/Aa2do6T6dPn25kjjNnd8IDg2dA== 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=ts++G+BYdmdUFqdAtNKLn3GW8JSwEPzR7WlqhqbkpgY=; b=SNq/KgM65DG37gPOdZVPafGGdUF8V3LjH0YFIsL9QYkQF8U7HggDayIf7BgrjhRaT3kVHBmHwz+UknUnS9D50RJ1NkHyPI6uSMfy+0YQ+MVsx02hngHXS1gm9zs/1JIYDYIkQhJ60QmUHkxb6l3x7qkamhZsJKKHPtl+uaU2Z2chZipvMWWJe2ryylTdcFZFNTko+CGVpkHMCkcRkX2BvzyiTx5svOKJpA0KsaSuMAWBeDHLQuUHx3cNAM4V+ATAW/CKr90Nd3LaTSadLa3tPxDV9XM7yyhFC5jRM4/UM44LEWzeC7mCaeYoMS5GC70dw98uFgNXatvc8rzQHRVGIw== 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=ts++G+BYdmdUFqdAtNKLn3GW8JSwEPzR7WlqhqbkpgY=; b=NAW1kA7Sygn7Y7GzHGBKKAeurvE1Ok36V75dzSZaXhzWu8xlhiKS7+M6z/PcAV3C0L2kt84AjuutZPG1Um+1CyURmJ1waUHJfwGrh83mzcn/UKTblufeeMRVDemkaBglAXeRz6/J97+39zjTQ0LryMoO8dkKH/yS8BjOvWvs62A= Received: from BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) by CY8PR10MB7123.namprd10.prod.outlook.com (2603:10b6:930:74::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Thu, 19 Oct 2023 02:31:39 +0000 Received: from BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2]) by BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::59f7:ec45:eb41:d8c2%6]) with mapi id 15.20.6863.032; Thu, 19 Oct 2023 02:31:39 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Muchun Song , Joao Martins , Konrad Dybcio , Oscar Salvador , David Hildenbrand , Miaohe Lin , David Rientjes , Anshuman Khandual , Naoya Horiguchi , Barry Song <21cnbao@gmail.com>, Michal Hocko , Matthew Wilcox , Xiongchun Duan , Sergey Senozhatsky , Usama Arif , Andrew Morton , Mike Kravetz Subject: [PATCH v8 8/8] hugetlb: batch TLB flushes when restoring vmemmap Date: Wed, 18 Oct 2023 19:31:10 -0700 Message-ID: <20231019023113.345257-9-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019023113.345257-1-mike.kravetz@oracle.com> References: <20231019023113.345257-1-mike.kravetz@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MW4PR03CA0109.namprd03.prod.outlook.com (2603:10b6:303:b7::24) To BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4196:EE_|CY8PR10MB7123:EE_ X-MS-Office365-Filtering-Correlation-Id: 56c4f069-2e88-4c37-0167-08dbd04b85ce X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kQEOqk2kwcERpCV+is9Y9uHmqYaG27mSBtqqF0mIYojoA/zeXRFVlU0FNMtsWCzVpjU7qwOdosJXyWXmw8wzAWY7DzWTYZHdPton4e7AZuxH+4cSuZAyU4+eT1Ol6AqtkVypW8cRupCpfZP+turvy1PPTFcVR1VvD5tY3MXaPQHPGMIcRpNgHRUJOBCcT7dop0RaEWENdbJdSRRCJ6EncnrxWN64j3s4gYRkJ6BvJVvvA3Iu5bsgspZoZKsTAf37/BCS+rxDZJp2uScT9ilfUrZVbyenFHihlVGujviBRCsyFri1pT8HmvmrwCpwYCeLzhaNkhqBKQF2KnU5MgmC8WkVc3/a2IL+8hZRIL4+e94kiHYFsgiO28nwpjyKZXZECvoI9hJ1/qzwyzZYF36abJTHCpn+VN6AfwPtVXQyBHfC75tffnADXxqxmcpzKRPizxRwThAkV28C/enM7p5lgUliNB55M017SKMJttdfKkwmNDgwl0giCLFDDaYFfyE0D900zlGaqcBlfLgak0LH+0NV3QHPoTQNnCm4cfbKwMPVDVmbbG4N3eNeQmzpB5Kf X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4196.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(136003)(346002)(396003)(366004)(230922051799003)(1800799009)(186009)(64100799003)(451199024)(478600001)(54906003)(316002)(66946007)(66476007)(6486002)(66556008)(6666004)(1076003)(86362001)(2616005)(26005)(6506007)(36756003)(107886003)(6512007)(8936002)(2906002)(4326008)(8676002)(7416002)(44832011)(41300700001)(83380400001)(5660300002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nL2WEc6YYaP0NtdXfehwv04o3mChqWPBz40r29lSqmBlQGYY3m4hcnRmu+TS?= =?us-ascii?Q?79OIDsoTSFc+d51QCAnsWNg1xnmkuTb68NOF9FVLIX2khlHo9/2sVFdI9Nqs?= =?us-ascii?Q?uWaBF8ZNil47JUQgBi5FYnWht/yegJ5PEzKVoE4tCjr4tgm5em9W67dHaxn2?= =?us-ascii?Q?1JaP1tdqHn17YkwFnGonb8RocxY5gKpwqEFf1KZ14ryenEpsEnW+USz7702U?= =?us-ascii?Q?CRXvV4bxc0v4AV5DB3eFB9/M9Dupws/kaakOGPGgP5taKjuQRRjsDiQY97HB?= =?us-ascii?Q?f9sQWSMSePNWcta25w9/0gywaHeIVNpc7pKAMjBKChj9WfaOOLQhHxTJGTA9?= =?us-ascii?Q?RiVcVy7FdtTEMpmHM+IlSR4cjmLICJXUWkhIxHeBVBmBQSHlKOi0RpPIRzkL?= =?us-ascii?Q?jO7mDJ0nlKyCKuQxHu1r2sMFgRTv8RfuAhj4YbSYlyuJG+uYij58KuGrYrY4?= =?us-ascii?Q?SUmGlqNMVfdLHjagUMtJeVXJi8RmKnOTCabNyYRvCVlEj+7V6YA+lTZw/xHe?= =?us-ascii?Q?3Ra0Myc08xn/masUa+IzAp+6m7LUTvly9eQDtz2b3c0qnlxBye+RODj5izH9?= =?us-ascii?Q?eVGJrMFkNlIbGVpbcPJ/YRHrHL49jo9XhtgBz6L9P5HcMyYO0sQcN/1uRyEU?= =?us-ascii?Q?MVarVebl4YL+aZ5UBtVVRGl1cG5skt45yHjOuVh5hUg6IK7aGuszEaiGXpJo?= =?us-ascii?Q?xHvgfJ5MmB4WaH97PH+7L+REQpePRI+wNtouiYb0BBGhmrjBF4qpsF7+7nQD?= =?us-ascii?Q?+hF99z4oXi5p6jXO0Gj0hWHFKAa87qlYRGJ+w3s/cGqwiiPCSeuYXJgORjga?= =?us-ascii?Q?qh5zBECENZCAE7CJ23cwyO27ezF1FASNLWg4sHCNQsnWXQhl75QwUEohfwXj?= =?us-ascii?Q?9pLslKnMbA2860SMjXHkNBIsyW0SpYua9K9BW0GNCEx+SrpMsrmLhn1TwtNj?= =?us-ascii?Q?ZxgYnpzExDSwOoalaqMkJzxfib2qAQU0S+tR2JIvtgnEaKq4VkhSda+k1gA1?= =?us-ascii?Q?AzphjO4WqD8r5hgPoGIFUdcReQgPMK4tOXp3YukuQyTHeOwbelgEmCtbuZU1?= =?us-ascii?Q?9y2o1u1FsJJqLQvenLaDgwidN4KG22DyuY6L/6QFGKrVEPxWIomKStdWX6xa?= =?us-ascii?Q?ATp0LgeqyKRsoJ5HOgY9n5oeT6zmlk+sab4Ya08NHvoEOg9f0ERoe+1MEWhH?= =?us-ascii?Q?XQafu95BVu51zeIh1teKHlX7E56Ji2ieOaoO4nmhxhkBdYTG1Ua/Vsboge9/?= =?us-ascii?Q?UiQDx35fx3ukXCqRmL+Zou7igWEUXmhnHZLyDJf9xSk1r2Mx90kQQk0jFhTO?= =?us-ascii?Q?UjaaFAQY2U2SSYEbkd73wnxSxcCy+BV0nruCxEa5yf0aX/upO+icI7NjyrmP?= =?us-ascii?Q?KfQVFVAx/2MrWWqC7jNzs+sJrSYG3eBdGhFX95UaI3IE6K3xXPb6tOItjJ31?= =?us-ascii?Q?jbhCdlMUz2LCk/4ly5n3n+l7dYLITNCQZlIUJN6QKm3blUtY7hwe7llIl0KR?= =?us-ascii?Q?Mqc0jO+/8O7iAFL+060De2ed2y82ayOol9fyd1BIaUwhUQAkQnQRvnO8Crlj?= =?us-ascii?Q?ggjIKf8292GIimTUZT4TxCqu9sDMsRbKT9Iu+ZMBaE3eFehnG+gfjDaj+XiE?= =?us-ascii?Q?jw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?gTgJwKsbanJhaRrKCQ1BgyQSaRQv2xAfTYviuyZfPRBpFp7Euk5Xp7KtZD3g?= =?us-ascii?Q?oIzlIjXbK3BVOal3Rap9e/M+iSwvbwTwR3mkKPwMhkBfEivBmYJdjx/wune3?= =?us-ascii?Q?l58N8h19Ss20rw1QCennZyF7YWVLS0Pt+MWTr9hj5c6uncN7k0Lok1QJWaPs?= =?us-ascii?Q?Fvnz2vBkTlDoOIDgxDtGOwq6n4mpP1X5qb043ykNxI53EoVTrJENL3PRV4wt?= =?us-ascii?Q?vAz4fFSKAMSU5YbCxJomq+qRrRoiTmD6OSZzfJvAg1WuajfstF0ijR48/4RJ?= =?us-ascii?Q?rIp5BEs8B941tyJCsc2YdXQCvkG1QqK4qJH6srzHuOJ1S2jAaM7P+udPpdhv?= =?us-ascii?Q?m2mwRfeV6/87paLezIzqvJ7G8s+M3IZ+0qYHO2vHRhhus1kwlUgRbQsd6gUH?= =?us-ascii?Q?1YoM2xXeU8p3vZKRhHk+FDkU2ueVFVM9qp1VbEQ2ZlMEBCtr+bVmGKEFcIYf?= =?us-ascii?Q?USGTdD2kcFi5vkNY3aD1gtBsiWuobZbcRGvBUBaNifQn0l7DUSmHVXGu3cly?= =?us-ascii?Q?91ZQ7RfQFULUXn7ThKZqblcZV2xmxhkZ0pNCYdZ4K0rXlT4BDEWNT6WHlj/3?= =?us-ascii?Q?QiHds8JjxUG6scUaPD/pZ4U74obkavM/pQEjNB3bUcikG7CqzKK/lxMn2OVd?= =?us-ascii?Q?aTVqE73N6RO0tRiIzsj3q10plHsRY0qwKaZn6WpqWqBvtFlYuVO47zR6S96k?= =?us-ascii?Q?yJukqK/kn3sngVLGux3mqexMxzD5xTn8E+HshPj/UZlmd1+YW5kRF+sorrau?= =?us-ascii?Q?yAZsXSRhAp5vSfT9GdKXQ+GgW3SeOUqRGY1ToeNTr9p5EgTLm19f9slyDH0q?= =?us-ascii?Q?Sa611R0vxY3IOjOa3/TVCw67gx+u8U8n5x/lLk0IpdEF6b+87wCYOBOP33u6?= =?us-ascii?Q?2RUbK1SsihReH9YNGew7Fs0PBvHUXCSG4H5AYVIXk85wsBmguweJVMw8N8Vu?= =?us-ascii?Q?FBnpU37mRexY8ATnt9jB68g8HQJ/s3OpNenVlJ4CkQ3Q7jSQ4IZWkJ0ihTr/?= =?us-ascii?Q?U7XhkWpEK958HLOOBQqTr8GpfxFCYja/x7ETyUrJXwIG0hLj2lAfIcOJ1Pgb?= =?us-ascii?Q?QL7ZfQoDvJN+fdb/zGWryuRRd3GL2tZ90F2VSb2fMj34zK+hz+SXtbknCVdO?= =?us-ascii?Q?/GcuAlJhfTpEi0CTINvRVWE2nmaLVY35mbgDUIozTVIOx8TlN3dIhovEPpYI?= =?us-ascii?Q?O8y5OJgHqizB/SIk?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56c4f069-2e88-4c37-0167-08dbd04b85ce X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2023 02:31:39.1280 (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: /DIjKm6n+/qZUGSFLQpWEi6l34Opv7w9oG5bGqxbbFYQmN2mue9LDJzXbdnZKP3vt7Jt5DPIgVviAbMCi0DkAA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7123 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-19_02,2023-10-18_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 bulkscore=0 malwarescore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310190019 X-Proofpoint-GUID: jCP4Z08mt3Ti3JgrqwfzBLSAnPG0v9FG X-Proofpoint-ORIG-GUID: jCP4Z08mt3Ti3JgrqwfzBLSAnPG0v9FG Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Update the internal hugetlb restore vmemmap code path such that TLB flushing can be batched. Use the existing mechanism of passing the VMEMMAP_REMAP_NO_TLB_FLUSH flag to indicate flushing should not be performed for individual pages. The routine hugetlb_vmemmap_restore_folios is the only user of this new mechanism, and it will perform a global flush after all vmemmap is restored. Signed-off-by: Joao Martins Signed-off-by: Mike Kravetz Reviewed-by: Muchun Song --- mm/hugetlb_vmemmap.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 9df350372046..d2999c303031 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -461,18 +461,19 @@ static int alloc_vmemmap_page_list(unsigned long star= t, unsigned long end, * @end: end address of the vmemmap virtual address range that we want to * remap. * @reuse: reuse address. + * @flags: modifications to vmemmap_remap_walk flags * * Return: %0 on success, negative error code otherwise. */ static int vmemmap_remap_alloc(unsigned long start, unsigned long end, - unsigned long reuse) + unsigned long reuse, unsigned long flags) { LIST_HEAD(vmemmap_pages); struct vmemmap_remap_walk walk =3D { .remap_pte =3D vmemmap_restore_pte, .reuse_addr =3D reuse, .vmemmap_pages =3D &vmemmap_pages, - .flags =3D 0, + .flags =3D flags, }; =20 /* See the comment in the vmemmap_remap_free(). */ @@ -494,17 +495,7 @@ EXPORT_SYMBOL(hugetlb_optimize_vmemmap_key); static bool vmemmap_optimize_enabled =3D IS_ENABLED(CONFIG_HUGETLB_PAGE_OP= TIMIZE_VMEMMAP_DEFAULT_ON); core_param(hugetlb_free_vmemmap, vmemmap_optimize_enabled, bool, 0); =20 -/** - * hugetlb_vmemmap_restore - restore previously optimized (by - * hugetlb_vmemmap_optimize()) vmemmap pages which - * will be reallocated and remapped. - * @h: struct hstate. - * @head: the head page whose vmemmap pages will be restored. - * - * Return: %0 if @head's vmemmap pages have been reallocated and remapped, - * negative error code otherwise. - */ -int hugetlb_vmemmap_restore(const struct hstate *h, struct page *head) +static int __hugetlb_vmemmap_restore(const struct hstate *h, struct page *= head, unsigned long flags) { int ret; unsigned long vmemmap_start =3D (unsigned long)head, vmemmap_end; @@ -525,7 +516,7 @@ int hugetlb_vmemmap_restore(const struct hstate *h, str= uct page *head) * When a HugeTLB page is freed to the buddy allocator, previously * discarded vmemmap pages must be allocated and remapping. */ - ret =3D vmemmap_remap_alloc(vmemmap_start, vmemmap_end, vmemmap_reuse); + ret =3D vmemmap_remap_alloc(vmemmap_start, vmemmap_end, vmemmap_reuse, fl= ags); if (!ret) { ClearHPageVmemmapOptimized(head); static_branch_dec(&hugetlb_optimize_vmemmap_key); @@ -534,6 +525,21 @@ int hugetlb_vmemmap_restore(const struct hstate *h, st= ruct page *head) return ret; } =20 +/** + * hugetlb_vmemmap_restore - restore previously optimized (by + * hugetlb_vmemmap_optimize()) vmemmap pages which + * will be reallocated and remapped. + * @h: struct hstate. + * @head: the head page whose vmemmap pages will be restored. + * + * Return: %0 if @head's vmemmap pages have been reallocated and remapped, + * negative error code otherwise. + */ +int hugetlb_vmemmap_restore(const struct hstate *h, struct page *head) +{ + return __hugetlb_vmemmap_restore(h, head, 0); +} + /** * hugetlb_vmemmap_restore_folios - restore vmemmap for every folio on the= list. * @h: hstate. @@ -557,7 +563,8 @@ long hugetlb_vmemmap_restore_folios(const struct hstate= *h, =20 list_for_each_entry_safe(folio, t_folio, folio_list, lru) { if (folio_test_hugetlb_vmemmap_optimized(folio)) { - ret =3D hugetlb_vmemmap_restore(h, &folio->page); + ret =3D __hugetlb_vmemmap_restore(h, &folio->page, + VMEMMAP_REMAP_NO_TLB_FLUSH); if (ret) break; restored++; @@ -567,6 +574,8 @@ long hugetlb_vmemmap_restore_folios(const struct hstate= *h, list_move(&folio->lru, non_hvo_folios); } =20 + if (restored) + flush_tlb_all(); if (!ret) ret =3D restored; return ret; --=20 2.41.0