From patchwork Tue May 21 04:02:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 13668895 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 A3F2DC25B74 for ; Tue, 21 May 2024 04:03:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3054F6B0093; Tue, 21 May 2024 00:03:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 28E046B0095; Tue, 21 May 2024 00:03:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E0EB6B0096; Tue, 21 May 2024 00:03:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DD95F6B0093 for ; Tue, 21 May 2024 00:03:45 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 8DE481C18E2 for ; Tue, 21 May 2024 04:03:45 +0000 (UTC) X-FDA: 82141059210.30.0D74C36 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf10.hostedemail.com (Postfix) with ESMTP id B4352C0017 for ; Tue, 21 May 2024 04:03:43 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NNNc55l3; spf=pass (imf10.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716264223; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=uX/01s4vYIQbr18bE5flsb5nej8ApaXUJjiKJpBs8CU=; b=BcNjX64dCxsBMFhdxkGowLdzyCCE2dRvAd+Vcq6nvIm6YJqzrnv7YMnuDpWiQUN2nYA2vL fS+9UVOxfPfF9I8LgmzjK9U6ziGkMR+cWTbsJBku0y/qFoII8i7VkqQ475NW1lkoZsequw fFnpkOW3F+ZKZ/l+aQVEpm1SZ7exOLs= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NNNc55l3; spf=pass (imf10.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716264223; a=rsa-sha256; cv=none; b=ti7FBewDhAEu15tNd0i/eBZAAmQK02FNuZujb6b3LqKmEe22ziWu38piS3zjqqYFY+Ahjl 817ULiOH5SmWGNv8tfCgj3XIb3dz43G10JY5I285OaEV/pmsMJXzBg2caTeKzuQxAAFSh0 LMHtxxT68pv9zlvh2VAbyaswiL5oCBg= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1ecd9a81966so23344735ad.0 for ; Mon, 20 May 2024 21:03:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716264223; x=1716869023; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uX/01s4vYIQbr18bE5flsb5nej8ApaXUJjiKJpBs8CU=; b=NNNc55l3+bgdZiB6g5dZI+Q5JDyRBZ3smc3l6Lk9WwT/UPDzkxPYv5jqGGtIFZuz9C JAp1oD2RJrV44S84hPtdInno5dyIhjJwjKW6dya1xU6iAAi8zUQm/wV2gh7wY0AoSwux +s9AH52SOLvmvxPtiSDW7RvtxusdQ7dstW6nIpoQR02s8jhw3VJa8qKCvrSbBBhCneZu MCJINO0KA4H/nShNcXo5xWJvN7a7tbmfd7fy8ZPpiGF34Y0XVuRJOZZnOmo/SfCG6PxT mOwhJfuRESs30nrGMCkCOY49xMp+B8t454e2ujLSojdgbExEg68NhO2qrG2/i6gIRTxQ t+YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716264223; x=1716869023; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uX/01s4vYIQbr18bE5flsb5nej8ApaXUJjiKJpBs8CU=; b=xSs27bxx+spc0zt+yJJM+YpsPcoPT1+6sd/XQXs/ufRaKCNaX4oHHZALyqNcwiIqbl no27k58dRp2htf1vdHiaL6H2wIjyhr/V7w7VAZp1YZXkV/H13RNLULn/kdc4SSLWsmun I1oYk4nr7yv0/m7OjaHtdtG61pufzyQh3IZpfm+M9V58LwFaoOfKpMOZFnhnXt7srTUI j+F4AVLTS5zWc+L5vcrbktDfboZwI1OyK0OPR97i1Woxi4JkmoMVrsAtMEug5Nj4BKf8 soYGnDWaPs3UNA95rHNAKMnmVm0hlVXU2esWE8OqZOf+n4hMUAqGI7btI8IzHdGgOCOa Y/tg== X-Forwarded-Encrypted: i=1; AJvYcCVA7u/XAlureh063o2sCEQ9gP1tyXz0VQQ98eitZ7L0Yvbvr5oWQD20fCB6r6UWsqO0Sl3WtMgb0NzsOpZm0Vcu2g0= X-Gm-Message-State: AOJu0YwiukD7NCVyeQAU638ckxs771A6X4pslOFkUfhwpaYlUry95EzW CbNR8A2w/L26Kkdq26BkGyhyAkHAp5GmTga88//XzR85XIaHqdan X-Google-Smtp-Source: AGHT+IHUenY7Vns4wwcjPnGW95ACeeeUgKgYAe9jFb6BEdQnC4grlMSeDLzUCyAEyHVP1CHFiQcmZg== X-Received: by 2002:a17:903:230b:b0:1f2:fb9e:f697 with SMTP id d9443c01a7336-1f2fb9ef9d5mr87868225ad.2.1716264222544; Mon, 20 May 2024 21:03:42 -0700 (PDT) Received: from LancedeMBP.lan.lan ([2403:2c80:6::302d]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0bad62bfsm211683945ad.74.2024.05.20.21.03.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 21:03:42 -0700 (PDT) From: Lance Yang To: akpm@linux-foundation.org Cc: willy@infradead.org, sj@kernel.org, baolin.wang@linux.alibaba.com, 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, Lance Yang Subject: [PATCH v6 3/3] mm/vmscan: avoid split lazyfree THP during shrink_folio_list() Date: Tue, 21 May 2024 12:02:44 +0800 Message-Id: <20240521040244.48760-4-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240521040244.48760-1-ioworker0@gmail.com> References: <20240521040244.48760-1-ioworker0@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: B4352C0017 X-Stat-Signature: npfbkbecebjqn4dodsa61wa7nity8uyd X-HE-Tag: 1716264223-431601 X-HE-Meta: U2FsdGVkX191tHjexfRdc9o4kojAttxu33W8Gho2+yTEN3Bx4DdIY0Ms/uPkojjQehvzTnD25+EZfJ4UiwKBMOtnU4+v0ZubqTiCWTskL63dZdlhlHVHGzKuSdL2Dg2AQQeQnnQy7AUpKi/MSwlEG/E+7r1r7CB4OgeRdn3eZHM0uu+zpsGRzbTm/IQbPnf5m3BtIqKeWpWG4pEDXhebTyk/tp/vXLHfYucFp1L1YefRLt4l0M80p7NyWIgSapxvNiZ0nAjbSz7n0uYc38vJmPZWElQw23yu97hPWxXWmQbDx1Fz3ruv1SngUF5f+x9W4zM0EZLfq1dQMEfPEV6iFLLdWFhTuSG+UjBBPXE6BmVlqWlmpUylKQWCMX+oh5wAZL9fPJDh90GdeM1XLc5GqCco1LQ4u7+Exat0D8bLrQQ8qlxH4TdV43eKR63crppLIDeslAEKR8MIm2qSiSe5484oepja62yM+epGHCqoe7nVoHKsUNEvuA4Z4UwXE/09xE+H52yDQNvtg2WR9QKUN+gMnrWNjzTuoxJ8diXvNiBxRul2PgVls0CPNYBrNKa3vKzSZdQrSO0DDsGeXtxirDTKSW3/Lwj3ZIpg+NVHUxxk6sBDdFeZOYkpxSJVphex9S2913SmfywYaGskhfqNmmrnTK8iV9Z7zYsZDdBRw08q0yn3UV9uH7/MFiaUWZ6DXlobRJGOToC4jjl4W2svvwHxcyraDTY1uylqncSgDXaF4vzRdd6rNEoj8E9rNEyi9HRTs3IwETvOZZYA7g1gFAIhu3OMnUVmLhyNkAhGXT0Rm2u9hS1g4/iehfqfyd+ndgMxjlDK1TlDdcM8PtaqZNqknFkeokTws5NM+RaCQwSgfVNvlYVJGx36VuXok3s1dTw0IhFigsMy9tKTxg1D5AkF3k/rECCTVcvwx9/Le4opq3Hp3piV0JHf03yqkG9d8jjvqh8kCxBj5iGsPDu 29NLFVjp DzcZcCGJBUfRyWPpKma6ZWl8stHCuEOPrZAlxeZ5Yk3ekeZV1IyCdrL/vrJK+UXwvLBKqwdNI9z/Z0EtUDomRib0aR41EdRnUITdShCYed9CZy3glO/1clpFPAThkOc3mmVxoFVsur5ISzlgIb2WnnxUDushE4eciY0fzDRu5gL38nWx6AO662lowWglFTn3HJnCqWRSK7AS/C5Swisy38kRcXaf2VNN5mxEqXYsE26Gp+VtnOyfoPzrVGGs8tI6P5qK80ava7gDZe1i2NsZFrC4k6FQ4WA0rkaE0AFvS6kgngrdAF1s9XUewB7U81oKbVLShNkcFJG+HsLnglmXI34jnHr2WSrwKPW5MNFI9uLnyAJkDXXNw2wDxcn7wmZqTF8jxg54u7vVg99SaOmUHWm/4jTsWSKFBtJQ8hkjZb2EaPoBwS96BzKrJrtvbgxK3O/wlz1hLufx/HHxuSpU5fZfBg+xIm5Q5yTgG9P7ibwltJG/4kGty+ZsE4Ftd1cIKo/VkfWTqHo3G/v15y9gZwH6+CMd8LjGpqooyeOAO7luph5A= 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: 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 | 80 +++++++++++++++++++++++++++++++++++++++++ mm/rmap.c | 41 ++++++++++++++------- 3 files changed, 117 insertions(+), 13 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 9fcb0b0b6ed1..cfd7ec2b6d0a 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); #else /* CONFIG_TRANSPARENT_HUGEPAGE */ @@ -478,6 +480,13 @@ static inline void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd, bool freeze, struct folio *folio) {} +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 425272c6c50b..4793ffa912ca 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2687,6 +2687,86 @@ 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) +{ + VM_WARN_ON_FOLIO(folio_test_swapbacked(folio), folio); + VM_WARN_ON_FOLIO(!folio_test_anon(folio), folio); + + struct mm_struct *mm = vma->vm_mm; + int ref_count, map_count; + pmd_t orig_pmd = *pmdp; + struct page *page; + + 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; + + if (folio_test_dirty(folio) || pmd_dirty(orig_pmd)) { + folio_set_swapbacked(folio); + return false; + } + + orig_pmd = pmdp_huge_clear_flush(vma, addr, pmdp); + + /* + * 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 folio or its PMD 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 (folio_test_dirty(folio) || pmd_dirty(orig_pmd)) + folio_set_swapbacked(folio); + + if (folio_test_swapbacked(folio) || ref_count != map_count + 1) { + 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); + if (vma->vm_flags & VM_LOCKED) + mlock_drain_local(); + folio_put(folio); + + return true; +} + +bool unmap_huge_pmd_locked(struct vm_area_struct *vma, unsigned long addr, + pmd_t *pmdp, struct folio *folio) +{ + VM_WARN_ON_FOLIO(!folio_test_pmd_mappable(folio), folio); + VM_WARN_ON_FOLIO(!folio_test_locked(folio), folio); + VM_WARN_ON_ONCE(!IS_ALIGNED(addr, HPAGE_PMD_SIZE)); + + if (folio_test_anon(folio) && !folio_test_swapbacked(folio)) + return __discard_trans_pmd_locked(vma, addr, pmdp, folio); + + return false; +} + static void remap_page(struct folio *folio, unsigned long nr) { int i = 0; diff --git a/mm/rmap.c b/mm/rmap.c index 08a93347f283..249d6e305bec 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1630,6 +1630,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, enum ttu_flags flags = (enum ttu_flags)(long)arg; unsigned long pfn; unsigned long hsz = 0; + bool pmd_mapped = false; /* * When racing against e.g. zap_pte_range() on another cpu, @@ -1677,18 +1678,26 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, goto walk_done_err; } - if (!pvmw.pte && (flags & TTU_SPLIT_HUGE_PMD)) { - /* - * We temporarily have to drop the PTL and start once - * again from that now-PTE-mapped page table. - */ - split_huge_pmd_locked(vma, range.start, pvmw.pmd, false, - folio); - pvmw.pmd = NULL; - spin_unlock(pvmw.ptl); - pvmw.ptl = NULL; - flags &= ~TTU_SPLIT_HUGE_PMD; - continue; + if (!pvmw.pte) { + pmd_mapped = true; + if (unmap_huge_pmd_locked(vma, range.start, pvmw.pmd, + folio)) + goto walk_done; + + if (flags & TTU_SPLIT_HUGE_PMD) { + /* + * We temporarily have to drop the PTL and start + * once again from that now-PTE-mapped page + * table. + */ + split_huge_pmd_locked(vma, range.start, + pvmw.pmd, false, folio); + pvmw.pmd = NULL; + spin_unlock(pvmw.ptl); + pvmw.ptl = NULL; + flags &= ~TTU_SPLIT_HUGE_PMD; + continue; + } } /* Unexpected PMD-mapped THP? */ @@ -1816,7 +1825,13 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, */ if (unlikely(folio_test_swapbacked(folio) != folio_test_swapcache(folio))) { - WARN_ON_ONCE(1); + /* + * unmap_huge_pmd_locked() will unmark a + * PMD-mapped folio as lazyfree if the folio or + * its PMD was redirtied. + */ + if (!pmd_mapped) + WARN_ON_ONCE(1); goto walk_done_err; }