tag 20a16eaa6e1424e7cc5586a30494c60df1ecadc9
tagger The Android Open Source Project <initial-contribution@android.com> Mon Apr 10 14:34:10 2023 -0700
object 265864c35c0635942389128139fc1664015bb45f

Android 13.0.0 Release 40 (TQ2A.230405.003.B2)

commit 265864c35c0635942389128139fc1664015bb45f
author Robert Horvath <robhor@google.com> Thu Jun 30 17:00:39 2022 +0200
committer Kalesh Singh <kaleshsingh@google.com> Thu Aug 04 22:53:46 2022 +0000
tree a2874736b0a07aebd659afc55c2d5e9026caeedb
parent 5b5f6c92afa68a652b92f3fa9036b00b22f8ebb4

Ping client Binders without autosuspend lock held

This fixes a deadlock situation:
- system_server is calling acquire/releaseWakeLock on the system suspend
  HAL, but is blocked because mAutosuspendLock is currently held
- The system suspend HAL's autosuspend thread is holding the
  mAutosuspendLock, but blocked in pingBinder(). If system_server's
  Binder thread pool is exhausted and all Binder threads are waiting on
  the acquire/releaseWakeLock call to return.

This change introduces a new lock to protect the list of client tokens.
When checking client liveness by pinging the Binder tokens, the
mAutosuspendLock must not be held, to avoid the circular dependency
described above.

The lock ordering is mAutosuspendClientTokensLock > mAutosuspendLock,
ie. mAutosuspendClientTokensLock must be locked before mAutosuspendLock.

Bug: 241476033
Bug: 237496877
Bug: 241283953
Test: atest SystemSuspendV1_0UnitTest SystemSuspendV1_0AidlTest
Merged-In: Ia480d1f77d632d7c839a1012f5cd7e7555130406
Change-Id: Ia480d1f77d632d7c839a1012f5cd7e7555130406