Merge "ion: add ion pages to NR_UNRECLAIMABLE_PAGES" (51a60975) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/staging/android/ion/ion_system_heap.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -116,8 +116,13 @@ void free_buffer_page(struct ion_system_heap *heap,
		ion_page_pool_free_immediate(pool, page);
		else
		ion_page_pool_free(pool, page);

		mod_node_page_state(page_pgdat(page), NR_UNRECLAIMABLE_PAGES,
		-(1 << pool->order));
		} else {
		__free_pages(page, order);
		mod_node_page_state(page_pgdat(page), NR_UNRECLAIMABLE_PAGES,
		-(1 << order));
		}
		}

		@@ -317,6 +322,10 @@ static int ion_system_heap_allocate(struct ion_heap *heap,

		sz = (1 << info->order) * PAGE_SIZE;

		mod_node_page_state(
		page_pgdat(info->page), NR_UNRECLAIMABLE_PAGES,
		(1 << (info->order)));

		if (info->from_pool) {
		list_add_tail(&info->list, &pages_from_pool);
		} else {

+1 −0

Original line number	Diff line number	Diff line
		@@ -183,6 +183,7 @@ enum node_stat_item {
		NR_DIRTIED, /* page dirtyings since bootup */
		NR_WRITTEN, /* page writings since bootup */
		NR_INDIRECTLY_RECLAIMABLE_BYTES, /* measured in bytes */
		NR_UNRECLAIMABLE_PAGES,
		NR_VM_NODE_STAT_ITEMS
		};

+1 −0

Original line number	Diff line number	Diff line
		@@ -1091,6 +1091,7 @@ const char * const vmstat_text[] = {
		"nr_dirtied",
		"nr_written",
		"nr_indirectly_reclaimable",
		"nr_unreclaimable_pages",

		/* enum writeback_stat_item counters */
		"nr_dirty_threshold",