From mboxrd@z Thu Jan 1 00:00:00 1970 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 DC19E19B3EC; Sun, 26 Jan 2025 14:49:09 +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=1737902949; cv=none; b=I9TS6u+tjBWQjjSRVKMv+UhN9riVplYN6aLIBDWDIRiOSCMS8YORv8QuypjvPkTxGy65xhyp1Az0mOxWmFn6cDnMliUo+7aGeIhbKRos2+jHC3vul2YnCojK3jmMTOjI1AE+d24H+ZsDu3rUtHtA8GXYdnz25o9lcjYzxax8Fvs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737902949; c=relaxed/simple; bh=0XLn9vLxHEA2FrYvLm2zGqF8thjMeVk2zB+P6BMOENg=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=YexXilSSTV8RXLpJynfJJAmE5CXM9HWWjCNGef/REuvCOBj4ZqpqZ7Ii5jwN1wdgwz6RTXwwKK3M4LBjfxj+k6Cv97xmbzCwFi3IxD9moQUX8JbRlIWvq4/KkyYrogRNuEWADFgSM3xLUwULbdyBNU3iCF7lWwiup2qjHf3mJsY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ATWzxJND; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ATWzxJND" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45101C4CED3; Sun, 26 Jan 2025 14:49:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737902949; bh=0XLn9vLxHEA2FrYvLm2zGqF8thjMeVk2zB+P6BMOENg=; h=From:To:Cc:Subject:Date:From; b=ATWzxJNDf/t2qP4yqsHH7lxZnVOVjh6HAfx9uoiaMyNk5A6FWJCD8GoI6Unn95vD+ vBk/Dhpq3W8ma/6cQXVneOTXCpc5oh1NYIhzI99mv3Ado1MM1nuqqXFh3YjXth9oqZ +eu3pnSb2uY94imCULfE5+2ai/tiI4e7NQVf2urIsOcY/jgZ056FMz95iIP50eN5/5 R0v3eGsE8QnZD6gRqPjJVpvsdmTz6lMkfzadJuZRRzh4JYbUrZWmUtZN282I8FupPg rBJFKzYvazbxh6igR5B5zrOc8xYkaateo4gJK5Qbttt2OjgEB88AlZeblcIvHa5js7 L7HN2VXKQKS1g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Anshuman Khandual , Catalin Marinas , Will Deacon , Ard Biesheuvel , Ryan Roberts , Mark Rutland , linux-arm-kernel@lists.infradead.org, Gavin Shan , Sasha Levin , akpm@linux-foundation.org, peterx@redhat.com, christophe.leroy@csgroup.eu Subject: [PATCH AUTOSEL 6.6 1/5] arm64/mm: Ensure adequate HUGE_MAX_HSTATE Date: Sun, 26 Jan 2025 09:49:02 -0500 Message-Id: <20250126144906.925468-1-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.74 Content-Transfer-Encoding: 8bit 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@arm.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, 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); -- 2.39.5