github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-05-08 16:36:58 +00:00
Code Issues Projects Releases Wiki Activity

dm: bzimage: dynamically adapt to ramdisk size

Browse Source 
To remove the limit of 4MB ramdisk size simply adjust layout
dynamically according to ramdisk size rounded up to a 4K boundary.
This enables ramdisk based virtual machines which tend to have
large ramdisk memory requirements (128MB and above).

Tracked-On: #4840
Signed-off-by: Helmut Buchsbaum <helmut.buchsbaum@opensource.tttech-industrial.com>
This commit is contained in:
Helmut Buchsbaum 2020-01-21 13:57:33 +01:00 committed by wenlingz
parent d03df0c7e2
commit ccbabb4ce8
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
devicemodel/core/sw_load_bzimage.c
View File

@ -50,9 +50,9 @@
* +-----------------------------------------------------+
* | ... |
* +-----------------------------------------------------+
* | offset: lowmem - 4MB - 2K (kernel gdt) |
* | offset: lowmem - RAMDISK_LOAD_SIZE - 2K (kernel gdt)|
* +-----------------------------------------------------+
* | offset: lowmem - 4MB (ramdisk image) |
* | offset: lowmem - RAMDISK_LOAD_SIZE (ramdisk image) |
* +-----------------------------------------------------+
* | offset: lowmem - 8K (bootargs) |
* +-----------------------------------------------------+
@ -63,8 +63,10 @@
*/
/* Check default e820 table in sw_load_common.c for info about ctx->lowmem */
#define GDT_LOAD_OFF(ctx) (ctx->lowmem - 4*MB - 2* KB)
#define RAMDISK_LOAD_OFF(ctx) (ctx->lowmem - 4*MB)
/* use ramdisk size for ramdisk load offset, leave 8KB room for bootargs */
#define RAMDISK_LOAD_SIZE roundup2(ramdisk_size + 8*KB, 4*KB)
#define GDT_LOAD_OFF(ctx) (ctx->lowmem - RAMDISK_LOAD_SIZE - 2*KB)
#define RAMDISK_LOAD_OFF(ctx) (ctx->lowmem - RAMDISK_LOAD_SIZE)
#define BOOTARGS_LOAD_OFF(ctx) (ctx->lowmem - 8*KB)
#define KERNEL_ENTRY_OFF(ctx) (ctx->lowmem - 6*KB)
#define ZEROPAGE_LOAD_OFF(ctx) (ctx->lowmem - 4*KB)
@ -183,10 +185,12 @@ acrn_prepare_ramdisk(struct vmctx *ctx)
return -1;
}
if (len > (BOOTARGS_LOAD_OFF(ctx) - RAMDISK_LOAD_OFF(ctx))) {
/* make sure there is enough room for the theoretical maximum ramdisk
* size (kernel size is not yet available)
*/
if (ctx->lowmem <= (RAMDISK_LOAD_SIZE + 2*KB + KERNEL_LOAD_OFF(ctx))) {
pr_err("SW_LOAD ERR: the size of ramdisk file is too big"
" file len=0x%lx, limit is 0x%lx\n", len,
BOOTARGS_LOAD_OFF(ctx) - RAMDISK_LOAD_OFF(ctx));
" file len=0x%lx\n", len);
fclose(fp);
return -1;
}