Revert "init: poll in first stage mount if required devices are not found"
Bug: 62864413
This reverts commit 5f4e8eac8a0db87a43ed7a930103f4241c22d479.
Change-Id: I6f35b920bb52875c8ef430d3e20b205fda5165e8
diff --git a/init/devices.cpp b/init/devices.cpp
index 6f86662..27a20a4 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -19,7 +19,6 @@
#include <fcntl.h>
#include <fnmatch.h>
#include <libgen.h>
-#include <poll.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
@@ -1029,37 +1028,6 @@
selinux_status_close();
}
-void device_poll(const coldboot_callback& callback,
- const std::optional<std::chrono::milliseconds> relative_timeout) {
- using namespace std::chrono;
-
- pollfd ufd;
- ufd.events = POLLIN;
- ufd.fd = device_fd;
-
- auto start_time = steady_clock::now();
-
- while (true) {
- ufd.revents = 0;
-
- int timeout_ms = -1;
- if (relative_timeout) {
- auto now = steady_clock::now();
- auto time_elapsed = duration_cast<milliseconds>(now - start_time);
- if (time_elapsed > *relative_timeout) return;
-
- auto remaining_timeout = *relative_timeout - time_elapsed;
- timeout_ms = remaining_timeout.count();
- }
-
- int nr = poll(&ufd, 1, timeout_ms);
- if (nr == 0) return;
- if (nr < 0) {
- continue;
- }
- if (ufd.revents & POLLIN) {
- auto ret = handle_device_fd(callback);
- if (should_stop_coldboot(ret)) return;
- }
- }
+int get_device_fd() {
+ return device_fd;
}
diff --git a/init/devices.h b/init/devices.h
index 62aef2e..3f2cde4 100644
--- a/init/devices.h
+++ b/init/devices.h
@@ -17,11 +17,8 @@
#ifndef _INIT_DEVICES_H
#define _INIT_DEVICES_H
-#include <sys/stat.h>
-
-#include <chrono>
#include <functional>
-#include <optional>
+#include <sys/stat.h>
enum coldboot_action_t {
// coldboot continues without creating the device for the uevent
@@ -56,10 +53,8 @@
mode_t perm, unsigned int uid,
unsigned int gid, unsigned short prefix,
unsigned short wildcard);
+int get_device_fd();
char** get_block_device_symlinks(struct uevent* uevent);
-void device_poll(const coldboot_callback& callback = nullptr,
- const std::optional<std::chrono::milliseconds> relative_timeout = {});
-
#endif /* _INIT_DEVICES_H */
diff --git a/init/init_first_stage.cpp b/init/init_first_stage.cpp
index 9425027..60ce6e9 100644
--- a/init/init_first_stage.cpp
+++ b/init/init_first_stage.cpp
@@ -19,7 +19,6 @@
#include <stdlib.h>
#include <unistd.h>
-#include <chrono>
#include <memory>
#include <set>
#include <string>
@@ -34,8 +33,6 @@
#include "fs_mgr_avb.h"
#include "util.h"
-using namespace std::chrono_literals;
-
// Class Declarations
// ------------------
class FirstStageMount {
@@ -50,8 +47,8 @@
bool InitDevices();
protected:
- bool InitRequiredDevices();
- bool InitVerityDevice(const std::string& verity_device);
+ void InitRequiredDevices();
+ void InitVerityDevice(const std::string& verity_device);
bool MountPartitions();
virtual coldboot_action_t ColdbootCallback(uevent* uevent);
@@ -142,53 +139,42 @@
return true;
}
-bool FirstStageMount::InitDevices() { return GetRequiredDevices() && InitRequiredDevices(); }
+bool FirstStageMount::InitDevices() {
+ if (!GetRequiredDevices()) return false;
+
+ InitRequiredDevices();
+
+ // InitRequiredDevices() will remove found partitions from required_devices_partition_names_.
+ // So if it isn't empty here, it means some partitions are not found.
+ if (!required_devices_partition_names_.empty()) {
+ LOG(ERROR) << __FUNCTION__ << "(): partition(s) not found: "
+ << android::base::Join(required_devices_partition_names_, ", ");
+ return false;
+ } else {
+ return true;
+ }
+}
// Creates devices with uevent->partition_name matching one in the member variable
// required_devices_partition_names_. Found partitions will then be removed from it
// for the subsequent member function to check which devices are NOT created.
-bool FirstStageMount::InitRequiredDevices() {
+void FirstStageMount::InitRequiredDevices() {
if (required_devices_partition_names_.empty()) {
- return true;
+ return;
}
if (need_dm_verity_) {
const std::string dm_path = "/devices/virtual/misc/device-mapper";
- bool found = false;
- auto dm_callback = [&dm_path, &found](uevent* uevent) -> coldboot_action_t {
- if (uevent->path && uevent->path == dm_path) {
- found = true;
- return COLDBOOT_STOP;
- }
+ device_init(("/sys" + dm_path).c_str(), [&dm_path](uevent* uevent) -> coldboot_action_t {
+ if (uevent->path && uevent->path == dm_path) return COLDBOOT_STOP;
return COLDBOOT_CONTINUE; // dm_path not found, continue to find it.
- };
- device_init(("/sys" + dm_path).c_str(), dm_callback);
- if (!found) {
- device_poll(dm_callback, 10s);
- }
- if (!found) {
- LOG(ERROR) << "device-mapper device not found";
- return false;
- }
+ });
}
- auto uevent_callback = [this](uevent* uevent) -> coldboot_action_t {
- return ColdbootCallback(uevent);
- };
-
- device_init(nullptr, uevent_callback);
- if (!required_devices_partition_names_.empty()) {
- device_poll(uevent_callback, 10s);
- }
-
- if (!required_devices_partition_names_.empty()) {
- LOG(ERROR) << __PRETTY_FUNCTION__ << ": partition(s) not found: "
- << android::base::Join(required_devices_partition_names_, ", ");
- return false;
- }
+ device_init(nullptr,
+ [this](uevent* uevent) -> coldboot_action_t { return ColdbootCallback(uevent); });
device_close();
- return true;
}
coldboot_action_t FirstStageMount::ColdbootCallback(uevent* uevent) {
@@ -217,30 +203,18 @@
}
// Creates "/dev/block/dm-XX" for dm-verity by running coldboot on /sys/block/dm-XX.
-bool FirstStageMount::InitVerityDevice(const std::string& verity_device) {
+void FirstStageMount::InitVerityDevice(const std::string& verity_device) {
const std::string device_name(basename(verity_device.c_str()));
const std::string syspath = "/sys/block/" + device_name;
- bool found = false;
- auto verity_callback = [&](uevent* uevent) -> coldboot_action_t {
+ device_init(syspath.c_str(), [&](uevent* uevent) -> coldboot_action_t {
if (uevent->device_name && uevent->device_name == device_name) {
LOG(VERBOSE) << "Creating dm-verity device : " << verity_device;
- found = true;
return COLDBOOT_STOP;
}
return COLDBOOT_CONTINUE;
- };
-
- device_init(syspath.c_str(), verity_callback);
- if (!found) {
- device_poll(verity_callback, 10s);
- }
- if (!found) {
- LOG(ERROR) << "dm-verity device not found";
- return false;
- }
+ });
device_close();
- return true;
}
bool FirstStageMount::MountPartitions() {
@@ -306,7 +280,7 @@
} else if (ret == FS_MGR_SETUP_VERITY_SUCCESS) {
// The exact block device name (fstab_rec->blk_device) is changed to "/dev/block/dm-XX".
// Needs to create it because ueventd isn't started in init first stage.
- return InitVerityDevice(fstab_rec->blk_device);
+ InitVerityDevice(fstab_rec->blk_device);
} else {
return false;
}
diff --git a/init/ueventd.cpp b/init/ueventd.cpp
index d0b7b8e..f27be64 100644
--- a/init/ueventd.cpp
+++ b/init/ueventd.cpp
@@ -17,6 +17,7 @@
#include <ctype.h>
#include <fcntl.h>
#include <grp.h>
+#include <poll.h>
#include <pwd.h>
#include <signal.h>
#include <stdio.h>
@@ -75,7 +76,20 @@
device_init();
- device_poll();
+ pollfd ufd;
+ ufd.events = POLLIN;
+ ufd.fd = get_device_fd();
+
+ while (true) {
+ ufd.revents = 0;
+ int nr = poll(&ufd, 1, -1);
+ if (nr <= 0) {
+ continue;
+ }
+ if (ufd.revents & POLLIN) {
+ handle_device_fd();
+ }
+ }
return 0;
}