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

Commit f690884e authored by Liam Mark's avatar Liam Mark
Browse files

Revert "mm: add cma pcp list" 



This reverts commit 0114d914.

That commit appears to cause corruption in drain_all_pages.
So revert it for now until we have a fix for the
corruption.

CRs-fixed: 710493
Change-Id: I96ea44f3eaaed453640a9ddeb376a4668cd87b74
Signed-off-by: default avatarLiam Mark <lmark@codeaurora.org>
parent 288c9101

include/linux/mmzone.h

+3 −5
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ enum { 
	MIGRATE_UNMOVABLE,

	MIGRATE_RECLAIMABLE,

	MIGRATE_MOVABLE,

	MIGRATE_PCPTYPES,	/* the number of types on the pcp lists */

	MIGRATE_RESERVE = MIGRATE_PCPTYPES,

#ifdef CONFIG_CMA

	/*

	 * MIGRATE_CMA migration type is designed to mimic the way
@@ -55,8 +57,6 @@ enum { 
	 */

	MIGRATE_CMA,

#endif

	MIGRATE_PCPTYPES, /* the number of types on the pcp lists */

	MIGRATE_RESERVE = MIGRATE_PCPTYPES,

#ifdef CONFIG_MEMORY_ISOLATION

	MIGRATE_ISOLATE,	/* can't allocate from here */

#endif
@@ -74,11 +74,9 @@ extern int *get_migratetype_fallbacks(int mtype); 
#ifdef CONFIG_CMA

bool is_cma_pageblock(struct page *page);

#  define is_migrate_cma(migratetype) unlikely((migratetype) == MIGRATE_CMA)

#  define get_cma_migrate_type() MIGRATE_CMA

#else

#  define is_cma_pageblock(page) false

#  define is_migrate_cma(migratetype) false

#  define get_cma_migrate_type() MIGRATE_MOVABLE

#endif



#define for_each_migratetype_order(order, type) \

mm/page_alloc.c

+43 −59
Original line number Diff line number Diff line
@@ -1164,12 +1164,34 @@ retry_reserve: 
	return page;

}



static struct page *__rmqueue_cma(struct zone *zone, unsigned int order)

static struct page *__rmqueue_cma(struct zone *zone, unsigned int order,

							int migratetype)

{

	struct page *page = 0;

	if (IS_ENABLED(CONFIG_CMA))

		if (!zone->cma_alloc)

#ifdef CONFIG_CMA

	if (migratetype == MIGRATE_MOVABLE && !zone->cma_alloc)

		page = __rmqueue_smallest(zone, order, MIGRATE_CMA);

	if (!page)

#endif

retry_reserve :

		page = __rmqueue_smallest(zone, order, migratetype);





	if (unlikely(!page) && migratetype != MIGRATE_RESERVE) {

		page = __rmqueue_fallback(zone, order, migratetype);



		/*

		 * Use MIGRATE_RESERVE rather than fail an allocation. goto

		 * is used because __rmqueue_smallest is an inline function

		 * and we want just one call site

		 */

		if (!page) {

			migratetype = MIGRATE_RESERVE;

			goto retry_reserve;

		}

	}



	trace_mm_page_alloc_zone_locked(page, order, migratetype);

	return page;

}
@@ -1180,21 +1202,15 @@ static struct page *__rmqueue_cma(struct zone *zone, unsigned int order) 
 */

static int rmqueue_bulk(struct zone *zone, unsigned int order,

			unsigned long count, struct list_head *list,

			int migratetype, int cold)

			int migratetype, int cold, int cma)

{

	int mt = migratetype, i;



	spin_lock(&zone->lock);

	for (i = 0; i < count; ++i) {

		struct page *page;



		/*

		 * If migrate type CMA is being requested only try to

		 * satisfy the request with CMA pages to try and increase

		 * CMA utlization.

		 */

		if (is_migrate_cma(migratetype))

			page = __rmqueue_cma(zone, order);

		if (cma)

			page = __rmqueue_cma(zone, order, migratetype);

		else

			page = __rmqueue(zone, order, migratetype);

		if (unlikely(page == NULL))
@@ -1229,27 +1245,6 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order, 
	return i;

}



/*

 * Return the pcp list that corresponds to the migrate type if that list isn't

 * empty.

 * If the list is empty return NULL.

 */

static struct list_head *get_populated_pcp_list(struct zone *zone,

			unsigned int order, struct per_cpu_pages *pcp,

			int migratetype, int cold)

{

	struct list_head *list = &pcp->lists[migratetype];

	if (list_empty(list)) {

		pcp->count += rmqueue_bulk(zone, order,

				pcp->batch, list,

				migratetype, cold);



		if (list_empty(list))

			list = NULL;

	}

	return list;

}



#ifdef CONFIG_NUMA

/*

 * Called from the vmstat counter updater to drain pagesets of this
@@ -1420,7 +1415,8 @@ void free_hot_cold_page(struct page *page, int cold) 
	 * excessively into the page allocator

	 */

	if (migratetype >= MIGRATE_PCPTYPES) {

		if (unlikely(is_migrate_isolate(migratetype))) {

		if (unlikely(is_migrate_isolate(migratetype)) ||

			     is_migrate_cma(migratetype)) {

			free_one_page(zone, page, 0, migratetype);

			goto out;

		}
@@ -1562,33 +1558,23 @@ struct page *buffered_rmqueue(struct zone *preferred_zone, 
			int migratetype)

{

	unsigned long flags;

	struct page *page = NULL;

	struct page *page;

	int cold = !!(gfp_flags & __GFP_COLD);



again:

	if (likely(order == 0)) {

		struct per_cpu_pages *pcp;

		struct list_head *list = NULL;

		struct list_head *list;



		local_irq_save(flags);

		pcp = &this_cpu_ptr(zone->pageset)->pcp;



		/* First try to get CMA pages */

		if (migratetype == MIGRATE_MOVABLE &&

			gfp_flags & __GFP_CMA) {

			list = get_populated_pcp_list(zone, 0, pcp,

					get_cma_migrate_type(), cold);

		}



		if (list == NULL) {

			/*

			 * Either CMA is not suitable or there are no free CMA

			 * pages.

			 */

			list = get_populated_pcp_list(zone, 0, pcp,

				migratetype, cold);

			if (unlikely(list == NULL) ||

				unlikely(list_empty(list)))

		list = &pcp->lists[migratetype];

		if (list_empty(list)) {

			pcp->count += rmqueue_bulk(zone, 0,

					pcp->batch, list,

					migratetype, cold,

					gfp_flags & __GFP_CMA);

			if (unlikely(list_empty(list)))

				goto failed;

		}
@@ -1614,12 +1600,10 @@ again: 
			WARN_ON_ONCE(order > 1);

		}

		spin_lock_irqsave(&zone->lock, flags);

		if (migratetype == MIGRATE_MOVABLE && gfp_flags & __GFP_CMA)

			page = __rmqueue_cma(zone, order);



		if (!page)

		if (gfp_flags & __GFP_CMA)

			page = __rmqueue_cma(zone, order, migratetype);

		else

			page = __rmqueue(zone, order, migratetype);



		spin_unlock(&zone->lock);

		if (!page)

			goto failed;

mm/vmstat.c

+1 −1
Original line number Diff line number Diff line
@@ -629,10 +629,10 @@ static char * const migratetype_names[MIGRATE_TYPES] = { 
	"Unmovable",

	"Reclaimable",

	"Movable",

	"Reserve",

#ifdef CONFIG_CMA

	"CMA",

#endif

	"Reserve",

#ifdef CONFIG_MEMORY_ISOLATION

	"Isolate",

#endif