Merge "ion: Consider ion pool pages as indirectly reclaimable" (3fd5243b) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/staging/android/ion/ion_page_pool.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		* drivers/staging/android/ion/ion_page_pool.c
		*
		* Copyright (C) 2011 Google, Inc.
		* Copyright (c) 2016, The Linux Foundation. All rights reserved.
		* Copyright (c) 2016, 2018 The Linux Foundation. All rights reserved.
		*
		* This software is licensed under the terms of the GNU General Public
		* License version 2, as published by the Free Software Foundation, and
		@@ -65,6 +65,9 @@ static int ion_page_pool_add(struct ion_page_pool pool, struct page page)
		list_add_tail(&page->lru, &pool->low_items);
		pool->low_count++;
		}

		mod_node_page_state(page_pgdat(page), NR_INDIRECTLY_RECLAIMABLE_BYTES,
		(1 << (PAGE_SHIFT + pool->order)));
		mutex_unlock(&pool->mutex);
		return 0;
		}
		@@ -84,6 +87,8 @@ static struct page ion_page_pool_remove(struct ion_page_pool pool, bool high)
		}

		list_del(&page->lru);
		mod_node_page_state(page_pgdat(page), NR_INDIRECTLY_RECLAIMABLE_BYTES,
		-(1 << (PAGE_SHIFT + pool->order)));
		return page;
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -575,6 +575,13 @@ int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin)
		*/
		free += global_page_state(NR_SLAB_RECLAIMABLE);

		/*
		* Part of the kernel memory, which can be released
		* under memory pressure.
		*/
		free += global_node_page_state(
		NR_INDIRECTLY_RECLAIMABLE_BYTES) >> PAGE_SHIFT;

		/*
		* Leave reserved pages. The pages are not for anonymous pages.
		*/