android: binder: deal with contexts in debugfs.

Properly print the context in debugfs entries.

Change-Id: If10c2129536d9f39bae542afd7318ca79af60e3a
Signed-off-by: Martijn Coenen <maco@google.com>

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 93780d1cc19901617faae8d3a708ffd18981dedd..635be4d9b8f30cf7b38f7ae20d405348c530e4d4 100644 (file)
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -190,6 +190,7 @@ struct binder_transaction_log_entry {
        int to_node;
        int data_size;
        int offsets_size;
+       const char *context_name;
 };
 struct binder_transaction_log {
        int next;
@@ -217,10 +218,12 @@ static struct binder_transaction_log_entry *binder_transaction_log_add(
 struct binder_context {
        struct binder_node *binder_context_mgr_node;
        kuid_t binder_context_mgr_uid;
+       const char *name;
 };
 
 static struct binder_context global_context = {
        .binder_context_mgr_uid = INVALID_UID,
+       .name = "binder",
 };
 
 struct binder_work {
@@ -1409,6 +1412,7 @@ static void binder_transaction(struct binder_proc *proc,
        e->target_handle = tr->target.handle;
        e->data_size = tr->data_size;
        e->offsets_size = tr->offsets_size;
+       e->context_name = proc->context->name;
 
        if (reply) {
                in_reply_to = thread->transaction_stack;
@@ -3069,8 +3073,17 @@ static int binder_open(struct inode *nodp, struct file *filp)
                char strbuf[11];
 
                snprintf(strbuf, sizeof(strbuf), "%u", proc->pid);
+               /*
+                * proc debug entries are shared between contexts, so
+                * this will fail if the process tries to open the driver
+                * again with a different context. The priting code will
+                * anyway print all contexts that a given PID has, so this
+                * is not a problem.
+                */
                proc->debugfs_entry = debugfs_create_file(strbuf, S_IRUGO,
-                       binder_debugfs_dir_entry_proc, proc, &binder_proc_fops);
+                       binder_debugfs_dir_entry_proc,
+                       (void *)(unsigned long)proc->pid,
+                       &binder_proc_fops);
        }
 
        return 0;
@@ -3465,6 +3478,7 @@ static void print_binder_proc(struct seq_file *m,
        size_t header_pos;
 
        seq_printf(m, "proc %d\n", proc->pid);
+       seq_printf(m, "context %s\n", proc->context->name);
        header_pos = m->count;
 
        for (n = rb_first(&proc->threads); n != NULL; n = rb_next(n))
@@ -3589,6 +3603,7 @@ static void print_binder_proc_stats(struct seq_file *m,
        int count, strong, weak;
 
        seq_printf(m, "proc %d\n", proc->pid);
+       seq_printf(m, "context %s\n", proc->context->name);
        count = 0;
        for (n = rb_first(&proc->threads); n != NULL; n = rb_next(n))
                count++;
@@ -3696,23 +3711,18 @@ static int binder_transactions_show(struct seq_file *m, void *unused)
 static int binder_proc_show(struct seq_file *m, void *unused)
 {
        struct binder_proc *itr;
-       struct binder_proc *proc = m->private;
+       int pid = (unsigned long)m->private;
        int do_lock = !binder_debug_no_lock;
-       bool valid_proc = false;
 
        if (do_lock)
                binder_lock(__func__);
 
        hlist_for_each_entry(itr, &binder_procs, proc_node) {
-               if (itr == proc) {
-                       valid_proc = true;
-                       break;
+               if (itr->pid == pid) {
+                       seq_puts(m, "binder proc state:\n");
+                       print_binder_proc(m, itr, 1);
                }
        }
-       if (valid_proc) {
-               seq_puts(m, "binder proc state:\n");
-               print_binder_proc(m, proc, 1);
-       }
        if (do_lock)
                binder_unlock(__func__);
        return 0;
@@ -3722,11 +3732,11 @@ static void print_binder_transaction_log_entry(struct seq_file *m,
                                        struct binder_transaction_log_entry *e)
 {
        seq_printf(m,
-                  "%d: %s from %d:%d to %d:%d node %d handle %d size %d:%d\n",
+                  "%d: %s from %d:%d to %d:%d context %s node %d handle %d size %d:%d\n",
                   e->debug_id, (e->call_type == 2) ? "reply" :
                   ((e->call_type == 1) ? "async" : "call "), e->from_proc,
-                  e->from_thread, e->to_proc, e->to_thread, e->to_node,
-                  e->target_handle, e->data_size, e->offsets_size);
+                  e->from_thread, e->to_proc, e->to_thread, e->context_name,
+                  e->to_node, e->target_handle, e->data_size, e->offsets_size);
 }
 
 static int binder_transaction_log_show(struct seq_file *m, void *unused)