From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0DB12606A323 for ; Thu, 12 Nov 2026 03:48:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=FMQNC+ku; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=Pg/fy7SQ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:To:References:Message-Id: Content-Transfer-Encoding:Cc:Date:In-Reply-To:From:Subject:Mime-Version: Content-Type:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Unsubscribe-Post: List-Owner; bh=iwZKB7nwtPgPNz+YCvPlIwTeSdJDxh3u1WNVkxdvYlk=; b=FMQNC+kuEP9Xby hA8dRyyU2B0MGY30B1VFLhfI4S152+timexoSeFradDRm8n1RcVRTFzgYaxJFudT2TMjQZnKs7KoU bTP1t63bWEtR+YXiJWKAquS5Am6IWBJDmfT5r2VwGKWqvt8+SNYHMQ+XfZiDN2T+aQ80CGrtNCBoN 4Bf90I5FxM8vzum3vHJNYd/qVS4ZkYv6kmvKgGUeEHoDSaXKrlk64lEPzAiNZXaMHW4HoD9NW+kWn A7WJJiK1YWzerhpupNeUxNnKoIR0V+Gcvr2L0JTE03JbPlhPydc7XwN9kwgWmE3YYbmDvnIxQ49Gl GBtdBuhYYJEhLR1SN9sg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xRLmz-00000008eJe-40OE; Thu, 12 Nov 2026 03:47:53 +0000 Received: from out-64.mta0.migadu.com ([2001:41d0:1004:224b::40] helo=mta0.migadu.com) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xRLmt-00000008eJC-3epK for linux-arm-kernel@lists.infradead.org; Thu, 12 Nov 2026 03:47:52 +0000 X-Envelope-To: linux-arm-kernel@lists.infradead.org DKIM-Signature: a=rsa-sha256; bh=OadfzCGW2WfZe3bKn2zs0QyfwtQX+wSf4CH5BaN2Vtw=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1794455266; v=1; x=1795060066; b=Pg/fy7SQkfATu7EVEkhbXVw4DwKfwKMto0NUPELfZ9AHXXR8xaAOlByyv+FN8K5l/dRzXkQL dfPCAwb6k9VOG0jSKXgv9YohjOi17WCLOY5hLDqrkMYDhboVmWszad9rSC+0FKMqOKXguOaensd 9MhvQArqYWMf97YkIr4S4FRo= X-Envelope-To: linux-arm-kernel@lists.infradead.org Received: by mta12.migadu.com with ESMTPS id 64ab2262467329c6; Thu, 12 Nov 2026 03:47:45 +0000 X-Mizu-Trace-ID: 64ab2262467329c6 X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset=utf-8 X-Archived-By: Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3901.200.71.1.16\)) Subject: Re: [PATCH v2 01/20] hugetlb: Don't restore vmemmap of non-HVOed folios on bulk restore error From: Muchun Song In-Reply-To: <11457D37-5AF9-46C2-95BC-CAD4B22741A1@linux.dev> Date: Thu, 12 Nov 2026 11:47:28 +0800 Cc: akpm@linux-foundation.org, catalin.marinas@arm.com, David Hildenbrand , fvdl@google.com, linu.cherian@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, mark.rutland@arm.com, nikos.nikoleris@arm.com, osalvador@suse.de, rientjes@google.com, ryan.roberts@arm.com, sunnanyong@huawei.com, will@kernel.org, yuzhao@google.com Content-Transfer-Encoding: quoted-printable Message-Id: References: <491B482A-8177-447A-8CDB-AF83C13A5DEE@linux.dev> <20261021212738.321547-1-jthoughton@google.com> <11457D37-5AF9-46C2-95BC-CAD4B22741A1@linux.dev> To: James Houghton X-Mailer: Apple Mail (2.3901.200.71.1.16) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261111_194749_132455_0845BC3E X-CRM114-Status: GOOD ( 15.39 ) X-Spam-Score: -2.1 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-10.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 > On Oct 22, 2026, at 10:17, Muchun Song wrote: >=20 >=20 >=20 >> On Oct 22, 2026, at 05:27, James Houghton = wrote: >>=20 >> On Wed, Oct 21, 2026 at 2:33=E2=80=AFAM Muchun Song = wrote: >>>> On Oct 3, 2026, at 08:21, James Houghton = wrote: >>>> diff --git a/mm/hugetlb.c b/mm/hugetlb.c >>>> index a1b51251103b..4dac7ed1df57 100644 >>>> --- a/mm/hugetlb.c >>>> +++ b/mm/hugetlb.c >>>> @@ -1613,9 +1613,14 @@ static void = bulk_vmemmap_restore_error(struct hstate *h, >>>> * page is made a surplus page and removed from the = list. >>>> * If are able to restore vmemmap and free one hugetlb = page, we >>>> * quit processing the list to retry the bulk operation. >>>> + * >>>> + * Folios whose vmemmap was never optimized (e.g. = because HVO >>>> + * failed when they were allocated) can be freed right = away; >>>> + * remove_hugetlb_folio() has already cleared their = hugetlb flag. >>>=20 >>> Since you mentioned the hugetlb flag is cleared. So it's unnecessary = to clear it again. >>>=20 >>>> */ >>>> list_for_each_entry_safe(folio, t_folio, folio_list, = lru) >>>> - if (hugetlb_vmemmap_restore_folio(h, folio)) = { >>>> + if = (folio_test_hugetlb_vmemmap_optimized(folio) && >>>> + hugetlb_vmemmap_restore_folio(h, folio)) = { >>>> list_del(&folio->lru); >>>> spin_lock_irq(&hugetlb_lock); >>>> add_hugetlb_folio(h, folio, true); >>>=20 >>> Something like following: >>>=20 >>> diff --git a/mm/hugetlb.c b/mm/hugetlb.c >>> index 6a011b627986..1ab3e61f4704 100644 >>> --- a/mm/hugetlb.c >>> +++ b/mm/hugetlb.c >>> @@ -1616,21 +1616,31 @@ static void = bulk_vmemmap_restore_error(struct hstate *h, >>> * If are able to restore vmemmap and free one hugetlb = page, we >>> * quit processing the list to retry the bulk = operation. >>> */ >>> - list_for_each_entry_safe(folio, t_folio, folio_list, = lru) >>> - if (hugetlb_vmemmap_restore_folio(h, folio)) = { >>> - list_del(&folio->lru); >>> + list_for_each_entry_safe(folio, t_folio, folio_list, = lru) { >>> + list_del(&folio->lru); >>> + >>> + /* >>> + * remove_hugetlb_folio() already cleared = the hugetlb flag >>> + * for folios whose vmemmap was not = optimized, so they can >>> + * be freed without restoring vmemmap. >>> + */ >>> + if (folio_test_hugetlb(folio) && >>> + hugetlb_vmemmap_restore_folio(h, folio)) = { >>> spin_lock_irq(&hugetlb_lock); >>> add_hugetlb_folio(h, folio, true); >>> spin_unlock_irq(&hugetlb_lock); >>> - } else { >>> - list_del(&folio->lru); >>> + continue; >>> + } >>> + >>> + if (folio_test_hugetlb(folio)) { >>> spin_lock_irq(&hugetlb_lock); >>> __folio_clear_hugetlb(folio); >>> spin_unlock_irq(&hugetlb_lock); >>> - update_and_free_hugetlb_folio(h, = folio, false); >>> - cond_resched(); >>> - break; >>> } >>> + update_and_free_hugetlb_folio(h, folio, = false); >>> + cond_resched(); >>> + break; >>> + } >>> } >>> } >>=20 >> Thanks, Muchun. :) I think it's slightly easier to read without the = second >> folio_test_hugetlb(), like this: Hi James, Could you send it as a separate fix patch so that we could merge it = first? Thanks. >=20 > More clear, LGTM. >=20 > Thanks, > Muchun