Attachment 277241 Details for Bug 410811 – Avoid handing reserved pages to the boot allocator

[patch] Avoid handing reserved pages to the boot allocator

xen_lomem_e820_fix.diff (text/plain), 1.63 KB, created by Kimball Murray on 2007-12-04 18:50:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kimball Murray

Created: 2007-12-04 18:50:09 UTC

Size: 1.63 KB

patch

obsolete

>diff -Naur xen/arch/x86/setup.c ../kernel-2.6.18-55bb/xen/arch/x86/setup.c
>--- xen/arch/x86/setup.c	2007-10-23 15:23:10.000000000 -0400
>+++ ../kernel-2.6.18-55bb/xen/arch/x86/setup.c	2007-11-30 16:04:21.000000000 -0500
>@@ -441,6 +441,39 @@
>     return p;
> }
> 
>+/*
>+ * Add some low memory pages (from "lower" to "upper") to the boot
>+ * allocator, but be careful not to add any reserved areas (pay
>+ * attention to e820 map).
>+ */
>+static void seed_boot_allocator(unsigned long lower, unsigned long upper)
>+{
>+    int i;
>+
>+    for ( i = 0; i < e820_raw_nr; i++ )
>+    {
>+        uint64_t start, end;
>+
>+        if (e820_raw[i].type != E820_RAM)
>+            continue;
>+
>+        start = e820_raw[i].addr;
>+        if (start >= upper)
>+            continue;
>+        if (start < lower)
>+            start = lower;
>+
>+        end = e820_raw[i].addr + e820_raw[i].size;
>+        if (end <= lower)
>+            continue;
>+
>+        if (end > upper)
>+            end = upper;
>+
>+        init_boot_pages(start, end);
>+    }
>+}
>+
> void __init __start_xen(unsigned long mbi_p)
> {
>     char *memmap_type = NULL;
>@@ -810,9 +843,10 @@
>     xenheap_phys_end += xen_phys_start;
>     reserve_in_boot_e820(xen_phys_start,
>                          xen_phys_start + (opt_xenheap_megabytes<<20));
>-    init_boot_pages(1<<20, 16<<20); /* Initial seed: 15MB */
>+    /* Initial seed, lower 1M - 16M, but pay attention to e820 tables */
>+    seed_boot_allocator(1 << 20, 16 << 20);
> #else
>-    init_boot_pages(xenheap_phys_end, 16<<20); /* Initial seed: 4MB */
>+    seed_boot_allocator(xenheap_phys_end, 16<<20); /* Initial seed: 4MB */
> #endif
> 
>     if ( kexec_crash_area.size != 0 )

Actions: View | Diff

Attachments on bug 410811: 277241