binder: relocate low space calculation

Move the low async space calculation to debug_low_async_space_locked().
This logic not only fits better here but also offloads some of the many
tasks currently done in binder_alloc_new_buf_locked().

No functional change in this patch.

Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Link: https://lore.kernel.org/r/20231201172212.1813387-15-cmllamas@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c
index 3dca7b1992460b2cf76202e321946586f8c65dcf..167ee6f871dc15c985cb9b3b5173173bcd576abc 100644 (file)
--- a/drivers/android/binder_alloc.c
+++ b/drivers/android/binder_alloc.c
@@ -371,6 +371,15 @@ static bool debug_low_async_space_locked(struct binder_alloc *alloc)
        size_t num_buffers = 0;
        struct rb_node *n;
 
+       /*
+        * Only start detecting spammers once we have less than 20% of async
+        * space left (which is less than 10% of total buffer size).
+        */
+       if (alloc->free_async_space >= alloc->buffer_size / 10) {
+               alloc->oneway_spam_detected = false;
+               return false;
+       }
+
        for (n = rb_first(&alloc->allocated_buffers); n != NULL;
                 n = rb_next(n)) {
                buffer = rb_entry(n, struct binder_buffer, rb_node);
@@ -491,16 +500,8 @@ static struct binder_buffer *binder_alloc_new_buf_locked(
                binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,
                             "%d: binder_alloc_buf size %zd async free %zd\n",
                              alloc->pid, size, alloc->free_async_space);
-               if (alloc->free_async_space < alloc->buffer_size / 10) {
-                       /*
-                        * Start detecting spammers once we have less than 20%
-                        * of async space left (which is less than 10% of total
-                        * buffer size).
-                        */
-                       buffer->oneway_spam_suspect = debug_low_async_space_locked(alloc);
-               } else {
-                       alloc->oneway_spam_detected = false;
-               }
+               if (debug_low_async_space_locked(alloc))
+                       buffer->oneway_spam_suspect = true;
        }
 
        return buffer;