From patchwork Fri Jun 14 01:51:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 13697716 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 386C5C27C6E for ; Fri, 14 Jun 2024 01:54:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 416BC6B00A0; Thu, 13 Jun 2024 21:52:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C7726B00A2; Thu, 13 Jun 2024 21:52:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 268436B00A4; Thu, 13 Jun 2024 21:52:33 -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 0AAAD6B00A0 for ; Thu, 13 Jun 2024 21:52:33 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id BA5FCA16E4 for ; Fri, 14 Jun 2024 01:52:32 +0000 (UTC) X-FDA: 82227819744.14.FC5228D Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by imf03.hostedemail.com (Postfix) with ESMTP id E15FB20007 for ; Fri, 14 Jun 2024 01:52:30 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=mLO7Ps6O; spf=pass (imf03.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.210.176 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=1718329948; 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=h/pT6ukJbZTbcHICd4lFILO7tOygQ9w7tdWCnznoYp8=; b=5g8uZ7OnuCRzsIgeqVG5SBiJW8I3/X+dxaJUzB8ciA6BdxWMFi9okyjLfno6PUl6ReF1iD AqFIJrmUemAe+uL2/q4toqo5AG7h8OqQvPLEnrbKIgtnwpznuiXf3UtbZh/CqMnWdiH2Hq agxcQ3g6SQlIOgloNWhAIabWsdKMt4E= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718329948; a=rsa-sha256; cv=none; b=0lwMEPrvzze0JhxwhLspPfck7aozLaMoyfgrUPM7KD/NnS+FZYUr/ORYLo2h6coFBvghfz CqZ35Rpl+DfWWUtyzBZqC+xthcA29xTEr3IEVMd0xLWUK/bRDySOH8RS80rheRIDlkJnsw g0v8L6xyurQGdiZP0mw0F2+sifAUBnI= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=mLO7Ps6O; spf=pass (imf03.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.210.176 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-70255d5ddc7so1445467b3a.3 for ; Thu, 13 Jun 2024 18:52:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718329950; x=1718934750; 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=h/pT6ukJbZTbcHICd4lFILO7tOygQ9w7tdWCnznoYp8=; b=mLO7Ps6OtSvOg6Lers6bLg0UaMzqPFMjtzKuR+V+3tvo/e/Tl5ET1GxXj4ffiIgEKm vVURLeZow03PMAGlzwncG/RIj3mh2vxXgHfISFF4jABd5w91bBMTO7KjQP7tCBeXqxLn oTOYJ0au8t8NDKGO19/P33IzK+Rn6aoYBGZYZ/+vlymt66s9WwAAo34s/20q16VUY7cI gkisXW6aUVhbxgfJ6xlD9LFNgEBMyBcFYPVx9HVA8IkC42mfWYspaql768PXTd3x82LK pdIzcCFcZDvTYuXGHde2Pyh528cT9Yc85mETZ8FHcYBSVRlD159FMvxi1DWuwgojestg 4+bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718329950; x=1718934750; 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=h/pT6ukJbZTbcHICd4lFILO7tOygQ9w7tdWCnznoYp8=; b=oAKaqu6xJFalmKjAjxRFMmiqCqznSALC9IPx6W29mPO2ZKjFZHW+4+n7UXI+JDR8gm XzGnnvJSwzP6gqRaItRcV19xHnmlO5OKo50gU1NPEs5RtJ2rMzLgy2ZkuPAVkgGC25bl 0WU+qIywQIAaaBREIYe+gMNiAJ8s9LfR/JkmJ4IuSFxGTYQHNhkZxaOppWFsGHkknPLo ps1dFYWD2sAvabmjqO0hMN1VMDruiQLLvRf0CIundbnZ5CnqbfIrHNtN2jFzTgiQJbuU Qqvr8V7ri6qRXTUAfstK6CV0sCdrgQOwYfIXbWPSWwHnV4DiQycfMXPwwUTw/1hX1LXY 0SXA== X-Forwarded-Encrypted: i=1; AJvYcCWNCsz0s/GjPIa+NbZxsJa4l5+1Yxt1ve3jwMe+jybnZ+OrDHz5KSIXOWWOSHbcUjjpGsGviyyQrKCo5107PsMEgfE= X-Gm-Message-State: AOJu0YxbMa/hAETrW2sYx8xsMxAmpY2KoUaQ79MkOVUuCEzOyV1gwCeB SL4j8jS8e3N7U5v/lFH/gg5vy/Ft8JdrKOFaRQmGv2JhkX7c2wtx X-Google-Smtp-Source: AGHT+IHa1l1GAHgQyasvK4lvnN2hIWQ3RAuc8OqBpVBkUd1r2gMswUPTOL3yjTTBw1mSXUjvCm3kSg== X-Received: by 2002:a05:6a00:234c:b0:704:147b:d768 with SMTP id d2e1a72fcca58-705d71d0e4cmr1657112b3a.24.1718329949695; Thu, 13 Jun 2024 18:52:29 -0700 (PDT) Received: from LancedeMBP.lan.lan ([2403:2c80:6::304f]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-705cc96d4c3sm2000912b3a.59.2024.06.13.18.52.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jun 2024 18:52:29 -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 v8 3/3] mm/vmscan: avoid split lazyfree THP during shrink_folio_list() Date: Fri, 14 Jun 2024 09:51:38 +0800 Message-Id: <20240614015138.31461-4-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240614015138.31461-1-ioworker0@gmail.com> References: <20240614015138.31461-1-ioworker0@gmail.com> MIME-Version: 1.0 X-Stat-Signature: e5i8dc4r79d3yexgn5cab31uukd8etwi X-Rspamd-Queue-Id: E15FB20007 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1718329950-421635 X-HE-Meta: U2FsdGVkX1/evjiKrZyBgZPrx0KBhDMysDCbgecq8OeyW1b6bdsCQsYjnd5WmDpSlTeR03jCheUVq9ra3K0z9wAGOc+pOIxICIw/RHWQl3UI0YHlnHKlB8P2OnpdtxArWcW5aVc/p3YCkMvuOeKqlvX88e4LXtOspad6/eecofnw4HiK6dI/XSfb3h9QonU/c+xD2qO5prI0pkhFM4i7eHdSa7BF38FjOB110I3md/2nvtXYzhd+m8cArqJ4oeNbywoF1eL1NmCbnfcuDXOF2Eu8ytstXrpADhda5Su15QrONVOJRk6zWKqFkY0rypDeFe1Y8QszFuGn/O338C0L/qkIiknEWCiE2OVDFja5ZZoZduTZ4uDXV8Nj4l+uiv84/6vFugxbU0UE6vkYm3Y1SEYw053U8QOvVjWqnnQhEaABrXsyGxNSxaa0p2nfqUfwU8fk4ckaz2EhSBGz1U+ejaP4L+2Xwi7fnA9B5BuuTpRDw0Bu1Wt827JFcIeUtdST7P/LdWn7zBMliyTy1+DFdBoCTlKQ6SeR86gd/B+Q0hb9iB4aLuIHJLyCVrs0OOyeLb/NjbSyUxu4GKTfn3PAar9Q9tJpb9BEcz18jmSkjGeBkqkNPyhOEuya9ecoo6ehtwrhQ1PCqrpqpG/X4p5G380kcO2L7iXIm2jacBpIj94YOLu9NS6lsLdd+QHsErnbu7Zy9EQ7UDV0CbJNx3DlzV3kjTQdx64PR4TOjBaoQRJ2NxhAaH6/1O2VduXvBRDTQUW1MhqLkFhZkC67JBkPfNcg8SIkogDjoPYlIZYY6KZ5+cBNUmPJmruEBz4TZATTn3YXDj/xUuL0wNmL2zd+Pd2j+/qAgxivypfGW8itwe4uSq0jflZa1NpRZv03Mjdy6SkjPT+izBG4TsgZpU/DBG6ACDRV8Upj91tUpd6CKiU/UjLPchsuBw5MzphwbKbKGsnlAqVM0sMUyltFC+d MtPBbjmw 9afwvnZHw+2oITtpo4FLFOZMP/7bnMJEM5uoMCJez8TagaBAnt6ftjzKtmrKht44tH5Xqx1/I3FX2haF8bEg0aaWcZRURTh1cRnpIJHAvu4pYIjhM4phOC3Wqi8f45tmQfQ14hjMQbR9EhyIQy81OLN3GsmE77lGCXgk7/S0dHH0vTw/n1NMoEQhv4vxSzvN8Hk6v6u21cx9rZp0fjkvGWlhXIESzYgn5raMEbqHTRL4SwSWwEgrwR0LKtEqvBzGLfEmtfL5l9H5zZ4xipXyWXBRFCvkk/TCl2mojHEiSouvknMeN+pEkzZSsSBJq23X8Yz9AbRgaPPRBrwuF283tWQOmTYCcWrZVhOhvIVO4P5jJzjb5zS9/K9TZHhvPEJ/2ScuCJYrwag72IuCte6Hx0AUgl/Kvf9PWJlXnVVW1nB5tjy2jFAilOmO5nNsK5bSNNmkpkxDzsUijcns= 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 | 76 +++++++++++++++++++++++++++++++++++++++++ mm/rmap.c | 27 +++++++++------ 3 files changed, 102 insertions(+), 10 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 9f720b0731c4..212cca384d7e 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -430,6 +430,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 */ @@ -497,6 +499,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 e766d3f3a302..425374ae06ed 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2688,6 +2688,82 @@ static void unmap_folio(struct folio *folio) try_to_unmap_flush(); } +static bool __discard_anon_folio_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)) + 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) || + 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_anon_folio_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 dacf24bc82f0..7d97806f74cd 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1678,16 +1678,23 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, goto walk_abort; } - 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, pvmw.address, pvmw.pmd, - false, folio); - flags &= ~TTU_SPLIT_HUGE_PMD; - page_vma_mapped_walk_restart(&pvmw); - continue; + if (!pvmw.pte) { + if (unmap_huge_pmd_locked(vma, pvmw.address, 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, pvmw.address, + pvmw.pmd, false, folio); + flags &= ~TTU_SPLIT_HUGE_PMD; + page_vma_mapped_walk_restart(&pvmw); + continue; + } } /* Unexpected PMD-mapped THP? */