[PATCHv2,07/14] arm64: move SEGMENT_ALIGN to <asm/memory.h>

Message ID	1502801449-29246-8-git-send-email-mark.rutland@arm.com
State	Accepted
Commit	8018ba4edfd3a8b46f876c65988bd0d8e35c32a6
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Mark Rutland <mark.rutland@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: ard.biesheuvel@linaro.org, catalin.marinas@arm.com, james.morse@arm.com, labbott@redhat.com, linux-kernel@vger.kernel.org, luto@amacapital.net, mark.rutland@arm.com, matt@codeblueprint.co.uk, will.deacon@arm.com, kernel-hardening@lists.openwall.com, keescook@chromium.org Subject: [PATCHv2 07/14] arm64: move SEGMENT_ALIGN to <asm/memory.h> Date: Tue, 15 Aug 2017 13:50:42 +0100 Message-Id: <1502801449-29246-8-git-send-email-mark.rutland@arm.com> In-Reply-To: <1502801449-29246-1-git-send-email-mark.rutland@arm.com> References: <1502801449-29246-1-git-send-email-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk
Series	arm64: VMAP_STACK support \| expand [PATCHv2,00/14] arm64: VMAP_STACK support [PATCHv2,01/14] arm64: remove __die()'s stack dump [PATCHv2,02/14] fork: allow arch-override of VMAP stack alignment [PATCHv2,03/14] arm64: kernel: remove {THREAD,IRQ_STACK}_START_SP [PATCHv2,04/14] arm64: factor out PAGE_* and CONT_* definitions [PATCHv2,05/14] arm64: clean up THREAD_* definitions [PATCHv2,06/14] arm64: clean up irq stack definitions [PATCHv2,07/14] arm64: move SEGMENT_ALIGN to <asm/memory.h> [PATCHv2,08/14] efi/arm64: add EFI_KIMG_ALIGN [PATCHv2,09/14] arm64: factor out entry stack manipulation [PATCHv2,10/14] arm64: assembler: allow adr_this_cpu to use the stack pointer [PATCHv2,11/14] arm64: use an irq stack pointer [PATCHv2,12/14] arm64: add basic VMAP_STACK support [PATCHv2,13/14] arm64: add on_accessible_stack() [PATCHv2,14/14] arm64: add VMAP_STACK overflow detection

Message ID

1502801449-29246-8-git-send-email-mark.rutland@arm.com

State

Accepted

Commit

8018ba4edfd3a8b46f876c65988bd0d8e35c32a6

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-kernel-owner@vger.kernel.org designates 209.132.180.67
	as permitted sender) client-ip=209.132.180.67; 
From: Mark Rutland <mark.rutland@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: ard.biesheuvel@linaro.org, catalin.marinas@arm.com,
	james.morse@arm.com, labbott@redhat.com,
	linux-kernel@vger.kernel.org, luto@amacapital.net,
	mark.rutland@arm.com, matt@codeblueprint.co.uk,
	will.deacon@arm.com, kernel-hardening@lists.openwall.com,
	keescook@chromium.org
Subject: [PATCHv2 07/14] arm64: move SEGMENT_ALIGN to <asm/memory.h>
Date: Tue, 15 Aug 2017 13:50:42 +0100
Message-Id: <1502801449-29246-8-git-send-email-mark.rutland@arm.com>
In-Reply-To: <1502801449-29246-1-git-send-email-mark.rutland@arm.com>
References: <1502801449-29246-1-git-send-email-mark.rutland@arm.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Series

arm64: VMAP_STACK support | expand

Commit Message

Mark Rutland Aug. 15, 2017, 12:50 p.m. UTC

Currently we define SEGMENT_ALIGN directly in our vmlinux.lds.S.

This is unfortunate, as the EFI stub currently open-codes the same
number, and in future we'll want to fiddle with this.

This patch moves the definition to our <asm/memory.h>, where it can be
used by both vmlinux.lds.S and the EFI stub code.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Will Deacon <will.deacon@arm.com>
---
 arch/arm64/include/asm/memory.h | 19 +++++++++++++++++++
 arch/arm64/kernel/vmlinux.lds.S | 16 ----------------
 2 files changed, 19 insertions(+), 16 deletions(-)

-- 
1.9.1

diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index 1fc2453..7fa6ad4 100644
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -113,6 +113,25 @@ 
 #define IRQ_STACK_SIZE		THREAD_SIZE
 
 /*
+ * 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.
  */
 #define MT_DEVICE_nGnRnE	0
diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
index 987a00e..7156538 100644
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@ -72,22 +72,6 @@  PECOFF_FILE_ALIGNMENT = 0x200;
 #define PECOFF_EDATA_PADDING
 #endif
 
-#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
-
 SECTIONS
 {
 	/*

[PATCHv2,07/14] arm64: move SEGMENT_ALIGN to <asm/memory.h>

Commit Message

Patch