All of lore.kernel.org
 help / color / mirror / Atom feed
From: Laura Abbott <lauraa@codeaurora.org>
To: linux-arm-kernel@lists.infradead.org,
	Russell King <linux@arm.linux.org.uk>
Cc: Will Deacon <will.deacon@arm.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Nicoas Pitre <nicolas.pitre@linaro.org>,
	linux-arm-msm@vger.kernel.org,
	Laura Abbott <lauraa@codeaurora.org>
Subject: [RFC 2/3] arm: mm: Define set_memory_* functions for ARM
Date: Wed, 12 Jun 2013 10:23:29 -0700	[thread overview]
Message-ID: <1371057810-3189-3-git-send-email-lauraa@codeaurora.org> (raw)
In-Reply-To: <1371057810-3189-1-git-send-email-lauraa@codeaurora.org>

Other architectures define various set_memory functions to allow
attributes to be changed (e.g. set_memory_x, set_memory_rw, etc.)
Currently, these functions are missing on ARM. Define these in an
appropriate manner for ARM.

Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
---
 arch/arm/include/asm/cacheflush.h |    5 ++
 arch/arm/mm/mmu.c                 |   86 +++++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 0 deletions(-)

diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
index bff7138..55ed26b 100644
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
@@ -438,4 +438,9 @@ static inline void __sync_cache_range_r(volatile void *p, size_t size)
 #define sync_cache_w(ptr) __sync_cache_range_w(ptr, sizeof *(ptr))
 #define sync_cache_r(ptr) __sync_cache_range_r(ptr, sizeof *(ptr))
 
+int set_memory_ro(unsigned long addr, int numpages);
+int set_memory_rw(unsigned long addr, int numpages);
+int set_memory_x(unsigned long addr, int numpages);
+int set_memory_nx(unsigned long addr, int numpages);
+
 #endif
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index e0d8565..1dc14a3 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -335,6 +335,92 @@ const struct mem_type *get_mem_type(unsigned int type)
 }
 EXPORT_SYMBOL(get_mem_type);
 
+static int pte_set_ro(pte_t *ptep, pgtable_t token, unsigned long addr,
+			void *data)
+{
+	pte_t pte = pte_wrprotect(*ptep);
+
+	set_pte_ext(ptep, pte, 0);
+	return 0;
+}
+
+int set_memory_ro(unsigned long addr, int numpages)
+{
+	unsigned long start = addr;
+	unsigned long size = PAGE_SIZE*numpages;
+	unsigned end = start + size;
+
+	apply_to_page_range(&init_mm, start, size, pte_set_ro, NULL);
+	dsb();
+	flush_tlb_kernel_range(start, end);
+	return 0;
+}
+
+static int pte_set_rw(pte_t *ptep, pgtable_t token, unsigned long addr,
+			void *data)
+{
+	pte_t pte = pte_mkwrite(*ptep);
+
+	set_pte_ext(ptep, pte, 0);
+	return 0;
+}
+
+int set_memory_rw(unsigned long addr, int numpages)
+{
+	unsigned long start = addr;
+	unsigned long size = PAGE_SIZE*numpages;
+	unsigned end = start + size;
+
+	apply_to_page_range(&init_mm, start, size, pte_set_rw, NULL);
+	dsb();
+	flush_tlb_kernel_range(start, end);
+	return 0;
+
+}
+
+static int pte_set_x(pte_t *ptep, pgtable_t token, unsigned long addr,
+			void *data)
+{
+	pte_t pte = pte_mkexec(*ptep);
+
+	set_pte_ext(ptep, pte, 0);
+	return 0;
+}
+
+int set_memory_x(unsigned long addr, int numpages)
+{
+	unsigned long start = addr;
+	unsigned long size = PAGE_SIZE*numpages;
+	unsigned end = start + size;
+
+	apply_to_page_range(&init_mm, start, size, pte_set_x, NULL);
+	dsb();
+	flush_tlb_kernel_range(start, end);
+	return 0;
+}
+
+static int pte_set_nx(pte_t *ptep, pgtable_t token, unsigned long addr,
+			void *data)
+{
+	pte_t pte = pte_mknexec(*ptep);
+
+	set_pte_ext(ptep, pte, 0);
+	return 0;
+}
+
+int set_memory_nx(unsigned long addr, int numpages)
+{
+	unsigned long start = addr;
+	unsigned long size = PAGE_SIZE*numpages;
+	unsigned end = start + size;
+
+	apply_to_page_range(&init_mm, start, size, pte_set_nx, NULL);
+	dsb();
+	flush_tlb_kernel_range(start, end);
+
+	return 0;
+}
+
 /*
  * Adjust the PMD section entries according to the CPU in use.
  */
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

  parent reply	other threads:[~2013-06-12 17:23 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-12 17:23 [RFC 0/3] Allow CONFIG_DEBUG_SET_MODULE_RONX to be used on ARM Laura Abbott
2013-06-12 17:23 ` Laura Abbott
2013-06-12 17:23 ` [RFC 1/3] arm: Add definitions for pte_mkexec/pte_mknexec Laura Abbott
2013-06-12 17:23 ` Laura Abbott [this message]
2013-06-12 17:32   ` [RFC 2/3] arm: mm: Define set_memory_* functions for ARM Russell King - ARM Linux
2013-06-12 17:32     ` Russell King - ARM Linux
2013-06-13 16:25   ` Catalin Marinas
2013-06-13 16:25     ` Catalin Marinas
2013-06-18 11:09   ` Will Deacon
2013-06-18 11:09     ` Will Deacon
2013-06-19  1:48     ` Laura Abbott
2013-06-19  1:48       ` Laura Abbott
2013-06-19 13:59       ` Will Deacon
2013-06-19 13:59         ` Will Deacon
2013-10-25 13:08   ` Will Deacon
2013-10-25 13:08     ` Will Deacon
2013-10-27 10:18     ` Russell King - ARM Linux
2013-10-27 10:18       ` Russell King - ARM Linux
2013-06-12 17:23 ` [RFC 3/3] arm: add DEBUG_SET_MODULE_RONX option to Kconfig Laura Abbott
2013-10-24 13:03 ` [RFC 0/3] Allow CONFIG_DEBUG_SET_MODULE_RONX to be used on ARM Russell King - ARM Linux
2013-10-24 13:03   ` Russell King - ARM Linux
2013-10-27 10:34   ` Russell King - ARM Linux
2013-10-27 10:34     ` Russell King - ARM Linux
2013-10-27 11:57     ` Russell King - ARM Linux
2013-10-27 11:57       ` Russell King - ARM Linux

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=1371057810-3189-3-git-send-email-lauraa@codeaurora.org \
    --to=lauraa@codeaurora.org \
    --cc=catalin.marinas@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=nicolas.pitre@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.