From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D73CBC04AB3 for ; Wed, 29 May 2019 08:14:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 861C220B7C for ; Wed, 29 May 2019 08:14:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 861C220B7C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 16F556B000C; Wed, 29 May 2019 04:14:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F8A06B0266; Wed, 29 May 2019 04:14:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F2B206B026A; Wed, 29 May 2019 04:14:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) by kanga.kvack.org (Postfix) with ESMTP id 82AAB6B000C for ; Wed, 29 May 2019 04:14:52 -0400 (EDT) Received: by mail-lf1-f69.google.com with SMTP id 22so490765lft.2 for ; Wed, 29 May 2019 01:14:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:subject:to:cc :references:from:message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=cTf7SaHI2n1CYWishfMICX4XSf8udjd4wXUKHhXAiCE=; b=jh/XjoLG6EiMUHa+Jrykz2MTmP9UbATKyAXkfnnrr7YoH16/JaoLL0a9saofD1PnE0 KGtWWQ4AOnbOIKt7uqI1VEE8kFhWWDzL7X7Q9f12agwK+fEa0hXpiFXx+hvVOV1ySYlf QaO6cWWQ1C6Iqxu9hdp8jGDtOiLkKqG99MSPJ9iMbFPUAAJETmj6LsaiAMSDwkK/theY frGxwoOctpcMftMXubThcOUoJg6NXrucrCds8wK+wjsU6cqs7rX5P15p77HQ2vHl/Q2W JyBSztX2hfjMdbwG75NvdfzWMKSRcNLcoh5yVfoSNVGpUFgQTWgRbiOaYXnrGkqUVtxN L6GQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of ktkhai@virtuozzo.com designates 185.231.240.75 as permitted sender) smtp.mailfrom=ktkhai@virtuozzo.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com X-Gm-Message-State: APjAAAU57vNqJgX5EmWOt9myenUcD61Ztk9WHuEiPwg5ZhFu+U/Tto1A RM1SDsTgHZj3vF4jLVlArvOcTm5woXSvKDZqE7jLC+NEvSJEKzk58cHrTphMYWrlkektIyrBtjJ qGpzrGarA/W0fgyEIj7fiNc+/U3+MMpigGx0a/PLWkV+kcTAfJUn4TPQabyDiVchWuA== X-Received: by 2002:ac2:5e82:: with SMTP id b2mr10543946lfq.3.1559117691790; Wed, 29 May 2019 01:14:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqzgrArYqcdpdpoi70CfRvEa/L7T3OYSOvPK6qCfaxDfX3XIEKNcf4v8+F7pgloOZ+8zEQJJ X-Received: by 2002:ac2:5e82:: with SMTP id b2mr10543901lfq.3.1559117690552; Wed, 29 May 2019 01:14:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559117690; cv=none; d=google.com; s=arc-20160816; b=tj16n2PyjYcQn/v9AquNymDQHmbCbIeVGq7w95Ougm135ZbiwosotThe/ixJQ20SUZ c4cYmtBTBSz2rUT/28UMKCgWtQkqwo0sdMCrDcLpcbPi/WRTJ4jcUlDtnlQUZllDu473 qowjtiiCUQT9YriT0x82A/TDPCe+oYJ+eyMfGohv7qrfyPLemjfQehaxHel6Yc8w2csg JV1lRH+9aKEB92MTv3zixifpyctsQhIeMyWl/h2FrGsWBp9XxbyQqptmGUNPqn4g12Nm g/7eWGKOPetZKgh5Iy+NSz9037/Mo6heP7ZBDxieumFAWd+7JUSulZ3vnQL2/I9nVfmd brXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=cTf7SaHI2n1CYWishfMICX4XSf8udjd4wXUKHhXAiCE=; b=rFYaw35hyPfEqbjtOle1Fhha0r3B4mROa5hj4kFyhAzp7OfEdEV/a+8B8jnHvaIvgs Ej/lbu6aYf59uGIH/GT/fM23rzQO8WR5jpdzRc01OBfJlsWIQvhFlYpv6TT6HgepmpYI eGk2IRr5hoJ3w19Fbode7EMgrPWG0cn8j3ZrO38FuyIZhac2U0tih+1VGTCnuPCH0gYo n/THEZH0w4UVQgUQ651OOLiPAP7dTJwGvJm6eBzwUWZpq2pymVltjUkgFO0IKSb2QGzr bsLqDfPIuNNvJWUz6+FsSrFdPzfXkggCkwvMPSueB3J6uEYKM8kOzbcyeqXHvHqrjh6J bkfw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ktkhai@virtuozzo.com designates 185.231.240.75 as permitted sender) smtp.mailfrom=ktkhai@virtuozzo.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from relay.sw.ru (relay.sw.ru. [185.231.240.75]) by mx.google.com with ESMTPS id e5si17707085ljg.0.2019.05.29.01.14.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 May 2019 01:14:50 -0700 (PDT) Received-SPF: pass (google.com: domain of ktkhai@virtuozzo.com designates 185.231.240.75 as permitted sender) client-ip=185.231.240.75; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ktkhai@virtuozzo.com designates 185.231.240.75 as permitted sender) smtp.mailfrom=ktkhai@virtuozzo.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from [172.16.25.169] by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hVtjS-0001nI-9B; Wed, 29 May 2019 11:14:46 +0300 Subject: Re: [PATCH 1/3] mm: thp: make deferred split shrinker memcg aware To: Yang Shi , hannes@cmpxchg.org, mhocko@suse.com, kirill.shutemov@linux.intel.com, hughd@google.com, shakeelb@google.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <1559047464-59838-1-git-send-email-yang.shi@linux.alibaba.com> <1559047464-59838-2-git-send-email-yang.shi@linux.alibaba.com> <487665fe-c792-5078-292a-481f33d31d30@virtuozzo.com> From: Kirill Tkhai Message-ID: <20fe4ea6-c1c5-67bb-5c7e-2db0a9af6892@virtuozzo.com> Date: Wed, 29 May 2019 11:14:45 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 29.05.2019 05:43, Yang Shi wrote: > > > On 5/28/19 10:42 PM, Kirill Tkhai wrote: >> Hi, Yang, >> >> On 28.05.2019 15:44, Yang Shi wrote: >>> Currently THP deferred split shrinker is not memcg aware, this may cause >>> premature OOM with some configuration. For example the below test would >>> run into premature OOM easily: >>> >>> $ cgcreate -g memory:thp >>> $ echo 4G > /sys/fs/cgroup/memory/thp/memory/limit_in_bytes >>> $ cgexec -g memory:thp transhuge-stress 4000 >>> >>> transhuge-stress comes from kernel selftest. >>> >>> It is easy to hit OOM, but there are still a lot THP on the deferred >>> split queue, memcg direct reclaim can't touch them since the deferred >>> split shrinker is not memcg aware. >>> >>> Convert deferred split shrinker memcg aware by introducing per memcg >>> deferred split queue.  The THP should be on either per node or per memcg >>> deferred split queue if it belongs to a memcg.  When the page is >>> immigrated to the other memcg, it will be immigrated to the target >>> memcg's deferred split queue too. >>> >>> And, move deleting THP from deferred split queue in page free before >>> memcg uncharge so that the page's memcg information is available. >>> >>> Reuse the second tail page's deferred_list for per memcg list since the >>> same THP can't be on multiple deferred split queues. >>> >>> Cc: Kirill Tkhai >>> Cc: Johannes Weiner >>> Cc: Michal Hocko >>> Cc: "Kirill A . Shutemov" >>> Cc: Hugh Dickins >>> Cc: Shakeel Butt >>> Signed-off-by: Yang Shi >>> --- >>>   include/linux/huge_mm.h    |  24 ++++++ >>>   include/linux/memcontrol.h |   6 ++ >>>   include/linux/mm_types.h   |   7 +- >>>   mm/huge_memory.c           | 182 +++++++++++++++++++++++++++++++++------------ >>>   mm/memcontrol.c            |  20 +++++ >>>   mm/swap.c                  |   4 + >>>   6 files changed, 194 insertions(+), 49 deletions(-) >>> >>> diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h >>> index 7cd5c15..f6d1cde 100644 >>> --- a/include/linux/huge_mm.h >>> +++ b/include/linux/huge_mm.h >>> @@ -250,6 +250,26 @@ static inline bool thp_migration_supported(void) >>>       return IS_ENABLED(CONFIG_ARCH_ENABLE_THP_MIGRATION); >>>   } >>>   +static inline struct list_head *page_deferred_list(struct page *page) >>> +{ >>> +    /* >>> +     * Global deferred list in the second tail pages is occupied by >>> +     * compound_head. >>> +     */ >>> +    return &page[2].deferred_list; >>> +} >>> + >>> +static inline struct list_head *page_memcg_deferred_list(struct page *page) >>> +{ >>> +    /* >>> +     * Memcg deferred list in the second tail pages is occupied by >>> +     * compound_head. >>> +     */ >>> +    return &page[2].memcg_deferred_list; >>> +} >>> + >>> +extern void del_thp_from_deferred_split_queue(struct page *); >>> + >>>   #else /* CONFIG_TRANSPARENT_HUGEPAGE */ >>>   #define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; }) >>>   #define HPAGE_PMD_MASK ({ BUILD_BUG(); 0; }) >>> @@ -368,6 +388,10 @@ static inline bool thp_migration_supported(void) >>>   { >>>       return false; >>>   } >>> + >>> +static inline void del_thp_from_deferred_split_queue(struct page *page) >>> +{ >>> +} >>>   #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ >>>     #endif /* _LINUX_HUGE_MM_H */ >>> diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h >>> index bc74d6a..9ff5fab 100644 >>> --- a/include/linux/memcontrol.h >>> +++ b/include/linux/memcontrol.h >>> @@ -316,6 +316,12 @@ struct mem_cgroup { >>>       struct list_head event_list; >>>       spinlock_t event_list_lock; >>>   +#ifdef CONFIG_TRANSPARENT_HUGEPAGE >>> +    struct list_head split_queue; >>> +    unsigned long split_queue_len; >>> +    spinlock_t split_queue_lock; >>> +#endif >>> + >>>       struct mem_cgroup_per_node *nodeinfo[0]; >>>       /* WARNING: nodeinfo must be the last member here */ >>>   }; >>> diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h >>> index 8ec38b1..405f5e6 100644 >>> --- a/include/linux/mm_types.h >>> +++ b/include/linux/mm_types.h >>> @@ -139,7 +139,12 @@ struct page { >>>           struct {    /* Second tail page of compound page */ >>>               unsigned long _compound_pad_1;    /* compound_head */ >>>               unsigned long _compound_pad_2; >>> -            struct list_head deferred_list; >>> +            union { >>> +                /* Global THP deferred split list */ >>> +                struct list_head deferred_list; >>> +                /* Memcg THP deferred split list */ >>> +                struct list_head memcg_deferred_list; >> Why we need two namesakes for this list entry? >> >> For me it looks redundantly: it does not give additional information, >> but it leads to duplication (and we have two helpers page_deferred_list() >> and page_memcg_deferred_list() instead of one). > > Yes, kind of. Actually I was also wondering if this is worth or not. My point is this may improve the code readability. We can figure out what split queue (per node or per memcg) is being manipulated just by the name of the list. > > If the most people thought this is unnecessary, I'm definitely ok to just keep one name. > >> >>> +            }; >>>           }; >>>           struct {    /* Page table pages */ >>>               unsigned long _pt_pad_1;    /* compound_head */ >>> diff --git a/mm/huge_memory.c b/mm/huge_memory.c >>> index 9f8bce9..0b9cfe1 100644 >>> --- a/mm/huge_memory.c >>> +++ b/mm/huge_memory.c >>> @@ -492,12 +492,6 @@ pmd_t maybe_pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma) >>>       return pmd; >>>   } >>>   -static inline struct list_head *page_deferred_list(struct page *page) >>> -{ >>> -    /* ->lru in the tail pages is occupied by compound_head. */ >>> -    return &page[2].deferred_list; >>> -} >>> - >>>   void prep_transhuge_page(struct page *page) >>>   { >>>       /* >>> @@ -505,7 +499,10 @@ void prep_transhuge_page(struct page *page) >>>        * as list_head: assuming THP order >= 2 >>>        */ >>>   -    INIT_LIST_HEAD(page_deferred_list(page)); >>> +    if (mem_cgroup_disabled()) >>> +        INIT_LIST_HEAD(page_deferred_list(page)); >>> +    else >>> +        INIT_LIST_HEAD(page_memcg_deferred_list(page)); >>>       set_compound_page_dtor(page, TRANSHUGE_PAGE_DTOR); >>>   } >>>   @@ -2664,6 +2661,7 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) >>>       bool mlocked; >>>       unsigned long flags; >>>       pgoff_t end; >>> +    struct mem_cgroup *memcg = head->mem_cgroup; >>>         VM_BUG_ON_PAGE(is_huge_zero_page(page), page); >>>       VM_BUG_ON_PAGE(!PageLocked(page), page); >>> @@ -2744,17 +2742,30 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) >>>       } >>>         /* Prevent deferred_split_scan() touching ->_refcount */ >>> -    spin_lock(&pgdata->split_queue_lock); >>> +    if (!memcg) >>> +        spin_lock(&pgdata->split_queue_lock); >>> +    else >>> +        spin_lock(&memcg->split_queue_lock); >>>       count = page_count(head); >>>       mapcount = total_mapcount(head); >>>       if (!mapcount && page_ref_freeze(head, 1 + extra_pins)) { >>> -        if (!list_empty(page_deferred_list(head))) { >>> -            pgdata->split_queue_len--; >>> -            list_del(page_deferred_list(head)); >>> +        if (!memcg) { >>> +            if (!list_empty(page_deferred_list(head))) { >>> +                pgdata->split_queue_len--; >>> +                list_del(page_deferred_list(head)); >>> +            } >>> +        } else { >>> +            if (!list_empty(page_memcg_deferred_list(head))) { >>> +                memcg->split_queue_len--; >>> +                list_del(page_memcg_deferred_list(head)); >>> +            } >>>           } >>>           if (mapping) >>>               __dec_node_page_state(page, NR_SHMEM_THPS); >>> -        spin_unlock(&pgdata->split_queue_lock); >>> +        if (!memcg) >>> +            spin_unlock(&pgdata->split_queue_lock); >>> +        else >>> +            spin_unlock(&memcg->split_queue_lock); >>>           __split_huge_page(page, list, end, flags); >>>           if (PageSwapCache(head)) { >>>               swp_entry_t entry = { .val = page_private(head) }; >>> @@ -2771,7 +2782,10 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) >>>               dump_page(page, "total_mapcount(head) > 0"); >>>               BUG(); >>>           } >>> -        spin_unlock(&pgdata->split_queue_lock); >>> +        if (!memcg) >>> +            spin_unlock(&pgdata->split_queue_lock); >>> +        else >>> +            spin_unlock(&memcg->split_queue_lock); >>>   fail:        if (mapping) >>>               xa_unlock(&mapping->i_pages); >>>           spin_unlock_irqrestore(&pgdata->lru_lock, flags); >>> @@ -2791,17 +2805,40 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) >>>       return ret; >>>   } >>>   -void free_transhuge_page(struct page *page) >>> +void del_thp_from_deferred_split_queue(struct page *page) >>>   { >>>       struct pglist_data *pgdata = NODE_DATA(page_to_nid(page)); >>>       unsigned long flags; >>> +    struct mem_cgroup *memcg = compound_head(page)->mem_cgroup; >>>   -    spin_lock_irqsave(&pgdata->split_queue_lock, flags); >>> -    if (!list_empty(page_deferred_list(page))) { >>> -        pgdata->split_queue_len--; >>> -        list_del(page_deferred_list(page)); >>> +    /* >>> +     * The THP may be not on LRU at this point, e.g. the old page of >>> +     * NUMA migration.  And PageTransHuge is not enough to distinguish >>> +     * with other compound page, e.g. skb, THP destructor is not used >>> +     * anymore and will be removed, so the compound order sounds like >>> +     * the only choice here. >>> +     */ >>> +    if (PageTransHuge(page) && compound_order(page) == HPAGE_PMD_ORDER) { >>> +        if (!memcg) { >>> +            spin_lock_irqsave(&pgdata->split_queue_lock, flags); >>> +            if (!list_empty(page_deferred_list(page))) { >>> +                pgdata->split_queue_len--; >>> +                list_del(page_deferred_list(page)); >>> +            } >>> +            spin_unlock_irqrestore(&pgdata->split_queue_lock, flags); >>> +        } else { >>> +            spin_lock_irqsave(&memcg->split_queue_lock, flags); >>> +            if (!list_empty(page_memcg_deferred_list(page))) { >>> +                memcg->split_queue_len--; >>> +                list_del(page_memcg_deferred_list(page)); >>> +            } >>> +            spin_unlock_irqrestore(&memcg->split_queue_lock, flags); >> Such the patterns look like a duplication of functionality, we already have >> in list_lru: it handles both root_mem_cgroup and all children memcg. > > Would you please point me to some example code? I mean that we do almost the same in list_lru_add(): check for whether item is already added, find the desired list, maintain the list's len. It looks all the above we may replace with something like list_lru_add(defered_thp_lru, page_deferred_list(page)) after necessary preparations (some rewriting of the rest of code is needed). >> >> Should we try to reuse that code, and to switch huge pages shrinker >> into generic code? > > Definitely if it is feasible. > >> >> (Yeah, currently we allocate memcg_cache_ida IDS only for kmem, but we may >>   consider to allocate them for any cases, since now we have new memcg shrinkers >>   like you introduce). > > The patch 3/3 removes the restriction. It does that for shrinker code. but there is the code in mm/memcontrol.c, which maintains list_lru slots for all memcgs. In case of switching to list_lru base, we will need to teach the code to maintain the slots for !CONFIG_MEMCG_KMEM case too. Kirill