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

Merge changes from topic "modprobe-pgsize-fix" into main

Browse source 
* changes:
  toolbox/modprobe: Filter module directories based on kernel page size
  Revert "Load modules from _16K dir when running on 16K kernel"
This commit is contained in:
Will Deacon 2024-06-06 15:09:26 +00:00 committed by Gerrit Code Review
commit 0cb931b1ce
1 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
toolbox/modprobe.cpp
View file

@ -15,9 +15,9 @@
*/
#include <ctype.h>
#include <fcntl.h>
#include <getopt.h>
#include <stdlib.h>
#include <unistd.h>
#include <string>
@ -28,7 +28,6 @@
#include <modprobe/modprobe.h>
#include <sys/utsname.h>
#include <unistd.h>
namespace {
@ -87,6 +86,20 @@ void MyLogger(android::base::LogId id, android::base::LogSeverity severity, cons
}
}
static bool ModDirMatchesKernelPageSize(const char* mod_dir) {
static const unsigned int kernel_pgsize_kb = getpagesize() / 1024;
const char* mod_sfx = strrchr(mod_dir, '_');
unsigned int mod_pgsize_kb;
int mod_sfx_len;
if (mod_sfx == NULL || sscanf(mod_sfx, "_%uk%n", &mod_pgsize_kb, &mod_sfx_len) != 1 ||
strlen(mod_sfx) != mod_sfx_len) {
mod_pgsize_kb = 4;
}
return kernel_pgsize_kb == mod_pgsize_kb;
}
// Find directories in format of "/lib/modules/x.y.z-*".
static int KernelVersionNameFilter(const dirent* de) {
unsigned int major, minor;
@ -102,16 +115,11 @@ static int KernelVersionNameFilter(const dirent* de) {
}
if (android::base::StartsWith(de->d_name, kernel_version)) {
return 1;
return ModDirMatchesKernelPageSize(de->d_name);
}
return 0;
}
std::string GetPageSizeSuffix() {
static const size_t page_size = sysconf(_SC_PAGE_SIZE);
return android::base::StringPrintf("_%zuk", page_size / 1024);
}
} // anonymous namespace
extern "C" int modprobe_main(int argc, char** argv) {
@ -240,19 +248,6 @@ extern "C" int modprobe_main(int argc, char** argv) {
// Allow modules to be directly inside /lib/modules
mod_dirs.emplace_back(LIB_MODULES_PREFIX);
}
if (getpagesize() != 4096) {
struct utsname uts {};
if (uname(&uts)) {
PLOG(FATAL) << "Failed to get kernel version";
}
const auto module_dir = android::base::StringPrintf("/lib/modules/%s%s", uts.release,
GetPageSizeSuffix().c_str());
struct stat st {};
if (stat(module_dir.c_str(), &st) == 0 && S_ISDIR(st.st_mode)) {
mod_dirs.clear();
mod_dirs.emplace_back(module_dir);
}
}
LOG(DEBUG) << "mode is " << mode;
LOG(DEBUG) << "mod_dirs is: " << android::base::Join(mod_dirs, " ");