android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: android: ion: Remove system heap aliasing

Browse Source 
Now that all clients have transitioned to using the correct
system heap ID, remove the aliasing logic that reroutes
allocations from ION_HEAP_SYSTEM to ION_SYSTEM_HEAP_ID.

For now, print a warning if an allocation is directed
towards ION_HEAP_SYSTEM to catch anyone who is still using
ION_HEAP_SYSTEM.

Change-Id: Ie4a7c6384806016cc62837b14f4bc8d05cd1549d
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
This commit is contained in:
Isaac J. Manjarres 2020-07-07 12:59:38 -07:00
parent 38b1718d28
commit 077fddb129
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/android/ion/ion_buffer.c
View File

@ -14,7 +14,6 @@
#define CREATE_TRACE_POINTS
#include "ion_trace.h"
#include "ion_private.h"
#define ION_SYSTEM_HEAP_ID BIT(25)
static atomic_long_t total_heap_bytes;
@ -141,17 +140,10 @@ struct ion_buffer *ion_buffer_alloc(struct ion_device *dev, size_t len,
return ERR_PTR(-EINVAL);
}
/*
* Temporarily reroute generic system heap allocations to the MSM system
* heap. Once clients have stopped using the generic system heap ID, we
* can remove this.
*/
if (heap_id_mask & ION_HEAP_SYSTEM) {
get_task_comm(task_comm, current->group_leader);
pr_warn_ratelimited("%s: Rerouting allocation from generic sys heap to msm sys heap for %s-%d\n",
pr_warn_ratelimited("%s: Detected allocation from generic sys heap for task %s-%d\n",
__func__, task_comm, current->tgid);
heap_id_mask &= ~ION_HEAP_SYSTEM;
heap_id_mask |= ION_SYSTEM_HEAP_ID;
}
/*