From patchwork Tue Jul 18 00:49:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Kravetz X-Patchwork-Id: 121713 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1436959vqt; Mon, 17 Jul 2023 18:03:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlF0l7gCManc5KCMHv0oOyFX06F+8FyUakBiq5cOtEf/3Eyw8hcqNijPs/I9LATIS9QWLNSH X-Received: by 2002:a05:6512:114e:b0:4f8:5e8b:5ec8 with SMTP id m14-20020a056512114e00b004f85e8b5ec8mr14975594lfg.9.1689642228727; Mon, 17 Jul 2023 18:03:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1689642228; cv=pass; d=google.com; s=arc-20160816; b=uZGDJLx0iCSmoZw7sy+vzwxwJiO84fx7iGktbStYHwKxNNSKqsKtAGfrpR5Pvymqrf Hgw0tGKav1RuHXwQijweb9pzCQ7c07ijBc8KeAizLOUK/xmX1twgHkSlIkZ0ZG6aq3ZB Dbxfnnu557gFMoNgv7yFxEzATvBTY9InE7EOO0A1prLOQ6WyWgm/UfInRynalvNzCqkM RVf9pnWpgY8uskkVtG/C1nflJnLfU5XftaBeSqd6c5q4at8/mnOn2cQHh5jBLoHPhIf2 H9p3vTovok21QK9dILrJugqG+YcslQT2wFhcuwSjufEuanpDtNe4xT2P/dd+SEoCbnJZ ILXQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=tT5JR7OwlptdMOMpxbuk0zZhbMiMcLEjli2VWIuDKaQ=; fh=9OgAP8C8iLnYocHMACjPhgVbrx8fBo7nBpXd8JnF0jw=; b=MycYKzMm3k9aKyFpfjfMhurGDn9BBIjQFKcsHm3Cr+yd8eVhlrUFOuoToKsCKEGZHV 2nLG6x+gquMx22W5DY3Iz1J5QizlYpiDdLoSu98S3IG4kd2oiImSxLT2kEsB0BqimlDX jkeWOPncuHcKfa5jps8C+S281JSaeLlGYyKu40mWXhDHLlgD3rPHJllXA0UEMwY+16FB CLauKyEJCHmQ28CEh9OweT6ikN+81WbKWSq9L8hKf0YIfQN6BbbPP09+yHQuBRKrG6tJ ZW8WEkm0TM+Tn1u5Dw2i35w5Gu/REFwkqlLp6cDlRTFJoyBW235a+sshFLS3MUZEzebY Q31w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=q1HFfJbr; dkim=pass header.i=@oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=BH7ASMRS; arc=pass (i=1 spf=pass spfdomain=oracle.com dkim=pass dkdomain=oracle.com dmarc=pass fromdomain=oracle.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z3-20020a50eb43000000b0051e2a1c217csi422643edp.556.2023.07.17.18.03.25; Mon, 17 Jul 2023 18:03:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=q1HFfJbr; dkim=pass header.i=@oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=BH7ASMRS; arc=pass (i=1 spf=pass spfdomain=oracle.com dkim=pass dkdomain=oracle.com dmarc=pass fromdomain=oracle.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230124AbjGRAue (ORCPT + 99 others); Mon, 17 Jul 2023 20:50:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229818AbjGRAua (ORCPT ); Mon, 17 Jul 2023 20:50:30 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C59BC10E3; Mon, 17 Jul 2023 17:50:28 -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 36HKOMtW026841; Tue, 18 Jul 2023 00:49:54 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=tT5JR7OwlptdMOMpxbuk0zZhbMiMcLEjli2VWIuDKaQ=; b=q1HFfJbrz/FdCFR/hRyyA5D1ZnH3yOohzEc02qkN/pbmTyBjQrzIMKVlKr3O5aeaEQDI J33WlTilHn/1pFXkLDPvWWwLgCb1ALy+Quy0f1Wc70YyuxEWUroPoqlUjVk0J0+5IkfQ EVO1g6dWJGlrk5VRjYDKFnWL5w8i4PaYIK9xSwnYqovQuhkCjmVLiPwrdHA7SUX2Cyxn GaoZbvAlIkEBa/567zLL6tNvxo1qhk0Y8OB9YXnLqYxpF2jW9QvB739CHwKUtRgd58Gs oim76LEJEgsuHdypNUIt7OT0ePeEtUQnPbdOriNwUuxjDCrqwPgfsu9wlnoYsB1ObNDx Hw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3run783w7n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jul 2023 00:49:54 +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 36HNt2OH000934; Tue, 18 Jul 2023 00:49:53 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2103.outbound.protection.outlook.com [104.47.58.103]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ruhw4dbfs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jul 2023 00:49:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VmucW9KiYab4lI6MzLMuvVs9v2IWamfFkHC0EJU4aoAVmOTSi7u3TlLZ3xu9Kn+duL3JbS1R8cLjSKawvxGdrqWaq+e8NQrbj8Iq0EPlljaQVMUfTwL7PhZ2srtWjoa8NKCPiElzvsjBOPrQ0jGGOjMnLwxBR3XzqZOGZAno3KtQk2WrHEcqwAztBF9gB+qjeVqJyVJFvhrxYlbz2XSC9fqVaWogjy6IobwqZ9mfKIXqZ9FdNhPOV2X3fphPytL5RJInKjskGYXBXx2yylGciXUxthVYbvD58JQWDkxeklRKnhePggBl58xXeO4d7rRqEoBkqt/EtIPd+80Flnt6Mg== 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=tT5JR7OwlptdMOMpxbuk0zZhbMiMcLEjli2VWIuDKaQ=; b=naW7CoTnVyR+Xo9qNoKZTWKQlUGP2h1L5x/nnAqDMJTZT3DDAQ8Z0opDMaZbZ8zpZaGBttldcGxnD9uy6M4WW+w6/mmbpgJ+Bvlxlh7FRhwLjwUlZz2geoUXnJL21aXCfo7AlWQjKcMfE2oRICpt2TDmzahrCcEMIx8QwxSXNkt3WP+Q3g+PvoM8urc5pQec9zrMpVlKrO8g3ugFLXi93kR5CUxkZQHpRKQkg9vOsZk/9V5B4xK46+HaY0A7xhWWSbEP7LjuqoSl+fIBwl/Zaqvex6hPY+10Qjh5xylL3Sfh9ZsACBulpJp7vlcyse8jMK8kbV5eLTzJh+OSTFphxA== 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=tT5JR7OwlptdMOMpxbuk0zZhbMiMcLEjli2VWIuDKaQ=; b=BH7ASMRSSaDemXQv1jWEpjyIs974Nja0vu8yZEtsNGghUzpVB45kBz71HYBdXG0pr5tHDwNq0K6ERyrQIBCK5PeprCXsuqJDIfFLiFBziSGINY3lPVL56xAypjmc4o4E4cmHeI1FIUF524jSaHnrJ/bGxlwsO8/vhMh6IjKwJOA= Received: from BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) by IA1PR10MB6193.namprd10.prod.outlook.com (2603:10b6:208:3a7::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.31; Tue, 18 Jul 2023 00:49:50 +0000 Received: from BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::4a17:13b0:2876:97f2]) by BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::4a17:13b0:2876:97f2%7]) with mapi id 15.20.6588.017; Tue, 18 Jul 2023 00:49:50 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Jiaqi Yan , Naoya Horiguchi , Muchun Song , Miaohe Lin , Axel Rasmussen , James Houghton , Michal Hocko , Andrew Morton , Mike Kravetz , stable@vger.kernel.org Subject: [PATCH v2 1/2] hugetlb: Do not clear hugetlb dtor until allocating vmemmap Date: Mon, 17 Jul 2023 17:49:41 -0700 Message-ID: <20230718004942.113174-2-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230718004942.113174-1-mike.kravetz@oracle.com> References: <20230718004942.113174-1-mike.kravetz@oracle.com> X-ClientProxiedBy: MW4PR04CA0120.namprd04.prod.outlook.com (2603:10b6:303:83::35) To BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4196:EE_|IA1PR10MB6193:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ab88ceb-2a52-4419-6e5c-08db8728e490 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GBg9FEGhgBAXxC4Gx9Jrynj0thSCmA6UW75IgmhDfsIbthBsxGONxHa5VffS+w57Q2qDY1bPUKmgGM4/AILbNBLV2ycPGftl1f/M8VZu+0UGkh4S94Im4oboDHFQHUcLWuHL6YneNK4udAwiDRD77G+ILfwDN2mW5FKUqzpGexcDfIkNI3x8vk6zw62IL4QwtGNiixUNh8n6CBG7RF48dvypam28IHA6e8IDQWxoolbDQ+4J5RjO/6n0D/PzfyB1RyyGgAtVL4LKpO6jakT80LdiSscGNwg38PlFUk6ynu0HpNO24+9r2agIMiPAipxrpGqzjZk0hb6HtnPdpT46NvNgdouDMyz+MIxYlKoureuN8ikzZLnlzY/X3ngPQjV38NGTDZonCcHGWLUPBr5JqTmHo+BzHhfOx5egyl87aFzLHuOWzRgavAj4tbcLl8ZvEn9g6ROBHLBlJ0k5icvZKNJM2OWZV+T5pGh9QjFYoAC43nLQP+vXd6KXneAzgFJmghXeptpBVHyZScPIyZYp3DGYKgTkFfvHBLyDhYzW+ridH+Wl9rHCe/ERlXV2AxT2 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:(13230028)(376002)(396003)(136003)(366004)(39860400002)(346002)(451199021)(54906003)(6486002)(38100700002)(6666004)(41300700001)(8676002)(8936002)(5660300002)(66946007)(66556008)(66476007)(316002)(478600001)(4326008)(186003)(83380400001)(6512007)(2616005)(26005)(6506007)(1076003)(86362001)(36756003)(44832011)(2906002)(7416002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Xm5PQryyaKrFgg/4O9Bt4azqAxh4xChnJrX36auv8d/ryjsNaeJgp5wpiERYYWj0KzLx0+v7g3nGT9a5f1MpZ8Gjmx6FFhyuOPucVbQfdFMPY9TWF7J7qBuGw1etDv/Kyxo3fU7hKx5gtP359SGU/EriSAlCWre7pTn82pTSmE4OqU3+bXqCTP4wbYRCrk+DWENxTMAMEtDfYCiC1/T60V8AP3hsQQKcSDfGTcDRke+9ppRgeM499wZOqjtxrzQERSWi2otF2aSh+7hFBgokanKsRr/6PRARU4sE61mMt4qiyKGw93umIhmTWmIN8MgADjMhLePZ/vkK2BuaL+y6o8ZFDG6boCWViTYq5CnqB+SyPCogUvRbZgCRgcZmZ3ZJZgVWPoZUkCu9sdWttVGeFvEG1HBJbH+a2/EsJ7c8+2T/PGf3hVWvPbA0NtzoctT4wtsMdRuKfiN0ArahmsoOTLyhQB3El0WSWfMueWStBNiqB0Fz9yk8AnJmWHusxJHuF0UZm3zwBZH337ZqpR6xck9aJMDvD8779i9n+1Hnha8lygm/eUYMxKLZJnFrkoUmwRL/futlGImJR80pHirwwmLyjshgliOWpf+IJ3CSb5kEZxbE24TeBLS4BrIup3e2U4WFNAA8aoydgPkX4fskfZfuqZiJ69j92w6JncHZWsPKI8jKWgfAQEl36vJA+4yqGpmfxjUUA/cEgZO/8QyKfiwo8Z56SMA3V73h4favqPG/SyNCXcTXf+dlwz03+PHmzt8D8VQroZSvRZp3RkYa6Gt8r7GUv8FGHWLhIK9Lx44LEzAO3aQolYvjhdZZ0y3bB9VHRbY7wZHyGXAQSb/WYxYR0S3XnmCmnqcCb/33E2WDIpKDRbU24kLOKAL3cxjqNUGwPYJWHfEYLznss/WCli7AbKtk8uu0VLdiRTegUliu3uWfDblas/Qz0Wq4RLuf7jpbk1Co6P8i0plI/l0oC9t+/hLmZyLvHIZNlZAg28ryw8AArNtWn0jA49HWF53S5SY1wqehpXHsENxLYg3Dz+AOCGfYlGJqIE4JVXF/dUjevKs0jCMmWfFwcXAhbAwMXPt1Pak9/wgEYXgueDVcfaVr8MZ/AGTCa5GDz3bsX0ufU/tt34u4R6J/4zp6XWcFLbPgiKALd8lK/jC2A1dB4YYmW1balNp++Ll1UvkR4TKcAYoj+yv2UllQAf2fuOcwhNZvqGPBTA0Jog97ipTh9jlU1G5vldS9vi2cYKVrM/QN/Pz1jr052PaRLNM5fCAwaj+w1awlv3R1rgGEaDI6Qc7UGJPnlJY/kmaI5z03/OvHUO0ePFC7IgHInUUktcFEn+PF/rRs2vmPjQL5b+2hfuiHoTQhFZKe/KtOXdk9A3RPXhoAxryL6XI8Mznm2fHOYchjLam83RmSRQuJdPaUG8p7RHLpBNsrzcYAz00Our13maBmktTc2xaobcxjNCPagduDL+4qu/SCu/zBIXmvSDfk9WOgWUYLiO1f6WRZNshWtCP2j9jFN33oriuGz9byvMQxGfP87i6SZ1+obKwjkqkHwUzWa5g4sVTMbMLW3mAqSg55q9jyPogazBIhh7qq6xnvgixR1Q67KVWm+TRfKQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 3NYU9MoVc34rAiv8s32eq0zZyn8IMLfAdJG8IEY+Bx5cQpbW9Udq3OxRHz2hW+hewLT7cxsU/g5of5cJ/GK8/iByC+I+bAr/N9J71z+VF8Ls6O6T2oceoh8PJs5YwiF4S9uaN7VBcQVLXxqBs3ci1hnFXE2Hpr3DuN7Oiud8ikIquA49hNsdNTpIl5cNOGeGxz01jkttcxl4L+wgJ4SNcQ47tOsmdE9GJcwVbVAmpYd+WVyoYj13DlprOzJX7FYoR32Nq8YYjEp8nVVLkcFBAFzi74PK/o6SXDpOdQNlDzM5LiH71HX/1keFgx51vkWxF47UBRP++R+DdT+eew48ytrCDjcOYnh7Pkj5xcw/PNhMaImJyjW9KTJsaNIh9kZ2LoGhThBCe+eg8b7huP7oK/Q3lTEEczLWHEwZU/muKb4TOy3G0c9xiXzIOPupcY9lIG7/OQ0VrGFWyEMVVm78itgTxk5gyc3W6u4uGEVliQF/wgj9byoCVO6rRGOjIneQLwsOI1bG+/doS4z3oBcLMx+KUDWgNYjwQ5z1Wcq9vMeuFLxNLgbw9WWk9eelqpweW/OYvyUl0ExnYfHatZCDZrgSg6rlVMppAvhEWUr4nJRapjeuCSJdzpnYrrDWTwO+EdwGFeGgcTTRLgebhiJzSuyHc91B5VlRE61oV9PXrK5TUUvLMY0teaMHRtIu1cZ1HACaMGZPXTX00cN8umAU+adVC1AGS7Uc135cqbWYsV8bEjkoTrDJkeKHsgxJxv3fiesB7TzSH5AuVbdwX+La2Q5JLhtVCZq0dqJtLH6jh9VqAtS8zul6kuqnKmuHSSjyQ5YXXUOJDkvJ10KtT1mtxjSWmN3lA12KkH+2FC1YwH9jvj4pNnX+veen7K0LMUZu2taWRcMsiKBJM1IVqDEGF7B2fFpnuYqiviqnjTd3cucs21QyWuWc+4LwK9CQnYywtCr1/3J02od284xqF5QL3zneg0hT3ba0IGReyVnTlpQ4BONDJgb4msxAf18yi+6l X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ab88ceb-2a52-4419-6e5c-08db8728e490 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 00:49:50.7363 (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: DwkMwT5NJ9vQHz0x5AALAC36tVXZLu4eZ2wQA9WkGAD1pmUh2uW//GmYdSCUtmK6dX2fvB98kZLyOXwVdqKXxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6193 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-17_15,2023-07-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 suspectscore=0 phishscore=0 bulkscore=0 mlxscore=0 malwarescore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307180006 X-Proofpoint-ORIG-GUID: 5CrmmDV1sUbe8Y5OZeWmg-5FqrMKGG0J X-Proofpoint-GUID: 5CrmmDV1sUbe8Y5OZeWmg-5FqrMKGG0J X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771718289568755543 X-GMAIL-MSGID: 1771718289568755543 Freeing a hugetlb page and releasing base pages back to the underlying allocator such as buddy or cma is performed in two steps: - remove_hugetlb_folio() is called to remove the folio from hugetlb lists, get a ref on the page and remove hugetlb destructor. This all must be done under the hugetlb lock. After this call, the page can be treated as a normal compound page or a collection of base size pages. - update_and_free_hugetlb_folio() is called to allocate vmemmap if needed and the free routine of the underlying allocator is called on the resulting page. We can not hold the hugetlb lock here. One issue with this scheme is that a memory error could occur between these two steps. In this case, the memory error handling code treats the old hugetlb page as a normal compound page or collection of base pages. It will then try to SetPageHWPoison(page) on the page with an error. If the page with error is a tail page without vmemmap, a write error will occur when trying to set the flag. Address this issue by modifying remove_hugetlb_folio() and update_and_free_hugetlb_folio() such that the hugetlb destructor is not cleared until after allocating vmemmap. Since clearing the destructor requires holding the hugetlb lock, the clearing is done in remove_hugetlb_folio() if the vmemmap is present. This saves a lock/unlock cycle. Otherwise, destructor is cleared in update_and_free_hugetlb_folio() after allocating vmemmap. Note that this will leave hugetlb pages in a state where they are marked free (by hugetlb specific page flag) and have a ref count. This is not a normal state. The only code that would notice is the memory error code, and it is set up to retry in such a case. A subsequent patch will create a routine to do bulk processing of vmemmap allocation. This will eliminate a lock/unlock cycle for each hugetlb page in the case where we are freeing a large number of pages. Fixes: ad2fa3717b74 ("mm: hugetlb: alloc the vmemmap pages associated with each HugeTLB page") Cc: Signed-off-by: Mike Kravetz Acked-by: James Houghton Reviewed-by: Muchun Song Tested-by: Naoya Horiguchi --- mm/hugetlb.c | 90 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 24 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 64a3239b6407..4a910121a647 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1579,9 +1579,37 @@ static inline void destroy_compound_gigantic_folio(struct folio *folio, unsigned int order) { } #endif +static inline void __clear_hugetlb_destructor(struct hstate *h, + struct folio *folio) +{ + lockdep_assert_held(&hugetlb_lock); + + /* + * Very subtle + * + * For non-gigantic pages set the destructor to the normal compound + * page dtor. This is needed in case someone takes an additional + * temporary ref to the page, and freeing is delayed until they drop + * their reference. + * + * For gigantic pages set the destructor to the null dtor. This + * destructor will never be called. Before freeing the gigantic + * page destroy_compound_gigantic_folio will turn the folio into a + * simple group of pages. After this the destructor does not + * apply. + * + */ + if (hstate_is_gigantic(h)) + folio_set_compound_dtor(folio, NULL_COMPOUND_DTOR); + else + folio_set_compound_dtor(folio, COMPOUND_PAGE_DTOR); +} + /* - * Remove hugetlb folio from lists, and update dtor so that the folio appears - * as just a compound page. + * Remove hugetlb folio from lists. + * If vmemmap exists for the folio, update dtor so that the folio appears + * as just a compound page. Otherwise, wait until after allocating vmemmap + * to update dtor. * * A reference is held on the folio, except in the case of demote. * @@ -1612,31 +1640,19 @@ static void __remove_hugetlb_folio(struct hstate *h, struct folio *folio, } /* - * Very subtle - * - * For non-gigantic pages set the destructor to the normal compound - * page dtor. This is needed in case someone takes an additional - * temporary ref to the page, and freeing is delayed until they drop - * their reference. - * - * For gigantic pages set the destructor to the null dtor. This - * destructor will never be called. Before freeing the gigantic - * page destroy_compound_gigantic_folio will turn the folio into a - * simple group of pages. After this the destructor does not - * apply. - * - * This handles the case where more than one ref is held when and - * after update_and_free_hugetlb_folio is called. - * - * In the case of demote we do not ref count the page as it will soon - * be turned into a page of smaller size. + * We can only clear the hugetlb destructor after allocating vmemmap + * pages. Otherwise, someone (memory error handling) may try to write + * to tail struct pages. + */ + if (!folio_test_hugetlb_vmemmap_optimized(folio)) + __clear_hugetlb_destructor(h, folio); + + /* + * In the case of demote we do not ref count the page as it will soon + * be turned into a page of smaller size. */ if (!demote) folio_ref_unfreeze(folio, 1); - if (hstate_is_gigantic(h)) - folio_set_compound_dtor(folio, NULL_COMPOUND_DTOR); - else - folio_set_compound_dtor(folio, COMPOUND_PAGE_DTOR); h->nr_huge_pages--; h->nr_huge_pages_node[nid]--; @@ -1728,6 +1744,19 @@ static void __update_and_free_hugetlb_folio(struct hstate *h, return; } + /* + * If needed, clear hugetlb destructor under the hugetlb lock. + * This must be done AFTER allocating vmemmap pages in case there is an + * attempt to write to tail struct pages as in memory poison. + * It must be done BEFORE PageHWPoison handling so that any subsequent + * memory errors poison individual pages instead of head. + */ + if (folio_test_hugetlb(folio)) { + spin_lock_irq(&hugetlb_lock); + __clear_hugetlb_destructor(h, folio); + spin_unlock_irq(&hugetlb_lock); + } + /* * Move PageHWPoison flag from head page to the raw error pages, * which makes any healthy subpages reusable. @@ -3604,6 +3633,19 @@ static int demote_free_hugetlb_folio(struct hstate *h, struct folio *folio) return rc; } + /* + * The hugetlb destructor could still be set for this folio if vmemmap + * was actually allocated above. The ref count on all pages is 0. + * Therefore, nobody should attempt access. However, before destroying + * compound page below, clear the destructor. Unfortunately, this + * requires a lock/unlock cycle. + */ + if (folio_test_hugetlb(folio)) { + spin_lock_irq(&hugetlb_lock); + __clear_hugetlb_destructor(h, folio); + spin_unlock_irq(&hugetlb_lock); + } + /* * Use destroy_compound_hugetlb_folio_for_demote for all huge page * sizes as it will not ref count folios. From patchwork Tue Jul 18 00:49:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Kravetz X-Patchwork-Id: 121715 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1439171vqt; Mon, 17 Jul 2023 18:09:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlGnGhsSg03mIjv/VcObhR+RXLQnHYuLMVxoTcnvxQLGA0Rv2GewqZ9VsA8yuXf8mkd28O/K X-Received: by 2002:a17:906:10ca:b0:994:3395:942f with SMTP id v10-20020a17090610ca00b009943395942fmr11649487ejv.17.1689642574915; Mon, 17 Jul 2023 18:09:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1689642574; cv=pass; d=google.com; s=arc-20160816; b=UhVhz9UjWqGm+ZC696lObN4l0wu5vz424L97RiB9zS9/CkkDeHw7I9OOdIW9GhZBsz a7pPCLS3eohZ1XFPsohs7fUn0FuT3t+d+pzoQBFWBF1tKQx4G+ngBtpFSqT+hYgXU1Ev vgKDOPetpXCDv8PZS/FQ28WPD+a0pNfzyROGcbktKznsTSizJzswfEYSMoGKp5uuEWOU VnhQDp3Q/U4AwGteX6A0WaddY1PHdMMycc7YWySGg8+O5ydW1jKv6sEL82Erm0ldldE5 zDr3uGYc/OCL0sqhpeeemIHo6V1QIpADL4HEWo5ydOdyFu+LqSJ3kmRTFTcH/w/LphI9 QOtg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=ZgV7qJ5Wq9AaKiuOJNgLUYIz8E1B+1MkUqffdohg7SM=; fh=hXHbGBGErkPPVIw4OCNOb/WIL2zG0dbAJuId7DpeZoM=; b=ErAZX+cJggdgXhxiCbJb6f/CubZ2Wec/cKLOqS0gVdG5RLvpqLSE40Yj/U2zpUh2Dc wuu1dm27FPgQKGFfcrOYGoX3DyUNx8bjbvdTXrvnYSgND6rEX85Ydk3S3sSp9BPd+ZT5 1yCKRckWIEq5pIt1QoniSYzXlTaImS5GWDt282EEtilaAYIGMHf5xusIHPuxsuaOnyek XarhkTBlxRXdikoq6nnXuFyt4YtLiJPjJIXXxqruBy2lZ96NKtfNW8VJR1PfjQel25b0 arR+ztObBA06WxHnQJukSirT67YpUyfq88SFz40EGX8JSC/R+nNcwWF62xw/qtqp7BHl usHA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=MlWCxkzX; dkim=pass header.i=@oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=ONQlmkrq; arc=pass (i=1 spf=pass spfdomain=oracle.com dkim=pass dkdomain=oracle.com dmarc=pass fromdomain=oracle.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m9-20020a17090607c900b009873cbdd6cfsi388077ejc.706.2023.07.17.18.09.10; Mon, 17 Jul 2023 18:09:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=MlWCxkzX; dkim=pass header.i=@oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=ONQlmkrq; arc=pass (i=1 spf=pass spfdomain=oracle.com dkim=pass dkdomain=oracle.com dmarc=pass fromdomain=oracle.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230322AbjGRAui (ORCPT + 99 others); Mon, 17 Jul 2023 20:50:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230022AbjGRAuc (ORCPT ); Mon, 17 Jul 2023 20:50:32 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B13D110DF for ; Mon, 17 Jul 2023 17:50:31 -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 36HKOL3a023700; Tue, 18 Jul 2023 00:49:56 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=ZgV7qJ5Wq9AaKiuOJNgLUYIz8E1B+1MkUqffdohg7SM=; b=MlWCxkzX4YDQJmrpp7+xKoYrbHnz8jJ6+BvO57qEhd/1X+AwaP3EVACY+hFcb1RC/moM 1wggJqacg13/V9BY0W01wXK5woluj2C9gupKTd7MRSnUMoTqAGu2Qw4OOb2sJQcA0z7y aTyE2nLiUT2VsvCXOZ8IVSq+M7ShRLa8rphfWdLPVtjJqbtSZmOJlIXRR1GtszaMcMCG os66GlVCwV0/3YGfDLx/pJWU9Dhl2wiH3v/vUzIrmR5NJOLBFpqMzpYNsb+s2rhHsQ3g ujlh6MxfFP4UnercS1moL087wl94YsSjW1AiZTUooKCvasTITZgbXVu5Lr+5bq1BgFZ5 YQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3run88ky6g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jul 2023 00:49:56 +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 36HN24fc007757; Tue, 18 Jul 2023 00:49:55 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2101.outbound.protection.outlook.com [104.47.58.101]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ruhw45dqm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jul 2023 00:49:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eHKucMnXopTCDhuXXPr+XTd87+Kp0ayLXxDMDFI8Mh/QarplmsumP318CUKTB7ggcOjPOEGGB3KQLOTzX+MrARf2TF6f8UJFX08ZfNa5dmQid0AzDk4BAzRDZQNxBZmBcrReO7MdjvXfEMMv8fzfyIzK5djtDTxzuaOx9ztQhmfBlUEV+QCG1f15j+WU8H6nVGJDLHLpJsxvQCYZdAu4yTiVJi3PPfnJjXi8EaIo7f5JSbHc617uIJMd+m+VuI34bc3FzVtobBQ1zs79a77gX3J7dMfdiXDY/WvJ1uvPPMC/43rcDGe9ZqcfRxABH/UZEieWvWEi5JwM8VScJa9RmQ== 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=ZgV7qJ5Wq9AaKiuOJNgLUYIz8E1B+1MkUqffdohg7SM=; b=LFmHjmWFcQykli3VcAsf/UF7Jxa9qtaS4vTG8Fu6r/Pc7ogJ8NQSsEasLvuaoQd4NELWROjn6YBsi8hAvNWyIjqhi17dSvjrF9kYDN4v11tk71UCFl0EGB4ZHNrpUrcug4l4etk+aNlbAGnbsMhk5Jht/ZeV2bFEBY/+vxqT8Mr2EBwI2b0lNncmbRdernUl+DKX5YomFWV4b5Gjd8nI5AiJ9dTs94UEHshK60TKinnzSzBpUC/eoVpJBeEYZba3Kt29jw2XXtUXO4gULDtVjjpYorm3XxRY/jJJhJgqXm9PeiH9Zgk/v9Shyp/ryiKv619AkN3RrR3HkZX8XqpshA== 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=ZgV7qJ5Wq9AaKiuOJNgLUYIz8E1B+1MkUqffdohg7SM=; b=ONQlmkrq8Hsb49WH/qlMrRs0If4jjIDKq0lBHnFCRczwPoEO/AE6W1vCOzZdBdTYtLhQXvj9Fqz7k8+NiYI0hhHCXVj+uJOEqtaht0AyZC87KmvgHHTY6oDAzLtXXnyfQIFK4CQhuETEyI9ePWZLtDH/EqvFianBkjPB2bH3mXM= Received: from BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) by IA1PR10MB6193.namprd10.prod.outlook.com (2603:10b6:208:3a7::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.31; Tue, 18 Jul 2023 00:49:53 +0000 Received: from BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::4a17:13b0:2876:97f2]) by BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::4a17:13b0:2876:97f2%7]) with mapi id 15.20.6588.017; Tue, 18 Jul 2023 00:49:53 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Jiaqi Yan , Naoya Horiguchi , Muchun Song , Miaohe Lin , Axel Rasmussen , James Houghton , Michal Hocko , Andrew Morton , Mike Kravetz Subject: [PATCH v2 2/2] hugetlb: optimize update_and_free_pages_bulk to avoid lock cycles Date: Mon, 17 Jul 2023 17:49:42 -0700 Message-ID: <20230718004942.113174-3-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230718004942.113174-1-mike.kravetz@oracle.com> References: <20230718004942.113174-1-mike.kravetz@oracle.com> X-ClientProxiedBy: MW4PR04CA0117.namprd04.prod.outlook.com (2603:10b6:303:83::32) To BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB4196:EE_|IA1PR10MB6193:EE_ X-MS-Office365-Filtering-Correlation-Id: 5b0a0528-001c-4cd6-4f73-08db8728e5e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7muyrlVdGiGSoIwzPME2poQSpbS6wzNvMgQAw4qHdh6eKsrn6xNBzAKlbnot6RLfrrNalsc5fAYPToXGNsh9K3T1ReKFYDiVMsf2rKEwMkOLUKtgD4X4d8io25uzLppTLyBD865cD6XQ0CrwCMsXlinQa6HBa/+IL79LF9JSLIiih8XEGhEiy/H0nvA+D7cpjR+vV+bIaiet4NBEbxLw01/av5UTL/EhQj6YMHKPMp2kNURo/qs3e96GKToMqmrbnTcjnueIgysbX1vVlgHzLclwHaUKWcJCbzgXGjEl7ZEVy8YlqxbKa6cnWYDRFdAuba/pdDruWBfRAlLfZSYRPfXviO3SxiHWH5mF2Nh4jNqNwtHxn7369/eEL/Pm/7qKASomvKqEGosG2yuQ+AvMdIF59JV+E1DuUt1Fo5cjJamM8sAseDaskOIHSwEa4l0qlAHHfqI9BWDO+OmTsBxfPePw5DQ5URSimXalZ6IgyRuKr/8Mmrkx9cHIrst6KUZtSU0Fy0dgkglWIM5VOF9zcBZ40p8Oa3Om/pt6Gwq51wLVg0vKlURP5zmOkwWoCXKo 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:(13230028)(376002)(396003)(136003)(366004)(39860400002)(346002)(451199021)(54906003)(6486002)(38100700002)(6666004)(41300700001)(8676002)(8936002)(5660300002)(66946007)(66556008)(66476007)(316002)(478600001)(4326008)(186003)(83380400001)(6512007)(2616005)(26005)(6506007)(1076003)(107886003)(86362001)(36756003)(44832011)(15650500001)(2906002)(7416002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bMmnxjIDcqNnb/iYJoQ241b+5iEnY98WoX/AKOg0gPnYQM6U962+6DW644gYBVA/u7KEIsjWR3IgMkH0a96lfNC1Drr4ORuJrMVFnw4dXXJ0ZokgZtavh1XfKzei8mAUGzFcfXrO5N/2cohfC2skoihlVBsEt7ipwWkB+L75VGvKdckeqdFBBogb4JUTmqW976CivQDy3kLKinNnzFjS7tVzLRPabvQ0ZeudQJWtfTiWx+NoYjX29QD7CcaUyl0YToXjl20O1/gXWoIPJatDmK4A9uGRCaAURuRS2Neo7gr27qHdiEyHJs7j/drz1FzhU3IKBsw9FZzAU8bhldrdRp4fTCwZatoto8mlInpcY15+gJExdDJ/Y54DYtqwPwbnueK7Eg6zI9KOAcpb+0KzIqHMSmedKELSOla7jwUQ6vZjxAfw2MDEpS7M3xG2TcQs074QcIjTUaUtxKpGuHxRySk0G5MWxR1DcFnfuOBWep/oJNdpIxhw7fiy+CUBXL873h4TB5tjewuQUoLQtM/HDoUthrpiXoVpsfED1LrHQZdkoV+TFv4R9XLExz32z16Bd9TJUIxR6O0ujlhDCEOWroz2qh+SpE4BG0pXELa3Dit+zWycs34tJ5BLDKUsrWwmoM/BezqCc5AcGQDIpjau171Z81L2UUwi5UzkShHh+yDnag2DdAjiaA0+D+6n/ZCei36BR9EWVASR0j4Ud0s+/STZqp1EJdjD05Nht4kaKqvgydu2QWLc7ZkXKUB/lln4T6wg0/GPVnobHVKE2uYJF0Ps8US9xtduDbFZxTDo/l1A+Y9KloisNZJngw/r6ljQ69oQ63zfpqVLkuXKMxYTiHO5poD18sGOCYYcJDI6Eu4MSRVcQxnjLFRLDWh56m9SkZVv7YnxXZagmhuoLj6KXTT5ML/COLLUowhQUNxzx54XuBd4DlGFU/UMiTkitI0sXteIXQWVwFVv/9wtQQvEaSg+41VP/5ENfG/PvblSl3APAoVf9KzWQtrCP7+MXuSzCbT2rMtV3KDnNMvMtvNGffhKyr1AdfPysBPTf+2fBoNNKA1XzXoYQP3ECw4F1x6HHyXHdsrT0MR8khvsZtAonQghSuhZuyqyEs8oDyJc7p651Dt3VNasFV9FAElB8ckx5NEj/h4ycDluXfjmGttrfW9bN2buXyUDgNWJyo6UKQRq64Pnsxef7OBz6tLKk0hm0hZJ4lY4KorZRimWvUebFqjD44NvDyaGwpgsI5wIEDcaWCt+DUssb21OEjgE0n9FpL8fvS7mssy3rZmxbXcb/2c9gnCpvZapwIhXf0zVMEWKJ2T9ZCb4/rhu84yyGNe2V5x0nKUXQA1uT5WT7MtepC9FEyUF6IQUOq2bLupDhprwgmY2Foo4HZzQKlFA7JZgyhlo/9bftrq9QcOvF47j1oP3fo2kiNt5llZ89KG51/cZzcj5rcvEwY4mdHH+vBo6tRgRJIUOAQDnHbpmClqQj1YzGtDW/ssKAFXlMNuglwjvuJfd1hFBQKtvcLa/NYAdEHQ+V772Ac3DPL2zUVcgzT0lpmm/NLBgVzGY7MWazbWNWV+ZlEZJkIc755zVy++HIrikb9eAguece4gx4vfu4A== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: eXvGaZXsU6P8RGNnAq+SjTN7Ht4qX2IINgOLXa+slLloCtYEKDcCqOkY5yoBAvUEuvEVZQ3oPg67ldsXZq0Ah9XRhmugFLaMbH1dnhehmRVpWUx8hcA76DYiXoKhTq8rmwRMK9freKzDHIsgDFniDVICKYBYAYiGXVd8uCyJIB0nyWqXlM86QmSjlR8Sz7Gmlqo6FCAdnjMd/qPU5FKNk5IJE+h3XFt245mr8gsjewZK0C2tRjQms4kjafFsnmljuGVzyjR/FITt8XEht6y+mXygFijKFKB83DWz7efPg4/nX8lD5Xvd0jWCvwlCKpiBccj2RBLzxxXgZYde49NVWwKVmIgwEiqxiVAmGbuseznPQuYRvJz5riGaMoWJAj+i6Rs8vLZSe6SIjDhqC35/UG/O3htmvM82vjCMEl5yuTJYN5G7uj3N0N19qpRT8RJjLXivaQ+n3rEAUQx9M3HVCFKCw9C6VLuvxXs+JkKkrAwMhv3zS5V0YzNs+DKyrfzAgYaynm+zYYfX5EKsTmmJBktaZ2rWElrx9l02Q3mVrqItVVN2tv/mdQTCENoN+GKz7X6nrFN9EUSlb1nk6mStxBVwTxSczZ02EK+z+WD2N+Pmx9tG5nIFaTmlrpfynutM9zsriYmuS8Nq76eyUQvkKNZzhZrBBdSBe06GhplFZxtLbtFohXrJA8oXTvFIf/nOiWPVhPYOE45SffuRVdCcth13qgccp52SfX8sSISmryjuN8sKkZ6gU40t+3CPVfj1frVJWWRrIgMVzVQtddV3AG9XuJnF35aNOBT+PdzKFVA7WaI9dc7fnbXvsSqqjng3+KOPNsYJPbPEaEv7tEiRzA13T8oSlXPZe79TCSP+3jjDyzBC0JQuCfbC4FW3WCB+zB+Y2PuG5lR9jeYTBSB4f5NLW3OIMDciGcpQIZQ8AfYbnf2/uN61vn+Y+3EwyZoyLZftOMOcgtTcm88wgStA+Q1DKvy+L0bSB2E3pftqyNjxTEP71n0PvKLBSy1DX2LM X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b0a0528-001c-4cd6-4f73-08db8728e5e5 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 00:49:52.9624 (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: CMJuAxBUdTfDB1y7JACY4im6hyYsSnJm9J9SCnBJfCl+3NrHOo2Xx8c/GaRYxHLKIB8VXMNfSymnH7KbzQfs7g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6193 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-17_15,2023-07-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 bulkscore=0 malwarescore=0 spamscore=0 phishscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307180006 X-Proofpoint-GUID: -sYHlFC7LOPP7X9cvRVh3iPq52MmGGLK X-Proofpoint-ORIG-GUID: -sYHlFC7LOPP7X9cvRVh3iPq52MmGGLK X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771718652930392826 X-GMAIL-MSGID: 1771718652930392826 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 | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 4a910121a647..e6b780291539 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1856,13 +1856,43 @@ static void update_and_free_hugetlb_folio(struct hstate *h, struct folio *folio, static void update_and_free_pages_bulk(struct hstate *h, struct list_head *list) { struct page *page, *t_page; - struct folio *folio; + bool clear_dtor = false; + /* + * First allocate required vmemmmap for all pages on list. If vmemmap + * can not be allocated, we can not free page to lower level allocator, + * so add back as hugetlb surplus page. + */ list_for_each_entry_safe(page, t_page, list, lru) { - folio = page_folio(page); - update_and_free_hugetlb_folio(h, folio, false); - cond_resched(); + if (HPageVmemmapOptimized(page)) { + if (hugetlb_vmemmap_restore(h, page)) { + spin_lock_irq(&hugetlb_lock); + add_hugetlb_folio(h, page_folio(page), true); + spin_unlock_irq(&hugetlb_lock); + } else + clear_dtor = true; + cond_resched(); + } + } + + /* + * If vmemmmap allocation performed above, then take lock to clear + * destructor of all pages on list. + */ + if (clear_dtor) { + spin_lock_irq(&hugetlb_lock); + list_for_each_entry(page, list, lru) + __clear_hugetlb_destructor(h, page_folio(page)); + spin_unlock_irq(&hugetlb_lock); } + + /* + * Free pages 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(page, t_page, list, lru) + update_and_free_hugetlb_folio(h, page_folio(page), false); } struct hstate *size_to_hstate(unsigned long size)