v4: - make calculations more robust.
v3: - check size instead of end address.
Gerd Hoffmann (2): malloc: use variable for ZoneHigh size malloc: use large ZoneHigh when there is enough memory
src/config.h | 3 ++- src/malloc.c | 23 ++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-)
Use the variable highram_size instead of the BUILD_MAX_HIGHTABLE #define for the ZoneHigh size. Initialize the new variable with the old #define, so behavior does not change.
This allows to easily adjust the ZoneHigh size at runtime in a followup patch.
Signed-off-by: Gerd Hoffmann kraxel@redhat.com --- src/malloc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/malloc.c b/src/malloc.c index 3733855caf2c..ecd8c9ac78d2 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -422,7 +422,8 @@ malloc_preinit(void) e820_add(BUILD_BIOS_ADDR, BUILD_BIOS_SIZE, E820_RESERVED);
// Populate temp high ram - u32 highram = 0; + u32 highram_start = 0; + u32 highram_size = BUILD_MAX_HIGHTABLE; int i; for (i=e820_count-1; i>=0; i--) { struct e820entry *en = &e820_list[i]; @@ -432,10 +433,10 @@ malloc_preinit(void) if (en->type != E820_RAM || end > 0xffffffff) continue; u32 s = en->start, e = end; - if (!highram) { - u32 newe = ALIGN_DOWN(e - BUILD_MAX_HIGHTABLE, MALLOC_MIN_ALIGN); + if (!highram_start) { + u32 newe = ALIGN_DOWN(e - highram_size, MALLOC_MIN_ALIGN); if (newe <= e && newe >= s) { - highram = newe; + highram_start = newe; e = newe; } } @@ -444,9 +445,9 @@ malloc_preinit(void)
// Populate regions alloc_add(&ZoneTmpLow, BUILD_STACK_ADDR, BUILD_EBDA_MINIMUM); - if (highram) { - alloc_add(&ZoneHigh, highram, highram + BUILD_MAX_HIGHTABLE); - e820_add(highram, BUILD_MAX_HIGHTABLE, E820_RESERVED); + if (highram_start) { + alloc_add(&ZoneHigh, highram_start, highram_start + highram_size); + e820_add(highram_start, highram_size, E820_RESERVED); } }
In case there is enough memory installed use a large ZoneHigh.
Signed-off-by: Gerd Hoffmann kraxel@redhat.com --- src/config.h | 3 ++- src/malloc.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/config.h b/src/config.h index 93c8dbc2d530..9abe355b6c47 100644 --- a/src/config.h +++ b/src/config.h @@ -17,7 +17,8 @@ // Maximum number of map entries in the e820 map #define BUILD_MAX_E820 32 // Space to reserve in high-memory for tables -#define BUILD_MAX_HIGHTABLE (256*1024) +#define BUILD_MIN_HIGHTABLE (256*1024) +#define BUILD_MAX_HIGHTABLE (16*1024*1024) // Largest supported externaly facing drive id #define BUILD_MAX_EXTDRIVE 16 // Number of bytes the smbios may be and still live in the f-segment diff --git a/src/malloc.c b/src/malloc.c index ecd8c9ac78d2..da84098005f7 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -423,7 +423,7 @@ malloc_preinit(void)
// Populate temp high ram u32 highram_start = 0; - u32 highram_size = BUILD_MAX_HIGHTABLE; + u32 highram_size = 0; int i; for (i=e820_count-1; i>=0; i--) { struct e820entry *en = &e820_list[i]; @@ -434,10 +434,14 @@ malloc_preinit(void) continue; u32 s = en->start, e = end; if (!highram_start) { - u32 newe = ALIGN_DOWN(e - highram_size, MALLOC_MIN_ALIGN); - if (newe <= e && newe >= s) { - highram_start = newe; - e = newe; + u32 new_max = ALIGN_DOWN(e - BUILD_MAX_HIGHTABLE, MALLOC_MIN_ALIGN); + u32 new_min = ALIGN_DOWN(e - BUILD_MIN_HIGHTABLE, MALLOC_MIN_ALIGN); + if (new_max <= e && new_max >= s + BUILD_MAX_HIGHTABLE) { + highram_start = e = new_max; + highram_size = BUILD_MAX_HIGHTABLE; + } else if (new_min <= e && new_min >= s) { + highram_start = e = new_min; + highram_size = BUILD_MIN_HIGHTABLE; } } alloc_add(&ZoneTmpHigh, s, e);
On Wed, Apr 27, 2022 at 09:22:02AM +0200, Gerd Hoffmann wrote:
v4:
- make calculations more robust.
v3:
- check size instead of end address.
The series looks good to me.
-Kevin
-
Gerd Hoffmann -
Kevin O'Connor