* Tue May 10 2022 Miroslav Rezanina <mrezanin@redhat.com> - 1.16.0-2
- seabios-malloc-use-variable-for-ZoneHigh-size.patch [bz#2004662] - seabios-malloc-use-large-ZoneHigh-when-there-is-enough-memor.patch [bz#2004662] - Resolves: bz#2004662 (RFE: "Unable to allocate resource at romfile_loader_allocate:87" when running very large VMs)
This commit is contained in:
Miroslav Rezanina
parent
98ec775211
commit
2ae85706db
@ -0,0 +1,70 @@
|
||||
From f8c75c66a29fae7ff1e3bf23f382cd8f04e695a1 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Mon, 25 Apr 2022 09:25:31 +0200
|
||||
Subject: [PATCH 2/2] malloc: use large ZoneHigh when there is enough memory
|
||||
|
||||
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
||||
RH-MergeRequest: 3: malloc: use large ZoneHigh when there is enough memory
|
||||
RH-Commit: [2/2] 93b15659b39b9772c7620ddfbf558e11008bb8f9 (kraxel/centos-seabios)
|
||||
RH-Bugzilla: 2004662
|
||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
RH-Acked-by: Oliver Steffen <osteffen@redhat.com>
|
||||
|
||||
In case there is enough memory installed use a large ZoneHigh.
|
||||
|
||||
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
(cherry picked from commit dc88f9b72df52b22c35b127b80c487e0b6fca4af)
|
||||
---
|
||||
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 93c8dbc2..9abe355b 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 ecd8c9ac..da840980 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);
|
||||
--
|
||||
2.31.1
|
||||
|
||||
69
seabios-malloc-use-variable-for-ZoneHigh-size.patch
Normal file
69
seabios-malloc-use-variable-for-ZoneHigh-size.patch
Normal file
@ -0,0 +1,69 @@
|
||||
From 1c38dda9009b11aa935b9cd32043338c250f4de2 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Mon, 25 Apr 2022 09:20:02 +0200
|
||||
Subject: [PATCH 1/2] malloc: use variable for ZoneHigh size
|
||||
|
||||
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
||||
RH-MergeRequest: 3: malloc: use large ZoneHigh when there is enough memory
|
||||
RH-Commit: [1/2] 4265a009c535ebb7a592cc610266ba02546ec77d (kraxel/centos-seabios)
|
||||
RH-Bugzilla: 2004662
|
||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
RH-Acked-by: Oliver Steffen <osteffen@redhat.com>
|
||||
|
||||
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>
|
||||
(cherry picked from commit 3b91e8e9fe93d5ff7edf17f984c401f9e6ba55fe)
|
||||
---
|
||||
src/malloc.c | 15 ++++++++-------
|
||||
1 file changed, 8 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/malloc.c b/src/malloc.c
|
||||
index 3733855c..ecd8c9ac 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);
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
12
seabios.spec
12
seabios.spec
@ -1,6 +1,6 @@
|
||||
Name: seabios
|
||||
Version: 1.16.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Open-source legacy BIOS implementation
|
||||
|
||||
License: LGPLv3
|
||||
@ -9,6 +9,10 @@ URL: https://www.coreboot.org/SeaBIOS
|
||||
Source0: https://code.coreboot.org/p/seabios/downloads/get/seabios-1.16.0.tar.gz
|
||||
|
||||
Patch0002: 0002-Workaround-for-a-win8.1-32-S4-resume-bug.patch
|
||||
# For bz#2004662 - RFE: "Unable to allocate resource at romfile_loader_allocate:87" when running very large VMs
|
||||
Patch3: seabios-malloc-use-variable-for-ZoneHigh-size.patch
|
||||
# For bz#2004662 - RFE: "Unable to allocate resource at romfile_loader_allocate:87" when running very large VMs
|
||||
Patch4: seabios-malloc-use-large-ZoneHigh-when-there-is-enough-memor.patch
|
||||
|
||||
# Source-git patches
|
||||
|
||||
@ -135,6 +139,12 @@ install -m 0644 binaries/vgabios*.bin $RPM_BUILD_ROOT%{_datadir}/seavgabios
|
||||
%{_datadir}/seavgabios/vgabios*.bin
|
||||
|
||||
%changelog
|
||||
* Tue May 10 2022 Miroslav Rezanina <mrezanin@redhat.com> - 1.16.0-2
|
||||
- seabios-malloc-use-variable-for-ZoneHigh-size.patch [bz#2004662]
|
||||
- seabios-malloc-use-large-ZoneHigh-when-there-is-enough-memor.patch [bz#2004662]
|
||||
- Resolves: bz#2004662
|
||||
(RFE: "Unable to allocate resource at romfile_loader_allocate:87" when running very large VMs)
|
||||
|
||||
* Thu Apr 21 2022 Paweł Poławski <ppolawsk@redhat.com> - 1.16.0-1
|
||||
- Rebase to upstream 1.16.0 release [bz#2066826]
|
||||
- Resolves: bz#2066826
|
||||
|
||||
Loading…
Reference in New Issue
Block a user