From 5844c8e7aaa946341f0d30441adc8f2cd97efbfc Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Mon, 21 Nov 2022 17:27:41 -0800 Subject: [PATCH] ANDROID: mm: disable speculative page faults for CONFIG_NUMA do_numa_page() uses pte_offset_map() directly and needs to implement additional mechanisms to ensure the mempolicy object used in numa_migrate_prep() is not destroyed from under it when speculating. Rather than fixing this, just disable speculation for CONFIG_NUMA for now and fix it if it's ever needed in Android. Bug: 257443051 Change-Id: Ib5750b9809979a69a42ebfa6c130e123f416f1aa Signed-off-by: Suren Baghdasaryan --- mm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/Kconfig b/mm/Kconfig index 45adcb74ff62..848a44a9e4a0 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -957,7 +957,7 @@ config ARCH_SUPPORTS_SPECULATIVE_PAGE_FAULT config SPECULATIVE_PAGE_FAULT bool "Speculative page faults" default y - depends on ARCH_SUPPORTS_SPECULATIVE_PAGE_FAULT && MMU && SMP + depends on ARCH_SUPPORTS_SPECULATIVE_PAGE_FAULT && MMU && SMP && !NUMA # split ptl lock can result in PTL destruction under RCU depends on !ALLOC_SPLIT_PTLOCKS help