binder: use buffer offsets in debug logs
PATCH v3 1/1 binder: use buffer offsets in debug logs
Identify buffer addresses using vma offsets instead of full user addresses in debug logs or drop them if they are not useful.
Signed-off-by Tiffany Y. Yang <[email protected]>
---
V2 -> V3: Drop transaction data addresses
V1 -> V2: Resend to mailing lists
drivers/android/binder.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)
drivers/android/binder.c +11 -16
@@ -3261,20 +3261,16 @@ static void binder_transaction(struct binder_proc *proc,if (reply)binder_debug (BINDER_DEBUG_TRANSACTION , -"%d:%d BC_REPLY %d -> %d:%d, data %016llx-%016llx size %lld-%lld-%lld\n" , +"%d:%d BC_REPLY %d -> %d:%d, data size %lld-%lld-%lld\n" , proc->pid, thread->pid, t->debug_id, target_proc->pid, target_thread->pid, - (u64 )tr->data.ptr.buffer, - (u64 )tr->data.ptr.offsets, (u64 )tr->data_size, (u64 )tr->offsets_size, (u64 )extra_buffers_size);else binder_debug (BINDER_DEBUG_TRANSACTION , -"%d:%d BC_TRANSACTION %d -> %d - node %d, data %016llx-%016llx size %lld-%lld-%lld\n" , +"%d:%d BC_TRANSACTION %d -> %d - node %d, data size %lld-%lld-%lld\n" , proc->pid, thread->pid, t->debug_id, target_proc->pid, target_node->debug_id, - (u64 )tr->data.ptr.buffer, - (u64 )tr->data.ptr.offsets, (u64 )tr->data_size, (u64 )tr->offsets_size, (u64 )extra_buffers_size);
@@ -4223,20 +4219,21 @@ static int binder_thread_write(struct binder_proc *proc,if (IS_ERR_OR_NULL (buffer)) {if (PTR_ERR (buffer) == -EPERM ) {binder_user_error ( -"%d:%d BC_FREE_BUFFER u%016llx matched unreturned or currently freeing buffer\n" , +"%d:%d BC_FREE_BUFFER matched unreturned or currently freeing buffer at offset %lx\n" , proc->pid, thread->pid, - (u64 )data_ptr); + (unsigned long )data_ptr - proc->alloc.buffer); }else {binder_user_error ( -"%d:%d BC_FREE_BUFFER u%016llx no match\n" , +"%d:%d BC_FREE_BUFFER no match for buffer at offset %lx\n" , proc->pid, thread->pid, - (u64 )data_ptr); + (unsigned long )data_ptr - proc->alloc.buffer); }break ; }binder_debug (BINDER_DEBUG_FREE_BUFFER , -"%d:%d BC_FREE_BUFFER u%016llx found buffer %d for %s transaction\n" , - proc->pid, thread->pid, (u64 )data_ptr, +"%d:%d BC_FREE_BUFFER at offset %lx found buffer %d for %s transaction\n" , + proc->pid, thread->pid, + (unsigned long )data_ptr - proc->alloc.buffer, buffer->debug_id, buffer->transaction ?"active" :"finished" );binder_free_buf (proc, thread, buffer, false);
@@ -5053,16 +5050,14 @@ static int binder_thread_read(struct binder_proc *proc,trace_binder_transaction_received (t);binder_stat_br (proc, thread, cmd);binder_debug (BINDER_DEBUG_TRANSACTION , -"%d:%d %s %d %d:%d, cmd %u size %zd-%zd ptr %016llx-%016llx\n" , +"%d:%d %s %d %d:%d, cmd %u size %zd-%zd\n" , proc->pid, thread->pid, (cmd ==BR_TRANSACTION ) ?"BR_TRANSACTION" : (cmd ==BR_TRANSACTION_SEC_CTX ) ?"BR_TRANSACTION_SEC_CTX" :"BR_REPLY" , t->debug_id, t_from ? t_from->proc->pid :0 , t_from ? t_from->pid :0 , cmd, - t->buffer->data_size, t->buffer->offsets_size, - (u64 )trd->data.ptr.buffer, - (u64 )trd->data.ptr.offsets); + t->buffer->data_size, t->buffer->offsets_size);if (t_from)binder_thread_dec_tmpref (t_from);
Signature · 1 line
2.49.0.472.ge94155a9ec-goog
Carlos Llamas
maintainerQuoted 5 lines · Tiffany Y. Yang
Identify buffer addresses using vma offsets instead of full user addresses in debug logs or drop them if they are not useful.
Signed-off-by Tiffany Y. Yang <[email protected]>---
This looks good but there is one problem...
drivers/android/binder.c static int binder_thread_write(struct binder_proc *proc, · line 4224
Quoted 9 lines
drivers/android/binder.c +2
-2@@ -4223,20 +4219,21 @@ static int binder_thread_write(struct binder_proc *proc,if (IS_ERR_OR_NULL (buffer)) {if (PTR_ERR (buffer) == -EPERM ) {binder_user_error ( -"%d:%d BC_FREE_BUFFER u%016llx matched unreturned or currently freeing buffer\n" , +"%d:%d BC_FREE_BUFFER matched unreturned or currently freeing buffer at offset %lx\n" , proc->pid, thread->pid, - (u64 )data_ptr); + (unsigned long )data_ptr - proc->alloc.buffer);
The alloc.buffer should be alloc.vm_start, this was recently renamed. I think you would need to rebase your tree.
--
Carlos Llamas