Merge "[vold] pass along sysfs name in setOptions" into sc-dev
diff --git a/Process.cpp b/Process.cpp
index 79fe15d..c1d55ee 100644
--- a/Process.cpp
+++ b/Process.cpp
@@ -175,7 +175,15 @@
}
if (signal != 0) {
for (const auto& pid : pids) {
- LOG(WARNING) << "Sending " << strsignal(signal) << " to " << pid;
+ std::string comm;
+ android::base::ReadFileToString(StringPrintf("/proc/%d/comm", pid), &comm);
+ comm = android::base::Trim(comm);
+
+ std::string exe;
+ android::base::Readlink(StringPrintf("/proc/%d/exe", pid), &exe);
+
+ LOG(WARNING) << "Sending " << strsignal(signal) << " to pid " << pid << " (" << comm
+ << ", " << exe << ")";
kill(pid, signal);
}
}
diff --git a/cryptfs.cpp b/cryptfs.cpp
index 5764b5d..91235d2 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -256,8 +256,6 @@
struct crypt_persist_entry persist_entry[0];
};
-static int wait_and_unmount(const char* mountpoint, bool kill);
-
typedef int (*kdf_func)(const char* passwd, const unsigned char* salt, unsigned char* ikey,
void* params);
@@ -1515,7 +1513,7 @@
}
}
-static int wait_and_unmount(const char* mountpoint, bool kill) {
+static int wait_and_unmount(const char* mountpoint) {
int i, err, rc;
// Subdirectory mount will cause a failure of umount.
@@ -1537,15 +1535,19 @@
err = errno;
- /* If allowed, be increasingly aggressive before the last two retries */
- if (kill) {
- if (i == (WAIT_UNMOUNT_COUNT - 3)) {
- SLOGW("sending SIGHUP to processes with open files\n");
- android::vold::KillProcessesWithOpenFiles(mountpoint, SIGTERM);
- } else if (i == (WAIT_UNMOUNT_COUNT - 2)) {
- SLOGW("sending SIGKILL to processes with open files\n");
- android::vold::KillProcessesWithOpenFiles(mountpoint, SIGKILL);
- }
+ // If it's taking too long, kill the processes with open files.
+ //
+ // Originally this logic was only a fail-safe, but now it's relied on to
+ // kill certain processes that aren't stopped by init because they
+ // aren't in the main or late_start classes. So to avoid waiting for
+ // too long, we now are fairly aggressive in starting to kill processes.
+ static_assert(WAIT_UNMOUNT_COUNT >= 4);
+ if (i == 2) {
+ SLOGW("sending SIGTERM to processes with open files\n");
+ android::vold::KillProcessesWithOpenFiles(mountpoint, SIGTERM);
+ } else if (i >= 3) {
+ SLOGW("sending SIGKILL to processes with open files\n");
+ android::vold::KillProcessesWithOpenFiles(mountpoint, SIGKILL);
}
sleep(1);
@@ -1679,7 +1681,7 @@
return -1;
}
- if (!(rc = wait_and_unmount(DATA_MNT_POINT, true))) {
+ if (!(rc = wait_and_unmount(DATA_MNT_POINT))) {
/* If ro.crypto.readonly is set to 1, mount the decrypted
* filesystem readonly. This is used when /data is mounted by
* recovery mode.
@@ -2238,7 +2240,7 @@
* /data, set a property saying we're doing inplace encryption,
* and restart the framework.
*/
- wait_and_unmount(DATA_MNT_POINT, true);
+ wait_and_unmount(DATA_MNT_POINT);
if (fs_mgr_do_tmpfs_mount(DATA_MNT_POINT)) {
goto error_shutting_down;
}