From patchwork Wed Apr 17 14:14:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 13633427 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 0BD79C4345F for ; Wed, 17 Apr 2024 14:15:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 985856B0089; Wed, 17 Apr 2024 10:15:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 935B76B008A; Wed, 17 Apr 2024 10:15:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7AE6A6B008C; Wed, 17 Apr 2024 10:15:03 -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 5B9CC6B0089 for ; Wed, 17 Apr 2024 10:15:03 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 179CE412D6 for ; Wed, 17 Apr 2024 14:15:03 +0000 (UTC) X-FDA: 82019220486.29.CE9ABFB Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf25.hostedemail.com (Postfix) with ESMTP id 2F6B1A001A for ; Wed, 17 Apr 2024 14:15:00 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ZWbbRorN; spf=pass (imf25.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.214.169 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=1713363301; 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=lkdNcUi/cFtD91tOAv56m6RXgS21TIueDzxwluwn/Lw=; b=dpqKCLI4d18RwlUo/aO9Y7DDdUlag71eUyoH/zevWyDMi/xIc38bvSGLiehig5gQBsNf9f TWMto0QK/JfmgtyHOyVsTnednGDRJPFOzNrK98P/QIBIQ5eazSE0AnA+dDasUrzi6p5UrC WYyxNKdorMx2LiW0QhuQ4+bpQ9u0bTk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713363301; a=rsa-sha256; cv=none; b=bKMxDAqxw03gWpc/YdSztP8HkYtnPcrTf/3/+XyybvYpY9kgZOfYoi8pUgi4oQD1oW+FEt k2kVPbGcNhN7gMjdb4tshk/+AIsD8mWORu+tk0Ji84CNkeHiHicUVSwMhD6mICdig99ftn bSucdz2gZKSEhPShN/Exqf4qFSCOmPs= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ZWbbRorN; spf=pass (imf25.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1e455b630acso26569145ad.1 for ; Wed, 17 Apr 2024 07:15:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713363300; x=1713968100; 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=lkdNcUi/cFtD91tOAv56m6RXgS21TIueDzxwluwn/Lw=; b=ZWbbRorNMODJbygLD5Epo4LjRd9DUrtMp/IJiI79V/LE5JN0wXL3R6kdjxehXVR+bs q2iHKGbDG1+MvbbwGp23cSlSSqFOhANVJKMIApNv7at2i6wHRVAgGYTxfFER8yYwl6DC /Th0dGC27oQKpYIZSvGbYu4qn6CeUTj8JANA+mVT/tWuUyKZ+SkHL2NPIz1fGSkB8ZiV QK8dz/6aSitpgjWOTSfktgd4UFjIL/M95rTqw+mzlgjzqr5+DTY2Ryic4G0tDxQJvVbV 8rRwzVBSSGAuyPYi1U/ztTWNHghFquZobT0+opFnqXOCrb5xZefmgjhbKQ2ELSTp1WwK b0yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713363300; x=1713968100; 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=lkdNcUi/cFtD91tOAv56m6RXgS21TIueDzxwluwn/Lw=; b=N/2H4au7o5VecqGhoVh+weFq5+YQWctP8WUywOxmNAsPaiXze7q/D1GR9WsFtLBXvi 80ItXRudPL4qdg79ZBJmCt1bpTYoTlglvINzMfJVYesDDGbY75+6fjr5RfM6VOVV7zCe pfoyZYgqVwGLgkaiCLVQPbvBliuH914C/uLFN1EdwotUhAEL6KlFU/veiquBrOHePR4Z Jf65nSv+25F5LfE6NgaldUEenvFKhRRCuQhV834Wmbevu6Y9GTz09/2rjZyqPAHMm4hW 6kNy8zJRfRuTYMJSeJTBSAPjWTFgi+hjaj0mzztMn28THhalTly+o9W7C4kIcWBuY3nW Ln5g== X-Forwarded-Encrypted: i=1; AJvYcCUDFpGdC0F7oAknn0aBiDQ6/yuafmvlV69Rg5NNLHpNRUhpnkXnsUj/asnHb3rILvRUlCJbwzVqMfYo6EtsD3JHT9Q= X-Gm-Message-State: AOJu0Yx5X3ssiJyeHhh3IqsOpGvthFcBcMxnDRzct2Xa7atCfgnTQdGP ircyK1RsY1YCJW/m/aMra0D7Xr/jbLqjIcW/kEsxavrx7cavh/2D X-Google-Smtp-Source: AGHT+IFNu14u7a3I7+Ll1HOcTWP+Tr+CtfofRjw+IGm+xSJjJO923Owls7pUFZJGkbba4Ch4IATTlg== X-Received: by 2002:a17:903:2303:b0:1e4:b1eb:7dee with SMTP id d3-20020a170903230300b001e4b1eb7deemr16402525plh.47.1713363299859; Wed, 17 Apr 2024 07:14:59 -0700 (PDT) Received: from LancedeMBP.lan ([112.10.225.217]) by smtp.gmail.com with ESMTPSA id s14-20020a170902a50e00b001ddc83fda95sm11613562plq.186.2024.04.17.07.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Apr 2024 07:14:59 -0700 (PDT) From: Lance Yang To: akpm@linux-foundation.org Cc: 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, 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 1/3] mm/madvise: introduce clear_young_dirty_ptes() batch helper Date: Wed, 17 Apr 2024 22:14:34 +0800 Message-Id: <20240417141436.77963-2-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240417141436.77963-1-ioworker0@gmail.com> References: <20240417141436.77963-1-ioworker0@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 2F6B1A001A X-Stat-Signature: nx6n14fon5uxdk67tpuppyz6anzypmn5 X-HE-Tag: 1713363300-231717 X-HE-Meta: U2FsdGVkX19MLIR2uUCsJI+/Oxg9oLZ2bKhefc51/B1pIRzQv3vK9murHqbXk983+LmNYVrFhdMtr6qxtDNkDuBlYWXN5TryEftrE4AceWYCtSXN73yvXizqzyIQIO7hVjLDq7IU52rxY/KF2YsbvT6LD+n/pUAjbDZ5NYiVofjRE+uC22Qi1zjD9wUtYHAw9RK8HPrPX8GjDeMlGZxUPBHrY5Z5N+K4pQgVAiDxXZVqioa8n4ja8uBgJp5ZMgnK7MBPZfZ82I8qU0qWKN27OO5Wt15XkIiuWL+P12ZH7WpilBMSMUXIjkOzyU3hVnsLFBivt/zK4ZE8psHqpKIk3YeiLe2oeOmGtT+imjvFmz6fejHgGm4mN43Kx7iFoWAV7wZwKm9cMMI4yAlSX9NJFMIWheu1csmMgMpI78whpQMHfwbZZmydYYX+s8h5tGIX4q+Sn5RCDvwa99QCxGw57Gxm4QVLJYM7nckwOwKP+jggaSQPxlLOlaQYDwuhmgkVQy69vDr5ezDDYyXqZ7CtfBWBxFwygtuswxtbMD+ptGPVx2EJ62jRIIk3TP8jU8x5ewkJIycwu3PLG9cbKDv0cmnKeNHiwc+Eel1mjOeotuo7BDUMkVTbX0zm7un0jxFNR2DFkNbVYQp/eGOddzS6WW4iMnJ4mt4WJ2ynOKLhrZb8AU7waj6Puoi3PwHI6VEz/xWxaRwXG+ZnR2vG3P2dSPaxAPAsWe2rHwMjQDInV9jN/f+Ivqy1fd7JCPj9loJz3mFIwATPDBQEGn8XVsKgsa81pu156IhyfP85AT79lR2zBqSQGBPat5SvyNIZ93M2tGaM/+bWzrkdtJmnAtbm0obwM5Nx7ynxeg4os5ftU6mJlJtxNk1aduQcy/XbWGnXryBa+5OW8KrZnZd6bXjlpczzZmJXHtFpaag8cZdcwJlNo/pTAOEfqvYCGoI1bv9Sqq3a0bS70Rt3L2iQKXX NUXowEeF WEk+MDzpE0kc1UVKjnhqfheZEOfoSr6p7Om+9O2kaOf4Wk3eQdUSBiMkg18AYJ/7xXuoCncpIJdLxSwhRWdjpRxlnmPQV6uF5nmW53G1Vb9gU8LeQ9uY0AYZDiO4L87EtaR0cxacTNQv/50xxtojEZu9oNxXLzxdozUmRO8eKHInGy2nSd3knQSlC2CNGNePBp9AaIWOgtlToR/AZMdzUTcop1zxmTaoyFsez6Xv2HRrkSS0AapCjjcOkgM6kXcjTVElKTjBVYtCYpZcgxCztoGXF9hcDqaBmvOaOTk6vrEGLpo+MBajD/tpBIFEMplOYVHitHtsHewyzGekyXKbY5E8XkD3tVVISz7i8zN/EEuHg9+K+6WNzaEq3+Ic3UAdKpUiZ1+keDkwxyXWIMkdZsIEQ5n9R+PRep/Dc713mWmOdpO76FwsbPugkGsCbQLYldxbutdgyJjasSEOPvhdDsweLn+VtUyX9WbDC4GtKjE+uS4UrAJt2jfBaePngXFbY1MN5okxxz7dY8xdWOsVSprAlNT4ZOHBOrEmjmVWKaM958MV9j4LiPVAVQDnFngXtLh/T 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: This commit introduces clear_young_dirty_ptes() to replace mkold_ptes(). By doing so, we can use the same function for both use cases (madvise_pageout and madvise_free), and it also provides the flexibility to only clear the dirty flag in the future if needed. Suggested-by: Ryan Roberts Acked-by: David Hildenbrand Reviewed-by: Ryan Roberts Signed-off-by: Lance Yang --- include/linux/mm_types.h | 9 +++++ include/linux/pgtable.h | 74 ++++++++++++++++++++++++---------------- mm/madvise.c | 3 +- 3 files changed, 55 insertions(+), 31 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index db0adf5721cc..24323c7d0bd4 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -1368,6 +1368,15 @@ enum fault_flag { typedef unsigned int __bitwise zap_flags_t; +/* Flags for clear_young_dirty_ptes(). */ +typedef int __bitwise cydp_t; + +/* Clear the access bit */ +#define CYDP_CLEAR_YOUNG ((__force cydp_t)BIT(0)) + +/* Clear the dirty bit */ +#define CYDP_CLEAR_DIRTY ((__force cydp_t)BIT(1)) + /* * FOLL_PIN and FOLL_LONGTERM may be used in various combinations with each * other. Here is what they mean, and how to use them: diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index e2f45e22a6d1..18019f037bae 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -361,36 +361,6 @@ static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, } #endif -#ifndef mkold_ptes -/** - * mkold_ptes - Mark PTEs that map consecutive pages of the same folio as old. - * @vma: VMA the pages are mapped into. - * @addr: Address the first page is mapped at. - * @ptep: Page table pointer for the first entry. - * @nr: Number of entries to mark old. - * - * May be overridden by the architecture; otherwise, implemented as a simple - * loop over ptep_test_and_clear_young(). - * - * Note that PTE bits in the PTE range besides the PFN can differ. For example, - * some PTEs might be write-protected. - * - * Context: The caller holds the page table lock. The PTEs map consecutive - * pages that belong to the same folio. The PTEs are all in the same PMD. - */ -static inline void mkold_ptes(struct vm_area_struct *vma, unsigned long addr, - pte_t *ptep, unsigned int nr) -{ - for (;;) { - ptep_test_and_clear_young(vma, addr, ptep); - if (--nr == 0) - break; - ptep++; - addr += PAGE_SIZE; - } -} -#endif - #ifndef __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG) static inline int pmdp_test_and_clear_young(struct vm_area_struct *vma, @@ -489,6 +459,50 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, } #endif +#ifndef clear_young_dirty_ptes +/** + * clear_young_dirty_ptes - Mark PTEs that map consecutive pages of the + * same folio as old/clean. + * @mm: Address space the pages are mapped into. + * @addr: Address the first page is mapped at. + * @ptep: Page table pointer for the first entry. + * @nr: Number of entries to mark old/clean. + * @flags: Flags to modify the PTE batch semantics. + * + * May be overridden by the architecture; otherwise, implemented by + * get_and_clear/modify/set for each pte in the range. + * + * Note that PTE bits in the PTE range besides the PFN can differ. For example, + * some PTEs might be write-protected. + * + * Context: The caller holds the page table lock. The PTEs map consecutive + * pages that belong to the same folio. The PTEs are all in the same PMD. + */ +static inline void clear_young_dirty_ptes(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + unsigned int nr, cydp_t flags) +{ + pte_t pte; + + for (;;) { + if (flags == CYDP_CLEAR_YOUNG) + ptep_test_and_clear_young(vma, addr, ptep); + else { + pte = ptep_get_and_clear(vma->vm_mm, addr, ptep); + if (flags & CYDP_CLEAR_YOUNG) + pte = pte_mkold(pte); + if (flags & CYDP_CLEAR_DIRTY) + pte = pte_mkclean(pte); + set_pte_at(vma->vm_mm, addr, ptep, pte); + } + if (--nr == 0) + break; + ptep++; + addr += PAGE_SIZE; + } +} +#endif + static inline void ptep_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) { diff --git a/mm/madvise.c b/mm/madvise.c index 4b869b682fd5..f5e3699e7b54 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -507,7 +507,8 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, continue; if (!pageout && pte_young(ptent)) { - mkold_ptes(vma, addr, pte, nr); + clear_young_dirty_ptes(vma, addr, pte, nr, + CYDP_CLEAR_YOUNG); tlb_remove_tlb_entries(tlb, pte, nr, addr); } From patchwork Wed Apr 17 14:14:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 13633428 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 492C9C4345F for ; Wed, 17 Apr 2024 14:15:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C1CC56B0085; Wed, 17 Apr 2024 10:15:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BCD4B6B008C; Wed, 17 Apr 2024 10:15:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A6DEF6B0092; Wed, 17 Apr 2024 10:15:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 87DF86B0085 for ; Wed, 17 Apr 2024 10:15:11 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 46D96140DFA for ; Wed, 17 Apr 2024 14:15:11 +0000 (UTC) X-FDA: 82019220822.20.041E5B3 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf10.hostedemail.com (Postfix) with ESMTP id 9D137C0019 for ; Wed, 17 Apr 2024 14:15:08 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dlqqYL71; spf=pass (imf10.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.214.179 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=1713363308; a=rsa-sha256; cv=none; b=ObTAlSHwk5oSHW3RA2+eJQ7lrW4f9DXy0XfbQNUm6UaC6oXxjDiu5nDNrGyvXzkRbKRsue L52yGkf92J70/Pt4yeqo8OlfrnBbVFHs5K3ItV6GyTMtfxXYwHhObXZk+1rh6OD5enLRAQ t7sTdY0wxCOMTX2kfpHuW4xOB4CrY+U= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dlqqYL71; spf=pass (imf10.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.214.179 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=1713363308; 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=XITq4/hgHmAHZ0ZHlNrd2qmUtOIaf33ePb9J0ZwzOSE=; b=3GkKZsuHrfkf92sCMkUr1syfLCzanHtfmYCHHKYI4vK5NwrjbF37vr72pY2AJhj0kYmIDy FOm+1GfFzeNb7T/L8MWtlaRM6/a8fb6Wt9eSIyW05coSzhoBUBXX4bg8jPcnGK84j6UF7t TXoxsKZ/uISUusig+TSLdUkpjQGdnco= Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1e3c9300c65so49285235ad.0 for ; Wed, 17 Apr 2024 07:15:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713363307; x=1713968107; 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=XITq4/hgHmAHZ0ZHlNrd2qmUtOIaf33ePb9J0ZwzOSE=; b=dlqqYL711OdK8hyJKoZgTBs17z90dCZGuXZotVmfrRQoB6rgJhaYsiXSad5pqhYrnB YHjT0xp1vDUxSFWGSmAImY4U+hmc3zq5BbTpGNi5BwiuEB7mh6CFYmOkCwSBlmcw+Sd0 3f80ojUEz8isxxF+TMj0gPNE3txbFhdv3/Vcbbe50rpkrWKP6vWHBFr+vUV3SDk9g7nf rgjaXQtxmbU1Qr6H1BVY4M83y44ZGneeqNfM6wVlTA/EGoOR5nJXxkWjpauob5cqaJnP 22IVwbFPOwHq2MGWE0e29oxbaFpx/39fKg4zr3mTyvpyzgGg3VOyC+uHVrsB9hvyyQOz n68w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713363307; x=1713968107; 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=XITq4/hgHmAHZ0ZHlNrd2qmUtOIaf33ePb9J0ZwzOSE=; b=cu+XsM5tJFJh0gAQ8A2EM0tu0tvtuVkHqk0V0zv4yXTN1cxf2tZo+lXnKDbKoHsIGB z8MGZdWfWLPozaVmzK3D3QTS9rvWrxnJnvdA7Z3YsvIg2suWAulUb0j8TJerdNcljhiz +Ogt8rs9E1M9i3pba7g20R9lNlyNcAMlge7OIYQASIMn0J1TKk7Ai+XQYyYCj8zBEQM8 84aOOAzmZ8cPWFfwuKs4nJBng0DapU5dtXrSYpvepJsep9D95wO7q+j5PudBEi9zk3oj n1L+9JwkZpbTWVO8ZMth6iJMdrGutuRAQXZbIBuvyJMpl5MxvtZjZixBYzaNCXzFIDpd N2bw== X-Forwarded-Encrypted: i=1; AJvYcCVsfdxsYm/zUn1kUSGizj/+CCdhktCFl26i9E0pGuGoQA1daLSMNfxa8b0kqoz9FaY5E9x+cpSylc+QX+V+2KDS0AE= X-Gm-Message-State: AOJu0Yw8yce0PQDNI3LKiueU9KrSrRL5u/7pgcS13cyN/8BRRg3JHsbn xPKSy8nOR4NJZHomapdxRZp3fPbWsKJX/EUkY8slYu/tSPqC+NWv X-Google-Smtp-Source: AGHT+IEDm4KbIbQ0YdOSAbJN1v6q6PUuVmA+Q24uMMWeXUZznbyNrcroRNDGswYL5SuQ2L2kRGe+oA== X-Received: by 2002:a17:902:6b0b:b0:1de:e6a5:e51d with SMTP id o11-20020a1709026b0b00b001dee6a5e51dmr12852592plk.16.1713363307446; Wed, 17 Apr 2024 07:15:07 -0700 (PDT) Received: from LancedeMBP.lan ([112.10.225.217]) by smtp.gmail.com with ESMTPSA id s14-20020a170902a50e00b001ddc83fda95sm11613562plq.186.2024.04.17.07.15.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Apr 2024 07:15:07 -0700 (PDT) From: Lance Yang To: akpm@linux-foundation.org Cc: 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, 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 2/3] mm/arm64: override clear_young_dirty_ptes() batch helper Date: Wed, 17 Apr 2024 22:14:35 +0800 Message-Id: <20240417141436.77963-3-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240417141436.77963-1-ioworker0@gmail.com> References: <20240417141436.77963-1-ioworker0@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 9D137C0019 X-Stat-Signature: riuyuje1m7hzjgkt6moo9rn113xpcget X-Rspam-User: X-HE-Tag: 1713363308-610893 X-HE-Meta: U2FsdGVkX19eBnbTmNbnDW0pKVLlsq+/S5ee1wZk+1qOe7YxCf5dyeYIkYBeJf6HvjGuT534+uRH1Lyk+PZPF0D54x1oXIIoNsdNfl1NhGNiSZ3+G8rDewqVogC2Eua0Jw8EhxhJVtXc/+HEVqjlA3+weEdHIcL34ZodNRPROMV0BHmQ+vOm4qRMZjv+JDo0gsMJ/3tvLJMoC7IHrKxGdBUu/VlzivGQE4J1nCTQtTVcvPwX347EcGo9++2u7Fn8rWVQFNxnF+oJYqDVReXXtzhpvXdTxvuQHp9Q7SbI6vcHZH4uMfZZ0ooccmZ6gx2vnBh27K1i4alQOsH/e6R6ju3r+ziEOw1Ch1sU/T1X78LuFpj2ViR1bdFzaBed/qPsDVsyolWgpTsPiKf73g1GSXUpBxKOAFFJxkq9zkTIZC+Dor/1etfaqp4vDLz3RF9oh6ISoLRp6nocrmrEmej1M1gK+3ubvgzvgEwUrIXRgTuhpukoO5h1PRhGXuC6B2WuCnWR8dO0t9tIVrAYxIQK0PbK4+Jur53msxBmJM/pf89P2zVuqJjvu4P78Tlwx1gx0E5tbudRegYIi5qjuzYX4DAoWWYH1md8AhdjDkIduordD/4a0jJIDKn/tsRwpEkzj/aNinkHqCPO8vna+UixByRAU+/D4CLcDoGFVW6SWuuqBip4hoJwnFGSsCds475sl4OHE76GDs2bn9TU3BmwLKM+Up7SDHaAcohE0Y2joIoZHKoiWxVMG4jGWnSVuXJ1VTrweXLHg6pgzrKh1N70IyZPSEr2YcUSMNz22fZMp89Woim0hq66Ol1UvOS2hpzksTG/xNjjW/cXkeAqOmD0ebyQXWfJDxVZ/Ba+pbH0RKWLgBnnpIxmXKu22HtxU/M6qZDHYHreYblyi/zt1I683Hhkv10zeC1K6l5jZhbhHR4jXI7mVMAswGgYnyPdwAkfzJCeGmMyM2s1pRzD1wA eskwcIIx 59Am4btGmQhbkGN6WD5KhSaGC618/q5h0cgZC7CoEBz6Arj6Bx8odTXTlU06UU41PqfvvPYRsCOFdECkbTG1IV3iM+KfEQQgfT/mcyVcUflb7QeyOdDiqh2o8GNu+gq93eftHt06tYrGCTr94i1N6RDFq2Poug6LqZskHc7fdec+ofVqyPFsBhCNYcGIwZ6QB9IFoU5FRO4z62N11sIm9ICxyDLKsKUWixJMXnvGLWoaa3BsGJE+dk7S5PZ2OFnPPkff/9qo8NjfQ4hojbY2GIkJSBnAXnf7W7W3RSen1rOaSgNgFatRCrB0vlZo/e7er+w0oIQIWmBKfac9c8BTxFZvn7Y9VctvIqVyX1M9SzCZyqFbXgWlDlVkJHgnCytMbcvL9W7L0ycrzUNbwjOXhoaVHKDu6sxICwaTux7Itm2cNIAFHQ5efB+oH5zyRIrwxsHFhq9KCNzcbnRkkEO/oi4HpaG+GBiR+Bw2VJswzqT0GkTyEAphJfFqvt4aWMNFy2p4hT43+FRTCWsllmFMUsJaziVEGJe1aXhsdcrnIoEK2Vzo= 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: The per-pte get_and_clear/modify/set approach would result in unfolding/refolding for contpte mappings on arm64. So we need to override clear_young_dirty_ptes() for arm64 to avoid it. Suggested-by: Barry Song <21cnbao@gmail.com> Suggested-by: Ryan Roberts Reviewed-by: Ryan Roberts Signed-off-by: Lance Yang --- arch/arm64/include/asm/pgtable.h | 55 ++++++++++++++++++++++++++++++++ arch/arm64/mm/contpte.c | 29 +++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 9fd8613b2db2..1303d30287dc 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -1223,6 +1223,46 @@ static inline void __wrprotect_ptes(struct mm_struct *mm, unsigned long address, __ptep_set_wrprotect(mm, address, ptep); } +static inline void __clear_young_dirty_pte(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + pte_t pte, cydp_t flags) +{ + pte_t old_pte; + + do { + old_pte = pte; + + if (flags & CYDP_CLEAR_YOUNG) + pte = pte_mkold(pte); + if (flags & CYDP_CLEAR_DIRTY) + pte = pte_mkclean(pte); + + pte_val(pte) = cmpxchg_relaxed(&pte_val(*ptep), + pte_val(old_pte), pte_val(pte)); + } while (pte_val(pte) != pte_val(old_pte)); +} + +static inline void __clear_young_dirty_ptes(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + unsigned int nr, cydp_t flags) +{ + pte_t pte; + + for (;;) { + pte = __ptep_get(ptep); + + if (flags == (CYDP_CLEAR_YOUNG | CYDP_CLEAR_DIRTY)) + __set_pte(ptep, pte_mkclean(pte_mkold(pte))); + else + __clear_young_dirty_pte(vma, addr, ptep, pte, flags); + + if (--nr == 0) + break; + ptep++; + addr += PAGE_SIZE; + } +} + #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define __HAVE_ARCH_PMDP_SET_WRPROTECT static inline void pmdp_set_wrprotect(struct mm_struct *mm, @@ -1379,6 +1419,9 @@ extern void contpte_wrprotect_ptes(struct mm_struct *mm, unsigned long addr, extern int contpte_ptep_set_access_flags(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t entry, int dirty); +extern void contpte_clear_young_dirty_ptes(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + unsigned int nr, cydp_t flags); static __always_inline void contpte_try_fold(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte) @@ -1603,6 +1646,17 @@ static inline int ptep_set_access_flags(struct vm_area_struct *vma, return contpte_ptep_set_access_flags(vma, addr, ptep, entry, dirty); } +#define clear_young_dirty_ptes clear_young_dirty_ptes +static inline void clear_young_dirty_ptes(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + unsigned int nr, cydp_t flags) +{ + if (likely(nr == 1 && !pte_cont(__ptep_get(ptep)))) + __clear_young_dirty_ptes(vma, addr, ptep, nr, flags); + else + contpte_clear_young_dirty_ptes(vma, addr, ptep, nr, flags); +} + #else /* CONFIG_ARM64_CONTPTE */ #define ptep_get __ptep_get @@ -1622,6 +1676,7 @@ static inline int ptep_set_access_flags(struct vm_area_struct *vma, #define wrprotect_ptes __wrprotect_ptes #define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS #define ptep_set_access_flags __ptep_set_access_flags +#define clear_young_dirty_ptes __clear_young_dirty_ptes #endif /* CONFIG_ARM64_CONTPTE */ diff --git a/arch/arm64/mm/contpte.c b/arch/arm64/mm/contpte.c index 1b64b4c3f8bf..9f9486de0004 100644 --- a/arch/arm64/mm/contpte.c +++ b/arch/arm64/mm/contpte.c @@ -361,6 +361,35 @@ void contpte_wrprotect_ptes(struct mm_struct *mm, unsigned long addr, } EXPORT_SYMBOL_GPL(contpte_wrprotect_ptes); +void contpte_clear_young_dirty_ptes(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + unsigned int nr, cydp_t flags) +{ + /* + * We can safely clear access/dirty without needing to unfold from + * the architectures perspective, even when contpte is set. If the + * range starts or ends midway through a contpte block, we can just + * expand to include the full contpte block. While this is not + * exactly what the core-mm asked for, it tracks access/dirty per + * folio, not per page. And since we only create a contpte block + * when it is covered by a single folio, we can get away with + * clearing access/dirty for the whole block. + */ + unsigned long start = addr; + unsigned long end = start + nr; + + if (pte_cont(__ptep_get(ptep + nr - 1))) + end = ALIGN(end, CONT_PTE_SIZE); + + if (pte_cont(__ptep_get(ptep))) { + start = ALIGN_DOWN(start, CONT_PTE_SIZE); + ptep = contpte_align_down(ptep); + } + + __clear_young_dirty_ptes(vma, start, ptep, end - start, flags); +} +EXPORT_SYMBOL_GPL(contpte_clear_young_dirty_ptes); + int contpte_ptep_set_access_flags(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t entry, int dirty) From patchwork Wed Apr 17 14:14:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 13633429 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 826E0C04FFF for ; Wed, 17 Apr 2024 14:15:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 05DBA6B0093; Wed, 17 Apr 2024 10:15:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0345F6B0095; Wed, 17 Apr 2024 10:15:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E3E9E6B0098; Wed, 17 Apr 2024 10:15:18 -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 C61796B0093 for ; Wed, 17 Apr 2024 10:15:18 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 86FB2A0713 for ; Wed, 17 Apr 2024 14:15:18 +0000 (UTC) X-FDA: 82019221116.12.8F959D8 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by imf19.hostedemail.com (Postfix) with ESMTP id 887001A001E for ; Wed, 17 Apr 2024 14:15:16 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=K7tEYR0J; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.210.176 as permitted sender) smtp.mailfrom=ioworker0@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713363316; 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=8zmDsYAtJOCrhdAwJbAGzI50/YgT/UfiWJqJuE4bljE=; b=KkLKku/A1+glUqSnq1CJsSkDNcmPlKf7P2pDWyPR4At2Rncw4emhJGS3VcoT9A3/dZ9vlj x/dggRItOLhYec0LTjdQymNuoA413aHT5Y5jn1qTjwY0g9/svRtW2t/OmLdA6ehWCEsAFQ n6DOdFb6t352o0XjPf+swXK7hMMY034= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=K7tEYR0J; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.210.176 as permitted sender) smtp.mailfrom=ioworker0@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713363316; a=rsa-sha256; cv=none; b=r1PMaxAKnQZeCrmQps/iKUA2oYKWmmmQ4+lNTHbKY+fPPg3m1rumwcDZSwrRu8gqCpbM/X 0csGmGQ4DPEH2HdRw2iIeNZvdBnjg0/14lVEpaZOzV7fiOfBIh+5v7OOybdpA3l/LZUfQL HLzVEgTOk2kV+a4b0ROlelWEsh9IW/M= Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-6ead4093f85so4751455b3a.3 for ; Wed, 17 Apr 2024 07:15:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713363315; x=1713968115; 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=8zmDsYAtJOCrhdAwJbAGzI50/YgT/UfiWJqJuE4bljE=; b=K7tEYR0J9qq8YKH/D+M/dZ1cWnr4wAlBceIG1N/GqfBUtmQWfwKHbiHNHvNP00Vn7Q TcQ+AExfMrUbsqFjf0ZSNuYptI4/CabbOW8ZNjfnDmHn/cczV6edyj6CKOvasEoROjrJ XqHaGIX69cQhDIG21h13an2mCvsa6HBsiJAydQgaNzGxscwHKytVeKqJYUICbKInmR07 kN9PQG5Nqo/BTtq8jVDNWRWubgmN7os1DhfiXXqKkkJ+X3VRPxSYNNMw4uMTqwVFeP3X +yz3ZlNJBxvuJXg8HHketqsoOw4MmUp1E73IRIG1f/+cAxc58qkrkp1s96PcxFRo1siX HsYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713363315; x=1713968115; 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=8zmDsYAtJOCrhdAwJbAGzI50/YgT/UfiWJqJuE4bljE=; b=esnW2LgJj3Tjx8xHHwsfMkrNZagQ0wfsETSTHErZBsT+hq2wmZISUgpXbimVidgRYi zdsK5Qtr9albCsidvTmdGEDUWE/a0lSPc7eMP+GBkjy7HY3N/J597Y3jvnVrum2QwSr3 S7+mSaijLMr0cE94TevjvENzycoX4W28soUmSgVKi5WUAqfISqyPpIVIIYru+q+08UdD tQVKXz2sYf9r9wNAaI+kPWFTD09UTBDh31NiWDpMsRurSZVTO22BVAXr2lWkvkx4b07X h/aqb4Oe9njgoG/feCkMa+rPHmsOHOVzt+VZ7O9TIZo2eDFHxt0YRlHLE3cujY6LIs1T CNJQ== X-Forwarded-Encrypted: i=1; AJvYcCV8OViuZZzt2vr6kNNND6LlebuzZu9HHcWFNDRIohLRp+xzacjWIrIYv+wQh/ziEx0zbV9vbQWbXiDn++LFL65huIw= X-Gm-Message-State: AOJu0YwZcjWrxQwBNsZiUgwGEyWimGWnkVMFellBRV2br/AXvKH78+LZ 35KxS30r2jNiP/RPMgyDMhs4RMi2xnoBSwC82KL7J8pBwfZuZHWh X-Google-Smtp-Source: AGHT+IFHnRpIQz0volgPDyOzixsfBZR9W7TzOuIOwAy8+qIhGQ8COOnMGTqpfoWRzRuyD6dpMUBD1w== X-Received: by 2002:a05:6a20:3c9e:b0:1a8:2cd1:e437 with SMTP id b30-20020a056a203c9e00b001a82cd1e437mr17085789pzj.11.1713363315179; Wed, 17 Apr 2024 07:15:15 -0700 (PDT) Received: from LancedeMBP.lan ([112.10.225.217]) by smtp.gmail.com with ESMTPSA id s14-20020a170902a50e00b001ddc83fda95sm11613562plq.186.2024.04.17.07.15.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Apr 2024 07:15:14 -0700 (PDT) From: Lance Yang To: akpm@linux-foundation.org Cc: 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, 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/madvise: optimize lazyfreeing with mTHP in madvise_free Date: Wed, 17 Apr 2024 22:14:36 +0800 Message-Id: <20240417141436.77963-4-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240417141436.77963-1-ioworker0@gmail.com> References: <20240417141436.77963-1-ioworker0@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 887001A001E X-Stat-Signature: wu8coc1c6ycg1sutzx5d69m3ij9hr76t X-HE-Tag: 1713363316-781917 X-HE-Meta: U2FsdGVkX188zT/PQc50A8LIfGZOJ+pmGOlufLf3QDPwTeD3pIWbH/tBX9fxPtVgR9ODARAByp8M9ivxiKVPPUDjHgms6eLUw9cDw18cnNpAHDc7TqMkrc8pmYOrYcoV11Q3527nXVGXha9nF4ozQnALHLfa/kvAQu/kgQnFRLVucxcFRljQ1G3YzgCkRAg2yD4FdrhTq77NRXu1UzOy8rzMa3NIprk9N1kxhBascBrnrHESsj9MoGupohYkD1DGh5SsXvRO72rgwArz4m4YebvzatX8kWUIhIT550NogrsyuzEXNh/j/T0329f479Z2PmhdlePyceMszxGTmB73zgKnGGU902ScaB/qXJ7ZUR7r+cxnI39tii9hIM6KywkBmIqE+K9COue89lpVrq01qILu0cZYYGvyZXIlsrgN+tfk1yiZ8xhTSCbp1UeaR6SrytY/jtY0q+4iLWYVfdk514LrhHqu2UBsu0Ys3o4nSCpLcnmM58A7kLg7m2V7Ib99jJ+uN/1bBzcpPT5IlDL/E9iJnPpdAH7VCN+ExBKOLHO029pp8WvRoJHiPZccNACRojH1DPCNB1lBJwpqCuX2Q1aNlQDA6dgNQYVkq88rWOxK1djb/k6UefLXrjvVOgxoipsfNX9XGuiqjA1J2ORD6LjOkWBDbXqQ/Kn96Q884IJayhvuSJ2mY65F88DIrcNwp87boMUs60uP1ZKcFUYHrOluU38d72bGZWiSUfon139UU+lVle+XVZT/pUZtikKNp7TtNU72rW8eBpFdRx7lRtawS4PNvfwIYbPqWjf3OnnhkQIIwSL2ivsxYkZTYklRC7sJprZcW0e6yYncbroJ3qvB3wHOuHwKQmM1ryv0xMAmVpPauzHNBdO5jH6R9Yw10QJg9SYemalFIb2iNF1oEicMPhgfNIN1GwxEiVIOan2vrYXn9c9vRVUnL0NhK6fwVj7376p2pmb831/V1uN 0B2Xp9qw UZslPFCZ6OOAzHswNI/VMMzncimgmo780L4ZOIlT4QLJZ5IkJdhfqofZ4aYcRWGvAdh5XUnUKqvnhXkhnA+31/lywBj4jXCzlVTaciFtGiQXWD7pD/RwWeoQuHVro3KX8DoIYnhzxHK/kxRPOG/6kfoFpENlcFfO4Pn9xnNGUogzizUlvsgIg0w9dbH5ApwkuXKvUR93WiudDw1SH70q8kU4vNmEuibmbVu47GgVwZNMeBdh+HBhmT9XvQdO6etSzKIevB8h+93hFXLAThfWuKOALBQEK17T5FTZGa4H+A375lXTywtaLUSzKVI1En/P04UQngyrnd2g5x9S4dvhJYiIWzgZ2KRq1Ni6Zr+M1yV3FjYzLlY0YVw1gQ1E5boK5C0aUSm1uzzCPN8PyzcBJ50h6xIdzmGKceqaDMV1M/ea77riivA6Ym+Hik3FsO3d3Pg0lTsrGdSbPRl0wWLYLVGqyqMQDTkyEt/2L+hbeq0d5+iOd26VRj1yAG0qybCRfvUmCRo5kUiQ6Mv9QgKJ8u8ghD/WBlt1n+MlNWNYn6bU9OauRUSkj2MF52qPgin8lOkOSwU6pzDo9pp4ePxzJTN8vFafZsbLosUesHwSe0AJ6u7YbgrFmm8lJNYQqZELmFnuC 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: This patch optimizes lazyfreeing with PTE-mapped mTHP[1] (Inspired by David Hildenbrand[2]). We aim to avoid unnecessary folio splitting if the large folio is fully mapped within the target range. If a large folio is locked or shared, or if we fail to split it, we just leave it in place and advance to the next PTE in the range. But note that the behavior is changed; previously, any failure of this sort would cause the entire operation to give up. As large folios become more common, sticking to the old way could result in wasted opportunities. On an Intel I5 CPU, lazyfreeing a 1GiB VMA backed by PTE-mapped folios of the same size results in the following runtimes for madvise(MADV_FREE) in seconds (shorter is better): Folio Size | Old | New | Change ------------------------------------------ 4KiB | 0.590251 | 0.590259 | 0% 16KiB | 2.990447 | 0.185655 | -94% 32KiB | 2.547831 | 0.104870 | -95% 64KiB | 2.457796 | 0.052812 | -97% 128KiB | 2.281034 | 0.032777 | -99% 256KiB | 2.230387 | 0.017496 | -99% 512KiB | 2.189106 | 0.010781 | -99% 1024KiB | 2.183949 | 0.007753 | -99% 2048KiB | 0.002799 | 0.002804 | 0% [1] https://lkml.kernel.org/r/20231207161211.2374093-5-ryan.roberts@arm.com [2] https://lore.kernel.org/linux-mm/20240214204435.167852-1-david@redhat.com Signed-off-by: Lance Yang Reviewed-by: Ryan Roberts --- mm/internal.h | 12 ++++- mm/madvise.c | 141 ++++++++++++++++++++++++++++---------------------- mm/memory.c | 4 +- 3 files changed, 91 insertions(+), 66 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index c6483f73ec13..daa59cef85d7 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -134,6 +134,8 @@ static inline pte_t __pte_batch_clear_ignored(pte_t pte, fpb_t flags) * first one is writable. * @any_young: Optional pointer to indicate whether any entry except the * first one is young. + * @any_dirty: Optional pointer to indicate whether any entry except the + * first one is dirty. * * Detect a PTE batch: consecutive (present) PTEs that map consecutive * pages of the same large folio. @@ -149,18 +151,20 @@ static inline pte_t __pte_batch_clear_ignored(pte_t pte, fpb_t flags) */ static inline int folio_pte_batch(struct folio *folio, unsigned long addr, pte_t *start_ptep, pte_t pte, int max_nr, fpb_t flags, - bool *any_writable, bool *any_young) + bool *any_writable, bool *any_young, bool *any_dirty) { unsigned long folio_end_pfn = folio_pfn(folio) + folio_nr_pages(folio); const pte_t *end_ptep = start_ptep + max_nr; pte_t expected_pte, *ptep; - bool writable, young; + bool writable, young, dirty; int nr; if (any_writable) *any_writable = false; if (any_young) *any_young = false; + if (any_dirty) + *any_dirty = false; VM_WARN_ON_FOLIO(!pte_present(pte), folio); VM_WARN_ON_FOLIO(!folio_test_large(folio) || max_nr < 1, folio); @@ -176,6 +180,8 @@ static inline int folio_pte_batch(struct folio *folio, unsigned long addr, writable = !!pte_write(pte); if (any_young) young = !!pte_young(pte); + if (any_dirty) + dirty = !!pte_dirty(pte); pte = __pte_batch_clear_ignored(pte, flags); if (!pte_same(pte, expected_pte)) @@ -193,6 +199,8 @@ static inline int folio_pte_batch(struct folio *folio, unsigned long addr, *any_writable |= writable; if (any_young) *any_young |= young; + if (any_dirty) + *any_dirty |= dirty; nr = pte_batch_hint(ptep, pte); expected_pte = pte_advance_pfn(expected_pte, nr); diff --git a/mm/madvise.c b/mm/madvise.c index f5e3699e7b54..d6f1889d6308 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -321,6 +321,39 @@ static inline bool can_do_file_pageout(struct vm_area_struct *vma) file_permission(vma->vm_file, MAY_WRITE) == 0; } +static inline int madvise_folio_pte_batch(unsigned long addr, unsigned long end, + struct folio *folio, pte_t *ptep, + pte_t pte, bool *any_young, + bool *any_dirty) +{ + int max_nr = (end - addr) / PAGE_SIZE; + const fpb_t fpb_flags = FPB_IGNORE_DIRTY | FPB_IGNORE_SOFT_DIRTY; + + return folio_pte_batch(folio, addr, ptep, pte, max_nr, fpb_flags, NULL, + any_young, any_dirty); +} + +static inline bool madvise_pte_split_folio(struct mm_struct *mm, pmd_t *pmd, + unsigned long addr, + struct folio *folio, pte_t **pte, + spinlock_t **ptl) +{ + int err; + + if (!folio_trylock(folio)) + return false; + + folio_get(folio); + pte_unmap_unlock(*pte, *ptl); + err = split_folio(folio); + folio_unlock(folio); + folio_put(folio); + + *pte = pte_offset_map_lock(mm, pmd, addr, ptl); + + return err == 0; +} + static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, struct mm_walk *walk) @@ -456,41 +489,30 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, * next pte in the range. */ if (folio_test_large(folio)) { - const fpb_t fpb_flags = FPB_IGNORE_DIRTY | - FPB_IGNORE_SOFT_DIRTY; - int max_nr = (end - addr) / PAGE_SIZE; bool any_young; - nr = folio_pte_batch(folio, addr, pte, ptent, max_nr, - fpb_flags, NULL, &any_young); - if (any_young) - ptent = pte_mkyoung(ptent); + nr = madvise_folio_pte_batch(addr, end, folio, pte, + ptent, &any_young, NULL); if (nr < folio_nr_pages(folio)) { - int err; - if (folio_likely_mapped_shared(folio)) continue; if (pageout_anon_only_filter && !folio_test_anon(folio)) continue; - if (!folio_trylock(folio)) - continue; - folio_get(folio); + arch_leave_lazy_mmu_mode(); - pte_unmap_unlock(start_pte, ptl); - start_pte = NULL; - err = split_folio(folio); - folio_unlock(folio); - folio_put(folio); - start_pte = pte = - pte_offset_map_lock(mm, pmd, addr, &ptl); + if (madvise_pte_split_folio(mm, pmd, addr, + folio, &start_pte, &ptl)) + nr = 0; if (!start_pte) break; + pte = start_pte; arch_enter_lazy_mmu_mode(); - if (!err) - nr = 0; continue; } + + if (any_young) + ptent = pte_mkyoung(ptent); } /* @@ -688,44 +710,48 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr, continue; /* - * If pmd isn't transhuge but the folio is large and - * is owned by only this process, split it and - * deactivate all pages. + * If we encounter a large folio, only split it if it is not + * fully mapped within the range we are operating on. Otherwise + * leave it as is so that it can be marked as lazyfree. If we + * fail to split a folio, leave it in place and advance to the + * next pte in the range. */ if (folio_test_large(folio)) { - int err; + bool any_young, any_dirty; - if (folio_likely_mapped_shared(folio)) - break; - if (!folio_trylock(folio)) - break; - folio_get(folio); - arch_leave_lazy_mmu_mode(); - pte_unmap_unlock(start_pte, ptl); - start_pte = NULL; - err = split_folio(folio); - folio_unlock(folio); - folio_put(folio); - if (err) - break; - start_pte = pte = - pte_offset_map_lock(mm, pmd, addr, &ptl); - if (!start_pte) - break; - arch_enter_lazy_mmu_mode(); - pte--; - addr -= PAGE_SIZE; - continue; + nr = madvise_folio_pte_batch(addr, end, folio, pte, + ptent, &any_young, &any_dirty); + + if (nr < folio_nr_pages(folio)) { + if (folio_likely_mapped_shared(folio)) + continue; + + arch_leave_lazy_mmu_mode(); + if (madvise_pte_split_folio(mm, pmd, addr, + folio, &start_pte, &ptl)) + nr = 0; + if (!start_pte) + break; + pte = start_pte; + arch_enter_lazy_mmu_mode(); + continue; + } + + if (any_young) + ptent = pte_mkyoung(ptent); + if (any_dirty) + ptent = pte_mkdirty(ptent); } if (folio_test_swapcache(folio) || folio_test_dirty(folio)) { if (!folio_trylock(folio)) continue; /* - * If folio is shared with others, we mustn't clear - * the folio's dirty flag. + * If we have a large folio at this point, we know it is + * fully mapped so if its mapcount is the same as its + * number of pages, it must be exclusive. */ - if (folio_mapcount(folio) != 1) { + if (folio_mapcount(folio) != folio_nr_pages(folio)) { folio_unlock(folio); continue; } @@ -741,19 +767,10 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr, } if (pte_young(ptent) || pte_dirty(ptent)) { - /* - * Some of architecture(ex, PPC) don't update TLB - * with set_pte_at and tlb_remove_tlb_entry so for - * the portability, remap the pte with old|clean - * after pte clearing. - */ - ptent = ptep_get_and_clear_full(mm, addr, pte, - tlb->fullmm); - - ptent = pte_mkold(ptent); - ptent = pte_mkclean(ptent); - set_pte_at(mm, addr, pte, ptent); - tlb_remove_tlb_entry(tlb, pte, addr); + clear_young_dirty_ptes(vma, addr, pte, nr, + CYDP_CLEAR_YOUNG | + CYDP_CLEAR_DIRTY); + tlb_remove_tlb_entries(tlb, pte, nr, addr); } folio_mark_lazyfree(folio); } diff --git a/mm/memory.c b/mm/memory.c index 33d87b64d15d..9e07d1b9020c 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -989,7 +989,7 @@ copy_present_ptes(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma flags |= FPB_IGNORE_SOFT_DIRTY; nr = folio_pte_batch(folio, addr, src_pte, pte, max_nr, flags, - &any_writable, NULL); + &any_writable, NULL, NULL); folio_ref_add(folio, nr); if (folio_test_anon(folio)) { if (unlikely(folio_try_dup_anon_rmap_ptes(folio, page, @@ -1558,7 +1558,7 @@ static inline int zap_present_ptes(struct mmu_gather *tlb, */ if (unlikely(folio_test_large(folio) && max_nr != 1)) { nr = folio_pte_batch(folio, addr, pte, ptent, max_nr, fpb_flags, - NULL, NULL); + NULL, NULL, NULL); zap_present_folio_ptes(tlb, vma, folio, page, pte, ptent, nr, addr, details, rss, force_flush,