Merge branches 'for-next/gcs', 'for-next/probes', 'for-next/asm-offsets', 'for-next...

[linux.git] / arch / arm64 / Kconfig

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index fd9df6dcc5937208fe158ac8da9c4ede131d0fc7..5afd028116c9362d78cf89e547653cfedc036980 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -21,6 +21,7 @@ config ARM64
        select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2
        select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE
        select ARCH_HAS_CACHE_LINE_SIZE
+       select ARCH_HAS_CC_PLATFORM
        select ARCH_HAS_CURRENT_STACK_POINTER
        select ARCH_HAS_DEBUG_VIRTUAL
        select ARCH_HAS_DEBUG_VM_PGTABLE
@@ -38,12 +39,15 @@ config ARM64
        select ARCH_HAS_MEM_ENCRYPT
        select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS
        select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
+       select ARCH_HAS_NONLEAF_PMD_YOUNG if ARM64_HAFT
        select ARCH_HAS_PTE_DEVMAP
        select ARCH_HAS_PTE_SPECIAL
        select ARCH_HAS_HW_PTE_YOUNG
        select ARCH_HAS_SETUP_DMA_OPS
        select ARCH_HAS_SET_DIRECT_MAP
        select ARCH_HAS_SET_MEMORY
+       select ARCH_HAS_MEM_ENCRYPT
+       select ARCH_HAS_FORCE_DMA_UNENCRYPTED
        select ARCH_STACKWALK
        select ARCH_HAS_STRICT_KERNEL_RWX
        select ARCH_HAS_STRICT_MODULE_RWX
@@ -2177,8 +2181,44 @@ config ARCH_PKEY_BITS
        int
        default 3
 
+config ARM64_HAFT
+       bool "Support for Hardware managed Access Flag for Table Descriptors"
+       depends on ARM64_HW_AFDBM
+       default y
+       help
+         The ARMv8.9/ARMv9.5 introduces the feature Hardware managed Access
+         Flag for Table descriptors. When enabled an architectural executed
+         memory access will update the Access Flag in each Table descriptor
+         which is accessed during the translation table walk and for which
+         the Access Flag is 0. The Access Flag of the Table descriptor use
+         the same bit of PTE_AF.
+
+         The feature will only be enabled if all the CPUs in the system
+         support this feature. If unsure, say Y.
+
 endmenu # "ARMv8.9 architectural features"
 
+menu "v9.4 architectural features"
+
+config ARM64_GCS
+       bool "Enable support for Guarded Control Stack (GCS)"
+       default y
+       select ARCH_HAS_USER_SHADOW_STACK
+       select ARCH_USES_HIGH_VMA_FLAGS
+       depends on !UPROBES
+       help
+         Guarded Control Stack (GCS) provides support for a separate
+         stack with restricted access which contains only return
+         addresses.  This can be used to harden against some attacks
+         by comparing return address used by the program with what is
+         stored in the GCS, and may also be used to efficiently obtain
+         the call stack for applications such as profiling.
+
+         The feature is detected at runtime, and will remain disabled
+         if the system does not implement the feature.
+
+endmenu # "v9.4 architectural features"
+
 config ARM64_SVE
        bool "ARM Scalable Vector Extension support"
        default y