Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm/swap: rename cpu_fbatches->activate 

Rename cpu_fbatches->activate to cpu_fbatches->lru_activate, and its
handler folio_activate_fn() to lru_activate() so that all the boilerplate
can be removed at the end of this series.

Link: https://lkml.kernel.org/r/20240711021317.596178-3-yuzhao@google.com
Signed-off-by: Yu Zhao <yuzhao@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Yu Zhao 2024-07-10 20:13:14 -06:00 committed by Andrew Morton
parent b03484c2a7
commit 380d705493
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mm/swap.c
View File

@ -67,7 +67,7 @@ struct cpu_fbatches {
struct folio_batch lru_deactivate; struct folio_batch lru_deactivate;
struct folio_batch lru_lazyfree; struct folio_batch lru_lazyfree;
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
struct folio_batch activate; struct folio_batch lru_activate;
#endif #endif
}; };
static DEFINE_PER_CPU(struct cpu_fbatches, cpu_fbatches) = { static DEFINE_PER_CPU(struct cpu_fbatches, cpu_fbatches) = {
@ -331,7 +331,7 @@ void lru_note_cost_refault(struct folio *folio)
folio_nr_pages(folio), 0); folio_nr_pages(folio), 0);
} }
static void folio_activate_fn(struct lruvec *lruvec, struct folio *folio) static void lru_activate(struct lruvec *lruvec, struct folio *folio)
{ {
long nr_pages = folio_nr_pages(folio); long nr_pages = folio_nr_pages(folio);
@ -351,10 +351,10 @@ static void folio_activate_fn(struct lruvec *lruvec, struct folio *folio)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
static void folio_activate_drain(int cpu) static void folio_activate_drain(int cpu)
{ {
struct folio_batch *fbatch = &per_cpu(cpu_fbatches.activate, cpu); struct folio_batch *fbatch = &per_cpu(cpu_fbatches.lru_activate, cpu);
if (folio_batch_count(fbatch)) if (folio_batch_count(fbatch))
folio_batch_move_lru(fbatch, folio_activate_fn); folio_batch_move_lru(fbatch, lru_activate);
} }
void folio_activate(struct folio *folio) void folio_activate(struct folio *folio)
@ -371,8 +371,8 @@ void folio_activate(struct folio *folio)
} }
local_lock(&cpu_fbatches.lock); local_lock(&cpu_fbatches.lock);
fbatch = this_cpu_ptr(&cpu_fbatches.activate); fbatch = this_cpu_ptr(&cpu_fbatches.lru_activate);
folio_batch_add_and_move(fbatch, folio, folio_activate_fn); folio_batch_add_and_move(fbatch, folio, lru_activate);
local_unlock(&cpu_fbatches.lock); local_unlock(&cpu_fbatches.lock);
} }
@ -389,7 +389,7 @@ void folio_activate(struct folio *folio)
return; return;
lruvec = folio_lruvec_lock_irq(folio); lruvec = folio_lruvec_lock_irq(folio);
folio_activate_fn(lruvec, folio); lru_activate(lruvec, folio);
unlock_page_lruvec_irq(lruvec); unlock_page_lruvec_irq(lruvec);
folio_set_lru(folio); folio_set_lru(folio);
} }
@ -490,7 +490,7 @@ void folio_mark_accessed(struct folio *folio)
} else if (!folio_test_active(folio)) { } else if (!folio_test_active(folio)) {
/* /*
* If the folio is on the LRU, queue it for activation via * If the folio is on the LRU, queue it for activation via
* cpu_fbatches.activate. Otherwise, assume the folio is in a * cpu_fbatches.lru_activate. Otherwise, assume the folio is in a
* folio_batch, mark it active and it'll be moved to the active * folio_batch, mark it active and it'll be moved to the active
* LRU on the next drain. * LRU on the next drain.
*/ */
@ -829,7 +829,7 @@ static bool cpu_needs_drain(unsigned int cpu)
folio_batch_count(&fbatches->lru_deactivate_file) || folio_batch_count(&fbatches->lru_deactivate_file) ||
folio_batch_count(&fbatches->lru_deactivate) || folio_batch_count(&fbatches->lru_deactivate) ||
folio_batch_count(&fbatches->lru_lazyfree) || folio_batch_count(&fbatches->lru_lazyfree) ||
folio_batch_count(&fbatches->activate) || folio_batch_count(&fbatches->lru_activate) ||
need_mlock_drain(cpu) || need_mlock_drain(cpu) ||
has_bh_in_lru(cpu, NULL); has_bh_in_lru(cpu, NULL);
} }