narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[relocate] Preserve page alignment during relocation 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/45/head
Michael Brown 2016-02-19 02:38:48 +00:00
parent 6eb1c927a3
commit bfe6e3e90e
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/arch/x86/core/relocate.c
View File

@ -10,14 +10,6 @@
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
/*
* The linker passes in the symbol _max_align, which is the alignment
* that we must preserve, in bytes.
*
*/
extern char _max_align[];
#define max_align ( ( size_t ) _max_align )
/* Linker symbols */ /* Linker symbols */
extern char _textdata[]; extern char _textdata[];
extern char _etextdata[]; extern char _etextdata[];
@ -30,6 +22,12 @@ extern char _etextdata[];
*/ */
#define MAX_ADDR (0xfff00000UL) #define MAX_ADDR (0xfff00000UL)
/* Preserve alignment to a 4kB page
*
* Required for x86_64, and doesn't hurt for i386.
*/
#define ALIGN 4096
/** /**
* Relocate iPXE * Relocate iPXE
* *
@ -53,11 +51,11 @@ __asmcall void relocate ( struct i386_all_regs *ix86 ) {
start = virt_to_phys ( _textdata ); start = virt_to_phys ( _textdata );
end = virt_to_phys ( _etextdata ); end = virt_to_phys ( _etextdata );
size = ( end - start ); size = ( end - start );
padded_size = ( size + max_align - 1 ); padded_size = ( size + ALIGN - 1 );
DBG ( "Relocate: currently at [%x,%x)\n" DBG ( "Relocate: currently at [%x,%x)\n"
"...need %x bytes for %zd-byte alignment\n", "...need %x bytes for %d-byte alignment\n",
start, end, padded_size, max_align ); start, end, padded_size, ALIGN );
/* Determine maximum usable address */ /* Determine maximum usable address */
max = MAX_ADDR; max = MAX_ADDR;
@ -125,7 +123,7 @@ __asmcall void relocate ( struct i386_all_regs *ix86 ) {
* required alignemnt. * required alignemnt.
*/ */
new_start = new_end - padded_size; new_start = new_end - padded_size;
new_start += ( start - new_start ) & ( max_align - 1 ); new_start += ( ( start - new_start ) & ( ALIGN - 1 ) );
new_end = new_start + size; new_end = new_start + size;
DBG ( "Relocating from [%x,%x) to [%x,%x)\n", DBG ( "Relocating from [%x,%x) to [%x,%x)\n",