From: Zong Li <zong.li@sifive.com>
To: paul.walmsley@sifive.com, palmer@dabbelt.com,
aou@eecs.berkeley.edu, linux-riscv@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: Zong Li <zong.li@sifive.com>
Subject: [PATCH 5/8] riscv: add alignment for text, rodata and data sections
Date: Mon, 17 Feb 2020 16:32:20 +0800 [thread overview]
Message-ID: <20200217083223.2011-6-zong.li@sifive.com> (raw)
In-Reply-To: <20200217083223.2011-1-zong.li@sifive.com>
The kernel mapping will tried to optimize its mapping by using bigger
size. In rv64, it tries to use PMD_SIZE, and tryies to use PGDIR_SIZE in
rv32. To ensure that the start address of these sections could fit the
mapping entry size, make them align to the biggest alignment.
Define a macro SECTION_ALIGN because the HPAGE_SIZE or PMD_SIZE, etc.,
are invisible in linker script.
This patch is prepared for STRICT_KERNEL_RWX support.
Signed-off-by: Zong Li <zong.li@sifive.com>
---
arch/riscv/include/asm/set_memory.h | 13 +++++++++++++
arch/riscv/kernel/vmlinux.lds.S | 4 +++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/arch/riscv/include/asm/set_memory.h b/arch/riscv/include/asm/set_memory.h
index a9783a878dca..a91f192063c2 100644
--- a/arch/riscv/include/asm/set_memory.h
+++ b/arch/riscv/include/asm/set_memory.h
@@ -6,6 +6,7 @@
#ifndef _ASM_RISCV_SET_MEMORY_H
#define _ASM_RISCV_SET_MEMORY_H
+#ifndef __ASSEMBLY__
/*
* Functions to change memory attributes.
*/
@@ -17,4 +18,16 @@ int set_memory_nx(unsigned long addr, int numpages);
int set_direct_map_invalid_noflush(struct page *page);
int set_direct_map_default_noflush(struct page *page);
+#endif /* __ASSEMBLY__ */
+
+#ifdef CONFIG_ARCH_HAS_STRICT_KERNEL_RWX
+#ifdef CONFIG_64BIT
+#define SECTION_ALIGN (1 << 21)
+#else
+#define SECTION_ALIGN (1 << 22)
+#endif
+#else /* !CONFIG_ARCH_HAS_STRICT_KERNEL_RWX */
+#define SECTION_ALIGN L1_CACHE_BYTES
+#endif /* CONFIG_ARCH_HAS_STRICT_KERNEL_RWX */
+
#endif /* _ASM_RISCV_SET_MEMORY_H */
diff --git a/arch/riscv/kernel/vmlinux.lds.S b/arch/riscv/kernel/vmlinux.lds.S
index 4ba8a5397e8b..0b145b9c1778 100644
--- a/arch/riscv/kernel/vmlinux.lds.S
+++ b/arch/riscv/kernel/vmlinux.lds.S
@@ -37,6 +37,7 @@ SECTIONS
PERCPU_SECTION(L1_CACHE_BYTES)
__init_end = .;
+ . = ALIGN(SECTION_ALIGN);
.text : {
_text = .;
_stext = .;
@@ -53,13 +54,14 @@ SECTIONS
}
/* Start of data section */
- RO_DATA(L1_CACHE_BYTES)
+ RO_DATA(SECTION_ALIGN)
.srodata : {
*(.srodata*)
}
EXCEPTION_TABLE(0x10)
+ . = ALIGN(SECTION_ALIGN);
_sdata = .;
RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
--
2.25.0
next prev parent reply other threads:[~2020-02-17 8:32 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 8:32 [PATCH 0/8] Support strict kernel memory permissions for security Zong Li
2020-02-17 8:32 ` [PATCH 1/8] riscv: add ARCH_HAS_SET_MEMORY support Zong Li
2020-03-05 0:57 ` Palmer Dabbelt
2020-02-17 8:32 ` [PATCH 2/8] riscv: add ARCH_HAS_SET_DIRECT_MAP support Zong Li
2020-03-05 0:57 ` Palmer Dabbelt
2020-02-17 8:32 ` [PATCH 3/8] riscv: add ARCH_SUPPORTS_DEBUG_PAGEALLOC support Zong Li
2020-03-05 0:57 ` Palmer Dabbelt
2020-02-17 8:32 ` [PATCH 4/8] riscv: move exception table immediately after RO_DATA Zong Li
2020-03-05 0:57 ` Palmer Dabbelt
2020-03-05 4:01 ` Zong Li
2020-02-17 8:32 ` Zong Li [this message]
2020-03-05 0:58 ` [PATCH 5/8] riscv: add alignment for text, rodata and data sections Palmer Dabbelt
2020-02-17 8:32 ` [PATCH 6/8] riscv: add STRICT_KERNEL_RWX support Zong Li
2020-03-05 1:21 ` Palmer Dabbelt
2020-03-05 4:08 ` Zong Li
2020-02-17 8:32 ` [PATCH 7/8] riscv: add DEBUG_WX support Zong Li
2020-03-05 1:44 ` Palmer Dabbelt
2020-03-05 5:53 ` Zong Li
2020-02-17 8:32 ` [PATCH 8/8] riscv: add two hook functions of ftrace Zong Li
2020-03-05 1:44 ` Palmer Dabbelt
2020-03-05 4:27 ` Zong Li
2020-03-05 15:55 ` [PATCH 0/8] Support strict kernel memory permissions for security Palmer Dabbelt
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=20200217083223.2011-6-zong.li@sifive.com \
--to=zong.li@sifive.com \
--cc=aou@eecs.berkeley.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.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).