linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Jordan Niethe <jniethe5@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: christophe.leroy@c-s.fr, ajd@linux.ibm.com, npiggin@gmail.com,
	kbuild test robot <lkp@intel.com>,
	naveen.n.rao@linux.ibm.com, Jordan Niethe <jniethe5@gmail.com>,
	dja@axtens.net
Subject: [PATCH v9 7/8] powerpc/mm: implement set_memory_attr()
Date: Tue, 16 Mar 2021 14:17:40 +1100	[thread overview]
Message-ID: <20210316031741.1004850-7-jniethe5@gmail.com> (raw)
In-Reply-To: <20210316031741.1004850-1-jniethe5@gmail.com>

From: Christophe Leroy <christophe.leroy@c-s.fr>

In addition to the set_memory_xx() functions which allows to change
the memory attributes of not (yet) used memory regions, implement a
set_memory_attr() function to:
- set the final memory protection after init on currently used
kernel regions.
- enable/disable kernel memory regions in the scope of DEBUG_PAGEALLOC.

Unlike the set_memory_xx() which can act in three step as the regions
are unused, this function must modify 'on the fly' as the kernel is
executing from them. At the moment only PPC32 will use it and changing
page attributes on the fly is not an issue.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Reported-by: kbuild test robot <lkp@intel.com>
[ruscur: cast "data" to unsigned long instead of int]
Signed-off-by: Russell Currey <ruscur@russell.cc>
Signed-off-by: Jordan Niethe <jniethe5@gmail.com>
---
 arch/powerpc/include/asm/set_memory.h |  2 ++
 arch/powerpc/mm/pageattr.c            | 33 +++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/arch/powerpc/include/asm/set_memory.h b/arch/powerpc/include/asm/set_memory.h
index 64011ea444b4..b040094f7920 100644
--- a/arch/powerpc/include/asm/set_memory.h
+++ b/arch/powerpc/include/asm/set_memory.h
@@ -29,4 +29,6 @@ static inline int set_memory_x(unsigned long addr, int numpages)
 	return change_memory_attr(addr, numpages, SET_MEMORY_X);
 }
 
+int set_memory_attr(unsigned long addr, int numpages, pgprot_t prot);
+
 #endif
diff --git a/arch/powerpc/mm/pageattr.c b/arch/powerpc/mm/pageattr.c
index 2da3fbab6ff7..2fde1b195c85 100644
--- a/arch/powerpc/mm/pageattr.c
+++ b/arch/powerpc/mm/pageattr.c
@@ -79,3 +79,36 @@ int change_memory_attr(unsigned long addr, int numpages, long action)
 	return apply_to_existing_page_range(&init_mm, start, sz,
 					    change_page_attr, (void *)action);
 }
+
+/*
+ * Set the attributes of a page:
+ *
+ * This function is used by PPC32 at the end of init to set final kernel memory
+ * protection. It includes changing the maping of the page it is executing from
+ * and data pages it is using.
+ */
+static int set_page_attr(pte_t *ptep, unsigned long addr, void *data)
+{
+	pgprot_t prot = __pgprot((unsigned long)data);
+
+	spin_lock(&init_mm.page_table_lock);
+
+	set_pte_at(&init_mm, addr, ptep, pte_modify(*ptep, prot));
+	flush_tlb_kernel_range(addr, addr + PAGE_SIZE);
+
+	spin_unlock(&init_mm.page_table_lock);
+
+	return 0;
+}
+
+int set_memory_attr(unsigned long addr, int numpages, pgprot_t prot)
+{
+	unsigned long start = ALIGN_DOWN(addr, PAGE_SIZE);
+	unsigned long sz = numpages * PAGE_SIZE;
+
+	if (numpages <= 0)
+		return 0;
+
+	return apply_to_existing_page_range(&init_mm, start, sz, set_page_attr,
+					    (void *)pgprot_val(prot));
+}
-- 
2.25.1


  parent reply	other threads:[~2021-03-16  3:21 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-16  3:17 [PATCH v9 1/8] powerpc/mm: Implement set_memory() routines Jordan Niethe
2021-03-16  3:17 ` [PATCH v9 2/8] powerpc/lib/code-patching: Set up Strict RWX patching earlier Jordan Niethe
2021-03-16  3:36   ` Russell Currey
2021-03-16  6:32   ` Christophe Leroy
2021-03-17  0:38     ` Jordan Niethe
2021-03-17 12:04       ` Michael Ellerman
2021-03-16  3:17 ` [PATCH v9 3/8] powerpc/kprobes: Mark newly allocated probes as RO Jordan Niethe
2021-03-16  6:44   ` Christophe Leroy
2021-03-17  0:50     ` Jordan Niethe
2021-03-17  0:52     ` Jordan Niethe
2021-03-17  6:12   ` Christophe Leroy
2021-03-18  2:42     ` Jordan Niethe
2021-03-16  3:17 ` [PATCH v9 4/8] powerpc/mm/ptdump: debugfs handler for W+X checks at runtime Jordan Niethe
2021-03-16  6:47   ` Christophe Leroy
2021-03-16  3:17 ` [PATCH v9 5/8] powerpc: Set ARCH_HAS_STRICT_MODULE_RWX Jordan Niethe
2021-03-16  6:51   ` Christophe Leroy
2021-03-17  2:15     ` Jordan Niethe
2021-03-17  5:43       ` Christophe Leroy
2021-03-16  3:17 ` [PATCH v9 6/8] powerpc/configs: Enable STRICT_MODULE_RWX in skiroot_defconfig Jordan Niethe
2021-03-16  3:17 ` Jordan Niethe [this message]
2021-03-16  7:25   ` [PATCH v9 7/8] powerpc/mm: implement set_memory_attr() Christophe Leroy
2021-03-17  0:54     ` Jordan Niethe
2021-03-16  3:17 ` [PATCH v9 8/8] powerpc/32: use set_memory_attr() Jordan Niethe
2021-03-19  1:19 ` [PATCH v9 1/8] powerpc/mm: Implement set_memory() routines Michael Ellerman

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=20210316031741.1004850-7-jniethe5@gmail.com \
    --to=jniethe5@gmail.com \
    --cc=ajd@linux.ibm.com \
    --cc=christophe.leroy@c-s.fr \
    --cc=dja@axtens.net \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=lkp@intel.com \
    --cc=naveen.n.rao@linux.ibm.com \
    --cc=npiggin@gmail.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).