From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60CC252CCC1; Wed, 30 Sep 2026 18:43:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790793828; cv=none; b=MveuDzRe1TWcCdnUwG9rFEtrm0MbJ2bsxPz9DfhCSOqNYSFzkY91Yg/Yx2qBXqcha9Yv2vXYjkfa2IcDIpR5v7sxzPh81nSyvVRYd1BTVj/SwHqs8leTVymg1241d0lEXkgE3pxYZEL/fJxZ296Ybf0BBIcNRFbdkBl87+zW9LI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790793828; c=relaxed/simple; bh=yhkif7gFDERPFdxUiEKci6O7k70uP5R/VuSat7Aum5U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ddq68YLxdGrrI97OI/rp/iBFikgzVpZTq+UcdxcEYTBfTusmKGfWfyrE3MJziW34+dJdZiWXv6659OZfZUkiNMUATtoZJIZiIVHBMolthESaxYBXGSpcecBJY1XUUECmPEoatz/Pby7sC6tDnYiZ7v9doRXpPvlGtqmaplIi7yw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xhSEdnXk; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xhSEdnXk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 921451F000FF; Wed, 30 Sep 2026 18:43:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790793827; bh=YZ2R7DHkWWKRPdNZ2vFvKQdgJxHz07rT7fczuV7UcaI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xhSEdnXkyszDXOdk9AQ0WIJS2stL9QDXgeOsiBn41X+km4yylZLNbpZljHbC+sTkO oR9xGHqOAHYLp4mxh6T7kxTsFFTQmEiUHftWHpsSKfV+LTYJWENgTGeHK7QWrGae17 +ON4+w+SOq9D4scWuBH4/1MYTnGBIirZszGM8IRI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Longlong Xia , Andrew Morton , Muchun Song , David Hildenbrand , Miaohe Lin , Michal Hocko , Oscar Salvador , Sasha Levin Subject: [PATCH 6.18 365/395] mm/hugetlb: do not dissolve gigantic pages without runtime support Date: Wed, 30 Sep 2026 17:30:27 +0200 Message-ID: <20260930152348.609664459@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152340.591469096@linuxfoundation.org> References: <20260930152340.591469096@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Longlong Xia [ Upstream commit a363c62a653cc8b3e21da9545fa4e028ef50f9c3 ] dissolve_free_hugetlb_folio() doesn't check hstate_is_gigantic_no_runtime(h) though remove_hugetlb_folio()/ update_and_free_hugetlb_folio() silently bail for such folios, so it frees a still-listed folio and, on vmemmap restore failure, the add_hugetlb_folio() rollback corrupts the free list. Link: https://lore.kernel.org/20260823044118.1097121-2-xialonglong2025@163.com Fixes: 6eb4e88a6d27 ("hugetlb: create remove_hugetlb_page() to separate functionality") Signed-off-by: Longlong Xia Signed-off-by: Andrew Morton Assisted-by: Codex:gpt-5.6-sol Acked-by: Muchun Song Cc: David Hildenbrand Cc: Miaohe Lin Cc: Michal Hocko Cc: Oscar Salvador Cc: Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- mm/hugetlb.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2126,6 +2126,15 @@ retry: struct hstate *h = folio_hstate(folio); bool adjust_surplus = false; + /* + * remove_hugetlb_folio()/update_and_free_hugetlb_folio() bail + * for gigantic hstates without runtime support, so dissolving one + * here would leave it on the free list and, on vmemmap restore + * failure, the add_hugetlb_folio() rollback corrupts that list. + */ + if (hstate_is_gigantic_no_runtime(h)) + goto out; + if (!available_huge_pages(h)) goto out;