Commit e7d23dde authored by Suresh Siddha's avatar Suresh Siddha Committed by Ingo Molnar

x86_64, cpa: Use only text section in set_kernel_text_rw/ro

set_kernel_text_rw()/set_kernel_text_ro() are marking pages
starting from _text to __start_rodata as RW or RO.

With CONFIG_DEBUG_RODATA, there might be free pages (associated
with padding the sections to 2MB large page boundary) between
text and rodata sections that are given back to page allocator.
So we should use only use the start (__text) and end
(__stop___ex_table) of the text section in
set_kernel_text_rw()/set_kernel_text_ro().
Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Tested-by: default avatarSteven Rostedt <rostedt@goodmis.org>
LKML-Reference: <20091029024821.164525222@sbs-t61.sc.intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 55ca3cc1
...@@ -700,7 +700,7 @@ int kernel_set_to_readonly; ...@@ -700,7 +700,7 @@ int kernel_set_to_readonly;
void set_kernel_text_rw(void) void set_kernel_text_rw(void)
{ {
unsigned long start = PFN_ALIGN(_text); unsigned long start = PFN_ALIGN(_text);
unsigned long end = PFN_ALIGN(__start_rodata); unsigned long end = PFN_ALIGN(__stop___ex_table);
if (!kernel_set_to_readonly) if (!kernel_set_to_readonly)
return; return;
...@@ -708,13 +708,18 @@ void set_kernel_text_rw(void) ...@@ -708,13 +708,18 @@ void set_kernel_text_rw(void)
pr_debug("Set kernel text: %lx - %lx for read write\n", pr_debug("Set kernel text: %lx - %lx for read write\n",
start, end); start, end);
/*
* Make the kernel identity mapping for text RW. Kernel text
* mapping will always be RO. Refer to the comment in
* static_protections() in pageattr.c
*/
set_memory_rw(start, (end - start) >> PAGE_SHIFT); set_memory_rw(start, (end - start) >> PAGE_SHIFT);
} }
void set_kernel_text_ro(void) void set_kernel_text_ro(void)
{ {
unsigned long start = PFN_ALIGN(_text); unsigned long start = PFN_ALIGN(_text);
unsigned long end = PFN_ALIGN(__start_rodata); unsigned long end = PFN_ALIGN(__stop___ex_table);
if (!kernel_set_to_readonly) if (!kernel_set_to_readonly)
return; return;
...@@ -722,6 +727,9 @@ void set_kernel_text_ro(void) ...@@ -722,6 +727,9 @@ void set_kernel_text_ro(void)
pr_debug("Set kernel text: %lx - %lx for read only\n", pr_debug("Set kernel text: %lx - %lx for read only\n",
start, end); start, end);
/*
* Set the kernel identity mapping for text RO.
*/
set_memory_ro(start, (end - start) >> PAGE_SHIFT); set_memory_ro(start, (end - start) >> PAGE_SHIFT);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment