drop queue-5.4/binder-fix-unused-alloc-free_async_space.patch-15870

Duplicate patch.

diff --git a/queue-5.4/binder-fix-unused-alloc-free_async_space.patch-15870 b/queue-5.4/binder-fix-unused-alloc-free_async_space.patch-15870
deleted file mode 100644 (file)
index f8566b6..0000000
--- a/queue-5.4/binder-fix-unused-alloc-free_async_space.patch-15870
+++ /dev/null
@@ -1,58 +0,0 @@
-From c3e0fbeec7805ff98e4dd74c5a3d38031269da1e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 1 Dec 2023 17:21:34 +0000
-Subject: binder: fix unused alloc->free_async_space
-
-From: Carlos Llamas <cmllamas@google.com>
-
-[ Upstream commit c6d05e0762ab276102246d24affd1e116a46aa0c ]
-
-Each transaction is associated with a 'struct binder_buffer' that stores
-the metadata about its buffer area. Since commit 74310e06be4d ("android:
-binder: Move buffer out of area shared with user space") this struct is
-no longer embedded within the buffer itself but is instead allocated on
-the heap to prevent userspace access to this driver-exclusive info.
-
-Unfortunately, the space of this struct is still being accounted for in
-the total buffer size calculation, specifically for async transactions.
-This results in an additional 104 bytes added to every async buffer
-request, and this area is never used.
-
-This wasted space can be substantial. If we consider the maximum mmap
-buffer space of SZ_4M, the driver will reserve half of it for async
-transactions, or 0x200000. This area should, in theory, accommodate up
-to 262,144 buffers of the minimum 8-byte size. However, after adding
-the extra 'sizeof(struct binder_buffer)', the total number of buffers
-drops to only 18,724, which is a sad 7.14% of the actual capacity.
-
-This patch fixes the buffer size calculation to enable the utilization
-of the entire async buffer space. This is expected to reduce the number
-of -ENOSPC errors that are seen on the field.
-
-Fixes: 74310e06be4d ("android: binder: Move buffer out of area shared with user space")
-Signed-off-by: Carlos Llamas <cmllamas@google.com>
-Reviewed-by: Alice Ryhl <aliceryhl@google.com>
-Link: https://lore.kernel.org/r/20231201172212.1813387-6-cmllamas@google.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/android/binder_alloc.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c
-index ceb70543ca90..cfe8c61d14fc 100644
---- a/drivers/android/binder_alloc.c
-+++ b/drivers/android/binder_alloc.c
-@@ -360,8 +360,7 @@ static void debug_low_async_space_locked(struct binder_alloc *alloc, int pid)
-                       continue;
-               if (!buffer->async_transaction)
-                       continue;
--              total_alloc_size += binder_alloc_buffer_size(alloc, buffer)
--                      + sizeof(struct binder_buffer);
-+              total_alloc_size += binder_alloc_buffer_size(alloc, buffer);
-               num_buffers++;
-       }
- 
--- 
-2.43.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 2c72c858dde80ff3f2783f2634fb815032b8cc61..3c285a403cfe342bbc18797e279871b5ed317c33 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -165,7 +165,6 @@ mips-alchemy-fix-an-out-of-bound-access-in-db1200_de.patch
 mips-alchemy-fix-an-out-of-bound-access-in-db1550_de.patch
 serial-8250-omap-don-t-skip-resource-freeing-if-pm_r.patch
 binder-print-warnings-when-detecting-oneway-spamming.patch
-binder-fix-unused-alloc-free_async_space.patch-15870
 acpi-property-let-args-be-null-in-__acpi_node_get_pr.patch
 software-node-let-args-be-null-in-software_node_get_.patch
 perf-genelf-set-elf-program-header-addresses-properl.patch