lkml.org 
[lkml]   [2021]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 3/8] mm: memcontrol: remove the pgdata parameter of mem_cgroup_page_lruvec
    Date
    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.

    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>
    ---
    include/linux/memcontrol.h | 10 +++++-----
    mm/compaction.c | 2 +-
    mm/memcontrol.c | 9 +++------
    mm/swap.c | 2 +-
    mm/workingset.c | 2 +-
    5 files changed, 11 insertions(+), 14 deletions(-)

    diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
    index c193be760709..f2a5aaba3577 100644
    --- a/include/linux/memcontrol.h
    +++ b/include/linux/memcontrol.h
    @@ -743,13 +743,12 @@ static inline struct lruvec *mem_cgroup_lruvec(struct mem_cgroup *memcg,
    /**
    * mem_cgroup_page_lruvec - return lruvec for isolating/putting an LRU page
    * @page: the page
    - * @pgdat: pgdat of the page
    *
    * This function relies on page->mem_cgroup being stable.
    */
    -static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page,
    - struct pglist_data *pgdat)
    +static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page)
    {
    + pg_data_t *pgdat = page_pgdat(page);
    struct mem_cgroup *memcg = page_memcg(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;
    }

    -static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page,
    - struct pglist_data *pgdat)
    +static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page)
    {
    + pg_data_t *pgdat = page_pgdat(page);
    +
    return &pgdat->__lruvec;
    }

    diff --git a/mm/compaction.c b/mm/compaction.c
    index 8c5028bfbd56..1c500e697c88 100644
    --- a/mm/compaction.c
    +++ b/mm/compaction.c
    @@ -994,7 +994,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
    if (!TestClearPageLRU(page))
    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 (lruvec != locked) {
    diff --git a/mm/memcontrol.c b/mm/memcontrol.c
    index 50e3cf1e263e..caf193088beb 100644
    --- a/mm/memcontrol.c
    +++ b/mm/memcontrol.c
    @@ -1181,9 +1181,8 @@ void lruvec_memcg_debug(struct lruvec *lruvec, struct page *page)
    struct lruvec *lock_page_lruvec(struct page *page)
    {
    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);

    lruvec_memcg_debug(lruvec, page);
    @@ -1194,9 +1193,8 @@ struct lruvec *lock_page_lruvec(struct page *page)
    struct lruvec *lock_page_lruvec_irq(struct page *page)
    {
    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);

    lruvec_memcg_debug(lruvec, page);
    @@ -1207,9 +1205,8 @@ struct lruvec *lock_page_lruvec_irq(struct page *page)
    struct lruvec *lock_page_lruvec_irqsave(struct page *page, unsigned long *flags)
    {
    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);

    lruvec_memcg_debug(lruvec, page);
    diff --git a/mm/swap.c b/mm/swap.c
    index a75a8265302b..e0d5699213cc 100644
    --- a/mm/swap.c
    +++ b/mm/swap.c
    @@ -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)
    {
    - 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));
    }

    diff --git a/mm/workingset.c b/mm/workingset.c
    index b7cdeca5a76d..4f7a306ce75a 100644
    --- a/mm/workingset.c
    +++ b/mm/workingset.c
    @@ -408,7 +408,7 @@ void workingset_activation(struct page *page)
    memcg = page_memcg_rcu(page);
    if (!mem_cgroup_disabled() && !memcg)
    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));
    out:
    rcu_read_unlock();
    --
    2.11.0
    \
     
     \ /
      Last update: 2021-04-17 06:38    [W:3.663 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site