tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only skip _16k/_64k kernel modules dirs on 4K builds

Browse source 
The initramfs.img from kernel builds do not store kernel modules under
_16k directory. Currently, init is programmed to only load kernel
modules from _16k dir if running on 16K page size kernel. Relax this
restriction so that booting on custom 16K kernel would work without
going through platform rebuild.

Test: th
Bug: 293313353
Bug: 300184677

Change-Id: I9ee3c74066ad9ec5127f1e8662f7c1273445994c
This commit is contained in:
Kelvin Zhang 2023-09-21 15:52:19 -07:00
parent 81400915ef
commit b4987345ff
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
init/first_stage_init.cpp
View file

@ -239,8 +239,12 @@ bool LoadKernelModules(BootMode boot_mode, bool want_console, bool want_parallel
module_dirs.emplace_back(entry->d_name);
break;
}
// Ignore _16k/_64k module dirs on 4K kernels
if (GetPageSizeSuffix(entry->d_name) != page_size_suffix) {
// Is a directory does not have page size suffix, it does not mean this directory is for 4K
// kernels. Certain 16K kernel builds put all modules in /lib/modules/`uname -r` without any
// suffix. Therefore, only ignore a directory if it has _16k/_64k suffix and the suffix does
// not match system page size.
const auto dir_page_size_suffix = GetPageSizeSuffix(entry->d_name);
if (!dir_page_size_suffix.empty() && dir_page_size_suffix != page_size_suffix) {
continue;
}
int dir_major = 0, dir_minor = 0;