binder: Refactor binder_node print synchronization

The binder driver outputs information about each dead binder node by
iterating over the dead nodes list, and it prints the state of each live
node in the system by traversing each binder_proc's proc->nodes tree.
Both cases require similar logic to maintain the global lock ordering
while accessing each node.

Create a helper function to synchronize around printing binder nodes in
a list. Opportunistically make minor cosmetic changes to binder print
functions.

Acked-by: Carlos Llamas <cmllamas@google.com>
Signed-off-by: "Tiffany Y. Yang" <ynaffit@google.com>
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Link: https://lore.kernel.org/r/20250510013435.1520671-5-ynaffit@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 65af4b169388a0394c563b14a1d3dd92011c165b..b542d14aae1fca91980bdd364a9dc765a6898cfb 100644 (file)
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -6374,10 +6374,10 @@ static void print_binder_transaction_ilocked(struct seq_file *m,
 }
 
 static void print_binder_work_ilocked(struct seq_file *m,
-                                    struct binder_proc *proc,
-                                    const char *prefix,
-                                    const char *transaction_prefix,
-                                    struct binder_work *w)
+                                     struct binder_proc *proc,
+                                     const char *prefix,
+                                     const char *transaction_prefix,
+                                     struct binder_work *w)
 {
        struct binder_node *node;
        struct binder_transaction *t;
@@ -6427,7 +6427,7 @@ static void print_binder_work_ilocked(struct seq_file *m,
 
 static void print_binder_thread_ilocked(struct seq_file *m,
                                        struct binder_thread *thread,
-                                       int print_always)
+                                       bool print_always)
 {
        struct binder_transaction *t;
        struct binder_work *w;
@@ -6502,8 +6502,53 @@ static void print_binder_ref_olocked(struct seq_file *m,
        binder_node_unlock(ref->node);
 }
 
-static void print_binder_proc(struct seq_file *m,
-                             struct binder_proc *proc, int print_all)
+/**
+ * print_next_binder_node_ilocked() - Print binder_node from a locked list
+ * @m:          struct seq_file for output via seq_printf()
+ * @proc:       struct binder_proc we hold the inner_proc_lock to (if any)
+ * @node:       struct binder_node to print fields of
+ * @prev_node: struct binder_node we hold a temporary reference to (if any)
+ *
+ * Helper function to handle synchronization around printing a struct
+ * binder_node while iterating through @proc->nodes or the dead nodes list.
+ * Caller must hold either @proc->inner_lock (for live nodes) or
+ * binder_dead_nodes_lock. This lock will be released during the body of this
+ * function, but it will be reacquired before returning to the caller.
+ *
+ * Return:     pointer to the struct binder_node we hold a tmpref on
+ */
+static struct binder_node *
+print_next_binder_node_ilocked(struct seq_file *m, struct binder_proc *proc,
+                              struct binder_node *node,
+                              struct binder_node *prev_node)
+{
+       /*
+        * Take a temporary reference on the node so that isn't freed while
+        * we print it.
+        */
+       binder_inc_node_tmpref_ilocked(node);
+       /*
+        * Live nodes need to drop the inner proc lock and dead nodes need to
+        * drop the binder_dead_nodes_lock before trying to take the node lock.
+        */
+       if (proc)
+               binder_inner_proc_unlock(proc);
+       else
+               spin_unlock(&binder_dead_nodes_lock);
+       if (prev_node)
+               binder_put_node(prev_node);
+       binder_node_inner_lock(node);
+       print_binder_node_nilocked(m, node);
+       binder_node_inner_unlock(node);
+       if (proc)
+               binder_inner_proc_lock(proc);
+       else
+               spin_lock(&binder_dead_nodes_lock);
+       return node;
+}
+
+static void print_binder_proc(struct seq_file *m, struct binder_proc *proc,
+                             bool print_all)
 {
        struct binder_work *w;
        struct rb_node *n;
@@ -6516,31 +6561,18 @@ static void print_binder_proc(struct seq_file *m,
        header_pos = m->count;
 
        binder_inner_proc_lock(proc);
-       for (n = rb_first(&proc->threads); n != NULL; n = rb_next(n))
+       for (n = rb_first(&proc->threads); n; n = rb_next(n))
                print_binder_thread_ilocked(m, rb_entry(n, struct binder_thread,
                                                rb_node), print_all);
 
-       for (n = rb_first(&proc->nodes); n != NULL; n = rb_next(n)) {
+       for (n = rb_first(&proc->nodes); n; n = rb_next(n)) {
                struct binder_node *node = rb_entry(n, struct binder_node,
                                                    rb_node);
                if (!print_all && !node->has_async_transaction)
                        continue;
 
-               /*
-                * take a temporary reference on the node so it
-                * survives and isn't removed from the tree
-                * while we print it.
-                */
-               binder_inc_node_tmpref_ilocked(node);
-               /* Need to drop inner lock to take node lock */
-               binder_inner_proc_unlock(proc);
-               if (last_node)
-                       binder_put_node(last_node);
-               binder_node_inner_lock(node);
-               print_binder_node_nilocked(m, node);
-               binder_node_inner_unlock(node);
-               last_node = node;
-               binder_inner_proc_lock(proc);
+               last_node = print_next_binder_node_ilocked(m, proc, node,
+                                                          last_node);
        }
        binder_inner_proc_unlock(proc);
        if (last_node)
@@ -6548,12 +6580,10 @@ static void print_binder_proc(struct seq_file *m,
 
        if (print_all) {
                binder_proc_lock(proc);
-               for (n = rb_first(&proc->refs_by_desc);
-                    n != NULL;
-                    n = rb_next(n))
+               for (n = rb_first(&proc->refs_by_desc); n; n = rb_next(n))
                        print_binder_ref_olocked(m, rb_entry(n,
-                                                           struct binder_ref,
-                                                           rb_node_desc));
+                                                            struct binder_ref,
+                                                            rb_node_desc));
                binder_proc_unlock(proc);
        }
        binder_alloc_print_allocated(m, &proc->alloc);
@@ -6693,7 +6723,7 @@ static void print_binder_proc_stats(struct seq_file *m,
        count = 0;
        ready_threads = 0;
        binder_inner_proc_lock(proc);
-       for (n = rb_first(&proc->threads); n != NULL; n = rb_next(n))
+       for (n = rb_first(&proc->threads); n; n = rb_next(n))
                count++;
 
        list_for_each_entry(thread, &proc->waiting_threads, waiting_thread_node)
@@ -6707,7 +6737,7 @@ static void print_binder_proc_stats(struct seq_file *m,
                        ready_threads,
                        free_async_space);
        count = 0;
-       for (n = rb_first(&proc->nodes); n != NULL; n = rb_next(n))
+       for (n = rb_first(&proc->nodes); n; n = rb_next(n))
                count++;
        binder_inner_proc_unlock(proc);
        seq_printf(m, "  nodes: %d\n", count);
@@ -6715,7 +6745,7 @@ static void print_binder_proc_stats(struct seq_file *m,
        strong = 0;
        weak = 0;
        binder_proc_lock(proc);
-       for (n = rb_first(&proc->refs_by_desc); n != NULL; n = rb_next(n)) {
+       for (n = rb_first(&proc->refs_by_desc); n; n = rb_next(n)) {
                struct binder_ref *ref = rb_entry(n, struct binder_ref,
                                                  rb_node_desc);
                count++;
@@ -6753,29 +6783,16 @@ static int state_show(struct seq_file *m, void *unused)
        spin_lock(&binder_dead_nodes_lock);
        if (!hlist_empty(&binder_dead_nodes))
                seq_puts(m, "dead nodes:\n");
-       hlist_for_each_entry(node, &binder_dead_nodes, dead_node) {
-               /*
-                * take a temporary reference on the node so it
-                * survives and isn't removed from the list
-                * while we print it.
-                */
-               node->tmp_refs++;
-               spin_unlock(&binder_dead_nodes_lock);
-               if (last_node)
-                       binder_put_node(last_node);
-               binder_node_lock(node);
-               print_binder_node_nilocked(m, node);
-               binder_node_unlock(node);
-               last_node = node;
-               spin_lock(&binder_dead_nodes_lock);
-       }
+       hlist_for_each_entry(node, &binder_dead_nodes, dead_node)
+               last_node = print_next_binder_node_ilocked(m, NULL, node,
+                                                          last_node);
        spin_unlock(&binder_dead_nodes_lock);
        if (last_node)
                binder_put_node(last_node);
 
        mutex_lock(&binder_procs_lock);
        hlist_for_each_entry(proc, &binder_procs, proc_node)
-               print_binder_proc(m, proc, 1);
+               print_binder_proc(m, proc, true);
        mutex_unlock(&binder_procs_lock);
 
        return 0;
@@ -6804,7 +6821,7 @@ static int transactions_show(struct seq_file *m, void *unused)
        seq_puts(m, "binder transactions:\n");
        mutex_lock(&binder_procs_lock);
        hlist_for_each_entry(proc, &binder_procs, proc_node)
-               print_binder_proc(m, proc, 0);
+               print_binder_proc(m, proc, false);
        mutex_unlock(&binder_procs_lock);
 
        return 0;
@@ -6819,7 +6836,7 @@ static int proc_show(struct seq_file *m, void *unused)
        hlist_for_each_entry(itr, &binder_procs, proc_node) {
                if (itr->pid == pid) {
                        seq_puts(m, "binder proc state:\n");
-                       print_binder_proc(m, itr, 1);
+                       print_binder_proc(m, itr, true);
                }
        }
        mutex_unlock(&binder_procs_lock);