commit 9bcd24560f4732c087087c2f88e0d6ca91103607
author Chung-Kai (Michael) Mei <chungkai@google.com> Wed Mar 26 01:55:44 2025 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Mar 26 18:56:23 2025 -0700
tree b1f2b8313179cc0aa9f945b627277717c5063256
parent eca42322ad2b1a9ed9920c90e579f484667829d3

Revert "Parallel Module Loading: Add performance mode"

Revert submission 3556468

Reason for revert: stability issue

Reverted changes: /q/submissionid:3556468

Bug: 406160196
(cherry picked from https://android-review.googlesource.com/q/commit:0f62f623fb06724ad8792eac99651f670b1fa7d3)
Merged-In: I5566ccde4003b674bad51d4f8f449090fb890f67
Change-Id: I5566ccde4003b674bad51d4f8f449090fb890f67

init/first_stage_init.cpp

diff --git a/init/first_stage_init.cpp b/init/first_stage_init.cpp
index 6b0bd13..68c0f52 100644
--- a/init/first_stage_init.cpp
+++ b/init/first_stage_init.cpp
@@ -442,9 +442,6 @@
     if (bootconfig.find("androidboot.load_modules_parallel = \"true\"")
         != std::string::npos)
         want_parallel_mode = Modprobe::LoadParallelMode::NORMAL;
-    else if (bootconfig.find("androidboot.load_modules_parallel_mode = \"performance\"")
-        != std::string::npos)
-        want_parallel_mode = Modprobe::LoadParallelMode::PERFORMANCE;
 
     boot_clock::time_point module_start_time = boot_clock::now();
     int module_count = 0;

libmodprobe/include/modprobe/modprobe.h

diff --git a/libmodprobe/include/modprobe/modprobe.h b/libmodprobe/include/modprobe/modprobe.h
index 2d5145c..de9dcd2 100644
--- a/libmodprobe/include/modprobe/modprobe.h
+++ b/libmodprobe/include/modprobe/modprobe.h
@@ -31,7 +31,6 @@
     enum LoadParallelMode {
       NONE = 0,
       NORMAL,
-      PERFORMANCE,
     };
 
     Modprobe(const std::vector<std::string>&, const std::string load_file = "modules.load",

libmodprobe/libmodprobe.cpp

diff --git a/libmodprobe/libmodprobe.cpp b/libmodprobe/libmodprobe.cpp
index 5f3419d..1b524e9 100644
--- a/libmodprobe/libmodprobe.cpp
+++ b/libmodprobe/libmodprobe.cpp
@@ -546,9 +546,7 @@
             if (sequential_modules.empty() && parallel_modules.empty()) {
                 sleeping_threads++;
 
-                if (mode == LoadParallelMode::PERFORMANCE)
-                    cv_update_module.notify_one();
-                else if (mode == LoadParallelMode::NORMAL && sleeping_threads == num_threads)
+                if (mode == LoadParallelMode::NORMAL && sleeping_threads == num_threads)
                     cv_update_module.notify_one();
 
                 cv_load_module.wait(lock, [&](){