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

Commit 52ce54d8 authored by William McVicker's avatar William McVicker Committed by Automerger Merge Worker
Browse files

Merge "toolbox/modprobe: update kernel version directory filter" into main am: afec9fd6 

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



Change-Id: Ie72d69a9c9aaf137d391e4db7734c9aa0642b7fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 987deca5 afec9fd6

toolbox/modprobe.cpp

+27 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include <android-base/file.h>

#include <android-base/logging.h>

#include <android-base/macros.h>

#include <android-base/strings.h>

#include <android-base/stringprintf.h>

#include <modprobe/modprobe.h>
@@ -87,6 +88,17 @@ 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;

    unsigned int mod_pgsize_kb = 16;  // 16k default since android15-6.6



    if (mod_dir && strstr(mod_dir, "-4k") != NULL) {

        mod_pgsize_kb = 4;

    }



    return kernel_pgsize_kb == mod_pgsize_kb;

}



static bool ModDirMatchesKernelPageSizeLegacy(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;
@@ -102,7 +114,7 @@ static bool ModDirMatchesKernelPageSize(const char* mod_dir) { 


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

static int KernelVersionNameFilter(const dirent* de) {

    unsigned int major, minor;

    static unsigned int major, minor;

    static std::string kernel_version;

    utsname uts;
@@ -115,7 +127,20 @@ static int KernelVersionNameFilter(const dirent* de) { 
    }



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

        // Check for GKI to avoid breaking non-GKI Android devices.

        if (UNLIKELY(strstr(de->d_name, "-android") == NULL)) {

            // For non-GKI, just match when the major and minor versions match.

            return 1;

        }



        // For android15-6.6 and later, GKI adds `-4k` to the UTS release

        // string to identify 4kb page size kernels. If there is no page size

        // suffix, then the kernel page size is 16kb.

        if (major > 6 || (major == 6 && minor >= 6)) {

            return ModDirMatchesKernelPageSize(de->d_name);

        } else {

            return ModDirMatchesKernelPageSizeLegacy(de->d_name);

        }

    }

    return 0;

}