* [PATCH 1/3] x86: add sanity checks to init_32.c
@ 2009-03-03 11:15 Pekka Enberg
2009-03-03 11:24 ` [tip:x86/mm] " Pekka Enberg
0 siblings, 1 reply; 2+ messages in thread
From: Pekka Enberg @ 2009-03-03 11:15 UTC (permalink / raw)
To: mingo; +Cc: x86, linux-kernel
From: Pekka Enberg <penberg@cs.helsinki.fi>
Impact: unification
This patch adds sanity checks that are already in init_64.c to init_32.c.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
arch/x86/mm/init_32.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index a0c32d5..ee4b032 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -1193,18 +1193,21 @@ void mark_rodata_ro(void)
void free_init_pages(char *what, unsigned long begin, unsigned long end)
{
-#ifdef CONFIG_DEBUG_PAGEALLOC
+ unsigned long addr = begin;
+
+ if (addr >= end)
+ return;
+
/*
* If debugging page accesses then do not free this memory but
* mark them not present - any buggy init-section access will
* create a kernel page fault:
*/
+#ifdef CONFIG_DEBUG_PAGEALLOC
printk(KERN_INFO "debug: unmapping init memory %08lx..%08lx\n",
begin, PAGE_ALIGN(end));
set_memory_np(begin, (end - begin) >> PAGE_SHIFT);
#else
- unsigned long addr;
-
/*
* We just marked the kernel text read only above, now that
* we are going to free part of that, we need to make that
@@ -1212,14 +1215,16 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
*/
set_memory_rw(begin, (end - begin) >> PAGE_SHIFT);
- for (addr = begin; addr < end; addr += PAGE_SIZE) {
+ printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
+
+ for (; addr < end; addr += PAGE_SIZE) {
ClearPageReserved(virt_to_page(addr));
init_page_count(virt_to_page(addr));
- memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
+ memset((void *)(addr & ~(PAGE_SIZE-1)),
+ POISON_FREE_INITMEM, PAGE_SIZE);
free_page(addr);
totalram_pages++;
}
- printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
#endif
}
--
1.5.4.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:x86/mm] x86: add sanity checks to init_32.c
2009-03-03 11:15 [PATCH 1/3] x86: add sanity checks to init_32.c Pekka Enberg
@ 2009-03-03 11:24 ` Pekka Enberg
0 siblings, 0 replies; 2+ messages in thread
From: Pekka Enberg @ 2009-03-03 11:24 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, penberg, tglx, mingo
Commit-ID: 05f209e7b936a48e341d36831079116a06658ccc
Gitweb: http://git.kernel.org/tip/05f209e7b936a48e341d36831079116a06658ccc
Author: "Pekka Enberg" <penberg@cs.helsinki.fi>
AuthorDate: Tue, 3 Mar 2009 13:15:02 +0200
Commit: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 3 Mar 2009 12:21:17 +0100
x86: add sanity checks to init_32.c
Impact: unification
This patch adds sanity checks that are already in init_64.c to init_32.c.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
LKML-Reference: <1236078902.2675.16.camel@penberg-laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/mm/init_32.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 1dd6b63..1570a82 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -1214,18 +1214,21 @@ void mark_rodata_ro(void)
void free_init_pages(char *what, unsigned long begin, unsigned long end)
{
-#ifdef CONFIG_DEBUG_PAGEALLOC
+ unsigned long addr = begin;
+
+ if (addr >= end)
+ return;
+
/*
* If debugging page accesses then do not free this memory but
* mark them not present - any buggy init-section access will
* create a kernel page fault:
*/
+#ifdef CONFIG_DEBUG_PAGEALLOC
printk(KERN_INFO "debug: unmapping init memory %08lx..%08lx\n",
begin, PAGE_ALIGN(end));
set_memory_np(begin, (end - begin) >> PAGE_SHIFT);
#else
- unsigned long addr;
-
/*
* We just marked the kernel text read only above, now that
* we are going to free part of that, we need to make that
@@ -1233,14 +1236,16 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
*/
set_memory_rw(begin, (end - begin) >> PAGE_SHIFT);
- for (addr = begin; addr < end; addr += PAGE_SIZE) {
+ printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
+
+ for (; addr < end; addr += PAGE_SIZE) {
ClearPageReserved(virt_to_page(addr));
init_page_count(virt_to_page(addr));
- memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
+ memset((void *)(addr & ~(PAGE_SIZE-1)),
+ POISON_FREE_INITMEM, PAGE_SIZE);
free_page(addr);
totalram_pages++;
}
- printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
#endif
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-03-03 11:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-03 11:15 [PATCH 1/3] x86: add sanity checks to init_32.c Pekka Enberg
2009-03-03 11:24 ` [tip:x86/mm] " Pekka Enberg
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).