mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-03-19 13:34:07 +00:00
mm: memcontrol: remove the pgdata parameter of mem_cgroup_page_lruvec
All the callers of mem_cgroup_page_lruvec() just pass page_pgdat(page) as the 2nd parameter to it (except isolate_migratepages_block()). But for isolate_migratepages_block(), the page_pgdat(page) is also equal to the local variable of @pgdat. So mem_cgroup_page_lruvec() do not need the pgdat parameter. Just remove it to simplify the code. Link: https://lkml.kernel.org/r/20210417043538.9793-4-songmuchun@bytedance.com Signed-off-by: Muchun Song <songmuchun@bytedance.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Reviewed-by: Shakeel Butt <shakeelb@google.com> Acked-by: Roman Gushchin <guro@fb.com> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Vladimir Davydov <vdavydov.dev@gmail.com> Cc: Xiongchun Duan <duanxiongchun@bytedance.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
2884b6b7ee
commit
a984226f45
5 changed files with 11 additions and 14 deletions
|
@ -743,13 +743,12 @@ out:
|
||||||
/**
|
/**
|
||||||
* mem_cgroup_page_lruvec - return lruvec for isolating/putting an LRU page
|
* mem_cgroup_page_lruvec - return lruvec for isolating/putting an LRU page
|
||||||
* @page: the page
|
* @page: the page
|
||||||
* @pgdat: pgdat of the page
|
|
||||||
*
|
*
|
||||||
* This function relies on page->mem_cgroup being stable.
|
* This function relies on page->mem_cgroup being stable.
|
||||||
*/
|
*/
|
||||||
static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page,
|
static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page)
|
||||||
struct pglist_data *pgdat)
|
|
||||||
{
|
{
|
||||||
|
pg_data_t *pgdat = page_pgdat(page);
|
||||||
struct mem_cgroup *memcg = page_memcg(page);
|
struct mem_cgroup *memcg = page_memcg(page);
|
||||||
|
|
||||||
VM_WARN_ON_ONCE_PAGE(!memcg && !mem_cgroup_disabled(), page);
|
VM_WARN_ON_ONCE_PAGE(!memcg && !mem_cgroup_disabled(), page);
|
||||||
|
@ -1221,9 +1220,10 @@ static inline struct lruvec *mem_cgroup_lruvec(struct mem_cgroup *memcg,
|
||||||
return &pgdat->__lruvec;
|
return &pgdat->__lruvec;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page,
|
static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page)
|
||||||
struct pglist_data *pgdat)
|
|
||||||
{
|
{
|
||||||
|
pg_data_t *pgdat = page_pgdat(page);
|
||||||
|
|
||||||
return &pgdat->__lruvec;
|
return &pgdat->__lruvec;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1028,7 +1028,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
|
||||||
if (!TestClearPageLRU(page))
|
if (!TestClearPageLRU(page))
|
||||||
goto isolate_fail_put;
|
goto isolate_fail_put;
|
||||||
|
|
||||||
lruvec = mem_cgroup_page_lruvec(page, pgdat);
|
lruvec = mem_cgroup_page_lruvec(page);
|
||||||
|
|
||||||
/* If we already hold the lock, we can skip some rechecking */
|
/* If we already hold the lock, we can skip some rechecking */
|
||||||
if (lruvec != locked) {
|
if (lruvec != locked) {
|
||||||
|
|
|
@ -1199,9 +1199,8 @@ void lruvec_memcg_debug(struct lruvec *lruvec, struct page *page)
|
||||||
struct lruvec *lock_page_lruvec(struct page *page)
|
struct lruvec *lock_page_lruvec(struct page *page)
|
||||||
{
|
{
|
||||||
struct lruvec *lruvec;
|
struct lruvec *lruvec;
|
||||||
struct pglist_data *pgdat = page_pgdat(page);
|
|
||||||
|
|
||||||
lruvec = mem_cgroup_page_lruvec(page, pgdat);
|
lruvec = mem_cgroup_page_lruvec(page);
|
||||||
spin_lock(&lruvec->lru_lock);
|
spin_lock(&lruvec->lru_lock);
|
||||||
|
|
||||||
lruvec_memcg_debug(lruvec, page);
|
lruvec_memcg_debug(lruvec, page);
|
||||||
|
@ -1212,9 +1211,8 @@ struct lruvec *lock_page_lruvec(struct page *page)
|
||||||
struct lruvec *lock_page_lruvec_irq(struct page *page)
|
struct lruvec *lock_page_lruvec_irq(struct page *page)
|
||||||
{
|
{
|
||||||
struct lruvec *lruvec;
|
struct lruvec *lruvec;
|
||||||
struct pglist_data *pgdat = page_pgdat(page);
|
|
||||||
|
|
||||||
lruvec = mem_cgroup_page_lruvec(page, pgdat);
|
lruvec = mem_cgroup_page_lruvec(page);
|
||||||
spin_lock_irq(&lruvec->lru_lock);
|
spin_lock_irq(&lruvec->lru_lock);
|
||||||
|
|
||||||
lruvec_memcg_debug(lruvec, page);
|
lruvec_memcg_debug(lruvec, page);
|
||||||
|
@ -1225,9 +1223,8 @@ struct lruvec *lock_page_lruvec_irq(struct page *page)
|
||||||
struct lruvec *lock_page_lruvec_irqsave(struct page *page, unsigned long *flags)
|
struct lruvec *lock_page_lruvec_irqsave(struct page *page, unsigned long *flags)
|
||||||
{
|
{
|
||||||
struct lruvec *lruvec;
|
struct lruvec *lruvec;
|
||||||
struct pglist_data *pgdat = page_pgdat(page);
|
|
||||||
|
|
||||||
lruvec = mem_cgroup_page_lruvec(page, pgdat);
|
lruvec = mem_cgroup_page_lruvec(page);
|
||||||
spin_lock_irqsave(&lruvec->lru_lock, *flags);
|
spin_lock_irqsave(&lruvec->lru_lock, *flags);
|
||||||
|
|
||||||
lruvec_memcg_debug(lruvec, page);
|
lruvec_memcg_debug(lruvec, page);
|
||||||
|
|
|
@ -313,7 +313,7 @@ void lru_note_cost(struct lruvec *lruvec, bool file, unsigned int nr_pages)
|
||||||
|
|
||||||
void lru_note_cost_page(struct page *page)
|
void lru_note_cost_page(struct page *page)
|
||||||
{
|
{
|
||||||
lru_note_cost(mem_cgroup_page_lruvec(page, page_pgdat(page)),
|
lru_note_cost(mem_cgroup_page_lruvec(page),
|
||||||
page_is_file_lru(page), thp_nr_pages(page));
|
page_is_file_lru(page), thp_nr_pages(page));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -408,7 +408,7 @@ void workingset_activation(struct page *page)
|
||||||
memcg = page_memcg_rcu(page);
|
memcg = page_memcg_rcu(page);
|
||||||
if (!mem_cgroup_disabled() && !memcg)
|
if (!mem_cgroup_disabled() && !memcg)
|
||||||
goto out;
|
goto out;
|
||||||
lruvec = mem_cgroup_page_lruvec(page, page_pgdat(page));
|
lruvec = mem_cgroup_page_lruvec(page);
|
||||||
workingset_age_nonresident(lruvec, thp_nr_pages(page));
|
workingset_age_nonresident(lruvec, thp_nr_pages(page));
|
||||||
out:
|
out:
|
||||||
rcu_read_unlock();
|
rcu_read_unlock();
|
||||||
|
|
Loading…
Add table
Reference in a new issue