arm64/Kconfig: Remove CONFIG_RODATA_FULL_DEFAULT_ENABLED

Now that 'rodata=full' has been removed in favour of parity with x86,
CONFIG_RODATA_FULL_DEFAULT_ENABLED no longer serves a useful purpose.

Remove it.

Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: Huang Shijie <shijie@os.amperecomputing.com>
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index e9bbfacc35a64d7ef1793a5d7f7ff8db138f2814..8b3c23ee7a6463b3554e9973eceef8bbd1cc3746 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1698,20 +1698,6 @@ config MITIGATE_SPECTRE_BRANCH_HISTORY
          When taking an exception from user-space, a sequence of branches
          or a firmware call overwrites the branch history.
 
-config RODATA_FULL_DEFAULT_ENABLED
-       bool "Apply r/o permissions of VM areas also to their linear aliases"
-       default y
-       help
-         Apply read-only attributes of VM areas to the linear alias of
-         the backing pages as well. This prevents code or read-only data
-         from being modified (inadvertently or intentionally) via another
-         mapping of the same memory page. This additional enhancement can
-         be turned off at runtime by passing rodata=[off|on] (and turned on
-         with rodata=full if this option is set to 'n')
-
-         This requires the linear region to be mapped down to pages,
-         which may adversely affect performance in some cases.
-
 config ARM64_SW_TTBR0_PAN
        bool "Emulate Privileged Access Never using TTBR0_EL1 switching"
        depends on !KCSAN

diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
index 04d4a8f676db422d3e0593719e75c36f52a9a641..667aff1efe4928b88532b84490560780f0a7f7c2 100644 (file)
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@ -20,7 +20,7 @@ struct page_change_data {
        pgprot_t clear_mask;
 };
 
-bool rodata_full __ro_after_init = IS_ENABLED(CONFIG_RODATA_FULL_DEFAULT_ENABLED);
+bool rodata_full __ro_after_init = true;
 
 bool can_set_direct_map(void)
 {