arm64: remove CONFIG_DEBUG_ALIGN_RODATA feature

When CONFIG_DEBUG_ALIGN_RODATA is enabled, kernel segments mapped with
different permissions (r-x for .text, r-- for .rodata, rw- for .data,
etc) are rounded up to 2 MiB so they can be mapped more efficiently.
In particular, it permits the segments to be mapped using level 2
block entries when using 4k pages, which is expected to result in less
TLB pressure.

However, the mappings for the bulk of the kernel will use level 2
entries anyway, and the misaligned fringes are organized such that they
can take advantage of the contiguous bit, and use far fewer level 3
entries than would be needed otherwise.

This makes the value of this feature dubious at best, and since it is not
enabled in defconfig or in the distro configs, it does not appear to be
in wide use either. So let's just remove it.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Will Deacon <will@kernel.org>
Acked-by: Laura Abbott <labbott@kernel.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/Kconfig.debug b/arch/arm64/Kconfig.debug
index 1c906d932d6bc117e8e96d57fbe7ebf29e5e41f5..a1efa246c9ed3a9416effa415335130ecedf9c2d 100644 (file)
--- a/arch/arm64/Kconfig.debug
+++ b/arch/arm64/Kconfig.debug
@@ -52,19 +52,6 @@ config DEBUG_WX
 
          If in doubt, say "Y".
 
-config DEBUG_ALIGN_RODATA
-       depends on STRICT_KERNEL_RWX
-       bool "Align linker sections up to SECTION_SIZE"
-       help
-         If this option is enabled, sections that may potentially be marked as
-         read only or non-executable will be aligned up to the section size of
-         the kernel. This prevents sections from being split into pages and
-         avoids a potential TLB penalty. The downside is an increase in
-         alignment and potentially wasted space. Turn on this option if
-         performance is more important than memory pressure.
-
-         If in doubt, say N.
-
 config DEBUG_EFI
        depends on EFI && DEBUG_INFO
        bool "UEFI debugging"

diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index 2be67b232499befa8067f9c7868ad526b5a39a6c..a1871bb32bb17d6e6947974d9725371db0dc653d 100644 (file)
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -120,22 +120,12 @@
 
 /*
  * Alignment of kernel segments (e.g. .text, .data).
- */
-#if defined(CONFIG_DEBUG_ALIGN_RODATA)
-/*
- *  4 KB granule:   1 level 2 entry
- * 16 KB granule: 128 level 3 entries, with contiguous bit
- * 64 KB granule:  32 level 3 entries, with contiguous bit
- */
-#define SEGMENT_ALIGN          SZ_2M
-#else
-/*
+ *
  *  4 KB granule:  16 level 3 entries, with contiguous bit
  * 16 KB granule:   4 level 3 entries, without contiguous bit
  * 64 KB granule:   1 level 3 entry
  */
 #define SEGMENT_ALIGN          SZ_64K
-#endif
 
 /*
  * Memory types available.

diff --git a/drivers/firmware/efi/libstub/arm64-stub.c b/drivers/firmware/efi/libstub/arm64-stub.c
index 2915b44132e60413dfd626a69e60acc0fc0f15b7..2bba0c9c366458a1cfa76b193b335e0c53b52640 100644 (file)
--- a/drivers/firmware/efi/libstub/arm64-stub.c
+++ b/drivers/firmware/efi/libstub/arm64-stub.c
@@ -82,14 +82,12 @@ efi_status_t handle_kernel_image(unsigned long *image_addr,
 
        if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) && phys_seed != 0) {
                /*
-                * If CONFIG_DEBUG_ALIGN_RODATA is not set, produce a
-                * displacement in the interval [0, MIN_KIMG_ALIGN) that
-                * doesn't violate this kernel's de-facto alignment
+                * Produce a displacement in the interval [0, MIN_KIMG_ALIGN)
+                * that doesn't violate this kernel's de-facto alignment
                 * constraints.
                 */
                u32 mask = (MIN_KIMG_ALIGN - 1) & ~(EFI_KIMG_ALIGN - 1);
-               u32 offset = !IS_ENABLED(CONFIG_DEBUG_ALIGN_RODATA) ?
-                            (phys_seed >> 32) & mask : TEXT_OFFSET;
+               u32 offset = (phys_seed >> 32) & mask;
 
                /*
                 * With CONFIG_RANDOMIZE_TEXT_OFFSET=y, TEXT_OFFSET may not