commit eca42322ad2b1a9ed9920c90e579f484667829d3
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:13 2025 -0700
tree 09d1a1b8819ea3817454b9a3b96edf258787427a
parent 157af3f59172866c3533bc6393e2506e7035acff

Revert "Parallel Module Loading: Add conservative 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:3a3df3dcaa4610428c9e04db2b2a1a4212eac7f4)
Merged-In: Ic3d2c950249ed745134761bb43cd3eeb5889b303
Change-Id: Ic3d2c950249ed745134761bb43cd3eeb5889b303

init/first_stage_init.cpp

diff --git a/init/first_stage_init.cpp b/init/first_stage_init.cpp
index 1405fff..6b0bd13 100644
--- a/init/first_stage_init.cpp
+++ b/init/first_stage_init.cpp
@@ -445,9 +445,6 @@
     else if (bootconfig.find("androidboot.load_modules_parallel_mode = \"performance\"")
         != std::string::npos)
         want_parallel_mode = Modprobe::LoadParallelMode::PERFORMANCE;
-    else if (bootconfig.find("androidboot.load_modules_parallel = \"conservative\"")
-        != std::string::npos)
-        want_parallel_mode = Modprobe::LoadParallelMode::CONSERVATIVE;
 
     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 55931b7..2d5145c 100644
--- a/libmodprobe/include/modprobe/modprobe.h
+++ b/libmodprobe/include/modprobe/modprobe.h
@@ -32,7 +32,6 @@
       NONE = 0,
       NORMAL,
       PERFORMANCE,
-      CONSERVATIVE,
     };
 
     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 c43ad96..5f3419d 100644
--- a/libmodprobe/libmodprobe.cpp
+++ b/libmodprobe/libmodprobe.cpp
@@ -548,7 +548,7 @@
 
                 if (mode == LoadParallelMode::PERFORMANCE)
                     cv_update_module.notify_one();
-                else if (sleeping_threads == num_threads)
+                else if (mode == LoadParallelMode::NORMAL && sleeping_threads == num_threads)
                     cv_update_module.notify_one();
 
                 cv_load_module.wait(lock, [&](){
@@ -603,10 +603,6 @@
                 else
                     parallel_modules.emplace_back(cnd_last);
             }
-
-            if (mode == LoadParallelMode::CONSERVATIVE &&
-                parallel_modules.size() >= num_threads)
-                break;
         }
 
         cv_load_module.notify_all();