コミット: 35a700179b56c2c110c4626e19536bcd3342589a - system-core (git)

system/core

コミットメタ情報

• リビジョン: 35a700179b56c2c110c4626e19536bcd3342589a (tree)
• 日時: 2019-12-17 14:24:56
• 作者: Michael Goffioul <michael.goffioul@linc...>
• コミッター: Chih-Wei Huang

ログメッセージ

ueventd: auto load modules on uevents

変更サマリ

• modified: init/modalias_handler.cpp
• modified: init/modalias_handler.h
• modified: rootdir/ueventd.rc

差分

--- a/init/modalias_handler.cpp
+++ b/init/modalias_handler.cpp
@@ -18,6 +18,8 @@
 
 #include <fnmatch.h>
 #include <sys/syscall.h>
+#include <sys/utsname.h>
+#include <unistd.h>
 
 #include <algorithm>
 #include <functional>
@@ -33,6 +35,13 @@
 namespace android {
 namespace init {
 
+static const std::string base_paths[] = {
+    "/system/lib/modules/",
+    "/vendor/lib/modules/",
+    "/lib/modules/",
+    "/odm/lib/modules/",
+};
+
 Result<Success> ModaliasHandler::ParseDepCallback(std::vector<std::string>&& args) {
     std::vector<std::string> deps;
 
@@ -83,26 +92,60 @@ Result<Success> ModaliasHandler::ParseAliasCallback(std::vector<std::string>&& a
 ModaliasHandler::ModaliasHandler() {
     using namespace std::placeholders;
 
-    static const std::string base_paths[] = {
-            "/vendor/lib/modules/",
-            "/lib/modules/",
-            "/odm/lib/modules/",
-    };
+    struct utsname uts;
+    uname(&uts);
+    release_ = uts.release;
 
     Parser alias_parser;
     auto alias_callback = std::bind(&ModaliasHandler::ParseAliasCallback, this, _1);
     alias_parser.AddSingleLineParser("alias", alias_callback);
-    for (const auto& base_path : base_paths) alias_parser.ParseConfig(base_path + "modules.alias");
+    for (const auto& base_path : base_paths) {
+        alias_parser.ParseConfig(base_path + release_ + "/modules.alias");
+        alias_parser.ParseConfig(base_path + "modules.alias");
+    }
 
     Parser dep_parser;
     auto dep_callback = std::bind(&ModaliasHandler::ParseDepCallback, this, _1);
     dep_parser.AddSingleLineParser("", dep_callback);
-    for (const auto& base_path : base_paths) dep_parser.ParseConfig(base_path + "modules.dep");
+    for (const auto& base_path : base_paths) {
+        dep_parser.ParseConfig(base_path + release_ + "/modules.dep");
+        dep_parser.ParseConfig(base_path + "modules.dep");
+    }
+
+    auto blacklist_callback = [] (auto args, std::set<std::string>* v_) -> Result<Success> {
+        if (args.size() < 2) {
+            return Error() << "blacklist/deferred lines must have 2 entries";
+        }
+
+        v_->emplace(args[1]);
+        return Success();
+    };
+    Parser blacklist_parser;
+    blacklist_parser.AddSingleLineParser("blacklist", std::bind(blacklist_callback, _1, &this->modules_to_blacklist_));
+    blacklist_parser.AddSingleLineParser("deferred", std::bind(blacklist_callback, _1, &this->modules_to_defer_));
+    blacklist_parser.ParseConfig("/system/etc/modules.blacklist");
+}
+
+std::string ModaliasHandler::GetModulePath(const std::string& path_name) {
+    if (path_name[0] != '/') {
+        std::string module_path_name;
+        for (const auto& base_path : base_paths) {
+            module_path_name = base_path + release_ + "/" + path_name;
+            if (access(module_path_name.c_str(), F_OK) == 0) {
+                return module_path_name;
+            }
+            module_path_name = base_path + path_name;
+            if (access(module_path_name.c_str(), F_OK) == 0) {
+                return module_path_name;
+            }
+        }
+    }
+    return path_name;
 }
 
 Result<Success> ModaliasHandler::Insmod(const std::string& path_name, const std::string& args) {
     base::unique_fd fd(
-            TEMP_FAILURE_RETRY(open(path_name.c_str(), O_RDONLY | O_NOFOLLOW | O_CLOEXEC)));
+            TEMP_FAILURE_RETRY(open(GetModulePath(path_name).c_str(), O_RDONLY | O_NOFOLLOW | O_CLOEXEC)));
     if (fd == -1) return ErrnoError() << "Could not open module '" << path_name << "'";
 
     int ret = syscall(__NR_finit_module, fd.get(), args.c_str(), 0);
@@ -145,6 +188,17 @@ void ModaliasHandler::HandleUevent(const Uevent& uevent) {
     for (const auto& [alias, module] : module_aliases_) {
         if (fnmatch(alias.c_str(), uevent.modalias.c_str(), 0) != 0) continue;  // Keep looking
 
+        if (modules_to_blacklist_.find(module) != modules_to_blacklist_.end()) {
+            // skip blacklisted module
+            continue;
+        }
+
+        if (modules_to_defer_.find(module) != modules_to_defer_.end()) {
+            // defer module load until cold boot phase is done
+            deferred_modules_.emplace(module);
+            continue;
+        }
+
         LOG(DEBUG) << "Loading kernel module '" << module << "' for alias '" << uevent.modalias
                    << "'";
 
@@ -155,9 +209,19 @@ void ModaliasHandler::HandleUevent(const Uevent& uevent) {
         }
 
         // loading was successful
-        return;
     }
 }
 
+void ModaliasHandler::ColdbootDone() {
+    for (const auto& module : deferred_modules_) {
+        LOG(INFO) << "Loading kernel module '" << module << "' [deferred]";
+        if (auto result = InsmodWithDeps(module, ""); !result) {
+            LOG(ERROR) << "Cannot load module: " << result.error();
+        }
+    }
+    modules_to_defer_.clear();
+    deferred_modules_.clear();
+}
+
 }  // namespace init
 }  // namespace android

--- a/init/modalias_handler.h
+++ b/init/modalias_handler.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <set>
 #include <string>
 #include <unordered_map>
 #include <vector>
@@ -33,6 +34,7 @@ class ModaliasHandler : public UeventHandler {
     virtual ~ModaliasHandler() = default;
 
     void HandleUevent(const Uevent& uevent) override;
+    void ColdbootDone() override;
 
   private:
     Result<Success> InsmodWithDeps(const std::string& module_name, const std::string& args);
@@ -41,8 +43,15 @@ class ModaliasHandler : public UeventHandler {
     Result<Success> ParseDepCallback(std::vector<std::string>&& args);
     Result<Success> ParseAliasCallback(std::vector<std::string>&& args);
 
+    std::string GetModulePath(const std::string& path_name);
+
     std::vector<std::pair<std::string, std::string>> module_aliases_;
     std::unordered_map<std::string, std::vector<std::string>> module_deps_;
+    std::set<std::string> modules_to_defer_;
+    std::set<std::string> modules_to_blacklist_;
+    std::set<std::string> deferred_modules_;
+
+    std::string release_;
 };
 
 }  // namespace init

--- a/rootdir/ueventd.rc
+++ b/rootdir/ueventd.rc
@@ -1,4 +1,5 @@
 firmware_directories /system/lib/firmware
+modalias_handling enabled
 uevent_socket_rcvbuf_size 16M
 
 subsystem graphics