Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fc8b8b2 authored by Chris Goldsworthy's avatar Chris Goldsworthy
Browse files

ion: Fix pool refill error 



When performing secure pool allocations, it's possible to
spuriously trigger pool refill attempts for the cached and
uncached pools. Fix this by adding a check to see if we're
performing a secure allocation or not, before refilling a pool.

Change-Id: I9a415a302ca92790e6a793784020b09dea6a86e1
[cgoldswo@codeaurora.org: Fix merge conflicts]
Signed-off-by: default avatarChris Goldsworthy <cgoldswo@codeaurora.org>
parent 98e83a9d

drivers/staging/android/ion/heaps/ion_system_heap.c

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * ION Memory Allocator system heap exporter

 *

 * Copyright (C) 2011 Google, Inc.

 * Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.

 *

 */
@@ -82,7 +82,7 @@ static struct page *alloc_buffer_page(struct ion_system_heap *sys_heap, 
	page = ion_page_pool_alloc(pool, from_pool);



	if (pool_auto_refill_en &&

	    pool_count_below_lowmark(pool)) {

	    pool_count_below_lowmark(pool) && vmid <= 0) {

		wake_up_process(sys_heap->kworker[cached]);

	}