diff options
author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-08-14 14:34:00 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-08-23 11:52:15 -0400 |
commit | 3aca7fbc8ede0dd194317b2e3144815128ffb232 (patch) | |
tree | a46417408998d0952947891122ea4cd555f2f65a | |
parent | 7f9140626c757b773624b97865cb53c2a8348a69 (diff) |
xen/mmu: Remove from __ka space PMD entries for pagetables.
Please first read the description in "xen/mmu: Copy and revector the
P2M tree."
At this stage, the __ka address space (which is what the old
P2M tree was using) is partially disassembled. The cleanup_highmap
has removed the PMD entries from 0-16MB and anything past _brk_end
up to the max_pfn_mapped (which is the end of the ramdisk).
The xen_remove_p2m_tree and code around has ripped out the __ka for
the old P2M array.
Here we continue on doing it to where the Xen page-tables were.
It is safe to do it, as the page-tables are addressed using __va.
For good measure we delete anything that is within MODULES_VADDR
and up to the end of the PMD.
At this point the __ka only contains PMD entries for the start
of the kernel up to __brk.
[v1: Per Stefano's suggestion wrapped the MODULES_VADDR in debug]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r-- | arch/x86/xen/mmu.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index a640949f78d4..3f8e963b76c0 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
@@ -1240,6 +1240,25 @@ static void __init xen_pagetable_setup_done(pgd_t *base) | |||
1240 | xen_start_info->mfn_list = new_mfn_list; | 1240 | xen_start_info->mfn_list = new_mfn_list; |
1241 | } | 1241 | } |
1242 | } | 1242 | } |
1243 | /* At this stage, cleanup_highmap has already cleaned __ka space | ||
1244 | * from _brk_limit way up to the max_pfn_mapped (which is the end of | ||
1245 | * the ramdisk). We continue on, erasing PMD entries that point to page | ||
1246 | * tables - do note that they are accessible at this stage via __va. | ||
1247 | * For good measure we also round up to the PMD - which means that if | ||
1248 | * anybody is using __ka address to the initial boot-stack - and try | ||
1249 | * to use it - they are going to crash. The xen_start_info has been | ||
1250 | * taken care of already in xen_setup_kernel_pagetable. */ | ||
1251 | addr = xen_start_info->pt_base; | ||
1252 | size = roundup(xen_start_info->nr_pt_frames * PAGE_SIZE, PMD_SIZE); | ||
1253 | |||
1254 | xen_cleanhighmap(addr, addr + size); | ||
1255 | xen_start_info->pt_base = (unsigned long)__va(__pa(xen_start_info->pt_base)); | ||
1256 | #ifdef DEBUG | ||
1257 | /* This is superflous and is not neccessary, but you know what | ||
1258 | * lets do it. The MODULES_VADDR -> MODULES_END should be clear of | ||
1259 | * anything at this stage. */ | ||
1260 | xen_cleanhighmap(MODULES_VADDR, roundup(MODULES_VADDR, PUD_SIZE) - 1); | ||
1261 | #endif | ||
1243 | #endif | 1262 | #endif |
1244 | xen_post_allocator_init(); | 1263 | xen_post_allocator_init(); |
1245 | } | 1264 | } |