shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: binder: refactor binder_delete_free_buffer()

Browse Source 
Skip the freelist call immediately as needed, instead of continuing the
pointless checks. Also, drop the debug logs that we don't really need.

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

Bug: 254650075
(cherry picked from commit f07b83a48e944c8a1cc1e9f6703fae5e34df2ba4)
Change-Id: I035bd6cd5c06ec984cd6eb3c3b53e0958c64df4f
Signed-off-by: Carlos Llamas <cmllamas@google.com>
This commit is contained in:
Carlos Llamas
2023-12-01 17:21:54 +00:00
parent aacaa36eaa
commit 0402339efb
1 changed files with 11 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/android/binder_alloc.c
View File

@@ -636,48 +636,26 @@ static unsigned long prev_buffer_end_page(struct binder_buffer *buffer)
static void binder_delete_free_buffer(struct binder_alloc *alloc, static void binder_delete_free_buffer(struct binder_alloc *alloc,
struct binder_buffer *buffer) struct binder_buffer *buffer)
{ {
struct binder_buffer *prev, *next = NULL; struct binder_buffer *prev, *next;
bool to_free = true;
if (PAGE_ALIGNED(buffer->user_data))
goto skip_freelist;
BUG_ON(alloc->buffers.next == &buffer->entry); BUG_ON(alloc->buffers.next == &buffer->entry);
prev = binder_buffer_prev(buffer); prev = binder_buffer_prev(buffer);
BUG_ON(!prev->free); BUG_ON(!prev->free);
if (prev_buffer_end_page(prev) == buffer_start_page(buffer)) { if (prev_buffer_end_page(prev) == buffer_start_page(buffer))
to_free = false; goto skip_freelist;
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC,
"%d: merge free, buffer %lx share page with %lx\n",
alloc->pid, buffer->user_data,
prev->user_data);
}
if (!list_is_last(&buffer->entry, &alloc->buffers)) { if (!list_is_last(&buffer->entry, &alloc->buffers)) {
next = binder_buffer_next(buffer); next = binder_buffer_next(buffer);
if (buffer_start_page(next) == buffer_start_page(buffer)) { if (buffer_start_page(next) == buffer_start_page(buffer))
to_free = false; goto skip_freelist;
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC,
"%d: merge free, buffer %lx share page with %lx\n",
alloc->pid,
buffer->user_data,
next->user_data);
}
} }
if (PAGE_ALIGNED(buffer->user_data)) { binder_lru_freelist_add(alloc, buffer_start_page(buffer),
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC, buffer_start_page(buffer) + PAGE_SIZE);
"%d: merge free, buffer start %lx is page aligned\n", skip_freelist:
alloc->pid, buffer->user_data);
to_free = false;
}
if (to_free) {
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC,
"%d: merge free, buffer %lx do not share page with %lx or %lx\n",
alloc->pid, buffer->user_data,
prev->user_data,
next ? next->user_data : 0);
binder_lru_freelist_add(alloc, buffer_start_page(buffer),
buffer_start_page(buffer) + PAGE_SIZE);
}
list_del(&buffer->entry); list_del(&buffer->entry);
kfree(buffer); kfree(buffer);
} }