From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>,
Andi Kleen <andi@firstfloor.org>
Subject: [patch 6/9] Text Edit Lock - x86_64
Date: Sun, 12 Aug 2007 11:04:08 -0400 [thread overview]
Message-ID: <20070812150640.343635195@polymtl.ca> (raw)
In-Reply-To: 20070812150402.148764478@polymtl.ca
[-- Attachment #1: text-edit-lock-x86_64.patch --]
[-- Type: text/plain, Size: 4210 bytes --]
Interface to use for code patching : makes sure the page is writable
between calls to kernel_text_mark_rw() and kernel_text_unmark().
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: Andi Kleen <andi@firstfloor.org>
---
arch/x86_64/mm/init.c | 72 +++++++++++++++++++++++++++++-----------
include/asm-x86_64/cacheflush.h | 7 +++
2 files changed, 60 insertions(+), 19 deletions(-)
Index: linux-2.6-lttng/arch/x86_64/mm/init.c
===================================================================
--- linux-2.6-lttng.orig/arch/x86_64/mm/init.c 2007-08-12 09:33:55.000000000 -0400
+++ linux-2.6-lttng/arch/x86_64/mm/init.c 2007-08-12 10:04:13.000000000 -0400
@@ -103,7 +103,7 @@ static __init void *spp_getpage(void)
{
void *ptr;
if (after_bootmem)
- ptr = (void *) get_zeroed_page(GFP_ATOMIC);
+ ptr = (void *) get_zeroed_page(GFP_KERNEL);
else
ptr = alloc_bootmem_pages(PAGE_SIZE);
if (!ptr || ((unsigned long)ptr & ~PAGE_MASK))
@@ -598,25 +598,11 @@ void free_initmem(void)
void mark_rodata_ro(void)
{
- unsigned long start = (unsigned long)_stext, end;
+ unsigned long start = PFN_ALIGN(_stext);
+ unsigned long end = PFN_ALIGN(__end_rodata);
-#ifdef CONFIG_HOTPLUG_CPU
- /* It must still be possible to apply SMP alternatives. */
- if (num_possible_cpus() > 1)
- start = (unsigned long)_etext;
-#endif
-
-#ifdef CONFIG_KPROBES
- start = (unsigned long)__start_rodata;
-#endif
-
- end = (unsigned long)__end_rodata;
- start = (start + PAGE_SIZE - 1) & PAGE_MASK;
- end &= PAGE_MASK;
- if (end <= start)
- return;
-
- change_page_attr_addr(start, (end - start) >> PAGE_SHIFT, PAGE_KERNEL_RO);
+ change_page_attr_addr(start, (end - start) >> PAGE_SHIFT,
+ PAGE_KERNEL_RO);
printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
(end - start) >> 10);
@@ -629,6 +615,54 @@ void mark_rodata_ro(void)
*/
global_flush_tlb();
}
+
+/**
+ * kernel_text_mark_rw - Change kernel core text flags to RW
+ * @address: location of the code
+ * @len: size of code to mark
+ *
+ * Change kernel text flags to RW. Useful for code patching.
+ */
+
+void kernel_text_mark_rw(unsigned long address, size_t len)
+{
+ if (address >= PFN_ALIGN(_text)
+ && (address + len) <= PFN_ALIGN(_etext)) {
+ unsigned long nr_pages;
+ nr_pages = ((address + len) >> PAGE_SHIFT)
+ - (address >> PAGE_SHIFT) + 1;
+ change_page_attr(virt_to_page(address), nr_pages,
+ PAGE_KERNEL_EXEC);
+ mb();
+ global_flush_tlb();
+ mb();
+ }
+}
+EXPORT_SYMBOL_GPL(kernel_text_mark_rw);
+
+/**
+ * kernel_text_unmark - Unmap a kernel text rw mapping.
+ * @address: location of the mapping
+ * @len: size of code to mark
+ *
+ * Remove RW flag from kernel text.
+ */
+
+void kernel_text_unmark(unsigned long address, size_t len)
+{
+ if (address >= PFN_ALIGN(_text)
+ && (address + len) <= PFN_ALIGN(_etext)) {
+ unsigned long nr_pages;
+ nr_pages = ((address + len) >> PAGE_SHIFT)
+ - (address >> PAGE_SHIFT) + 1;
+ mb();
+ change_page_attr(virt_to_page(address), nr_pages,
+ PAGE_KERNEL_RO);
+ mb();
+ global_flush_tlb();
+ }
+}
+EXPORT_SYMBOL_GPL(kernel_text_unmark);
#endif
#ifdef CONFIG_BLK_DEV_INITRD
Index: linux-2.6-lttng/include/asm-x86_64/cacheflush.h
===================================================================
--- linux-2.6-lttng.orig/include/asm-x86_64/cacheflush.h 2007-08-12 09:33:55.000000000 -0400
+++ linux-2.6-lttng/include/asm-x86_64/cacheflush.h 2007-08-12 09:34:07.000000000 -0400
@@ -31,6 +31,13 @@ void clflush_cache_range(void *addr, int
#ifdef CONFIG_DEBUG_RODATA
void mark_rodata_ro(void);
+
+/* mark kernel text pages writable */
+extern void kernel_text_mark_rw(unsigned long address, size_t len);
+extern void kernel_text_unmark(unsigned long address, size_t len);
+#else
+void kernel_text_mark_rw(unsigned long address, size_t len) { }
+void kernel_text_unmark(unsigned long address, size_t len) { }
#endif
#endif /* _X8664_CACHEFLUSH_H */
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
next prev parent reply other threads:[~2007-08-12 15:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-12 15:04 [patch 0/9] Text Edit Lock Mathieu Desnoyers
2007-08-12 15:04 ` [patch 1/9] Kprobes - use a mutex to protect the instruction pages list Mathieu Desnoyers
2007-08-12 15:04 ` [patch 2/9] Kprobes - do not use kprobes mutex in arch code Mathieu Desnoyers
2007-08-12 15:04 ` [patch 3/9] Kprobes - declare kprobe_mutex static Mathieu Desnoyers
2007-08-12 15:04 ` [patch 4/9] Text Edit Lock - Architecture Independent Code Mathieu Desnoyers
2007-08-12 15:04 ` [patch 5/9] Text Edit Lock - i386 Mathieu Desnoyers
2007-08-12 15:04 ` Mathieu Desnoyers [this message]
2007-08-12 15:04 ` [patch 7/9] Text Edit Lock - kprobes architecture independent support Mathieu Desnoyers
2007-08-12 15:04 ` [patch 8/9] Text Edit Lock - kprobes i386 Mathieu Desnoyers
2007-08-12 15:04 ` [patch 9/9] Text Edit Lock - kprobes x86_64 Mathieu Desnoyers
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=20070812150640.343635195@polymtl.ca \
--to=mathieu.desnoyers@polymtl.ca \
--cc=akpm@linux-foundation.org \
--cc=andi@firstfloor.org \
--cc=linux-kernel@vger.kernel.org \
/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.