mm-swapc-fold-vm-event-pgrotated-into-pagevec_move_tail_fn.patch removed from -mm tree
The patch titled
Subject: mm/swap.c: fold vm event PGROTATED into pagevec_move_tail_fn
has been removed from the -mm tree. Its filename was
mm-swapc-fold-vm-event-pgrotated-into-pagevec_move_tail_fn.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Alex Shi <[email protected]>
Subject: mm/swap.c: fold vm event PGROTATED into pagevec_move_tail_fn
Fold the PGROTATED event collection into pagevec_move_tail_fn call back func like other funcs does in pagevec_lru_move_fn. Thus we could save func call pagevec_move_tail(). Now all usage of pagevec_lru_move_fn are same and no needs of its 3rd parameter.
It's just simply the calling. No functional change.
---
mm/swap.c | 65 ++++++++++++++++++---------------------------------- 1 file changed, 23 insertions(+), 42 deletions(-)
mm/swap.c renamed from mm/swap.c~mm-swapc-fold-vm-event-pgrotated-into-pagevec_move_tail_fn +23 -42
@@ -204,8 +204,7 @@ int get_kernel_page(unsigned long start,EXPORT_SYMBOL_GPL (get_kernel_page);static void pagevec_lru_move_fn (struct pagevec *pvec, -void (*move_fn)(struct page *page,struct lruvec *lruvec,void *arg), -void *arg) +void (*move_fn)(struct page *page,struct lruvec *lruvec)) {int i;struct pglist_data *pgdat =NULL ;
@@ -224,7 +223,7 @@ static void pagevec_lru_move_fn(struct p } lruvec =mem_cgroup_page_lruvec (page, pgdat); - (*move_fn)(page, lruvec, arg); + (*move_fn)(page, lruvec); }if (pgdat)spin_unlock_irqrestore (&pgdat->lru_lock, flags);
@@ -232,35 +231,22 @@ static void pagevec_lru_move_fn(struct ppagevec_reinit (pvec); } -static void pagevec_move_tail_fn (struct page *page,struct lruvec *lruvec, -void *arg) +static void pagevec_move_tail_fn (struct page *page,struct lruvec *lruvec) { -int *pgmoved = arg; -if (PageLRU (page) && !PageUnevictable (page)) {del_page_from_lru_list (page, lruvec,page_lru (page));ClearPageActive (page);add_page_to_lru_list_tail (page, lruvec,page_lru (page)); - (*pgmoved) +=thp_nr_pages (page); +__count_vm_events (PGROTATED ,thp_nr_pages (page)); } }/* -* pagevec_move_tail() must be called with IRQ disabled. -* Otherwise this may cause nasty races. -*/ -static void pagevec_move_tail (struct pagevec *pvec) -{ -int pgmoved =0 ; - -pagevec_lru_move_fn (pvec, pagevec_move_tail_fn, &pgmoved); -__count_vm_events (PGROTATED , pgmoved); -} - -/* * Writeback is about to end against a page which has been marked for immediate * reclaim. If it still appears to be reclaimable, move it to the tail of the * inactive list. +* +* rotate_reclaimable_page() must disable IRQs, to prevent nasty races. */ void rotate_reclaimable_page (struct page *page) {
@@ -273,7 +259,7 @@ void rotate_reclaimable_page(struct pagelocal_lock_irqsave (&lru_rotate.lock, flags); pvec =this_cpu_ptr (&lru_rotate.pvec);if (!pagevec_add (pvec, page) ||PageCompound (page)) -pagevec_move_tail (pvec); +pagevec_lru_move_fn (pvec, pagevec_move_tail_fn);local_unlock_irqrestore (&lru_rotate.lock, flags); } }
@@ -315,8 +301,7 @@ void lru_note_cost_page(struct page *pag page_is_file_lru(page), thp_nr_pages(page)); } -static void __activate_page (struct page *page,struct lruvec *lruvec, -void *arg) +static void __activate_page (struct page *page,struct lruvec *lruvec) {if (PageLRU (page) && !PageActive (page) && !PageUnevictable (page)) {int lru =page_lru_base_type (page);
@@ -340,7 +325,7 @@ static void activate_page_drain(int cpu)struct pagevec *pvec = &per_cpu (lru_pvecs.activate_page, cpu);if (pagevec_count (pvec)) -pagevec_lru_move_fn (pvec, __activate_page,NULL ); +pagevec_lru_move_fn (pvec, __activate_page); }static bool need_activate_page_drain (int cpu)
@@ -358,7 +343,7 @@ static void activate_page(struct page *p pvec =this_cpu_ptr (&lru_pvecs.activate_page);get_page (page);if (!pagevec_add (pvec, page) ||PageCompound (page)) -pagevec_lru_move_fn (pvec, __activate_page,NULL ); +pagevec_lru_move_fn (pvec, __activate_page);local_unlock (&lru_pvecs.lock); } }
@@ -374,7 +359,7 @@ static void activate_page(struct page *p page =compound_head (page);spin_lock_irq (&pgdat->lru_lock); -__activate_page (page,mem_cgroup_page_lruvec (page, pgdat),NULL ); +__activate_page (page,mem_cgroup_page_lruvec (page, pgdat)); spin_unlock_irq(&pgdat->lru_lock); }#endif
@@ -525,8 +510,7 @@ void lru_cache_add_inactive_or_unevictab* be write it out by flusher threads as this is much more effective * than the single-page writeout from reclaim. */ -static void lru_deactivate_file_fn (struct page *page,struct lruvec *lruvec, -void *arg) +static void lru_deactivate_file_fn (struct page *page,struct lruvec *lruvec) {int lru;bool active;
@@ -573,8 +557,7 @@ static void lru_deactivate_file_fn(struc } } -static void lru_deactivate_fn (struct page *page,struct lruvec *lruvec, -void *arg) +static void lru_deactivate_fn (struct page *page,struct lruvec *lruvec) {if (PageLRU (page) &&PageActive (page) && !PageUnevictable (page)) {int lru =page_lru_base_type (page);
@@ -591,8 +574,7 @@ static void lru_deactivate_fn(struct pag } } -static void lru_lazyfree_fn (struct page *page,struct lruvec *lruvec, -void *arg) +static void lru_lazyfree_fn (struct page *page,struct lruvec *lruvec) {if (PageLRU (page) &&PageAnon (page) &&PageSwapBacked (page) && !PageSwapCache (page) && !PageUnevictable (page)) {
@@ -636,21 +618,21 @@ void lru_add_drain_cpu(int cpu)/* No harm done if a racing interrupt already did this */ local_lock_irqsave (&lru_rotate.lock, flags); -pagevec_move_tail (pvec); +pagevec_lru_move_fn (pvec, pagevec_move_tail_fn);local_unlock_irqrestore (&lru_rotate.lock, flags); } pvec = &per_cpu (lru_pvecs.lru_deactivate_file, cpu);if (pagevec_count (pvec)) -pagevec_lru_move_fn (pvec, lru_deactivate_file_fn,NULL ); +pagevec_lru_move_fn (pvec, lru_deactivate_file_fn); pvec = &per_cpu (lru_pvecs.lru_deactivate, cpu);if (pagevec_count (pvec)) -pagevec_lru_move_fn (pvec, lru_deactivate_fn,NULL ); +pagevec_lru_move_fn (pvec, lru_deactivate_fn); pvec = &per_cpu (lru_pvecs.lru_lazyfree, cpu);if (pagevec_count (pvec)) -pagevec_lru_move_fn (pvec, lru_lazyfree_fn,NULL ); +pagevec_lru_move_fn (pvec, lru_lazyfree_fn);activate_page_drain (cpu); }
@@ -679,7 +661,7 @@ void deactivate_file_page(struct page *p pvec =this_cpu_ptr (&lru_pvecs.lru_deactivate_file);if (!pagevec_add (pvec, page) ||PageCompound (page)) -pagevec_lru_move_fn (pvec, lru_deactivate_file_fn,NULL ); +pagevec_lru_move_fn (pvec, lru_deactivate_file_fn);local_unlock (&lru_pvecs.lock); } }
@@ -701,7 +683,7 @@ void deactivate_page(struct page *page) pvec =this_cpu_ptr (&lru_pvecs.lru_deactivate);get_page (page);if (!pagevec_add (pvec, page) ||PageCompound (page)) -pagevec_lru_move_fn (pvec, lru_deactivate_fn,NULL ); +pagevec_lru_move_fn (pvec, lru_deactivate_fn);local_unlock (&lru_pvecs.lock); } }
@@ -723,7 +705,7 @@ void mark_page_lazyfree(struct page *pag pvec =this_cpu_ptr (&lru_pvecs.lru_lazyfree);get_page (page);if (!pagevec_add (pvec, page) ||PageCompound (page)) -pagevec_lru_move_fn (pvec, lru_lazyfree_fn,NULL ); +pagevec_lru_move_fn (pvec, lru_lazyfree_fn);local_unlock (&lru_pvecs.lock); } }
@@ -977,8 +959,7 @@ void __pagevec_release(struct pagevec *p }EXPORT_SYMBOL (__pagevec_release); -static void __pagevec_lru_add_fn (struct page *page,struct lruvec *lruvec, -void *arg) +static void __pagevec_lru_add_fn (struct page *page,struct lruvec *lruvec) {enum lru_list lru;int was_unevictable =TestClearPageUnevictable (page);
@@ -1037,7 +1018,7 @@ static void __pagevec_lru_add_fn(struct*/ void __pagevec_lru_add (struct pagevec *pvec) { -pagevec_lru_move_fn (pvec, __pagevec_lru_add_fn,NULL ); +pagevec_lru_move_fn (pvec, __pagevec_lru_add_fn); }/**
_
Patches currently in -mm which might be from [email protected] are
mm-vmscan-__isolate_lru_page_prepare-clean-up.patch fs-nilfs2-remove-some-unused-macros-to-tame-gcc.patch gcov-fix-kernel-doc-markup-issue.patch mm-memcg-bail-early-from-swap-accounting-if-memcg-disabled.patch mm-memcg-warning-on-memcg-after-readahead-page-charged.patch mm-memcontrol-rewrite-mem_cgroup_page_lruvec-fix.patch