diff options
| author | Huang Shijie <shijie@os.amperecomputing.com> | 2025-09-09 11:32:36 +0800 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2025-09-16 20:53:13 +0100 |
| commit | bfbbb0d3215f0f6ef622cc8066e5f6afda6960a2 (patch) | |
| tree | ad7bcf4a298c3dc4983a4f444a56deb6f80d6707 | |
| parent | c0f303d7d4723b01c686e949e6f26a93e5cda910 (diff) | |
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>
| -rw-r--r-- | arch/arm64/Kconfig | 14 | ||||
| -rw-r--r-- | arch/arm64/mm/pageattr.c | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index e9bbfacc35a6..8b3c23ee7a64 100644 --- 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 04d4a8f676db..667aff1efe49 100644 --- 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) { |
