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

Commit f04e9ebb authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by Linus Torvalds
Browse files

swap: use an array for the LRU pagevecs 



Turn the pagevecs into an array just like the LRUs.  This significantly
cleans up the source code and reduces the size of the kernel by about 13kB
after all the LRU lists have been created further down in the split VM
patch series.

Signed-off-by: default avatarRik van Riel <riel@redhat.com>
Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b69408e8

include/linux/pagevec.h

+11 −2
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ struct pagevec { 
void __pagevec_release(struct pagevec *pvec);

void __pagevec_release_nonlru(struct pagevec *pvec);

void __pagevec_free(struct pagevec *pvec);

void __pagevec_lru_add(struct pagevec *pvec);

void __pagevec_lru_add_active(struct pagevec *pvec);

void ____pagevec_lru_add(struct pagevec *pvec, enum lru_list lru);

void pagevec_strip(struct pagevec *pvec);

unsigned pagevec_lookup(struct pagevec *pvec, struct address_space *mapping,

		pgoff_t start, unsigned nr_pages);
@@ -81,6 +80,16 @@ static inline void pagevec_free(struct pagevec *pvec) 
		__pagevec_free(pvec);

}



static inline void __pagevec_lru_add(struct pagevec *pvec)

{

	____pagevec_lru_add(pvec, LRU_INACTIVE);

}



static inline void __pagevec_lru_add_active(struct pagevec *pvec)

{

	____pagevec_lru_add(pvec, LRU_ACTIVE);

}



static inline void pagevec_lru_add(struct pagevec *pvec)

{

	if (pagevec_count(pvec))

include/linux/swap.h

+16 −2
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ extern unsigned int nr_free_pagecache_pages(void); 




/* linux/mm/swap.c */

extern void lru_cache_add(struct page *);

extern void lru_cache_add_active(struct page *);

extern void __lru_cache_add(struct page *, enum lru_list lru);

extern void lru_cache_add_lru(struct page *, enum lru_list lru);

extern void activate_page(struct page *);

extern void mark_page_accessed(struct page *);

extern void lru_add_drain(void);
@@ -180,6 +180,20 @@ extern int lru_add_drain_all(void); 
extern void rotate_reclaimable_page(struct page *page);

extern void swap_setup(void);



/**

 * lru_cache_add: add a page to the page lists

 * @page: the page to add

 */

static inline void lru_cache_add(struct page *page)

{

	__lru_cache_add(page, LRU_INACTIVE);

}



static inline void lru_cache_add_active(struct page *page)

{

	__lru_cache_add(page, LRU_ACTIVE);

}



/* linux/mm/vmscan.c */

extern unsigned long try_to_free_pages(struct zonelist *zonelist, int order,

					gfp_t gfp_mask);

mm/migrate.c

+1 −10
Original line number Diff line number Diff line
@@ -55,16 +55,7 @@ int migrate_prep(void) 


static inline void move_to_lru(struct page *page)

{

	if (PageActive(page)) {

		/*

		 * lru_cache_add_active checks that

		 * the PG_active bit is off.

		 */

		ClearPageActive(page);

		lru_cache_add_active(page);

	} else {

		lru_cache_add(page);

	}

	lru_cache_add_lru(page, page_lru(page));

	put_page(page);

}

mm/swap.c

+27 −52
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ 
/* How many pages do we try to swap or page in/out together? */

int page_cluster;



static DEFINE_PER_CPU(struct pagevec, lru_add_pvecs);

static DEFINE_PER_CPU(struct pagevec, lru_add_active_pvecs);

static DEFINE_PER_CPU(struct pagevec[NR_LRU_LISTS], lru_add_pvecs);

static DEFINE_PER_CPU(struct pagevec, lru_rotate_pvecs);



/*
@@ -186,28 +185,29 @@ void mark_page_accessed(struct page *page) 


EXPORT_SYMBOL(mark_page_accessed);



/**

 * lru_cache_add: add a page to the page lists

 * @page: the page to add

 */

void lru_cache_add(struct page *page)

void __lru_cache_add(struct page *page, enum lru_list lru)

{

	struct pagevec *pvec = &get_cpu_var(lru_add_pvecs);

	struct pagevec *pvec = &get_cpu_var(lru_add_pvecs)[lru];



	page_cache_get(page);

	if (!pagevec_add(pvec, page))

		__pagevec_lru_add(pvec);

		____pagevec_lru_add(pvec, lru);

	put_cpu_var(lru_add_pvecs);

}



void lru_cache_add_active(struct page *page)

/**

 * lru_cache_add_lru - add a page to a page list

 * @page: the page to be added to the LRU.

 * @lru: the LRU list to which the page is added.

 */

void lru_cache_add_lru(struct page *page, enum lru_list lru)

{

	struct pagevec *pvec = &get_cpu_var(lru_add_active_pvecs);

	if (PageActive(page)) {

		ClearPageActive(page);

	}



	page_cache_get(page);

	if (!pagevec_add(pvec, page))

		__pagevec_lru_add_active(pvec);

	put_cpu_var(lru_add_active_pvecs);

	VM_BUG_ON(PageLRU(page) || PageActive(page));

	__lru_cache_add(page, lru);

}



/*
@@ -217,15 +217,15 @@ void lru_cache_add_active(struct page *page) 
 */

static void drain_cpu_pagevecs(int cpu)

{

	struct pagevec *pvecs = per_cpu(lru_add_pvecs, cpu);

	struct pagevec *pvec;

	int lru;



	pvec = &per_cpu(lru_add_pvecs, cpu);

	if (pagevec_count(pvec))

		__pagevec_lru_add(pvec);



	pvec = &per_cpu(lru_add_active_pvecs, cpu);

	for_each_lru(lru) {

		pvec = &pvecs[lru - LRU_BASE];

		if (pagevec_count(pvec))

		__pagevec_lru_add_active(pvec);

			____pagevec_lru_add(pvec, lru);

	}



	pvec = &per_cpu(lru_rotate_pvecs, cpu);

	if (pagevec_count(pvec)) {
@@ -380,34 +380,7 @@ void __pagevec_release_nonlru(struct pagevec *pvec) 
 * Add the passed pages to the LRU, then drop the caller's refcount

 * on them.  Reinitialises the caller's pagevec.

 */

void __pagevec_lru_add(struct pagevec *pvec)

{

	int i;

	struct zone *zone = NULL;



	for (i = 0; i < pagevec_count(pvec); i++) {

		struct page *page = pvec->pages[i];

		struct zone *pagezone = page_zone(page);



		if (pagezone != zone) {

			if (zone)

				spin_unlock_irq(&zone->lru_lock);

			zone = pagezone;

			spin_lock_irq(&zone->lru_lock);

		}

		VM_BUG_ON(PageLRU(page));

		SetPageLRU(page);

		add_page_to_inactive_list(zone, page);

	}

	if (zone)

		spin_unlock_irq(&zone->lru_lock);

	release_pages(pvec->pages, pvec->nr, pvec->cold);

	pagevec_reinit(pvec);

}



EXPORT_SYMBOL(__pagevec_lru_add);



void __pagevec_lru_add_active(struct pagevec *pvec)

void ____pagevec_lru_add(struct pagevec *pvec, enum lru_list lru)

{

	int i;

	struct zone *zone = NULL;
@@ -424,9 +397,9 @@ void __pagevec_lru_add_active(struct pagevec *pvec) 
		}

		VM_BUG_ON(PageLRU(page));

		SetPageLRU(page);

		VM_BUG_ON(PageActive(page));

		if (is_active_lru(lru))

			SetPageActive(page);

		add_page_to_active_list(zone, page);

		add_page_to_lru_list(zone, page, lru);

	}

	if (zone)

		spin_unlock_irq(&zone->lru_lock);
@@ -434,6 +407,8 @@ void __pagevec_lru_add_active(struct pagevec *pvec) 
	pagevec_reinit(pvec);

}



EXPORT_SYMBOL(____pagevec_lru_add);



/*

 * Try to drop buffers from the pages in a pagevec

 */