leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86, efi: Break up large initrd reads

Browse Source 
The efi boot stub tries to read the entire initrd in 1 go, however
some efi implementations hang if too much if asked to read too much
data at the same time. After some experimentation I found out that my
asrock p67 board will hang if asked to read chunks of 4MiB, so use a
safe value.

elilo reads in chunks of 16KiB, but since that requires many read
calls I use a value of 1 MiB.  hpa suggested adding individual
blacklists for when systems are found where this value causes a crash.

Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
Link: http://lkml.kernel.org/r/4EEB3A02.3090201@gmail.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
Maarten Lankhorst 2011-12-16 13:30:58 +01:00 committed by H. Peter Anvin
parent 291f36325f
commit 2d2da60fb4
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/x86/boot/compressed/eboot.c
View File

@ -643,14 +643,22 @@ grow:
u64 size; u64 size;
size = initrds[j].size; size = initrds[j].size;
status = efi_call_phys3(fh->read, initrds[j].handle, while (size) {
&size, addr); u64 chunksize;
if (status != EFI_SUCCESS) if (size > EFI_READ_CHUNK_SIZE)
goto free_initrd_total; chunksize = EFI_READ_CHUNK_SIZE;
else
chunksize = size;
status = efi_call_phys3(fh->read,
initrds[j].handle,
&chunksize, addr);
if (status != EFI_SUCCESS)
goto free_initrd_total;
addr += chunksize;
size -= chunksize;
}
efi_call_phys1(fh->close, initrds[j].handle); efi_call_phys1(fh->close, initrds[j].handle);
addr += size;
} }
} }

1
arch/x86/boot/compressed/eboot.h
View File

@ -12,6 +12,7 @@
#define DESC_TYPE_CODE_DATA (1 << 0) #define DESC_TYPE_CODE_DATA (1 << 0)
#define EFI_PAGE_SIZE (1UL << EFI_PAGE_SHIFT) #define EFI_PAGE_SIZE (1UL << EFI_PAGE_SHIFT)
#define EFI_READ_CHUNK_SIZE (1024 * 1024)
#define PIXEL_RGB_RESERVED_8BIT_PER_COLOR 0 #define PIXEL_RGB_RESERVED_8BIT_PER_COLOR 0
#define PIXEL_BGR_RESERVED_8BIT_PER_COLOR 1 #define PIXEL_BGR_RESERVED_8BIT_PER_COLOR 1