Attachment 148800 Details for Bug 220592 – RHEL5 Patch: Move the frametablet to the top of memory on x86_64

[patch] RHEL5 Patch: Move the frametablet to the top of memory on x86_64

xen-frametable-top.patch (text/plain), 2.93 KB, created by Chris Lalancette on 2007-02-26 15:51:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lalancette

Created: 2007-02-26 15:51:13 UTC

Size: 2.93 KB

patch

obsolete

>diff -urp xen.orig/arch/x86/mm.c xen/arch/x86/mm.c
>--- xen.orig/arch/x86/mm.c	2007-02-23 13:48:21.000000000 -0500
>+++ xen/arch/x86/mm.c	2007-02-23 14:24:43.000000000 -0500
>@@ -179,7 +179,15 @@ void __init init_frametable(void)
> 
>     for ( i = 0; i < nr_pages; i += page_step )
>     {
>-        mfn = alloc_boot_pages(min(nr_pages - i, page_step), page_step);
>+#ifdef __x86_64__
>+        /* for x86_64 we want to allocate the frame table from the top
>+         * of memory rather than the bottom; otherwise, on large memory
>+         * machines (> 64G), we exhaust DMA memory, and dom0 cannot boot
>+         */
>+        mfn = alloc_boot_high_pages(min(nr_pages - i, page_step), page_step);
>+#else
>+         mfn = alloc_boot_pages(min(nr_pages - i, page_step), page_step);
>+#endif
>         if ( mfn == 0 )
>             panic("Not enough memory for frame table\n");
>         map_pages_to_xen(
>diff -urp xen.orig/common/page_alloc.c xen/common/page_alloc.c
>--- xen.orig/common/page_alloc.c	2006-10-16 16:07:17.000000000 -0400
>+++ xen/common/page_alloc.c	2007-02-23 14:24:21.000000000 -0500
>@@ -213,22 +213,41 @@ void init_boot_pages(paddr_t ps, paddr_t
>     }
> }
> 
>-unsigned long alloc_boot_pages(unsigned long nr_pfns, unsigned long pfn_align)
>+static unsigned long alloc_boot_pages_at(unsigned long nr_pfns, unsigned long pfn_at)
> {
>-    unsigned long pg, i;
>+    unsigned long i;
> 
>-    for ( pg = 0; (pg + nr_pfns) < max_page; pg += pfn_align )
>+    for ( i = 0; i < nr_pfns; i++ )
>+        if ( allocated_in_map(pfn_at + i) )
>+             break;
>+
>+    if ( i == nr_pfns )
>     {
>-        for ( i = 0; i < nr_pfns; i++ )
>-            if ( allocated_in_map(pg + i) )
>-                 break;
>+        map_alloc(pfn_at, nr_pfns);
>+        return pfn_at;
>+    }
> 
>-        if ( i == nr_pfns )
>-        {
>-            map_alloc(pg, nr_pfns);
>+    return 0;
>+}
>+
>+unsigned long alloc_boot_high_pages(unsigned long nr_pfns, unsigned long pfn_align)
>+{
>+    unsigned long pg;
>+
>+    for ( pg = (max_page - nr_pfns); pg > 0; pg -= pfn_align )
>+        if (alloc_boot_pages_at(nr_pfns, pg))
>+            return pg;
>+
>+    return 0;
>+}
>+
>+unsigned long alloc_boot_pages(unsigned long nr_pfns, unsigned long pfn_align)
>+{
>+    unsigned long pg;
>+
>+    for ( pg = 0; (pg + nr_pfns) < max_page; pg += pfn_align )
>+        if (alloc_boot_pages_at(nr_pfns, pg))
>             return pg;
>-        }
>-    }
> 
>     return 0;
> }
>diff -urp xen.orig/include/xen/mm.h xen/include/xen/mm.h
>--- xen.orig/include/xen/mm.h	2006-10-16 16:07:18.000000000 -0400
>+++ xen/include/xen/mm.h	2007-02-23 14:24:21.000000000 -0500
>@@ -39,6 +39,7 @@ struct page_info;
> /* Boot-time allocator. Turns into generic allocator after bootstrap. */
> paddr_t init_boot_allocator(paddr_t bitmap_start);
> void init_boot_pages(paddr_t ps, paddr_t pe);
>+unsigned long alloc_boot_high_pages(unsigned long nr_pfns, unsigned long pfn_align);
> unsigned long alloc_boot_pages(unsigned long nr_pfns, unsigned long pfn_align);
> void end_boot_allocator(void);
>

Actions: View | Diff

Attachments on bug 220592: 144270 | 144362 | 144363 | 144364 | 144387 | 145875 | 145914 | 145966 | 145968 | 148554 | 148800 | 148801