diff options
author | Michael Brown | 2016-03-08 14:06:06 +0100 |
---|---|---|
committer | Michael Brown | 2016-03-08 14:25:09 +0100 |
commit | d3db00ecf9f9860d8e029b22b17a5cef9dbdbc33 (patch) | |
tree | 05fdec94b101b73da234ddf516469ed1fbbd3a72 /src/arch | |
parent | [infiniband] Allow for the creation of multicast groups (diff) | |
download | ipxe-d3db00ecf9f9860d8e029b22b17a5cef9dbdbc33.tar.gz ipxe-d3db00ecf9f9860d8e029b22b17a5cef9dbdbc33.tar.xz ipxe-d3db00ecf9f9860d8e029b22b17a5cef9dbdbc33.zip |
[pcbios] Restrict external memory allocations to the low 4GB
When running the 64-bit BIOS version of iPXE, restrict external memory
allocations to the low 4GB to ensure that allocations (such as for
initrds) fall within our identity-mapped memory region, and will be
accessible to the potentially 32-bit operating system.
Move largest_memblock() back to memtop_umalloc.c, since this change
imposes a restriction that applies only to BIOS builds.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch')
-rw-r--r-- | src/arch/x86/interface/pcbios/memtop_umalloc.c | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/src/arch/x86/interface/pcbios/memtop_umalloc.c b/src/arch/x86/interface/pcbios/memtop_umalloc.c index 957f8e32..f1ab73e2 100644 --- a/src/arch/x86/interface/pcbios/memtop_umalloc.c +++ b/src/arch/x86/interface/pcbios/memtop_umalloc.c @@ -38,6 +38,9 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include <ipxe/memblock.h> #include <ipxe/umalloc.h> +/** Maximum usable address for external allocated memory */ +#define EM_MAX_ADDRESS 0xffffffffUL + /** Alignment of external allocated memory */ #define EM_ALIGN ( 4 * 1024 ) @@ -62,6 +65,56 @@ static userptr_t bottom = UNULL; static size_t heap_size; /** + * Find largest usable memory region + * + * @ret start Start of region + * @ret len Length of region + */ +size_t largest_memblock ( userptr_t *start ) { + struct memory_map memmap; + struct memory_region *region; + physaddr_t max = EM_MAX_ADDRESS; + physaddr_t region_start; + physaddr_t region_end; + size_t region_len; + unsigned int i; + size_t len = 0; + + /* Avoid returning uninitialised data on error */ + *start = UNULL; + + /* Scan through all memory regions */ + get_memmap ( &memmap ); + for ( i = 0 ; i < memmap.count ; i++ ) { + region = &memmap.regions[i]; + DBG ( "Considering [%llx,%llx)\n", region->start, region->end ); + + /* Truncate block to maximum physical address */ + if ( region->start > max ) { + DBG ( "...starts after maximum address %lx\n", max ); + continue; + } + region_start = region->start; + if ( region->end > max ) { + DBG ( "...end truncated to maximum address %lx\n", max); + region_end = 0; /* =max, given the wraparound */ + } else { + region_end = region->end; + } + region_len = ( region_end - region_start ); + + /* Use largest block */ + if ( region_len > len ) { + DBG ( "...new best block found\n" ); + *start = phys_to_user ( region_start ); + len = region_len; + } + } + + return len; +} + +/** * Initialise external heap * */ |