[PATCH RFT v5 3/7] mm: Introduce ARCH_HAS_USER_SHADOW_STACK
From: Mark Brown <broonie@kernel.org>
Date: 2024-02-03 00:05:43
Also in:
linux-kselftest, lkml
Subsystem:
filesystems (vfs and infrastructure), memory management, memory management - core, memory mapping, proc filesystem, the rest, x86 architecture (32-bit and 64-bit) · Maintainers:
Alexander Viro, Christian Brauner, Andrew Morton, David Hildenbrand, Liam R. Howlett, Lorenzo Stoakes, Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
Since multiple architectures have support for shadow stacks and we need to select support for this feature in several places in the generic code provide a generic config option that the architectures can select. Suggested-by: David Hildenbrand <redacted> Acked-by: David Hildenbrand <redacted> Signed-off-by: Mark Brown <broonie@kernel.org> --- arch/x86/Kconfig | 1 + fs/proc/task_mmu.c | 2 +- include/linux/mm.h | 2 +- mm/Kconfig | 6 ++++++ 4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5edec175b9bf..34553911d07d 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig@@ -1952,6 +1952,7 @@ config X86_USER_SHADOW_STACK depends on AS_WRUSS depends on X86_64 select ARCH_USES_HIGH_VMA_FLAGS + select ARCH_HAS_USER_SHADOW_STACK select X86_CET help Shadow stack protection is a hardware feature that detects function
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 3f78ebbb795f..ff2c601f7d1c 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c@@ -700,7 +700,7 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma) #ifdef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR [ilog2(VM_UFFD_MINOR)] = "ui", #endif /* CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */ -#ifdef CONFIG_X86_USER_SHADOW_STACK +#ifdef CONFIG_ARCH_HAS_USER_SHADOW_STACK [ilog2(VM_SHADOW_STACK)] = "ss", #endif };
diff --git a/include/linux/mm.h b/include/linux/mm.h
index f5a97dec5169..c0a782eda803 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h@@ -341,7 +341,7 @@ extern unsigned int kobjsize(const void *objp); #endif #endif /* CONFIG_ARCH_HAS_PKEYS */ -#ifdef CONFIG_X86_USER_SHADOW_STACK +#ifdef CONFIG_ARCH_HAS_USER_SHADOW_STACK /* * VM_SHADOW_STACK should not be set with VM_SHARED because of lack of * support core mm.
diff --git a/mm/Kconfig b/mm/Kconfig
index ffc3a2ba3a8c..9119e016777a 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig@@ -1261,6 +1261,12 @@ config LOCK_MM_AND_FIND_VMA config IOMMU_MM_DATA bool +config ARCH_HAS_USER_SHADOW_STACK + bool + help + The architecture has hardware support for userspace shadow call + stacks (eg, x86 CET, arm64 GCS or RISC-V Zicfiss). + source "mm/damon/Kconfig" endmenu
--
2.30.2