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 F16FF2E6122; Tue, 15 Jul 2025 13:49:54 +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=1752587395; cv=none; b=C1Irgy9nlU/Qeex65DwP/wDjUr6zKN0+eTjPcAsMg6gZNwNkCgCSxh2HK0g04EeUQgHQnfQZmyUK+AbJ0g6i3l8k2BUfc/cPsNcRZ5b50wM18JiRn4dR36be978FlXxUAuahVtL6qiLZrJT0voEAzy5T1yZJ+aEmdLxqSh8xjN0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752587395; c=relaxed/simple; bh=aoJVrWR+pUBDYPmK5JyW9EzXEJe+S1aBu3mKQaeX6fw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cCa2xVluy7Z/1tomWZD/fDdCxFBJr4QrpT+QFHl7r255w3tP20aaWnIaMchYNly+T9aziGm77yxNOrM1XhEZVdnaT4OESbMUjDlTbUi5eHTTnczcsdIX2SH1TZ2m1k6/aZ78NFz6zbgrbO/vZpRMm3waF/JF1l3qIOvHyHR86Kw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Hi9fU3se; 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="Hi9fU3se" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85720C4CEE3; Tue, 15 Jul 2025 13:49:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1752587394; bh=aoJVrWR+pUBDYPmK5JyW9EzXEJe+S1aBu3mKQaeX6fw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hi9fU3seljfKRRzaCK5NRRy9Pe4tYQsPDghmOJI3Gi48jgPbC5wtEOjaFHKJiHNIg GWcP8JVXyYvTqjaLoUg3RLGe+V6zsukH3GMDhZKVRLLH8KscYlNu1BBX8Kn9qSLSVW 0I4SVDF9f6r6L8pxO41oCdLyj5Q5S69I720d4JG8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vitaly Chikunov , Dave Hansen , Jann Horn , Dave Hansen , Oscar Salvador , David Hildenbrand Subject: [PATCH 6.1 85/88] x86/mm: Disable hugetlb page table sharing on 32-bit Date: Tue, 15 Jul 2025 15:15:01 +0200 Message-ID: <20250715130757.980989097@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250715130754.497128560@linuxfoundation.org> References: <20250715130754.497128560@linuxfoundation.org> User-Agent: quilt/0.68 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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jann Horn commit 76303ee8d54bff6d9a6d55997acd88a6c2ba63cf upstream. Only select ARCH_WANT_HUGE_PMD_SHARE on 64-bit x86. Page table sharing requires at least three levels because it involves shared references to PMD tables; 32-bit x86 has either two-level paging (without PAE) or three-level paging (with PAE), but even with three-level paging, having a dedicated PGD entry for hugetlb is only barely possible (because the PGD only has four entries), and it seems unlikely anyone's actually using PMD sharing on 32-bit. Having ARCH_WANT_HUGE_PMD_SHARE enabled on non-PAE 32-bit X86 (which has 2-level paging) became particularly problematic after commit 59d9094df3d7 ("mm: hugetlb: independent PMD page table shared count"), since that changes `struct ptdesc` such that the `pt_mm` (for PGDs) and the `pt_share_count` (for PMDs) share the same union storage - and with 2-level paging, PMDs are PGDs. (For comparison, arm64 also gates ARCH_WANT_HUGE_PMD_SHARE on the configuration of page tables such that it is never enabled with 2-level paging.) Closes: https://lore.kernel.org/r/srhpjxlqfna67blvma5frmy3aa@altlinux.org Fixes: cfe28c5d63d8 ("x86: mm: Remove x86 version of huge_pmd_share.") Reported-by: Vitaly Chikunov Suggested-by: Dave Hansen Signed-off-by: Jann Horn Signed-off-by: Dave Hansen Acked-by: Oscar Salvador Acked-by: David Hildenbrand Tested-by: Vitaly Chikunov Cc:stable@vger.kernel.org Link: https://lore.kernel.org/all/20250702-x86-2level-hugetlb-v2-1-1a98096edf92%40google.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -124,7 +124,7 @@ config X86 select ARCH_WANTS_DYNAMIC_TASK_STRUCT select ARCH_WANTS_NO_INSTR select ARCH_WANT_GENERAL_HUGETLB - select ARCH_WANT_HUGE_PMD_SHARE + select ARCH_WANT_HUGE_PMD_SHARE if X86_64 select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP if X86_64 select ARCH_WANT_LD_ORPHAN_WARN select ARCH_WANTS_THP_SWAP if X86_64