From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9417CC021BC for ; Tue, 25 Feb 2025 14:29:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0CC69280004; Tue, 25 Feb 2025 09:29:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 07BF8280003; Tue, 25 Feb 2025 09:29:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EDE5C280004; Tue, 25 Feb 2025 09:29:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id CFAAE280003 for ; Tue, 25 Feb 2025 09:29:27 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 736B6141711 for ; Tue, 25 Feb 2025 14:29:27 +0000 (UTC) X-FDA: 83158699974.26.29C165C Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf04.hostedemail.com (Postfix) with ESMTP id 01E0D4000F for ; Tue, 25 Feb 2025 14:29:23 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf04.hostedemail.com: domain of tujinjiang@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=tujinjiang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740493765; a=rsa-sha256; cv=none; b=dLHn7hhXmIP/HOep2rWCM7/bmB4dpwdFvscC+RQZwema3Lh0vINhy7aKXgrkzo9Rv0+xQ+ kOC5B2cx5BAArlMBEurglO9eI2BMkxxOiJT/fO/lf1JQ99WrGgevpFLFgD57/6x1ds9MbU 7qfBApP93jxFlzES2JFkHDWkaVD9Pj8= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf04.hostedemail.com: domain of tujinjiang@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=tujinjiang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740493765; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=RTv+z26xie98jLcm5e2n8ReLIpalFPIsvEIWm5QFasM=; b=AxgOBjvpIfZJjOmwgNKEh/EBr+VMb+CR2RswrEpy/ZnUYclPLHW7FJpBJtQ9VcSplM69aW R2hPqzV+PKghwdafcnhS7W0+0Uo/wwNM81e73Bmt86WuVcig1TYX8zRRUKgNu/iGVIcDj2 MxW/ZGXwl9KmBFicYIDP0K4te3hb6pc= Received: from mail.maildlp.com (unknown [172.19.88.163]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4Z2KfG20yxz1KFLL; Tue, 25 Feb 2025 22:26:14 +0800 (CST) Received: from kwepemo200002.china.huawei.com (unknown [7.202.195.209]) by mail.maildlp.com (Postfix) with ESMTPS id 854D8180044; Tue, 25 Feb 2025 22:29:18 +0800 (CST) Received: from huawei.com (10.175.124.71) by kwepemo200002.china.huawei.com (7.202.195.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Tue, 25 Feb 2025 22:29:17 +0800 From: Jinjiang Tu To: , , , , , CC: Subject: [PATCH] mm/hugetlb: fix set_max_huge_pages() when there are surplus pages Date: Tue, 25 Feb 2025 22:19:33 +0800 Message-ID: <20250225141933.3852667-1-tujinjiang@huawei.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.175.124.71] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemo200002.china.huawei.com (7.202.195.209) X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 01E0D4000F X-Stat-Signature: w5xhpc7af77bse4u399fngtt1z6etug6 X-Rspam-User: X-HE-Tag: 1740493763-609651 X-HE-Meta: U2FsdGVkX1/FSlZ9RmCJoKnis6Ryue3NgD1anz70YIgyr1EbL1G5tn7KAOAOr+UuSRzqyWokonUZ3aWIw/lqnDDl0ezl6H/MQbJ2aYTXzNZkuVccyL530sBldVozO20+KYGJ+TKdNOH/oHNL3MbRQt4bsHwFNA67wVHOBloofkU8rd/FuAqWrfUTkD8O8iV58EpXyR0Bq4KAf4W458QfSh0y6mxQRhI7ERhNQt8KqPovDsBh5LVQhVvkbMSVrkDWy3XvVTgPi0T79xdGXz2YPByM03kKxjo6dQFQ0Ehv7jBaovHznkrWfseBEhF+eNF18CO7s6xvDNtQK2pbZ3tWG6VZvoep/+Ryiqm8AqIOb4uEYjReu+NqdYTeRX+9S0HQi6ZX/auXyq8yzdX3Nt1tB/jh4H0md6RtOfBbN5t+izrFKmqF1xjdmzLeG/ROdQUBvCMI6p8m2BBt4mHfwAEKengiiM+6K4G39AhUZXMfo9p1P48CtGKyhA4CmJikHIcGfCkCeWVn4UbI3u/rJEQfU+JcS0QfuRl8J5uT2Nj3Q0WRXvH+8+syPHcJ8PHj5PZYzE7dyHemItn/LKHoZkL2iAon0v4/lumHtNUQUDtoHeknA9sccBDuGfugGydxi97NCQLBfqugQq8zev+RiU4STc4vlXIVXjDmcndWN5yEaZzfllfsXfwkzAI0LIUI0RXhE4oI5jD4AjNhDf6HuxB7Dx7k2gVE7/xLbays26RaqGVhGGBIPZxJAm6dr4fQE6igM7nykRIqPqaKbDys36xYY4zg/5AqrjOxVo+3/9npZNEov2eUGgQD85eSqggjL+hLl7kuWLCqJtbu0hvJjCnvqliKLbz8Kwqkd8n1/vx91jPBM3LA1Xh5EaQWixVegA/IuRgyxZa/nud+4prl6l01mEWSSEwGZfQc0bVw7Ew/3rOnG0nLlsbFmfY6YjzJNjMI6E/E8E+4/LatVrkspOV Yq3RlNfj 7QiALJ7RxTI2oTNYPJCMRlbtLhPPAuKB3eW33T6RaCF87osoMXk2If64Q2oOTn1Ljoi/6LBdXv8uiVaAnWhsIscecnshjlt8fImdxOdgMXZ5qfQqbhx0sgPr4AhpbRvUSr/q94TY9GwrCxp7XgUlOwz37lrzk3gh/qm1eOGFBi+Ht+RpPx/K81wT9hqKevCPiUa1Y X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In set_max_huge_pages(), min_count should mean the acquired persistent huge pages, but it contains surplus huge pages. It will leads to failing to freeing free huge pages for a Node. Steps to reproduce: 1) create 5 huge pages in Node 0 2) run a program to use all the huge pages 3) create 5 huge pages in Node 1 4) echo 0 > nr_hugepages for Node 1 to free the huge pages The result: Node 0 Node 1 Total 5 5 Free 0 5 Surp 5 5 Fixes: 9a30523066cd ("hugetlb: add per node hstate attributes") Signed-off-by: Jinjiang Tu --- mm/hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 163190e89ea1..783faec7360b 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3758,7 +3758,7 @@ static int set_max_huge_pages(struct hstate *h, unsigned long count, int nid, * and won't grow the pool anywhere else. Not until one of the * sysctls are changed, or the surplus pages go out of use. */ - min_count = h->resv_huge_pages + h->nr_huge_pages - h->free_huge_pages; + min_count = h->resv_huge_pages + persistent_huge_pages(h) - h->free_huge_pages; min_count = max(count, min_count); try_to_free_low(h, min_count, nodes_allowed); -- 2.43.0