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 50ACBC36014 for ; Fri, 4 Apr 2025 13:18:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1DAA6280012; Fri, 4 Apr 2025 09:18:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 162E0280001; Fri, 4 Apr 2025 09:18:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F1F1F280012; Fri, 4 Apr 2025 09:18:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id CE34E280001 for ; Fri, 4 Apr 2025 09:18:17 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 5ADFB1A0184 for ; Fri, 4 Apr 2025 13:18:19 +0000 (UTC) X-FDA: 83296415118.28.724D83B Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf10.hostedemail.com (Postfix) with ESMTP id 27B6DC0015 for ; Fri, 4 Apr 2025 13:18:16 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=zOE7EHez; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=RtL6Cyrc; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=zOE7EHez; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=RtL6Cyrc; spf=pass (imf10.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743772697; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=WnW1pkdOkz8ksIjzD10uW4c2VR94mECt59Y5eUYdGQE=; b=4zItaqNIEMRrh+x8N509Ln3f8WDgi4rn/fEA4KIpLnrepdBd7+RukZiUw+ZWtHHyAc7xUi LEnR+m19bws046qDOKKR/xQW58hhdprJrrlgHTK4bRUJFrXTLqF2M5fMctQZuAYj6XESvs WxvJPIXf2SI36Hbs2ZkOYCpBAPJpxTI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743772697; a=rsa-sha256; cv=none; b=68DhWEbtvvxmqVWCsex7s0Op6nHGDD++4rq7PpKTVFwuUmqrB9Sxe3Gi1uyNUJe/WsZE+c hk75pcR98zykYVpaOENpsBlrLuYb2n1aQz4E7VuZzMPQh71SlmVKbS9IbvG/cj5whiAOYl RqRyNr8cwf/xkJL1ZgbEWIF+QA5MRZU= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=zOE7EHez; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=RtL6Cyrc; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=zOE7EHez; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=RtL6Cyrc; spf=pass (imf10.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id AEACD1F38C; Fri, 4 Apr 2025 13:18:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1743772695; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WnW1pkdOkz8ksIjzD10uW4c2VR94mECt59Y5eUYdGQE=; b=zOE7EHez8gZIVAa9SMxEfqJPCOuuWJzMuBAerzAS27uMxxgreiRS/u+btmX2W78OpBJv6x eUL7b/Vv+Uwe/Tvqesot6hxC8kfO6i7omosuVjpMyiUp9URhkXcsbhzx5UOk9MXjwZKYiA euA+xCgCmPzA9ASc5T02gW/iXCGzt8g= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1743772695; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WnW1pkdOkz8ksIjzD10uW4c2VR94mECt59Y5eUYdGQE=; b=RtL6CyrcrVd61VHEB9UaUOGkd2qJLxrO6CTRhFNr7+2VGkZADwUVCHvnzSJ8P//MynnEGp zH1WxW/taHC4V/Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1743772695; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WnW1pkdOkz8ksIjzD10uW4c2VR94mECt59Y5eUYdGQE=; b=zOE7EHez8gZIVAa9SMxEfqJPCOuuWJzMuBAerzAS27uMxxgreiRS/u+btmX2W78OpBJv6x eUL7b/Vv+Uwe/Tvqesot6hxC8kfO6i7omosuVjpMyiUp9URhkXcsbhzx5UOk9MXjwZKYiA euA+xCgCmPzA9ASc5T02gW/iXCGzt8g= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1743772695; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WnW1pkdOkz8ksIjzD10uW4c2VR94mECt59Y5eUYdGQE=; b=RtL6CyrcrVd61VHEB9UaUOGkd2qJLxrO6CTRhFNr7+2VGkZADwUVCHvnzSJ8P//MynnEGp zH1WxW/taHC4V/Aw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 4FD0313691; Fri, 4 Apr 2025 13:18:15 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id X47JEBfc72exWAAAD6G6ig (envelope-from ); Fri, 04 Apr 2025 13:18:15 +0000 Date: Fri, 4 Apr 2025 15:18:09 +0200 From: Oscar Salvador To: Jinjiang Tu Cc: muchun.song@linux.dev, akpm@linux-foundation.org, david@redhat.com, linux-mm@kvack.org, wangkefeng.wang@huawei.com Subject: Re: [PATCH v2] mm/hugetlb: fix set_max_huge_pages() when there are surplus pages Message-ID: References: <20250401082339.676723-1-tujinjiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 27B6DC0015 X-Stat-Signature: tccaphzrqsqim4sfbhr87umdisguuymb X-HE-Tag: 1743772696-662350 X-HE-Meta: U2FsdGVkX1/6It9iWdE4FgmSoLnJoUqvwKgPQsFymSbYWz6ZYx5oO50BjgtKhL35I1v/lUQJME8nE6gDmd2/61lM8CyORQWZGBb9fcE+Y54D4O5RTAe9zS84oaRBbuuD4eHjmIiQfizfexkj7Sa+H0jA98xrWippQAWmuFzyR+36vE39eMQPtZaPwn4SORRwEC4H0vGN27rnc+3qbvATzARjJOZPnuRVUWNSP01MwL/wsH7g5Yn3OkccfRz3KcO6Te6QA8+m6BhNKP2WCk7MeTf2L5QRo7+OQ7J8EOCMqhyyj3FLrtd+6kXkz94bgXFmEhBSJBxbSj8/gQYJ950JRDsafGKC3/KzOG10d20FDTVgaLTM7N8+kTPTyFER6JlmD7h8i4Jt2K4kOltDRR5m0W8+so8utBajwgKTUIb51B07PImDtfn561K1Y9ggS6qQOGrhs/Gejer8527D2O1uBssvynvYOVk8XNNHTIYdDlMULqm7OWLCcMVOZIabMBSyCC8ND62ncwJ1yWpM5hAGfTM4ty4b9pfqBDXBcem/IRmcgHMGoi1jEHQY/Qt8H49Nd3C+E1cl/GW0t2MsEOsf5+ZzG5jZyGbyzpRCQHhsJAYU3xj5niX8gUv2dXJUxeVKbuzHMNyVJr9iNJpiHNW0yuonI3OR6i+KvOC0dVzn8RBchNYW6LUjWrZDCwmLl9oRKUKG13eWE4vzhKx1ZmQ0oeIm4Wf4MyeGEETpVm4GUsf55f6e3kUm+einmRxkiZn2MmXdK3PwueReS3MLWDbF6sQx+bdxqpCC0smPr2BwDyqDjCB6mMMxOppLi+I5Uaem+4DTGQ0vY4Q3L839On/FFMiiJcKr6jGlU0mc7HiLGyscneKlNoJ5g6zqHpuNuzaaBLUi7YA/mApXv2XUYm0DtLhaANPu6t6zK8BdcGU8Z3P3eaWjEzMYUldwoOvtwTTATjdP9fyCuNLa8UEqM3d f1KbYkTw /TecKYPmjVV3c0Y9FSSklMosyDFjDubSRwiJA6ZfLUAwuFlz+dvDFN6h6J+lBS56JvD/1LJJ17nxw9UG0xZ+belyCg2EO1Q4JB35/vPj4wYrbT+z/Qe6ffw2x6+BjLTSMpozmg1108j+HPGdXt+baWM9gIQtyYRLmhq2IUYp5XUerH5Z/+i5ac+J67HC5pOibV/1YchC+t2lTszfH2Z1Bd16TLC/QIjVivS3Gl8cgjQlWALaiUKYvZW2S9zWJ02YgzFhEqdDoZdPPTIMwMQ46zggLksJOD+C15RbWgsPBvDwSUzITaaRV66VBOw== 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: On Thu, Apr 03, 2025 at 04:26:36PM +0200, Oscar Salvador wrote: > Unfortunately, this will not fly. I did not spend much time, but solving the problem of hvo free pages becoming surplus not being accounted twice, should not the following fix the entire problem? diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 39f92aad7bd1..6e9534a825ed 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3825,6 +3825,7 @@ static int adjust_pool_surplus(struct hstate *h, nodemask_t *nodes_allowed, static int set_max_huge_pages(struct hstate *h, unsigned long count, int nid, nodemask_t *nodes_allowed) { + unsigned long substract; unsigned long min_count; unsigned long allocated; struct folio *folio; @@ -3960,7 +3961,12 @@ 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; + if (h->free_huge_pages > persistent_huge_pages(h)) + substract = h->free_huge_pages - h->surplus_huge_pages; + else + h->free_huge_pages; + + min_count = h->resv_huge_pages + persistent_huge_pages(h) - substract; min_count = max(count, min_count); try_to_free_low(h, min_count, nodes_allowed); -- Oscar Salvador SUSE Labs