Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9963d9fd authored by Will Deacon's avatar Will Deacon Committed by Automerger Merge Worker
Browse files

Merge changes from topic "modprobe-pgsize-fix" into main am: 0cb931b1 am: e8d6ed05 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3110063



Change-Id: I1d2e30a5d6fd96f26fda48a8a0502a499ea0d3a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 93bc0eb1 e8d6ed05

toolbox/modprobe.cpp

+16 −21
Original line number Original line Diff line number Diff line
@@ -15,9 +15,9 @@ 
 */

 */





#include <ctype.h>

#include <ctype.h>

#include <fcntl.h>

#include <getopt.h>

#include <getopt.h>

#include <stdlib.h>

#include <stdlib.h>

#include <unistd.h>





#include <string>

#include <string>
@@ -28,7 +28,6 @@ 
#include <modprobe/modprobe.h>

#include <modprobe/modprobe.h>





#include <sys/utsname.h>

#include <sys/utsname.h>

#include <unistd.h>





namespace {

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-*".

// Find directories in format of "/lib/modules/x.y.z-*".

static int KernelVersionNameFilter(const dirent* de) {

static int KernelVersionNameFilter(const dirent* de) {

    unsigned int major, minor;

    unsigned int major, minor;
@@ -102,16 +115,11 @@ static int KernelVersionNameFilter(const dirent* de) { 
    }

    }





    if (android::base::StartsWith(de->d_name, kernel_version)) {

    if (android::base::StartsWith(de->d_name, kernel_version)) {

        return 1;

        return ModDirMatchesKernelPageSize(de->d_name);

    }

    }

    return 0;

    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

}  // anonymous namespace





extern "C" int modprobe_main(int argc, char** argv) {

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

        // Allow modules to be directly inside /lib/modules

        mod_dirs.emplace_back(LIB_MODULES_PREFIX);

        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) << "mode is " << mode;

    LOG(DEBUG) << "mod_dirs is: " << android::base::Join(mod_dirs, " ");

    LOG(DEBUG) << "mod_dirs is: " << android::base::Join(mod_dirs, " ");