From: Jun Yao <yaojun8558363@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Cc: catalin.marinas@arm.com, will.deacon@arm.com,
james.morse@arm.com, linux-kernel@vger.kernel.org
Subject: [RESEND PATCH v4 6/6] arm64/mm: Move
Date: Wed, 18 Jul 2018 18:17:27 +0800 [thread overview]
Message-ID: <20180718101727.10787-7-yaojun8558363@gmail.com> (raw)
In-Reply-To: <20180718101727.10787-1-yaojun8558363@gmail.com>
Move {idmap_pg_dir, tramp_pg_dir, reserved_ttbr0, swapper_pg_dir}
to .rodata section.
Signed-off-by: Jun Yao <yaojun8558363@gmail.com>
---
arch/arm64/kernel/vmlinux.lds.S | 39 ++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 15 deletions(-)
diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
index 2446911f4262..142528a23b44 100644
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@ -64,8 +64,13 @@ jiffies = jiffies_64;
*(.entry.tramp.text) \
. = ALIGN(PAGE_SIZE); \
__entry_tramp_text_end = .;
+
+#define TRAMP_PG_TABLE \
+ tramp_pg_dir = .; \
+ . += PAGE_SIZE;
#else
#define TRAMP_TEXT
+#define TRAMP_PG_TABLE
#endif
#define INIT_PG_TABLES \
@@ -74,6 +79,24 @@ jiffies = jiffies_64;
. += SWAPPER_DIR_SIZE; \
init_pg_end = .;
+#ifdef CONFIG_ARM64_SW_TTBR0_PAN
+#define RESERVED_PG_TABLE \
+ reserved_ttbr0 = .; \
+ . += RESERVED_TTBR0_SIZE;
+#else
+#define RESERVED_PG_TABLE
+#endif
+
+#define KERNEL_PG_TABLES \
+ . = ALIGN(PAGE_SIZE); \
+ idmap_pg_dir = .; \
+ . += IDMAP_DIR_SIZE; \
+ TRAMP_PG_TABLE \
+ RESERVED_PG_TABLE \
+ swapper_pg_dir = .; \
+ . += PAGE_SIZE; \
+ swapper_pg_end = .;
+
/*
* The size of the PE/COFF section that covers the kernel image, which
* runs from stext to _edata, must be a round multiple of the PE/COFF
@@ -143,6 +166,7 @@ SECTIONS
RO_DATA(PAGE_SIZE) /* everything from this point to */
EXCEPTION_TABLE(8) /* __init_begin will be marked RO NX */
NOTES
+ KERNEL_PG_TABLES
. = ALIGN(SEGMENT_ALIGN);
__init_begin = .;
@@ -224,21 +248,6 @@ SECTIONS
BSS_SECTION(0, 0, 0)
. = ALIGN(PAGE_SIZE);
- idmap_pg_dir = .;
- . += IDMAP_DIR_SIZE;
-
-#ifdef CONFIG_UNMAP_KERNEL_AT_EL0
- tramp_pg_dir = .;
- . += PAGE_SIZE;
-#endif
-
-#ifdef CONFIG_ARM64_SW_TTBR0_PAN
- reserved_ttbr0 = .;
- . += RESERVED_TTBR0_SIZE;
-#endif
- swapper_pg_dir = .;
- . += PAGE_SIZE;
- swapper_pg_end = .;
__pecoff_data_size = ABSOLUTE(. - __initdata_begin);
_end = .;
--
2.17.1
prev parent reply other threads:[~2018-07-18 10:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-18 10:17 [RESEND PATCH v4 0/6] arm64/mm: Move Jun Yao
2018-07-18 10:17 ` [RESEND PATCH v4 1/6] arm64/mm: Introduce init_pg_dir Jun Yao
2018-07-18 10:17 ` [RESEND PATCH v4 2/6] arm64/mm: Make __enable_mmu() take the Jun Yao
2018-07-18 10:17 ` [RESEND PATCH v4 3/6] arm64/mm: Create initial page tables in Jun Yao
2018-07-18 10:17 ` [RESEND PATCH v4 4/6] arm64/mm: Make swapper_pg_dir smaller Jun Yao
2018-07-18 10:17 ` [RESEND PATCH v4 5/6] arm64/mm: Populate swapper_pg_dir by Jun Yao
2018-07-18 10:17 ` Jun Yao [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180718101727.10787-7-yaojun8558363@gmail.com \
--to=yaojun8558363@gmail.com \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).