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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B76C3C10F1A for ; Thu, 9 May 2024 09:36:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 146DB6B0083; Thu, 9 May 2024 05:36:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F4BE6B0088; Thu, 9 May 2024 05:36:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EFE306B008A; Thu, 9 May 2024 05:36:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id D2ECF6B0083 for ; Thu, 9 May 2024 05:36:12 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 5BFC912152A for ; Thu, 9 May 2024 09:36:12 +0000 (UTC) X-FDA: 82098351384.06.8D557F0 Received: from out30-111.freemail.mail.aliyun.com (out30-111.freemail.mail.aliyun.com [115.124.30.111]) by imf14.hostedemail.com (Postfix) with ESMTP id 710B4100011 for ; Thu, 9 May 2024 09:36:08 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="LlUd4/FE"; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf14.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.111 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715247370; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pvNda+d/dgY+J2GX1dZdTaOZdRlBWeQizib67djYoac=; b=Mum8SXB/1lXdJX0ob1CT/w27MxtzOhcetJFOGsj4vNQmZXmX5DAUp06kBNfAj47HeywHRR es23Dlwef0qKfCQUXb9NgnoYNPqgBirK0m/aCEffbbaRzSiqCRJ1BQoNq8BfWF0RtgF/h0 du/0NYC5R8F2gzoIwE3iyjU9lSbuKSk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715247370; a=rsa-sha256; cv=none; b=fVehVvygIOOmLhwuEZAHXMqkULzKn6wTCvzgA4zPu51PzOxyhIVjcRAbxgGX0e+Avt7QAN 9+rHAFAWRzYBbiDEtd8/pdUzIx30F3/k1xJpa5vM3mz3HKDOYRSp98t8sna0uOgzPCb7j5 iRDXeJKtg5REA/GHPgoyH/PfWF0LndM= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="LlUd4/FE"; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf14.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.111 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1715247365; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=pvNda+d/dgY+J2GX1dZdTaOZdRlBWeQizib67djYoac=; b=LlUd4/FE304IT+LKS+icoj0rJeipkA26ZIcACtISj95vIOZUjjjh5oyX4Vtx7Yt7nXnN6X9UAFMVRGft5l1Wm0ZFQrnd8dCCV//DVXlxrdKGnKyOekDH0+3vMtsciSNvUJKmAPVTU48Yr4wNdxc4CMD9FB1Ol1THinTHuQCh7hI= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R441e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033037067113;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=21;SR=0;TI=SMTPD_---0W66VJRi_1715247361; Received: from 30.97.56.60(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W66VJRi_1715247361) by smtp.aliyun-inc.com; Thu, 09 May 2024 17:36:03 +0800 Message-ID: Date: Thu, 9 May 2024 17:36:01 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 3/3] mm/vmscan: avoid split lazyfree THP during shrink_folio_list() To: Lance Yang Cc: akpm@linux-foundation.org, willy@infradead.org, sj@kernel.org, maskray@google.com, ziy@nvidia.com, ryan.roberts@arm.com, david@redhat.com, 21cnbao@gmail.com, mhocko@suse.com, fengwei.yin@intel.com, zokeefe@google.com, shy828301@gmail.com, xiehuan09@gmail.com, libang.li@antgroup.com, wangkefeng.wang@huawei.com, songmuchun@bytedance.com, peterx@redhat.com, minchan@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20240501042700.83974-1-ioworker0@gmail.com> <20240501042700.83974-4-ioworker0@gmail.com> <8c1d6e06-d84b-4be7-81c8-76e2d8fb9883@linux.alibaba.com> From: Baolin Wang In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 710B4100011 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: yyhtwzxaxfunhy5skfo3wqtef93mzzuo X-HE-Tag: 1715247368-20608 X-HE-Meta: U2FsdGVkX19vpifeZld7FBsxx32Lo5j537COpS+GruxlYNiQl0+pFVa38rRxpVapqPZY2Y09bGgwZzKyGEVhDvNmftKvfqBe/QJEOeDt8EZUr43umhQDcDNrVmWu3st12CG9Uyn3Mz5KgPgiJiOdKs2aZzAMW7nbWXW+fts0HlEofRbW8sPWz5tIlZJiCfbpez7tnaSVUpp9LpcUFmMm2Op2S8cutigwOuBhKVeSK7cErM6CmYDe8NfyRriACTR996C2sHl7FNPLKtRLSjLHPKax67Y9nd+4DkrAULBhWIZnk7ob97K3MQcgn/b1HrmmJxZzJY4zyg+AmeI33wQEMqkr3go+ljUjs4jmEL/gC7bSadwvpwjDg+GlL3o+GvwZ7QwYlu3ldXTMBgotz/BtFCO9A8M/e+r5K8UN6yxDcBatC9XjHcWZKtAE9qS77uyGTcfQsd7OByVBT9Avcoa0XIjQ+F+3VM+zoo56S7r7r540b3aPXtsqlS2CFnRCR7lDwa5WDguFGCCBc1OPsMvlKcaxUr3iVS1id57xoCMc+XxNAfEZEteWn+oe3ZLjeMUd+5U6WwPVlk7JcOGqjk8kkquq0MXmCMn6xLpKnD6HUNN6IkCa8qnFjzNBJXgqBF9sWDAmj1tlGCcyUrLnA4wjBEOw/OGu2t74yyZSGXi/2NCyh7TD/sF9ECFRu2XTh3wJapvSU8x1JkB8BpA9byMA9wEPkpFEKw4Qv+3kLA5TQpRNZOvjj59y1pDcYcS6qMrNtKPVCFThLyG6xmGu4I1P6nTg5H3i/62wFGgO3KUCzsLpXnqV07ljzYjJ+b5Gs3Kt+jnwgYBHJnifL1uwNa0F008gXVPfhU+IpYjPtxKqKB389Yon3q/n8ssuVyPkANw+XO4NXpOR0mrSJd55DL7vzb/qeDUbQ9ZUkgCORud6seMSTOS/WpwsBbY0Szsk41aJ/CfjIKRyDDQd3zYmIND 3NOJOb3m Cc7CvUmeiZvM7mN1YS3HKP9iAFGzbig7AcZAJxZSB/2RCeLVE+djBGS8+nk5cUA7Vz3kGREq/I132bFzTm7tok99KinNqkpj7k3qovQbyb1p/7bNtA6a4cY9/qKSCMmTzxcPXANMddjrHkeXNT7v7YJ5fG05/VRdzQuQqXr2rCwqPubUIUu830sSOBPxx3ajBSQL1fCW80aQrfN5RuHN/aOMESNcIgKfkrEEjxbaa8W9yeox3jIolDkO3EwtNhSRoBC6eZMYTADVu/hSnkRb7RkQP3C2/ATW/qqDNVZ14Y1g/QpubK1fdiHI9mKUBRThZqSoTtVtSmMWJ6eJIpekGpSj4qT1ioOv41KBB56vFUoKi7S1TCADoKeF3iiZqEw75YXU+85QhzVYP7HBbIRtp1BU15UlSuJ3u8DBXGWmXGwKi5MUDwwwBXPmhqwNkAIkm/FrPfYn5A4Cd2lZYUEaOqM+6yg== 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: List-Subscribe: List-Unsubscribe: On 2024/5/7 19:37, Lance Yang wrote: > On Tue, May 7, 2024 at 5:33 PM Baolin Wang > wrote: >> >> >> >> On 2024/5/7 16:26, Lance Yang wrote: >>> On Tue, May 7, 2024 at 2:32 PM Lance Yang wrote: >>>> >>>> Hey Baolin, >>>> >>>> Thanks a lot for taking time to review! >>>> >>>> On Tue, May 7, 2024 at 12:01 PM Baolin Wang >>>> wrote: >>>>> >>>>> >>>>> >>>>> On 2024/5/1 12:27, Lance Yang wrote: >>>>>> When the user no longer requires the pages, they would use >>>>>> madvise(MADV_FREE) to mark the pages as lazy free. Subsequently, they >>>>>> typically would not re-write to that memory again. >>>>>> >>>>>> During memory reclaim, if we detect that the large folio and its PMD are >>>>>> both still marked as clean and there are no unexpected references >>>>>> (such as GUP), so we can just discard the memory lazily, improving the >>>>>> efficiency of memory reclamation in this case. On an Intel i5 CPU, reclaiming 1GiB of lazyfree THPs using >>>>>> mem_cgroup_force_empty() results in the following runtimes in seconds >>>>>> (shorter is better): >>>>>> >>>>>> -------------------------------------------- >>>>>> | Old | New | Change | >>>>>> -------------------------------------------- >>>>>> | 0.683426 | 0.049197 | -92.80% | >>>>>> -------------------------------------------- >>>>>> >>>>>> Suggested-by: Zi Yan >>>>>> Suggested-by: David Hildenbrand >>>>>> Signed-off-by: Lance Yang >>>>>> --- >>>>>> include/linux/huge_mm.h | 9 +++++ >>>>>> mm/huge_memory.c | 73 +++++++++++++++++++++++++++++++++++++++++ >>>>>> mm/rmap.c | 3 ++ >>>>>> 3 files changed, 85 insertions(+) >>>>>> >>>>>> diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h >>>>>> index 38c4b5537715..017cee864080 100644 >>>>>> --- a/include/linux/huge_mm.h >>>>>> +++ b/include/linux/huge_mm.h >>>>>> @@ -411,6 +411,8 @@ static inline bool thp_migration_supported(void) >>>>>> >>>>>> void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address, >>>>>> pmd_t *pmd, bool freeze, struct folio *folio); >>>>>> +bool unmap_huge_pmd_locked(struct vm_area_struct *vma, unsigned long addr, >>>>>> + pmd_t *pmdp, struct folio *folio); >>>>>> >>>>>> static inline void align_huge_pmd_range(struct vm_area_struct *vma, >>>>>> unsigned long *start, >>>>>> @@ -492,6 +494,13 @@ static inline void align_huge_pmd_range(struct vm_area_struct *vma, >>>>>> unsigned long *start, >>>>>> unsigned long *end) {} >>>>>> >>>>>> +static inline bool unmap_huge_pmd_locked(struct vm_area_struct *vma, >>>>>> + unsigned long addr, pmd_t *pmdp, >>>>>> + struct folio *folio) >>>>>> +{ >>>>>> + return false; >>>>>> +} >>>>>> + >>>>>> #define split_huge_pud(__vma, __pmd, __address) \ >>>>>> do { } while (0) >>>>>> >>>>>> diff --git a/mm/huge_memory.c b/mm/huge_memory.c >>>>>> index 145505a1dd05..90fdef847a88 100644 >>>>>> --- a/mm/huge_memory.c >>>>>> +++ b/mm/huge_memory.c >>>>>> @@ -2690,6 +2690,79 @@ static void unmap_folio(struct folio *folio) >>>>>> try_to_unmap_flush(); >>>>>> } >>>>>> >>>>>> +static bool __discard_trans_pmd_locked(struct vm_area_struct *vma, >>>>>> + unsigned long addr, pmd_t *pmdp, >>>>>> + struct folio *folio) >>>>>> +{ >>>>>> + struct mm_struct *mm = vma->vm_mm; >>>>>> + int ref_count, map_count; >>>>>> + pmd_t orig_pmd = *pmdp; >>>>>> + struct mmu_gather tlb; >>>>>> + struct page *page; >>>>>> + >>>>>> + if (pmd_dirty(orig_pmd) || folio_test_dirty(folio)) >>>>>> + return false; >>>>>> + if (unlikely(!pmd_present(orig_pmd) || !pmd_trans_huge(orig_pmd))) >>>>>> + return false; >>>>>> + >>>>>> + page = pmd_page(orig_pmd); >>>>>> + if (unlikely(page_folio(page) != folio)) >>>>>> + return false; >>>>>> + >>>>>> + tlb_gather_mmu(&tlb, mm); >>>>>> + orig_pmd = pmdp_huge_get_and_clear(mm, addr, pmdp); >>>>>> + tlb_remove_pmd_tlb_entry(&tlb, pmdp, addr); >>>>>> + >>>>>> + /* >>>>>> + * Syncing against concurrent GUP-fast: >>>>>> + * - clear PMD; barrier; read refcount >>>>>> + * - inc refcount; barrier; read PMD >>>>>> + */ >>>>>> + smp_mb(); >>>>>> + >>>>>> + ref_count = folio_ref_count(folio); >>>>>> + map_count = folio_mapcount(folio); >>>>>> + >>>>>> + /* >>>>>> + * Order reads for folio refcount and dirty flag >>>>>> + * (see comments in __remove_mapping()). >>>>>> + */ >>>>>> + smp_rmb(); >>>>>> + >>>>>> + /* >>>>>> + * If the PMD or folio is redirtied at this point, or if there are >>>>>> + * unexpected references, we will give up to discard this folio >>>>>> + * and remap it. >>>>>> + * >>>>>> + * The only folio refs must be one from isolation plus the rmap(s). >>>>>> + */ >>>>>> + if (ref_count != map_count + 1 || folio_test_dirty(folio) || >>>>>> + pmd_dirty(orig_pmd)) { >>>>>> + set_pmd_at(mm, addr, pmdp, orig_pmd); >>>>>> + return false; >>>>>> + } >>>>>> + >>>>>> + folio_remove_rmap_pmd(folio, page, vma); >>>>>> + zap_deposited_table(mm, pmdp); >>>>>> + add_mm_counter(mm, MM_ANONPAGES, -HPAGE_PMD_NR); >>>>>> + folio_put(folio); >>>>> >>>>> IIUC, you missed handling mlock vma, see mlock_drain_local() in >>>>> try_to_unmap_one(). >>>> >>>> Good spot! >>>> >>>> I suddenly realized that I overlooked another thing: If we detect that a >>>> PMD-mapped THP is within the range of the VM_LOCKED VMA, we >>>> should check whether the TTU_IGNORE_MLOCK flag is set in >>>> try_to_unmap_one(). If the flag is set, we will remove the PMD mapping >>>> from the folio. Otherwise, the folio should be mlocked, which avoids >>>> splitting the folio and then mlocking each page again. >>> >>> My previous response above is flawed - sorry :( >>> >>> If we detect that a PMD-mapped THP is within the range of the >>> VM_LOCKED VMA. >>> >>> 1) If the TTU_IGNORE_MLOCK flag is set, we will try to remove the >>> PMD mapping from the folio, as this series has done. >> >> Right. >> >>> 2) If the flag is not set, the large folio should be mlocked to prevent it >>> from being picked during memory reclaim? Currently, we just leave it >> >> Yes. From commit 1acbc3f93614 ("mm: handle large folio when large folio >> in VM_LOCKED VMA range"), large folios of the mlocked VMA will be >> handled during page reclaim phase. >> >>> as is and do not to mlock it, IIUC. >> >> Original code already handle the mlock case after the PMD-mapped THP is >> split in try_to_unmap_one(): > > Yep. But this series doesn't do the TTU_SPLIT_HUGE_PMD immediately. > >> /* >> * If the folio is in an mlock()d vma, we must not swap >> it out. >> */ >> if (!(flags & TTU_IGNORE_MLOCK) && >> (vma->vm_flags & VM_LOCKED)) { >> /* Restore the mlock which got missed */ > > IIUC, we could detect a PMD-mapped THP here. So, I'm not sure if we > need to mlock it to prevent it from being picked again during memory > reclaim. The change is as follows: For the page reclaim path, folio_check_references() should be able to help restore the mlock of the PMD-mapped THP. However, for other paths that call try_to_unmap(), I believe it is still necessary to check whether the mlock of the PMD-mapped THP was missed. Below code looks reasonable to me from a quick glance. > diff --git a/mm/rmap.c b/mm/rmap.c > index ed7f82036986..2a9d037ab23c 100644 > --- a/mm/rmap.c > +++ b/mm/rmap.c > @@ -1673,7 +1673,8 @@ static bool try_to_unmap_one(struct folio > *folio, struct vm_area_struct *vma, > if (!(flags & TTU_IGNORE_MLOCK) && > (vma->vm_flags & VM_LOCKED)) { > /* Restore the mlock which got missed */ > - if (!folio_test_large(folio)) > + if (!folio_test_large(folio) || > + (!pvmw.pte && (flags & TTU_SPLIT_HUGE_PMD))) > mlock_vma_folio(folio, vma); > goto walk_done_err; > } >