diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index c7ebf14587a6..4325384965e7 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -410,14 +410,13 @@ static struct binder_buffer *binder_alloc_new_buf_locked( } trace_android_vh_binder_alloc_new_buf_locked(size, &alloc->free_async_space, is_async); - trace_android_vh_binder_detect_low_async_space(is_async, &alloc->free_async_space, pid, - &should_fail); - if (should_fail) { - binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC, - "%d: binder_alloc_buf size %zd failed, not allowed to alloc more async space\n", - alloc->pid, size); - return ERR_PTR(-EPERM); - } + trace_android_vh_binder_detect_low_async_space_locked(is_async, &alloc->free_async_space, pid, &should_fail); + if (should_fail) { + binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC, + "%d: binder_alloc_buf size %zd failed, not allowed to alloc more async space\n", + alloc->pid, size); + return ERR_PTR(-EPERM); + } /* Pad 0-size buffers so they get assigned unique addresses */ size = max(size, sizeof(void *)); diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index a45022e569e2..c4b14f965ad3 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -391,7 +391,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_ioctl_end); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_looper_exited); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_spawn_new_thread); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_has_special_work_ilocked); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_detect_low_async_space); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_detect_low_async_space_locked); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_delayacct_init); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_delayacct_tsk_init); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_delayacct_tsk_free); diff --git a/include/trace/hooks/binder.h b/include/trace/hooks/binder.h index fa2b762e3401..e67cfc5fee1b 100644 --- a/include/trace/hooks/binder.h +++ b/include/trace/hooks/binder.h @@ -83,9 +83,9 @@ DECLARE_HOOK(android_vh_binder_alloc_new_buf_locked, TP_PROTO(size_t size, size_t *free_async_space, int is_async), TP_ARGS(size, free_async_space, is_async)); -DECLARE_HOOK(android_vh_binder_detect_low_async_space, - TP_PROTO(int is_async, size_t *free_async_space, int pid, bool *should_fail), - TP_ARGS(is_async, free_async_space, pid, should_fail)); +DECLARE_HOOK(android_vh_binder_detect_low_async_space_locked, + TP_PROTO(int is_async, size_t *free_async_space, int pid, bool *should_fail), + TP_ARGS(is_async, free_async_space, pid, should_fail)); struct binder_transaction_data; DECLARE_HOOK(android_vh_binder_reply, TP_PROTO(struct binder_proc *target_proc, struct binder_proc *proc,