提交: 60d83effb0b17b7a25ea440d2e2c21ae64cffed8 - system-core (git)

system/core

Commit MetaInfo

• 修訂: 60d83effb0b17b7a25ea440d2e2c21ae64cffed8 (tree)
• 時間: 2017-12-26 19:43:34
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

init: add modprobe

We added the modprobe function to init before but it was dropped in
oreo-x86. Originally I planned to replace it by toybox's modprobe.
However, it doesn't work as expected. For example, the audio driver
is not loaded correctly in some Skylake devices.

To fix that, add back the modprobe function to init.

Change Summary

• modified: init/Android.mk
• modified: init/devices.cpp
• modified: init/init.cpp
• modified: init/ueventd.h

差異

--- a/init/Android.mk
+++ b/init/Android.mk
@@ -94,6 +94,7 @@ LOCAL_REQUIRED_MODULES := \
 
 # Create symlinks.
 LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \
+    ln -sf ../init $(TARGET_ROOT_OUT)/sbin/modprobe; \
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd
 

--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -31,6 +31,7 @@
 #include <private/android_filesystem_config.h>
 #include <selinux/android.h>
 #include <selinux/selinux.h>
+#include <cutils/klog.h>
 #include <cutils/probe_module.h>
 
 #include "ueventd.h"
@@ -521,5 +522,40 @@ DeviceHandler::DeviceHandler()
     : DeviceHandler(std::vector<Permissions>{}, std::vector<SysfsPermissions>{},
                     std::vector<Subsystem>{}, false) {}
 
+int modprobe_main(int argc, char **argv)
+{
+    // We only accept requests from root user (kernel)
+    if (getuid()) return -EPERM;
+
+    // Kernel will launch a user space program specified by
+    // /proc/sys/kernel/modprobe to load modules.
+    // No deferred loading in this case.
+    while (argc > 1 && (!strcmp(argv[1], "-q") || !strcmp(argv[1], "--"))) {
+        klog_set_level(KLOG_NOTICE_LEVEL);
+        argc--, argv++;
+    }
+
+    if (argc < 2) {
+        // it is called without enough arguments
+        return -EINVAL;
+    }
+
+    std::string options;
+    if (argc > 2) {
+        options = argv[2];
+        for (int i = 3; i < argc; ++i) {
+            options += ' ';
+            options += argv[i];
+        }
+    }
+    KLOG_NOTICE("modprobe", "%s %s", argv[1], options.c_str());
+
+    Uevent uevent = { .modalias = argv[1] };
+    DeviceHandler dh;
+    dh.ReadModulesDescFiles();
+    dh.OnColdBootDone();
+    return dh.LoadModule(uevent) || dh.LoadModule(uevent.modalias) ? 0 : -1;
+}
+
 }  // namespace init
 }  // namespace android

--- a/init/init.cpp
+++ b/init/init.cpp
@@ -995,6 +995,10 @@ static void InstallRebootSignalHandlers() {
 }
 
 int main(int argc, char** argv) {
+    if (!strcmp(basename(argv[0]), "modprobe")) {
+        return modprobe_main(argc, argv);
+    }
+
     if (!strcmp(basename(argv[0]), "ueventd")) {
         return ueventd_main(argc, argv);
     }

--- a/init/ueventd.h
+++ b/init/ueventd.h
@@ -21,6 +21,7 @@ namespace android {
 namespace init {
 
 int ueventd_main(int argc, char** argv);
+int modprobe_main(int argc, char **argv);
 
 }  // namespace init
 }  // namespace android