Skip to contentSkip to conversation

mm/userfaultfd: Disable userfaultfd-wp on x86_32

PATCH Applied Peter Xu 2 participants 2 messages Apr 13, 2020

Subsystems (2)
Memory management x86
lore
Share & tools
lore

Peter Xu

author
#0 lore raw

PATCH 1/1 mm/userfaultfd: Disable userfaultfd-wp on x86_32

Userfaultfd-wp is not yet working on 32bit hosts, but it's accidentally enabled previously. Disable it.

Fixes 5a281062af1d ("userfaultfd: wp: add WP pagetable tracking to x86")
Cc Andrew Morton <[email protected]>
Cc Andrea Arcangeli <[email protected]>
Cc Hillf Danton <[email protected]>
Reported-by Naresh Kamboju <[email protected]>
Reported-by kernel test robot <[email protected]>
Tested-by Naresh Kamboju <[email protected]>
Signed-off-by Peter Xu <[email protected]>
---
 arch/x86/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Kconfig +1 -1
index 8d078642b4be..7a7d2db366a3 100644
@@ -149,7 +149,7 @@ config X86
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE
 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD if X86_64
-	select HAVE_ARCH_USERFAULTFD_WP		if USERFAULTFD
+	select HAVE_ARCH_USERFAULTFD_WP         if X86_64 && USERFAULTFD
 	select HAVE_ARCH_VMAP_STACK		if X86_64
 	select HAVE_ARCH_WITHIN_STACK_FRAMES
 	select HAVE_ASM_MODVERSIONS
Signature · 1 line
2.24.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Peter Xu

Userfaultfd-wp is not yet working on 32bit hosts, but it's accidentally enabled previously. Disable it.

Fixes 5a281062af1d ("userfaultfd: wp: add WP pagetable tracking to x86")
Cc Andrew Morton <[email protected]>
Cc Andrea Arcangeli <[email protected]>
Cc Hillf Danton <[email protected]>
Reported-by Naresh Kamboju <[email protected]>
Reported-by kernel test robot <[email protected]>
Tested-by Naresh Kamboju <[email protected]>
Signed-off-by Peter Xu <[email protected]>
Quoted 3 lines
---
 arch/x86/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by Andrea Arcangeli <[email protected]>

Thanks,
Andrea