Skip to content

Commit 53176f5

Browse files
committed
mm: disable CONFIG_PER_VMA_LOCK until its fixed
JIRA: https://issues.redhat.com/browse/RHEL-48221 Conflicts: * rhel-only hunk changing the realted entries in the configs database This patch is a backport of the following upstream commit: commit f96c486 Author: Suren Baghdasaryan <surenb@google.com> Date: Wed Jul 5 18:14:00 2023 -0700 mm: disable CONFIG_PER_VMA_LOCK until its fixed A memory corruption was reported in [1] with bisection pointing to the patch [2] enabling per-VMA locks for x86. Disable per-VMA locks config to prevent this issue until the fix is confirmed. This is expected to be a temporary measure. [1] https://bugzilla.kernel.org/show_bug.cgi?id=217624 [2] https://lore.kernel.org/all/20230227173632.3292573-30-surenb@google.com Link: https://lkml.kernel.org/r/20230706011400.2949242-3-surenb@google.com Reported-by: Jiri Slaby <jirislaby@kernel.org> Closes: https://lore.kernel.org/all/dbdef34c-3a07-5951-e1ae-e9c6e3cdf51b@kernel.org/ Reported-by: Jacob Young <jacobly.alt@gmail.com> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217624 Fixes: 0bff0aa ("x86/mm: try VMA lock-based page fault handling first") Signed-off-by: Suren Baghdasaryan <surenb@google.com> Cc: David Hildenbrand <david@redhat.com> Cc: Holger Hoffstätte <holger@applied-asynchrony.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Rafael Aquini <aquini@redhat.com>
1 parent 81cf488 commit 53176f5

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

mm/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1224,8 +1224,9 @@ config ARCH_SUPPORTS_PER_VMA_LOCK
12241224
def_bool n
12251225

12261226
config PER_VMA_LOCK
1227-
def_bool y
1227+
bool "Enable per-vma locking during page fault handling."
12281228
depends on ARCH_SUPPORTS_PER_VMA_LOCK && MMU && SMP
1229+
depends on BROKEN
12291230
help
12301231
Allow per-vma locking during page fault handling.
12311232

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# CONFIG_PER_VMA_LOCK is not set
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
CONFIG_PER_VMA_LOCK_STATS=y
1+
# CONFIG_PER_VMA_LOCK_STATS is not set

0 commit comments

Comments
 (0)