Merge "mm: vmscan: scan dirty pages even in laptop mode" (cba559bc) · Commits · e / devices / android_kernel_fairphone_FP3

include/linux/mmzone.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -245,8 +245,6 @@ struct lruvec {
		#define LRU_ALL_ANON (BIT(LRU_INACTIVE_ANON) \| BIT(LRU_ACTIVE_ANON))
		#define LRU_ALL ((1 << NR_LRU_LISTS) - 1)

		/* Isolate clean file */
		#define ISOLATE_CLEAN ((__force isolate_mode_t)0x1)
		/* Isolate unmapped file */
		#define ISOLATE_UNMAPPED ((__force isolate_mode_t)0x2)
		/* Isolate for asynchronous migration */

mm/vmscan.c

+2 −12

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ struct scan_control {
		/* The highest zone to isolate pages for reclaim from */
		enum zone_type reclaim_idx;

		/* Writepage batching in laptop mode; RECLAIM_WRITE */
		unsigned int may_writepage:1;

		/* Can mapped pages be reclaimed? */
		@@ -1416,13 +1417,10 @@ int __isolate_lru_page(struct page *page, isolate_mode_t mode)
		* wants to isolate pages it will be able to operate on without
		* blocking - clean pages for the most part.
		*
		* ISOLATE_CLEAN means that only clean pages should be isolated. This
		* is used by reclaim when it is cannot write to backing storage
		*
		* ISOLATE_ASYNC_MIGRATE is used to indicate that it only wants to pages
		* that it is possible to migrate without blocking
		*/
		if (mode & (ISOLATE_CLEAN\|ISOLATE_ASYNC_MIGRATE)) {
		if (mode & ISOLATE_ASYNC_MIGRATE) {
		/* All the caller can do on PageWriteback is block */
		if (PageWriteback(page))
		return ret;
		@@ -1430,10 +1428,6 @@ int __isolate_lru_page(struct page *page, isolate_mode_t mode)
		if (PageDirty(page)) {
		struct address_space *mapping;

		/* ISOLATE_CLEAN means only clean pages */
		if (mode & ISOLATE_CLEAN)
		return ret;

		/*
		* Only pages without mappings or that have a
		* ->migratepage callback are possible to migrate
		@@ -1831,8 +1825,6 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec,

		if (!sc->may_unmap)
		isolate_mode \|= ISOLATE_UNMAPPED;
		if (!sc->may_writepage)
		isolate_mode \|= ISOLATE_CLEAN;

		spin_lock_irq(&pgdat->lru_lock);

		@@ -2020,8 +2012,6 @@ static void shrink_active_list(unsigned long nr_to_scan,

		if (!sc->may_unmap)
		isolate_mode \|= ISOLATE_UNMAPPED;
		if (!sc->may_writepage)
		isolate_mode \|= ISOLATE_CLEAN;

		spin_lock_irq(&pgdat->lru_lock);