Merge "zsmalloc: separate free_zspage from putback_zspage" (7b94e4af) · Commits · e / devices / android_kernel_sony_msm8998

mm/zsmalloc.c

+11 −16

Original line number	Diff line number	Diff line
		@@ -1687,14 +1687,12 @@ static struct zspage isolate_zspage(struct size_class class, bool source)

		/*
		* putback_zspage - add @zspage into right class's fullness list
		* @pool: target pool
		* @class: destination class
		* @zspage: target page
		*
		* Return @zspage's fullness_group
		*/
		static enum fullness_group putback_zspage(struct zs_pool *pool,
		struct size_class *class,
		static enum fullness_group putback_zspage(struct size_class *class,
		struct zspage *zspage)
		{
		enum fullness_group fullness;
		@@ -1703,15 +1701,6 @@ static enum fullness_group putback_zspage(struct zs_pool *pool,
		insert_zspage(class, zspage, fullness);
		set_zspage_mapping(zspage, class->index, fullness);

		if (fullness == ZS_EMPTY) {
		zs_stat_dec(class, OBJ_ALLOCATED, get_maxobj_per_zspage(
		class->size, class->pages_per_zspage));
		atomic_long_sub(class->pages_per_zspage,
		&pool->pages_allocated);

		free_zspage(pool, zspage);
		}

		return fullness;
		}

		@@ -1760,23 +1749,29 @@ static void __zs_compact(struct zs_pool pool, struct size_class class)
		if (!migrate_zspage(pool, class, &cc))
		break;

		putback_zspage(pool, class, dst_zspage);
		putback_zspage(class, dst_zspage);
		}

		/* Stop if we couldn't find slot */
		if (dst_zspage == NULL)
		break;

		putback_zspage(pool, class, dst_zspage);
		if (putback_zspage(pool, class, src_zspage) == ZS_EMPTY)
		putback_zspage(class, dst_zspage);
		if (putback_zspage(class, src_zspage) == ZS_EMPTY) {
		zs_stat_dec(class, OBJ_ALLOCATED, get_maxobj_per_zspage(
		class->size, class->pages_per_zspage));
		atomic_long_sub(class->pages_per_zspage,
		&pool->pages_allocated);
		free_zspage(pool, src_zspage);
		pool->stats.pages_compacted += class->pages_per_zspage;
		}
		spin_unlock(&class->lock);
		cond_resched();
		spin_lock(&class->lock);
		}

		if (src_zspage)
		putback_zspage(pool, class, src_zspage);
		putback_zspage(class, src_zspage);

		spin_unlock(&class->lock);
		}