From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795373089; b=np3zTMCLC5KD+G87y7mEbgjZ+uuq9656RcB6UWx/uNtnT++Tj/o4yzLFfgRgqBFmjEG3 PuSP9Igmi8mxIJ/s3jgpubaapLwwC4tzKQuPK8qkUAlyNiPh+RXHUtmrLlCnoV38iv1Rp xSZWfNVhRmvcKbxhN5s+2EdbjMy031rQD5mVIO9eWmQYdU37HhgsLQyzZ1ZPOgXiVnNJS ODTSYBwSekZilyaQi8FNJvXG85v1XN3zzjSmZwbcKrH5XF6n7iubPCVpQFv/Y+3dQWhV6 7Xxz/YijQpbjhV3k8ihGctcONOTxN8zHFHU0TS0gXWALPScgjrsJ9CS7b1CZw6zs1YA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795373089; h=Received:DKIM-Signature:Message-ID:Date:MIME-Version:User-Agent: Subject:From:To:Cc:References:Content-Language:Autocrypt:In-Reply-To: Content-Type:Content-Transfer-Encoding; bh=+mFUnJ0G0eEYTFMAR5FV99b/Z4DvZ9aEuSHItMsFjv8=; b=xtyWzHB92cJE/gL9DdbY9gAbxvxjY7FjpLUTtUzqAy7jw0sE3U+3MzvppdleG1nX4zS8 9PUdZrAo/3GbuqHQSFqzTSmFhBxtT+k3+UiZyECcBAjb/BQtAnPHmFN1tCROqfZrah8fk SnbMggjVbmKu5w2QIc6ALiAHFI5UaxZItLp1GJr+FrFi6puUK+aPKve8OZ1DngKNonpPO Qbs1uekxJap9yq9v8jpvjn2jfTwl/SHGRGDBHhRDkuNkKVyWjOM2LsclHjou1akbtBcMV RMYKN3Mndqr+1fOwxQNOl85YBBlXFAAWsOYUdFEZsVahk5osjLedG01gLHA3OF82Efw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=cpyh39c5; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0BE8B606A320; Sun, 22 Nov 2026 18:44:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=cpyh39c5 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 042651F000CF; Sun, 22 Nov 2026 18:44:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1795373088; bh=+mFUnJ0G0eEYTFMAR5FV99b/Z4DvZ9aEuSHItMsFjv8=; h=Date:Subject:From:To:Cc:References:In-Reply-To; b=cpyh39c50bNlYxatPg1dfUoMxxqhYKpWV6ZiCOkt6i6cBlt3OgZlIGIcLNGcvsxF7 BUSuJKIotBJvGeTW00tOSqW6WS5ISVNtDAjKMVLG/HbMxhRcNxH8FLNETEUUeYUC+0 jfpF1zA1Qysv7cT+KqxswBuxM6tPWJvupfyCJavn2tv/C6MKg+MXl4U0Aw8EG8DfzY 2LN8QmWaq77+HD0OoH+BUUaBDQ23EVG2II3EdGs2MFpX9/S5WeOvhFlshr9Mmbfcsj kOXVwPj94xxH3ulkHyTn49CnEnZeZjO1pP5hXQWEwg4+dsZbQovxSnlIz4jgvEqGUE H0RxwQV+1RRFA== Message-ID: <5f477c4f-9874-4f51-ab84-5b044a3ea568@kernel.org> Date: Sun, 22 Nov 2026 19:44:35 +0100 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 04/15] mm/hugetlb: account temporary folios separately From: "David Hildenbrand (Arm)" To: Muchun Song , Oscar Salvador , Naoya Horiguchi , Andrew Morton , Mel Gorman , Andy Whitcroft , Miaohe Lin , Michal Hocko , Rik van Riel , Hugh Dickins , Baolin Wang , Vivek Kasireddy , Dave Airlie , Jason Gunthorpe , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Jonathan Corbet , Shuah Khan , Randy Dunlap , Peter Xu , Breno Leitao , Will Deacon , "Aneesh Kumar K.V" , Nick Piggin , Peter Zijlstra , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Arnd Bergmann Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Gerd Hoffmann , linux-doc@vger.kernel.org, linux-arch@vger.kernel.org, linux-s390@vger.kernel.org, stable@kernel.org, Josef Bacik References: <20261116-fixes_hugetlb-v2-0-4dd9e94ea9ac@kernel.org> <20261116-fixes_hugetlb-v2-4-4dd9e94ea9ac@kernel.org> <45997a78-95bd-4e50-b433-f64237f9ec1a@kernel.org> Content-Language: en-US Autocrypt: addr=david@kernel.org; keydata= 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 qIws/H2t In-Reply-To: <45997a78-95bd-4e50-b433-f64237f9ec1a@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 11/22/26 19:21, David Hildenbrand (Arm) wrote: > On 11/16/26 19:29, David Hildenbrand (Arm) wrote: >> Hugetlb migration might have to allocate a temporary folio through >> alloc_migrate_hugetlb_folio(). Such folios are currently accounted in >> "nr_huge_pages" but not in "surplus_huge_pages". persistent_huge_pages() >> can mistake them as persistent huge pages, as it merely calculates the >> difference. >> >> If set_max_huge_pages() shrinks the pool at the wrong time, it will turn >> hugetlb folios into surplus folios until persistent_huge_pages() returns >> the desired number. >> >> After the migration (successful or unsuccessful) either the new (temporary) >> folio or the old folio gets freed: this will reduce "nr_huge_pages" but >> not "surplus_huge_pages", to undo what was done when allocating a >> temporary folio. >> >> This can result in having more surplus folios than actually allocated >> folios: >> >> HugePages_Total: 0 >> HugePages_Surp: 1 >> >> From then on persistent_huge_pages() returns garbage. >> >> To fix it, add internal temporary counters and subtract them when >> calculating persistent pool sizes. Update persistent_huge_pages() and add >> persistent_huge_pages_node() to make the code easier to read. >> >> Count migration targets and rejected surplus allocations as temporary. >> Transfer the per-node temporary count along with the temporary flag on >> migration, such that folio freeing will always do the right thing. >> >> Take care of calling account_new_hugetlb_folio() only after setting the >> folios to be temporary. >> >> For now, keep temporary folios in nr_huge_pages, so HugePages_Total and >> Hugetlb continue to include them and overcommit accounting remains >> unchanged. The new temporary counters are internal for now and are not >> exported to userspace. >> >> Fixes: ab5ac90aecf5 ("mm, hugetlb: do not rely on overcommit limit during migration") >> Cc: stable@kernel.org >> Reported-by: Josef Bacik >> Acked-by: Muchun Song >> Signed-off-by: David Hildenbrand (Arm) >> --- > > In combination with > > mm/hugetlb: preserve persistent flags when returning folios to the pool > > This results in an issue during boot. > > I think the following is required: > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index bfc88d42ef0d..aa6ad8d93266 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1804,8 +1804,8 @@ void free_huge_folio(struct folio *folio) > h->resv_huge_pages++; > > if (folio_test_hugetlb_temporary(folio)) { > - folio_clear_hugetlb_temporary(folio); > remove_hugetlb_folio(h, folio, false); > + folio_clear_hugetlb_temporary(folio); > spin_unlock_irqrestore(&hugetlb_lock, flags); > update_and_free_hugetlb_folio(h, folio, true); > } else if (h->surplus_huge_pages_node[nid] && > > I'll test real quick whether that resolves CI issues ... > Yes, that makes it work. @Andrew, can you fix that up? -- Cheers, David