lkml.org 
[lkml]   [2021]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 001/221] mm/memcg: rename mem_cgroup_split_huge_fixup to split_page_memcg and add nr_pages argument
    Date
    From: Zhou Guanghui <zhouguanghui1@huawei.com>

    commit be6c8982e4ab9a41907555f601b711a7e2a17d4c upstream.

    Rename mem_cgroup_split_huge_fixup to split_page_memcg and explicitly pass
    in page number argument.

    In this way, the interface name is more common and can be used by
    potential users. In addition, the complete info(memcg and flag) of the
    memcg needs to be set to the tail pages.

    Link: https://lkml.kernel.org/r/20210304074053.65527-2-zhouguanghui1@huawei.com
    Signed-off-by: Zhou Guanghui <zhouguanghui1@huawei.com>
    Acked-by: Johannes Weiner <hannes@cmpxchg.org>
    Reviewed-by: Zi Yan <ziy@nvidia.com>
    Reviewed-by: Shakeel Butt <shakeelb@google.com>
    Acked-by: Michal Hocko <mhocko@suse.com>
    Cc: Hugh Dickins <hughd@google.com>
    Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
    Cc: Nicholas Piggin <npiggin@gmail.com>
    Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
    Cc: Hanjun Guo <guohanjun@huawei.com>
    Cc: Tianhong Ding <dingtianhong@huawei.com>
    Cc: Weilong Chen <chenweilong@huawei.com>
    Cc: Rui Xiang <rui.xiang@huawei.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Hugh Dickins <hughd@google.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    include/linux/memcontrol.h | 6 ++----
    mm/huge_memory.c | 2 +-
    mm/memcontrol.c | 15 +++++----------
    3 files changed, 8 insertions(+), 15 deletions(-)

    --- a/include/linux/memcontrol.h
    +++ b/include/linux/memcontrol.h
    @@ -937,9 +937,7 @@ static inline void memcg_memory_event_mm
    rcu_read_unlock();
    }

    -#ifdef CONFIG_TRANSPARENT_HUGEPAGE
    -void mem_cgroup_split_huge_fixup(struct page *head);
    -#endif
    +void split_page_memcg(struct page *head, unsigned int nr);

    #else /* CONFIG_MEMCG */

    @@ -1267,7 +1265,7 @@ unsigned long mem_cgroup_soft_limit_recl
    return 0;
    }

    -static inline void mem_cgroup_split_huge_fixup(struct page *head)
    +static inline void split_page_memcg(struct page *head, unsigned int nr)
    {
    }

    --- a/mm/huge_memory.c
    +++ b/mm/huge_memory.c
    @@ -2433,7 +2433,7 @@ static void __split_huge_page(struct pag
    lruvec = mem_cgroup_page_lruvec(head, pgdat);

    /* complete memcg works before add pages to LRU */
    - mem_cgroup_split_huge_fixup(head);
    + split_page_memcg(head, nr);

    if (PageAnon(head) && PageSwapCache(head)) {
    swp_entry_t entry = { .val = page_private(head) };
    --- a/mm/memcontrol.c
    +++ b/mm/memcontrol.c
    @@ -3268,26 +3268,21 @@ void obj_cgroup_uncharge(struct obj_cgro

    #endif /* CONFIG_MEMCG_KMEM */

    -#ifdef CONFIG_TRANSPARENT_HUGEPAGE
    -
    /*
    - * Because tail pages are not marked as "used", set it. We're under
    - * pgdat->lru_lock and migration entries setup in all page mappings.
    + * Because head->mem_cgroup is not set on tails, set it now.
    */
    -void mem_cgroup_split_huge_fixup(struct page *head)
    +void split_page_memcg(struct page *head, unsigned int nr)
    {
    struct mem_cgroup *memcg = head->mem_cgroup;
    int i;

    - if (mem_cgroup_disabled())
    + if (mem_cgroup_disabled() || !memcg)
    return;

    - for (i = 1; i < HPAGE_PMD_NR; i++) {
    - css_get(&memcg->css);
    + for (i = 1; i < nr; i++)
    head[i].mem_cgroup = memcg;
    - }
    + css_get_many(&memcg->css, nr - 1);
    }
    -#endif /* CONFIG_TRANSPARENT_HUGEPAGE */

    #ifdef CONFIG_MEMCG_SWAP
    /**

    \
     
     \ /
      Last update: 2021-03-29 10:30    [W:4.224 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site