x86/64 Linux: destroy entire init memory mapping beyond kernel image.

Avoids overlap with modules mapping area.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
xen-unstable changeset:   10287:ec903b8e6612eba5c90451fcb1bbb25d34cd88e4
xen-unstable date:        Wed Jun  7 11:24:44 2006 +0100

diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
index 109a77705abfb33b07d1aeaff5e814b6ea5b6bc9..0d749507dee3ad61aee22afe2f9a26583e7aebad 100644 (file)
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
@@ -823,14 +823,6 @@ void __init setup_arch(char **cmdline_p)
 #ifdef CONFIG_XEN
        {
                int i, j, k, fpp;
-               unsigned long va;
-
-               /* 'Initial mapping' of initrd must be destroyed. */
-               for (va = xen_start_info->mod_start;
-                    va < (xen_start_info->mod_start+xen_start_info->mod_len);
-                    va += PAGE_SIZE) {
-                       HYPERVISOR_update_va_mapping(va, __pte_ma(0), 0);
-               }
 
                if (!xen_feature(XENFEAT_auto_translated_physmap)) {
                        /* Make sure we have a large enough P->M table. */
@@ -846,14 +838,6 @@ void __init setup_arch(char **cmdline_p)
                                PFN_PHYS(PFN_UP(xen_start_info->nr_pages *
                                                sizeof(unsigned long))));
 
-                       /* Destroyed 'initial mapping' of old p2m table. */
-                       for (va = xen_start_info->mfn_list;
-                            va < (xen_start_info->mfn_list +
-                                  (xen_start_info->nr_pages*sizeof(unsigned long)));
-                            va += PAGE_SIZE) {
-                               HYPERVISOR_update_va_mapping(va, __pte_ma(0), 0);
-                       }
-
                        /*
                         * Initialise the list of the frames that specify the
                         * list of frames that make up the p2m table. Used by

diff --git a/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c b/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c
index f9e2d529036994036754b381d0e9e6b4775da7c9..f1ff11ecfc1e20b779ad04f34b8feab16bb02140 100644 (file)
--- a/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c
+++ b/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c
@@ -661,13 +661,29 @@ void __meminit init_memory_mapping(unsigned long start, unsigned long end)
        }
 
        if (!after_bootmem) {
-               BUG_ON(start_pfn != table_start + (tables_space >> PAGE_SHIFT));
-               /*
-                * Destroy the temporary mappings created above. Prevents
+               BUG_ON(start_pfn != table_start + (tables_space>>PAGE_SHIFT));
+
+               /* Re-vector virtual addresses pointing into the initial
+                  mapping to the just-established permanent ones. */
+               xen_start_info = __va(__pa(xen_start_info));
+               xen_start_info->pt_base = (unsigned long)
+                       __va(__pa(xen_start_info->pt_base));
+               if (!xen_feature(XENFEAT_auto_translated_physmap)) {
+                       phys_to_machine_mapping =
+                               __va(__pa(xen_start_info->mfn_list));
+                       xen_start_info->mfn_list = (unsigned long)
+                               phys_to_machine_mapping;
+               }
+               if (xen_start_info->mod_start)
+                       xen_start_info->mod_start = (unsigned long)
+                               __va(__pa(xen_start_info->mod_start));
+
+               /* Destroy the Xen-created mappings beyond the kernel image as
+                * well as the temporary mappings created above. Prevents
                 * overlap with modules area (if init mapping is very big).
                 */
-               start = __START_KERNEL_map + (table_start << PAGE_SHIFT);
-               end   = start + tables_space;
+               start = PAGE_ALIGN((unsigned long)_end);
+               end   = __START_KERNEL_map + (start_pfn << PAGE_SHIFT);
                for (; start < end; start += PAGE_SIZE)
                        WARN_ON(HYPERVISOR_update_va_mapping(
                                start, __pte_ma(0), 0));