tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix deadlock between vold and init

Browse source 
By setting property after listeners are initialized
we avoid deadlock between vold and init where
vold is waiting on property_service while init is blocked
(and therefore is not able to accept connections) on vdc
which is attempting to communicate with vold.

(This also speeds up boot by 250ms)

Test: Boot a device, check locks and make sure there is no timeout
      on property_set(.)
Test: Successfully boot a device with new property service protocol.
Bug: http://b/34278978
Change-Id: I9547d2f19cb35aa452bf01fbff0eb4b32a4824a4
This commit is contained in:
Dimitry Ivanov 2017-01-19 12:48:27 -08:00
parent 04c55e6ed7
commit c976e73bbd
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
main.cpp
View file

@ -39,7 +39,7 @@
#include <dirent.h> #include <dirent.h>
#include <fs_mgr.h> #include <fs_mgr.h>
static int process_config(VolumeManager *vm); static int process_config(VolumeManager *vm, bool* has_adoptable);
static void coldboot(const char *path); static void coldboot(const char *path);
static void parse_args(int argc, char** argv); static void parse_args(int argc, char** argv);
@ -106,7 +106,9 @@ int main(int argc, char** argv) {
exit(1); exit(1);
} }
if (process_config(vm)) { bool has_adoptable;
if (process_config(vm, &has_adoptable)) {
PLOG(ERROR) << "Error reading configuration... continuing anyways"; PLOG(ERROR) << "Error reading configuration... continuing anyways";
} }
@ -131,6 +133,10 @@ int main(int argc, char** argv) {
exit(1); exit(1);
} }
// This call should go after listeners are started to avoid
// a deadlock between vold and init (see b/34278978 for details)
property_set("vold.has_adoptable", has_adoptable ? "1" : "0");
// Eventually we'll become the monitoring thread // Eventually we'll become the monitoring thread
while(1) { while(1) {
sleep(1000); sleep(1000);
@ -207,7 +213,7 @@ static void coldboot(const char *path) {
} }
} }
static int process_config(VolumeManager *vm) { static int process_config(VolumeManager *vm, bool* has_adoptable) {
std::string path(android::vold::DefaultFstabPath()); std::string path(android::vold::DefaultFstabPath());
fstab = fs_mgr_read_fstab(path.c_str()); fstab = fs_mgr_read_fstab(path.c_str());
if (!fstab) { if (!fstab) {
@ -216,7 +222,7 @@ static int process_config(VolumeManager *vm) {
} }
/* Loop through entries looking for ones that vold manages */ /* Loop through entries looking for ones that vold manages */
bool has_adoptable = false; *has_adoptable = false;
for (int i = 0; i < fstab->num_entries; i++) { for (int i = 0; i < fstab->num_entries; i++) {
if (fs_mgr_is_voldmanaged(&fstab->recs[i])) { if (fs_mgr_is_voldmanaged(&fstab->recs[i])) {
if (fs_mgr_is_nonremovable(&fstab->recs[i])) { if (fs_mgr_is_nonremovable(&fstab->recs[i])) {
@ -230,7 +236,7 @@ static int process_config(VolumeManager *vm) {
if (fs_mgr_is_encryptable(&fstab->recs[i])) { if (fs_mgr_is_encryptable(&fstab->recs[i])) {
flags |= android::vold::Disk::Flags::kAdoptable; flags |= android::vold::Disk::Flags::kAdoptable;
has_adoptable = true; *has_adoptable = true;
} }
if (fs_mgr_is_noemulatedsd(&fstab->recs[i]) if (fs_mgr_is_noemulatedsd(&fstab->recs[i])
|| property_get_bool("vold.debug.default_primary", false)) { || property_get_bool("vold.debug.default_primary", false)) {
@ -241,6 +247,5 @@ static int process_config(VolumeManager *vm) {
new VolumeManager::DiskSource(sysPattern, nickname, flags))); new VolumeManager::DiskSource(sysPattern, nickname, flags)));
} }
} }
property_set("vold.has_adoptable", has_adoptable ? "1" : "0");
return 0; return 0;
} }