From: Balbir Singh <bsingharora@gmail.com>
To: mpe@ellerman.id.au
Cc: linuxppc-dev@lists.ozlabs.org, Balbir Singh <bsingharora@gmail.com>
Subject: [PATCH 2/2] powerpc/strict_rwx: fixup region splitting
Date: Wed, 27 Sep 2017 19:51:11 +1000 [thread overview]
Message-ID: <20170927095111.10626-2-bsingharora@gmail.com> (raw)
In-Reply-To: <20170927095111.10626-1-bsingharora@gmail.com>
We were aggressive with splitting regions and missed the case
when _stext and __init_begin completely overlap addr and addr+mapping.
This patch fixes that case and allows us to keep the largest possible
mapping through the overlap. The patch also simplies the check
into a function
Fixes: 7614ff3 ("powerpc/mm/radix: Implement STRICT_RWX/mark_rodata_ro() for Radix")
Signed-off-by: Balbir Singh <bsingharora@gmail.com>
---
arch/powerpc/mm/pgtable-radix.c | 39 ++++++++++++++++++++++++++++-----------
1 file changed, 28 insertions(+), 11 deletions(-)
diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c
index c2a2b46..ea0da3b 100644
--- a/arch/powerpc/mm/pgtable-radix.c
+++ b/arch/powerpc/mm/pgtable-radix.c
@@ -210,17 +210,36 @@ static inline void __meminit print_mapping(unsigned long start,
pr_info("Mapped 0x%016lx-0x%016lx with %s pages\n", start, end, buf);
}
+static inline int __meminit
+should_split_mapping_size(unsigned long addr, unsigned long mapping_size)
+{
+#ifdef CONFIG_STRICT_KERNEL_RWX
+ /*
+ * If addr, addr+mapping overlap the text region and
+ * _stext and __init_begin end up lying between
+ * addr, addr+mapping split the mapping size down
+ * further
+ */
+ if ((addr < __pa_symbol(__init_begin)) &&
+ (addr + mapping_size) > __pa_symbol(_stext)) {
+
+ if (((addr + mapping_size) <= __pa_symbol(__init_begin)) &&
+ (addr >= __pa_symbol(_stext)))
+ return 0;
+
+ return 1;
+ }
+#endif
+ return 0;
+}
+
+
static int __meminit create_physical_mapping(unsigned long start,
unsigned long end)
{
unsigned long vaddr, addr, mapping_size = 0;
pgprot_t prot;
unsigned long max_mapping_size;
-#ifdef CONFIG_STRICT_KERNEL_RWX
- int split_text_mapping = 1;
-#else
- int split_text_mapping = 0;
-#endif
start = _ALIGN_UP(start, PAGE_SIZE);
for (addr = start; addr < end; addr += mapping_size) {
@@ -242,16 +261,14 @@ static int __meminit create_physical_mapping(unsigned long start,
else
mapping_size = PAGE_SIZE;
- if (split_text_mapping && (mapping_size == PUD_SIZE) &&
- (addr <= __pa_symbol(__init_begin)) &&
- (addr + mapping_size) >= __pa_symbol(_stext)) {
+ if ((mapping_size == PUD_SIZE) &&
+ should_split_mapping_size(addr, mapping_size)) {
max_mapping_size = PMD_SIZE;
goto retry;
}
- if (split_text_mapping && (mapping_size == PMD_SIZE) &&
- (addr <= __pa_symbol(__init_begin)) &&
- (addr + mapping_size) >= __pa_symbol(_stext))
+ if ((mapping_size == PMD_SIZE) &&
+ should_split_mapping_size(addr, mapping_size))
mapping_size = PAGE_SIZE;
if (mapping_size != previous_size) {
--
2.9.5
next prev parent reply other threads:[~2017-09-27 9:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-27 9:51 [PATCH 1/2] powerpc/strict_rwx: quirks for STRICT_RWX patches Balbir Singh
2017-09-27 9:51 ` Balbir Singh [this message]
2017-10-04 11:14 ` [PATCH 2/2] powerpc/strict_rwx: fixup region splitting Michael Ellerman
2017-10-16 1:03 ` Balbir Singh
2017-10-04 9:04 ` [PATCH 1/2] powerpc/strict_rwx: quirks for STRICT_RWX patches Michael Ellerman
2017-10-16 1:01 ` Balbir Singh
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=20170927095111.10626-2-bsingharora@gmail.com \
--to=bsingharora@gmail.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
/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).