From patchwork Mon Apr 29 13:23:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 13646954 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 33288C4345F for ; Mon, 29 Apr 2024 13:23:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A3CB66B009B; Mon, 29 Apr 2024 09:23:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9ECE96B009C; Mon, 29 Apr 2024 09:23:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 88F816B009D; Mon, 29 Apr 2024 09:23:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6AEA76B009B for ; Mon, 29 Apr 2024 09:23:44 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C5542C1A81 for ; Mon, 29 Apr 2024 13:23:43 +0000 (UTC) X-FDA: 82062636726.14.B40C171 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf24.hostedemail.com (Postfix) with ESMTP id 07844180003 for ; Mon, 29 Apr 2024 13:23:41 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="LG/RvTSz"; spf=pass (imf24.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.216.44 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=1714397022; 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=Yyi8NgAotG2uQx5M1DNlDhdviU8akK6rE5R0Kl6KUlU=; b=oHGMrX5JB9yTIf4IsMbyTJ931Q7NkV72/cdJDfVuqiagBICD771350zktSm3KeTVKTflpc cYfnuOsh5qyMzRhXQUU06YmG+qTASY6lxEY1FEeUycRDLZ3Lvhsll0wWJ9TVuSngc1vyfS A5j88mnPWTPNAG+f7dgDWdx9dETYoio= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="LG/RvTSz"; spf=pass (imf24.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.216.44 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=1714397022; a=rsa-sha256; cv=none; b=jp/WmPdb3jXbtVGQXotX+DFIQ30cl34xjMzsqmB2ukIl/r2QXmBXnbMG4k2mTxgk9EzeYy d7RTJFsWEG5hl18Bt5wSFCYbzrT0MlC0ZF/h5DBUzPIM+y3VReO5oTvlLT8X3CJLEfYeyn 2Oqf0wUQ5MTRxQbfB63PWR+VCQ3q7b4= Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2b1cfae51a5so554949a91.2 for ; Mon, 29 Apr 2024 06:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714397016; x=1715001816; 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=Yyi8NgAotG2uQx5M1DNlDhdviU8akK6rE5R0Kl6KUlU=; b=LG/RvTSz19MQtdCIZ/5ZV8UPFWuqsOOA1BfOPn4rQGiTke0M8ADZTXJasKtKCIzSKg jdwU/fcokSgLJe7U9QChepN0P44eCKgUV+H9k0ovCfnRd9GiL4E0E8ZPCiJB6/I5QXxl VzoclgsO9CKyEp0BrF+ek2G+6z7dLC6uYwagvaPzXK0DhfcsA5p3T9iQGK9H1+e6wCjv r11szh41wb60sp5HX90Sq3eROVT1DHPBpE6kG8qtGSYEhxKTLsrjcmGal37xGCmCnkKl gs2RUHmJLeTzg4ZFO9UQLSzw8pZgiBeY2Ckpg0WpOo3LEPpydsGVw1QeD3SXmalPNwJh Iq3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714397016; x=1715001816; 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=Yyi8NgAotG2uQx5M1DNlDhdviU8akK6rE5R0Kl6KUlU=; b=SkFpY5qD3mlyt3cj/oRAvZ3UudGtf7KmpfnjNsnSdrQ2isktGZFyTiatyuW+Zwips7 uOtKCEcC8eoPF+Iu7ytByZ/b7gXo+byHKYs9tUFI6HGhwQbwIFdwhPhBkBdiB3fdFR72 TFN5ZRzrOjiHZXQc8Hp+/gbi0eT6vsc4uBZe2uq2uXRcTrHCWAYB773toEWVqWtVNEVi wNWT8eZSBGfiRCKgbgUhLSQBNxb0o52d89wP8CZGr1vKma1ffgi5qq1yHYGjNMYKua33 zNOoA/ZKg/6CzH29Mr3p0ui6SwVO+o3REVz/N3h/E5hj8NF/5oEH+saPlCHBDFfoK1f6 MlkQ== X-Forwarded-Encrypted: i=1; AJvYcCUPWkknhJklLIHVWkprSAar11QB3PGcrE+qp0Jphhs3Z9BNGCkf6nOgdeOfRdGYOJHbCugj82ZHVuLwS/O6Umdx2JU= X-Gm-Message-State: AOJu0YzviCbj/oT665gK4jiIvvBj9UQOtUQRzDD5rCElgXbnOH4jFdlX ykj5Y4EWRAsdyNiP8laoLTAUCeOZPyzlOxoZTvRLfQCUuUcBbCt+ X-Google-Smtp-Source: AGHT+IE3glKHvTVXbEue7ZJjzMdZwSs4YepE3f+DkJR5stamEyLLZPKJxPWIl3KdJI4v7bdaHehPKw== X-Received: by 2002:a17:90a:654c:b0:2a0:215f:dc9c with SMTP id f12-20020a17090a654c00b002a0215fdc9cmr9546775pjs.35.1714397015463; Mon, 29 Apr 2024 06:23:35 -0700 (PDT) Received: from LancedeMBP.lan ([112.10.225.242]) by smtp.gmail.com with ESMTPSA id pa5-20020a17090b264500b002b113ad5f10sm3562203pjb.12.2024.04.29.06.23.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Apr 2024 06:23:35 -0700 (PDT) From: Lance Yang To: akpm@linux-foundation.org Cc: willy@infradead.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, Lance Yang Subject: [PATCH v3 3/3] mm/vmscan: avoid split lazyfree THP during shrink_folio_list() Date: Mon, 29 Apr 2024 21:23:08 +0800 Message-Id: <20240429132308.38794-4-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240429132308.38794-1-ioworker0@gmail.com> References: <20240429132308.38794-1-ioworker0@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 07844180003 X-Rspamd-Server: rspam06 X-Stat-Signature: 6rkuqy7zw814qb1u87ifoaicd8ti5iyu X-HE-Tag: 1714397021-853587 X-HE-Meta: U2FsdGVkX1/zSXeRQ0lfussvYVbXOu4A/BDCIF+QcBTUSHUM6SV2T424ObYjVY0ykHmMwFwC8S7w1WH5jGuZNO3c3guIi9zsvGBuWi+GvETkKndMnPJMsbXbJh1K+FHjBAH4O3jUahaiXFZC/oreHHgpv8L6CbyQR2XI/Izd9yAcJg9kgQifUz0jpWHHc5nQdej6eWp77yg4p4M83WCRPPexYX3u1t7jXxeBA7jDqWFo1v42jwL6EaqX0MBawoB3jizL4yWKbPGUgL8eapPe7Uep9Vo/hU50nWekZ45VL7CXLfYCOyVGSFUHPyV03Byem+Fy1baHmtKXD8JoGUm6e04vT4j7sYqy9/TJiD31p25+NR2lsdEtXAzDZQgxDkFyObc10W2lWmjjjcCLRZbeBE1v54gCeLsRXVbzWaegMNEKGwyQu27yFKRwewxBvOitDox6cBLHNlseyLEqdKurjGNj/icNVdAx6/tNh4LUTMxlV2pXDwgrhB5vpL0QMJOqUkyqYBKAerfrPQL9MLGuTcuVwLh0vRIvvwc7sGR1QsDq9U/VIHxgtM8bq95kseXVxp+c/fXU/Es7bvnouYwpTL1izJSoGbsX0BF2+u0FMn9CyO/QdXvvw/RwGp784bRJv7toDjUHB4LZyDGgZDRMSDNMgrytWEpCVBAT5PbQaMwD+GEnkPu8GzMHs+9WfxkC/tKeQerBMt0phEqvqt1GCkQ0YZq5vhguOWCt+4iDN8yVjkP0v0pnDu0UD9yY8W1eCvzVbLAMZke3N4k8NeZs1+zXTYlIsOi0xCWzB1Hn5Aer2BqEaQV2MwDrhH12DeF3oINxL7v4JlwzYISyaHwVPz4PBDJngBMQ3RLg5p6cOayi2CZjsvjAEHWl0mQUoqeBEyP50Eb1IPjlRXp1QWHh+wPZv3ExmmsU1zllcnqfYg7LSHN4hbmCWEcFnYtmcl/g0G02TXhBRI5U1zzory0 hpPEZyux /Epf94ubuogoGYtl3fkM7cbK5m/z8IxgYkYrKvff/BzPEbII0n2jd8UqKwDcnsE7oBnwCyALmYH+mKL/EJdvSBYIL19RFxnfOPi2CY1ZlZ75y/XVKQLOi0JuHtjTnsAwotRA/fwXjz4ZIpexr2TmrSobtp8lwsJcHPIff 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 | 2 ++ mm/huge_memory.c | 75 +++++++++++++++++++++++++++++++++++++++++ mm/rmap.c | 3 ++ 3 files changed, 80 insertions(+) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 2daadfcc6776..fd330f72b4f3 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -38,6 +38,8 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, unsigned long cp_flags); 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); vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write); vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write); diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 145505a1dd05..d35d526ed48f 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2690,6 +2690,81 @@ 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); + + 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)); + +#ifdef CONFIG_TRANSPARENT_HUGEPAGE + if (folio_test_anon(folio) && !folio_test_swapbacked(folio)) + return __discard_trans_pmd_locked(vma, addr, pmdp, folio); +#endif + + 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 e42f436c7ff3..ab37af4f47aa 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1677,6 +1677,9 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, } if (!pvmw.pte && (flags & TTU_SPLIT_HUGE_PMD)) { + if (unmap_huge_pmd_locked(vma, range.start, pvmw.pmd, + folio)) + goto walk_done; /* * We temporarily have to drop the PTL and start once * again from that now-PTE-mapped page table.