diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-01 23:21:59 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-01 23:21:59 +0000 |
commit | 6f2f6d887a06873c69b3d26d06f7267a6f956c14 (patch) | |
tree | 4964e882a090e3537f996c6f3f4087d18da60d41 | |
parent | 968a0969ebb0730b321030072efcf2c49200e25a (diff) | |
parent | 9ec3035667f606b7de388153951b861c271c3f7e (diff) | |
download | core-6f2f6d887a06873c69b3d26d06f7267a6f956c14.tar.gz |
Snap for 10594510 from 9ec3035667f606b7de388153951b861c271c3f7e to udc-qpr1-release
Change-Id: I8384ae13c85a5ff87c5bc3921ea66ec90b282308
-rw-r--r-- | trusty/storage/proxy/Android.bp | 1 | ||||
-rw-r--r-- | trusty/storage/proxy/proxy.c | 13 | ||||
-rw-r--r-- | trusty/storage/proxy/rpmb.c | 8 |
3 files changed, 22 insertions, 0 deletions
diff --git a/trusty/storage/proxy/Android.bp b/trusty/storage/proxy/Android.bp index 2e97ee0fe..e362b8b97 100644 --- a/trusty/storage/proxy/Android.bp +++ b/trusty/storage/proxy/Android.bp @@ -33,6 +33,7 @@ cc_binary { shared_libs: [ "libbase", + "libbinder_ndk", "libcutils", "liblog", "libhardware_legacy", diff --git a/trusty/storage/proxy/proxy.c b/trusty/storage/proxy/proxy.c index c89c5b6fd..67e935e39 100644 --- a/trusty/storage/proxy/proxy.c +++ b/trusty/storage/proxy/proxy.c @@ -24,6 +24,7 @@ #include <sys/stat.h> #include <unistd.h> +#include <android/binder_process.h> #include <cutils/android_filesystem_config.h> #include "checkpoint_handling.h" @@ -238,6 +239,18 @@ int main(int argc, char* argv[]) { /* parse arguments */ parse_args(argc, argv); + /* + * Start binder threadpool. At least one extra binder thread is needed to + * connect to the wakelock service without relying on polling. If we poll on + * the main thread we end up pausing for at least 1s even if the service + * starts faster. We set the max thread count to 0 because startThreadPool + * "Starts one thread, PLUS those requested in setThreadPoolMaxThreadCount, + * PLUS those manually requested in joinThreadPool." We only need a single + * binder thread to receive notifications on. + */ + ABinderProcess_setThreadPoolMaxThreadCount(0); + ABinderProcess_startThreadPool(); + /* initialize secure storage directory */ rc = storage_init(ss_data_root); if (rc < 0) return EXIT_FAILURE; diff --git a/trusty/storage/proxy/rpmb.c b/trusty/storage/proxy/rpmb.c index 22a85a72b..1f5d10796 100644 --- a/trusty/storage/proxy/rpmb.c +++ b/trusty/storage/proxy/rpmb.c @@ -399,6 +399,14 @@ static int send_ufs_rpmb_req(int sg_fd, const struct storage_rpmb_send_req* req, bool is_request_write = req->reliable_write_size > 0; + /* + * Internally this call connects to the suspend service, which will cause + * this service to start if not already running. If the binder thread pool + * has not been started at this point, this call will block and poll for the + * service every 1s. We need to make sure the thread pool is started to + * receive an async notification that the service is started to avoid + * blocking (see main). + */ wl_rc = acquire_wake_lock(PARTIAL_WAKE_LOCK, UFS_WAKE_LOCK_NAME); if (wl_rc < 0) { ALOGE("%s: failed to acquire wakelock: %d, %s\n", __func__, wl_rc, strerror(errno)); |