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

Commit 0abf194c authored by Chung-Kai (Michael) Mei's avatar Chung-Kai (Michael) Mei Committed by Automerger Merge Worker
Browse files

Merge "libmodprobe: check blockedlist if load failed" am: 64e65115 am: cc2394b8 

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



Change-Id: If373bc622a14f40b2e490bb2d634e2dec18d656b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f7b08b9 cc2394b8

libmodprobe/libmodprobe.cpp

+15 −5
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ bool Modprobe::IsBlocklisted(const std::string& module_name) { 
// until all modules are loaded.

bool Modprobe::LoadModulesParallel(int num_threads) {

    bool ret = true;

    int count = -1;

    std::map<std::string, std::set<std::string>> mod_with_deps;



    // Get dependencies
@@ -471,18 +472,21 @@ bool Modprobe::LoadModulesParallel(int num_threads) { 
        }

    }



    while (!mod_with_deps.empty()) {

    while (!mod_with_deps.empty() &&  count != module_loaded_.size()) {

        std::vector<std::thread> threads;

        std::vector<std::string> mods_path_to_load;

        std::mutex vector_lock;

        count = module_loaded_.size();



        // Find independent modules

        for (const auto& [it_mod, it_dep] : mod_with_deps) {

            if (it_dep.size() == 1) {

                if (module_options_[it_mod].find("load_sequential=1") != std::string::npos) {

                    LoadWithAliases(it_mod, true);

                    if (!LoadWithAliases(it_mod, true) && !IsBlocklisted(it_mod)) {

                      return false;

                    }

                } else {

                    mods_path_to_load.emplace_back(*(it_dep.begin()));

                    mods_path_to_load.emplace_back(it_mod);

                }

            }

        }
@@ -491,12 +495,16 @@ bool Modprobe::LoadModulesParallel(int num_threads) { 
        auto thread_function = [&] {

            std::unique_lock lk(vector_lock);

            while (!mods_path_to_load.empty()) {

                auto mod_path_to_load = std::move(mods_path_to_load.back());

                auto ret_load = true;

                auto mod_to_load = std::move(mods_path_to_load.back());

                mods_path_to_load.pop_back();



                lk.unlock();

                ret &= Insmod(mod_path_to_load, "");

                ret_load &= LoadWithAliases(mod_to_load, true);

                lk.lock();

                if (!ret_load && !IsBlocklisted(mod_to_load)) {

                    ret &= ret_load;

                }

            }

        };
@@ -508,6 +516,8 @@ bool Modprobe::LoadModulesParallel(int num_threads) { 
            thread.join();

        }



        if (!ret) return ret;



        std::lock_guard guard(module_loaded_lock_);

        // Remove loaded module form mod_with_deps and soft dependencies of other modules

        for (const auto& module_loaded : module_loaded_) {