From nobody Wed Dec 17 05:59:22 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E72FB26B0B9; Thu, 13 Feb 2025 15:22:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739460151; cv=none; b=lOuhsP1gQPAspHJfDfb65fW8kf8ZkK9pxxRCGfX/sQmQqrHyIUR+kg7Nlh8XZgN12o5AYRkzsHER8NPk1gcBYTzjp7KrlKYpUF04xfcs+xUVoq5xKD/71yNrlRkjktqO4FGoDv0huFjEaJJT1Gwprv95xZf0aCsKokHWibk8Mgg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739460151; c=relaxed/simple; bh=zEgF4g0AQMys4k6Epa35uEvH8+aFtp85pHii0/gWs34=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ixsyzvfcuEc4FWk7loX357nNoN/bG8Cm1eJnWLnT5V3tLfVcNjpmwPkbZuXsfJhibPQFb4PDQPKV1Ei5NWW9V0xPJU+281RnLu/H7D021exjp4xtdhXPQYGeiEPXOlk591XLNbVS7Ogb2p2NiQ7Jjrlt/nXGiuFCD6pz88unAoA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YwVbZhCt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="YwVbZhCt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20B33C4CED1; Thu, 13 Feb 2025 15:22:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739460150; bh=zEgF4g0AQMys4k6Epa35uEvH8+aFtp85pHii0/gWs34=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YwVbZhCtvptQ5yhLQpYqHZQl+jqk6jhd/8KWOmU/WmJvKiLUOHgJ7d7bEBIbI+eVI gCmaXWmd6Qaub65YLLp5yYFCEKYRp5EDuOP7Yoh2rqSL2kbISIWNUGgob8j3IL3i91 WSNbuz6fMjjcqElgjheC68FoHJrZl5FjCpeagixM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Catalin Marinas , Will Deacon , Ard Biesheuvel , Ryan Roberts , Mark Rutland , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Anshuman Khandual , Gavin Shan , Sasha Levin Subject: [PATCH 6.6 003/273] arm64/mm: Ensure adequate HUGE_MAX_HSTATE Date: Thu, 13 Feb 2025 15:26:15 +0100 Message-ID: <20250213142407.494258827@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250213142407.354217048@linuxfoundation.org> References: <20250213142407.354217048@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 6.6-stable review patch. If anyone has any objections, please let me know. Reviewed-by: Gavin Shan Reviewed-by: Ryan Roberts ------------------ From: Anshuman Khandual [ Upstream commit 1e5823c8e86de83a43d59a522b4de29066d3b306 ] This asserts that HUGE_MAX_HSTATE is sufficient enough preventing potential hugetlb_max_hstate runtime overflow in hugetlb_add_hstate() thus triggering a BUG_ON() there after. Cc: Catalin Marinas Cc: Will Deacon Cc: Ard Biesheuvel Cc: Ryan Roberts Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual Reviewed-by: Ryan Roberts Reviewed-by: Gavin Shan Link: https://lore.kernel.org/r/20241202064407.53807-1-anshuman.khandual@ar= m.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/mm/hugetlbpage.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 13fd592228b18..a5e1588780b2c 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -526,6 +526,18 @@ pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, =20 static int __init hugetlbpage_init(void) { + /* + * HugeTLB pages are supported on maximum four page table + * levels (PUD, CONT PMD, PMD, CONT PTE) for a given base + * page size, corresponding to hugetlb_add_hstate() calls + * here. + * + * HUGE_MAX_HSTATE should at least match maximum supported + * HugeTLB page sizes on the platform. Any new addition to + * supported HugeTLB page sizes will also require changing + * HUGE_MAX_HSTATE as well. + */ + BUILD_BUG_ON(HUGE_MAX_HSTATE < 4); if (pud_sect_supported()) hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT); =20 --=20 2.39.5