summarylogtreecommitdiffstats
path: root/0003-mm-disable-CONFIG_PER_VMA_LOCK-by-default-until-its-.patch
diff options
context:
space:
mode:
Diffstat (limited to '0003-mm-disable-CONFIG_PER_VMA_LOCK-by-default-until-its-.patch')
-rw-r--r--0003-mm-disable-CONFIG_PER_VMA_LOCK-by-default-until-its-.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/0003-mm-disable-CONFIG_PER_VMA_LOCK-by-default-until-its-.patch b/0003-mm-disable-CONFIG_PER_VMA_LOCK-by-default-until-its-.patch
new file mode 100644
index 000000000000..994bf3c4267f
--- /dev/null
+++ b/0003-mm-disable-CONFIG_PER_VMA_LOCK-by-default-until-its-.patch
@@ -0,0 +1,38 @@
+From a6571d06002b30ca7f51af7681128179b122977c Mon Sep 17 00:00:00 2001
+From: Suren Baghdasaryan <surenb@google.com>
+Date: Mon, 3 Jul 2023 11:21:50 -0700
+Subject: [PATCH 3/4] mm: disable CONFIG_PER_VMA_LOCK by default 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 while the problem is
+being investigated. 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
+
+Reported-by: Jiri Slaby <jirislaby@kernel.org>
+Reported-by: Jacob Young <jacobly.alt@gmail.com>
+Fixes: 0bff0aaea03e ("x86/mm: try VMA lock-based page fault handling first")
+Signed-off-by: Suren Baghdasaryan <surenb@google.com>
+---
+ mm/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mm/Kconfig b/mm/Kconfig
+index e3454087fd31..d91a544678ee 100644
+--- a/mm/Kconfig
++++ b/mm/Kconfig
+@@ -1198,7 +1198,7 @@ config ARCH_SUPPORTS_PER_VMA_LOCK
+ def_bool n
+
+ config PER_VMA_LOCK
+- def_bool y
++ bool "Enable per-vma locking during page fault handling."
+ depends on ARCH_SUPPORTS_PER_VMA_LOCK && MMU && SMP
+ help
+ Allow per-vma locking during page fault handling.
+--
+2.41.0
+