summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRiley Andrews <riandrews@google.com>2017-06-29 12:01:37 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-30 10:19:26 +0200
commit1792d6c17cb282fd8e5cd197a8b33cb78484eb6a (patch)
tree10307cf3064e6664a2d6881952707f155b078e0f /drivers
parent596b97ec2e5e24c966b9cb4aa9a9766e53ecdd43 (diff)
binder: Use wake up hint for synchronous transactions.
commit 00b40d613352c623aaae88a44e5ded7c912909d7 upstream. Use wake_up_interruptible_sync() to hint to the scheduler binder transactions are synchronous wakeups. Disable preemption while waking to avoid ping-ponging on the binder lock. Signed-off-by: Todd Kjos <tkjos@google.com> Signed-off-by: Omprakash Dhyade <odhyade@codeaurora.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/android/binder.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 76650faca2f6..74da4821b8d6 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -1718,8 +1718,12 @@ static void binder_transaction(struct binder_proc *proc,
list_add_tail(&t->work.entry, target_list);
tcomplete->type = BINDER_WORK_TRANSACTION_COMPLETE;
list_add_tail(&tcomplete->entry, &thread->todo);
- if (target_wait)
- wake_up_interruptible(target_wait);
+ if (target_wait) {
+ if (reply || !(t->flags & TF_ONE_WAY))
+ wake_up_interruptible_sync(target_wait);
+ else
+ wake_up_interruptible(target_wait);
+ }
return;
err_get_unused_fd_failed: