From patchwork Mon Apr 5 23:00:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Kravetz X-Patchwork-Id: 12183803 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E2C7C433B4 for ; Mon, 5 Apr 2021 23:01:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 545E2613BC for ; Mon, 5 Apr 2021 23:01:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 545E2613BC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B1C976B0071; Mon, 5 Apr 2021 19:01:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AE7FE6B0073; Mon, 5 Apr 2021 19:01:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8EBB36B0078; Mon, 5 Apr 2021 19:01:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0109.hostedemail.com [216.40.44.109]) by kanga.kvack.org (Postfix) with ESMTP id 68D2E6B0071 for ; Mon, 5 Apr 2021 19:01:57 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 32D5383F1 for ; Mon, 5 Apr 2021 23:01:57 +0000 (UTC) X-FDA: 77999837874.21.9C1A8D1 Received: from aserp2130.oracle.com (aserp2130.oracle.com [141.146.126.79]) by imf14.hostedemail.com (Postfix) with ESMTP id B98FBC0007E7 for ; Mon, 5 Apr 2021 23:01:52 +0000 (UTC) Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 135N07Sl014878; Mon, 5 Apr 2021 23:01:42 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-2020-01-29; bh=bjJ8BITTlbisNR/LOqpXpU5wYr8TGaUYDvW6QoK/vq8=; b=dIthAsTC9r8xaBRAxTOax+cum4Qi7Ai1HHrXZyTf0bgg6a0Yp9d7uN9YY/upbYgvx8kR Qqx8AhiN25/5wjd/AUTU5RS7j6clvyNGbcGhc7AWXr7T/nhlwuGwtMKonSDryFGwWubE 2BKbzZCmCbatdrj8lArTO6vYie/1MhP8aJzzcuIim+hOVeZJpaVdmnaFbOLyKqgAjgYG HwuQF3mJkkuxJaQYBBAQy42buTWYbUXzBstjTIDitMbBOn4NPhUzKQ2EInTcPto9vjfC vp872pjcKKvfF8OU1rPtnTAUt78AZSN+B9qM/kD9UV5opJ0ZPksaPG1UutUblE4bt5lY bg== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2130.oracle.com with ESMTP id 37q38mkkba-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 05 Apr 2021 23:01:42 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 135MtqFj089438; Mon, 5 Apr 2021 23:01:41 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2170.outbound.protection.outlook.com [104.47.58.170]) by userp3030.oracle.com with ESMTP id 37qa3hp3ex-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 05 Apr 2021 23:01:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AbNz2d+qYFjtWBicp+eWOhq88bkAP95p7wtI9VWZ9YS25nvY3H+Sap036xplCjL4RxcoKm4xwzpM8h8CqCsoTcjXPHNkR7acDxQvWvZLDy5q+AU6onhYeK7ZJWzJak1SP+oL8WAoWx2lr1KrDAr525sSx5MqU86XPeleUhJV5LKXTAUYQ+Pi0Ji3Ovoch8s4qk264WfYZFxh/WWu2yoUp9IiZHKlYhd4Rqs721Rwmgvpj50NMdqV+JCWlAikzbRWWMIEF6GLjH5E7BbYqbD4d8YXmTNOflsxY23EN9aHhlaVunxo0uS0k03FXaIOXJS1uQB3dmXq2vXoVLfMpcxI1g== 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-SenderADCheck; bh=bjJ8BITTlbisNR/LOqpXpU5wYr8TGaUYDvW6QoK/vq8=; b=HHHZrCEyUcPw6+lIwbnvdUf6WGEORyN0Yb67yghnVSL1/eFRckv/UpD1RiJuJPbO8No6S4RLtWSJKWQSI97mkACnevVASeybyFzzsczhd6o6E39AVEDXxYuCZx4NJ5OPaFwElK/c26cP7Gc4sMLDYd+X8IQbcIMVoTAl3d/oS9uhgkHhWTkSu3wdya3sX5DRmU+ixwh8bVSi81WD2UinMYwkf/8Uf2PfrLu5UGs9mVoDlNCAHSjP8HnHwZVTB58cX/WzJYGcUj+0Mviy2bA8m0wf0EA+GI/ClPu+GufHlJhGaX6vQEdQViT4qLJ6JdfbUleZMfetgbL6x5g5HKIt1g== 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=bjJ8BITTlbisNR/LOqpXpU5wYr8TGaUYDvW6QoK/vq8=; b=G3mFkMoer+T6gcqDSn5y9eZPCybnpGeQpU3AwvPeojAON5IX/CxQBKZqzTSFVukunMzZr9R8RA4FFtqRQV8WaTwIVY+JYcBMgED01f5jqVhlB/SNkGyWIFT5wFyWsCnip85+jZUDgP5s2Y8XH1iZJR4d2/YD8ZuR1TDMtkiAyBA= Authentication-Results: kvack.org; dkim=none (message not signed) header.d=none;kvack.org; dmarc=none action=none header.from=oracle.com; Received: from BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) by BYAPR10MB3544.namprd10.prod.outlook.com (2603:10b6:a03:121::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.26; Mon, 5 Apr 2021 23:01:37 +0000 Received: from BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::980e:61ba:57d2:47ee]) by BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::980e:61ba:57d2:47ee%6]) with mapi id 15.20.3999.032; Mon, 5 Apr 2021 23:01:37 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Roman Gushchin , Michal Hocko , Shakeel Butt , Oscar Salvador , David Hildenbrand , Muchun Song , David Rientjes , Miaohe Lin , Peter Zijlstra , Matthew Wilcox , HORIGUCHI NAOYA , "Aneesh Kumar K . V" , Waiman Long , Peter Xu , Mina Almasry , Hillf Danton , Joonsoo Kim , Barry Song , Will Deacon , Andrew Morton , Mike Kravetz Subject: [PATCH v4 6/8] hugetlb: change free_pool_huge_page to remove_pool_huge_page Date: Mon, 5 Apr 2021 16:00:41 -0700 Message-Id: <20210405230043.182734-7-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210405230043.182734-1-mike.kravetz@oracle.com> References: <20210405230043.182734-1-mike.kravetz@oracle.com> X-Originating-IP: [50.38.35.18] X-ClientProxiedBy: MWHPR18CA0031.namprd18.prod.outlook.com (2603:10b6:320:31::17) To BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from monkey.oracle.com (50.38.35.18) by MWHPR18CA0031.namprd18.prod.outlook.com (2603:10b6:320:31::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.27 via Frontend Transport; Mon, 5 Apr 2021 23:01:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f9daf939-9e2e-4fe2-5329-08d8f886c3e6 X-MS-TrafficTypeDiagnostic: BYAPR10MB3544: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: udS3Xf8Z6OOW9Nhht2MG77DdVeyT6277pfQ6zrppmFNWsghgqHFJIzZPCAUz9yroT2ykyj7dztfVkw3JxmhG/9pejpV1Jnov5euq4r9l3sYiP6c2UTqEu7Pp0K9rpfi1tsqoBVvyRaeq0NxVbseJMBImqqL+hNFlIZs5OyDyZnHPSx5q1kQPmW8dHhZScpwWsWNrwoZPuUIiGHLt9mZFCTCDD4GT3kxgJV59/FQ+AEkV0RwUke3EF0srdJqZOuFEJeTx+vZwJ7mzMgmONDElMAfpKJ5QXCnoLMoZNwAih1JxiZ1ycOiV1FboQkM3JESBqDwoLUaZ/Qv0f/uMBjFdQxSO7n6pa4NIQOuTAGeq2pNvpHx3WlCCaQIom8PY8cqoe7rpncw9I8s0fcOiMESgOhQYZFVNk9hTkUD0zsdgNbJNcCJIZX0CInZJIh+jOgOoV/owmFFQTeZdVcPQLJqFmdx+pU6R50KZBAZZvAABF1o4masEN8cmZm+KgZDiumAtsX3kznjL8M6J7CY85EcBDPHiUfX3uR2Z6LTBwqMDzsOSV8CdsSdRx0ZEPvyroGC7OII7CO3A9CsJaOXHRqN0TkGYQfwVE17+oYuHdwZ9+OlfR9sWSHjYldOV2DsMcCmutJQReAeUXJojL0aqJVwJyRoCRd+u99QVnin0buN42YfCjkiBKbZ9RS84BjKJI3rRIChEx/SKTBVb6JlaAzfl/g== 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:(136003)(396003)(376002)(366004)(39860400002)(346002)(2616005)(44832011)(66476007)(5660300002)(107886003)(8676002)(86362001)(26005)(6486002)(66946007)(16526019)(38350700001)(1076003)(2906002)(54906003)(83380400001)(4326008)(52116002)(7696005)(186003)(7416002)(478600001)(38100700001)(8936002)(36756003)(316002)(66556008)(6666004)(956004)(14583001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: +UJqpB42TlONBETEKU3YXHW/apKDjTO0c5yS8g6DVc7CCpZfz2/gGvkNH39L4eCv/EqgYDlUwoM5xHsblxIVGFhC/9SQCOyA1un7Eij2bd9NZdRZnzszbcQVzvIO+4kSMPtco6JdO38PyP9MUgMdO2zsPxuXD3ZePVjpmZPL3kJ2JflCaUdULEWN1e0vZoc7UhH5Lth6md/lAqrh3df3nFOx+g/DeiIL0G1xjwMpwNr58kmaTCuRrK/c3ivNwSACAX5Mi0ofVmDmmcoRnf/S2/PekgIKggGn/wmNvH9yZs7ruZFFu2cV0iGx5k13+pvY2z1hp2ooT3vNt8Qh1ruZHgfGRjtNXkI+yyAUKBwHqDnWCYKXPEeMcKoKtSFS0heOYbl3FxlO6YNIkFhMyutZ0yBul12DPc28p/DDIV9NVcNsLDPpoQvd+rczxr6KT4IiOeM4/qelev+49MEUCLhcIJ8UnnXwlC8RXuVJlxHtS2SDxwFZOqD/xRBfWUqXfLvAhxswI0EGfjWtBbObrQ1QVqrYXs2d7WaDUAE8Dx7Hzf0fMZi9IhQPf5AlV9CdHV6nOx9utigHyjC+SwsrTNQSO1koO+fTeJKlzfkXmPJ2xlo/MDNUpamnY7BtuC17usMXTdyxKAQBtlZTHkLM99MD6A9isWH7ZsnvpMt6EWP5yq04YT7ZcMhswTLi/Iv6+zcarz061ogLZgUuCjklRGSeqkGdtofxBI0zSGdkOUP/YLeJgt76GBuqE8FS0aYCUKWxcj9GIjsxgmD2fCc3Zk+pTROi9sF7c97XFD+UvaEvXlfkhLa8+QxFfcGoXoC6BxzhyyXN3gRtT9PKtV9zeEwvpQAXf8sm4bsbFjtpHKO57PcsPh9XE61pE4CvxWCuZfj/C1a98sD7cV/PPkoFlAov1rAjVTUzrSvE7zXCRUY2L8TDMnm2hyf5bqC13kDzeOnebyzpPX6W4W7NNet1lnwIS3sdmqLtXuuj8qbZLzSj0o/4LHCXNvRTOeDjJMqv3p+9VXvIBjrBzAf5cD1LdyZOLQI9p1IHUA5/WZcNbrPu+9XkS9FWk1VauxX8eU8pP6yRrKwkcCsE3hE61iMDcfZt4kMgPWARIO4s++fvlMvFCBdwbs/a7oP6X7iMtEs/N/C3KSkveMVpw/cfdgOtznks99pDS1wfOFBWCzUIv1MXUvTb3jQWQAkIk7hDQ57Fi6ewNGczl3g+NlfTu7UpY+PVp99FpJsqcVZAE2Wlaa85Ts6N+w5gBu0o1SsTvIlgrbv+uByyYmbuQ8QUS75MyEJe32EPKJLmEDjlIdi5HQ7Cw46acBG2wpA1/REEwURYmvX1 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9daf939-9e2e-4fe2-5329-08d8f886c3e6 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2021 23:01:37.6678 (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: +dkupVK7za+Eaj6fUlsM/Hr3gB2IK2W3g3mfGiQCsEGApRv69MIBqtc7MsQHU/7q06CKSQiWG9/Z56mFwQ3ecw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3544 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9945 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 malwarescore=0 mlxscore=0 spamscore=0 phishscore=0 adultscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104030000 definitions=main-2104050152 X-Proofpoint-GUID: smRMt5xKuNbAVAUTDkFDsi0ItUVRceh- X-Proofpoint-ORIG-GUID: smRMt5xKuNbAVAUTDkFDsi0ItUVRceh- X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9945 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1015 suspectscore=0 impostorscore=0 malwarescore=0 priorityscore=1501 spamscore=0 mlxscore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 phishscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104030000 definitions=main-2104050152 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: B98FBC0007E7 X-Stat-Signature: 9mqq3q8jrhzcfs58bnoxtgddphigr5gm Received-SPF: none (oracle.com>: No applicable sender policy available) receiver=imf14; identity=mailfrom; envelope-from=""; helo=aserp2130.oracle.com; client-ip=141.146.126.79 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617663712-629295 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: free_pool_huge_page was called with hugetlb_lock held. It would remove a hugetlb page, and then free the corresponding pages to the lower level allocators such as buddy. free_pool_huge_page was called in a loop to remove hugetlb pages and these loops could hold the hugetlb_lock for a considerable time. Create new routine remove_pool_huge_page to replace free_pool_huge_page. remove_pool_huge_page will remove the hugetlb page, and it must be called with the hugetlb_lock held. It will return the removed page and it is the responsibility of the caller to free the page to the lower level allocators. The hugetlb_lock is dropped before freeing to these allocators which results in shorter lock hold times. Add new helper routine to call update_and_free_page for a list of pages. Note: Some changes to the routine return_unused_surplus_pages are in need of explanation. Commit e5bbc8a6c992 ("mm/hugetlb.c: fix reservation race when freeing surplus pages") modified this routine to address a race which could occur when dropping the hugetlb_lock in the loop that removes pool pages. Accounting changes introduced in that commit were subtle and took some thought to understand. This commit removes the cond_resched_lock() and the potential race. Therefore, remove the subtle code and restore the more straight forward accounting effectively reverting the commit. Signed-off-by: Mike Kravetz Reviewed-by: Muchun Song Acked-by: Michal Hocko Reviewed-by: Oscar Salvador --- mm/hugetlb.c | 93 ++++++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 42 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index be6031a8e2a9..93a2a11b9376 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1204,7 +1204,7 @@ static int hstate_next_node_to_alloc(struct hstate *h, } /* - * helper for free_pool_huge_page() - return the previously saved + * helper for remove_pool_huge_page() - return the previously saved * node ["this node"] from which to free a huge page. Advance the * next node id whether or not we find a free huge page to free so * that the next attempt to free addresses the next node. @@ -1386,6 +1386,16 @@ static void update_and_free_page(struct hstate *h, struct page *page) } } +static void update_and_free_pages_bulk(struct hstate *h, struct list_head *list) +{ + struct page *page, *t_page; + + list_for_each_entry_safe(page, t_page, list, lru) { + update_and_free_page(h, page); + cond_resched(); + } +} + struct hstate *size_to_hstate(unsigned long size) { struct hstate *h; @@ -1716,16 +1726,18 @@ static int alloc_pool_huge_page(struct hstate *h, nodemask_t *nodes_allowed, } /* - * Free huge page from pool from next node to free. - * Attempt to keep persistent huge pages more or less - * balanced over allowed nodes. + * Remove huge page from pool from next node to free. Attempt to keep + * persistent huge pages more or less balanced over allowed nodes. + * This routine only 'removes' the hugetlb page. The caller must make + * an additional call to free the page to low level allocators. * Called with hugetlb_lock locked. */ -static int free_pool_huge_page(struct hstate *h, nodemask_t *nodes_allowed, - bool acct_surplus) +static struct page *remove_pool_huge_page(struct hstate *h, + nodemask_t *nodes_allowed, + bool acct_surplus) { int nr_nodes, node; - int ret = 0; + struct page *page = NULL; for_each_node_mask_to_free(h, nr_nodes, node, nodes_allowed) { /* @@ -1734,23 +1746,14 @@ static int free_pool_huge_page(struct hstate *h, nodemask_t *nodes_allowed, */ if ((!acct_surplus || h->surplus_huge_pages_node[node]) && !list_empty(&h->hugepage_freelists[node])) { - struct page *page = - list_entry(h->hugepage_freelists[node].next, + page = list_entry(h->hugepage_freelists[node].next, struct page, lru); remove_hugetlb_page(h, page, acct_surplus); - /* - * unlock/lock around update_and_free_page is temporary - * and will be removed with subsequent patch. - */ - spin_unlock(&hugetlb_lock); - update_and_free_page(h, page); - spin_lock(&hugetlb_lock); - ret = 1; break; } } - return ret; + return page; } /* @@ -2070,17 +2073,16 @@ static int gather_surplus_pages(struct hstate *h, long delta) * to the associated reservation map. * 2) Free any unused surplus pages that may have been allocated to satisfy * the reservation. As many as unused_resv_pages may be freed. - * - * Called with hugetlb_lock held. However, the lock could be dropped (and - * reacquired) during calls to cond_resched_lock. Whenever dropping the lock, - * we must make sure nobody else can claim pages we are in the process of - * freeing. Do this by ensuring resv_huge_page always is greater than the - * number of huge pages we plan to free when dropping the lock. */ static void return_unused_surplus_pages(struct hstate *h, unsigned long unused_resv_pages) { unsigned long nr_pages; + struct page *page; + LIST_HEAD(page_list); + + /* Uncommit the reservation */ + h->resv_huge_pages -= unused_resv_pages; /* Cannot return gigantic pages currently */ if (hstate_is_gigantic(h)) @@ -2097,24 +2099,21 @@ static void return_unused_surplus_pages(struct hstate *h, * evenly across all nodes with memory. Iterate across these nodes * until we can no longer free unreserved surplus pages. This occurs * when the nodes with surplus pages have no free pages. - * free_pool_huge_page() will balance the freed pages across the + * remove_pool_huge_page() will balance the freed pages across the * on-line nodes with memory and will handle the hstate accounting. - * - * Note that we decrement resv_huge_pages as we free the pages. If - * we drop the lock, resv_huge_pages will still be sufficiently large - * to cover subsequent pages we may free. */ while (nr_pages--) { - h->resv_huge_pages--; - unused_resv_pages--; - if (!free_pool_huge_page(h, &node_states[N_MEMORY], 1)) + page = remove_pool_huge_page(h, &node_states[N_MEMORY], 1); + if (!page) goto out; - cond_resched_lock(&hugetlb_lock); + + list_add(&page->lru, &page_list); } out: - /* Fully uncommit the reservation */ - h->resv_huge_pages -= unused_resv_pages; + spin_unlock(&hugetlb_lock); + update_and_free_pages_bulk(h, &page_list); + spin_lock(&hugetlb_lock); } @@ -2682,7 +2681,6 @@ static void try_to_free_low(struct hstate *h, unsigned long count, nodemask_t *nodes_allowed) { int i; - struct page *page, *next; LIST_HEAD(page_list); if (hstate_is_gigantic(h)) @@ -2692,6 +2690,7 @@ static void try_to_free_low(struct hstate *h, unsigned long count, * Collect pages to be freed on a list, and free after dropping lock */ for_each_node_mask(i, *nodes_allowed) { + struct page *page, *next; struct list_head *freel = &h->hugepage_freelists[i]; list_for_each_entry_safe(page, next, freel, lru) { if (count >= h->nr_huge_pages) @@ -2705,10 +2704,7 @@ static void try_to_free_low(struct hstate *h, unsigned long count, out: spin_unlock(&hugetlb_lock); - list_for_each_entry_safe(page, next, &page_list, lru) { - update_and_free_page(h, page); - cond_resched(); - } + update_and_free_pages_bulk(h, &page_list); spin_lock(&hugetlb_lock); } #else @@ -2755,6 +2751,8 @@ static int set_max_huge_pages(struct hstate *h, unsigned long count, int nid, nodemask_t *nodes_allowed) { unsigned long min_count, ret; + struct page *page; + LIST_HEAD(page_list); NODEMASK_ALLOC(nodemask_t, node_alloc_noretry, GFP_KERNEL); /* @@ -2867,11 +2865,22 @@ static int set_max_huge_pages(struct hstate *h, unsigned long count, int nid, min_count = h->resv_huge_pages + h->nr_huge_pages - h->free_huge_pages; min_count = max(count, min_count); try_to_free_low(h, min_count, nodes_allowed); + + /* + * Collect pages to be removed on list without dropping lock + */ while (min_count < persistent_huge_pages(h)) { - if (!free_pool_huge_page(h, nodes_allowed, 0)) + page = remove_pool_huge_page(h, nodes_allowed, 0); + if (!page) break; - cond_resched_lock(&hugetlb_lock); + + list_add(&page->lru, &page_list); } + /* free the pages after dropping lock */ + spin_unlock(&hugetlb_lock); + update_and_free_pages_bulk(h, &page_list); + spin_lock(&hugetlb_lock); + while (count < persistent_huge_pages(h)) { if (!adjust_pool_surplus(h, nodes_allowed, 1)) break;