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 B937BC4345F for ; Thu, 18 Apr 2024 10:58:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4ED0C6B0085; Thu, 18 Apr 2024 06:58:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 49D0E6B0089; Thu, 18 Apr 2024 06:58:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 33DCE6B008C; Thu, 18 Apr 2024 06:58:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 131086B0085 for ; Thu, 18 Apr 2024 06:58:28 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0C966121359 for ; Thu, 18 Apr 2024 10:58:22 +0000 (UTC) X-FDA: 82022353644.20.3C99EA3 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf24.hostedemail.com (Postfix) with ESMTP id 1106218000A for ; Thu, 18 Apr 2024 10:58:19 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=jaFtFRrU; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf24.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.210.182 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=1713437900; 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=R0CVYbHyG2fwsqs5SDZYuq5i7qVMAEsE3hASqp3qZA2gy4BeUccYO4k6y2xqcz8xooPlFW GFExe8tSF2m9DsH0Z+z81MjftsOLTbchIhltWBdr0wXkkijBSUWwcASP9qxcOSQ00k2QPi KkewHSuk8SyuTRp4ZtnlgeEi09/dntY= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=jaFtFRrU; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf24.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=ioworker0@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713437900; a=rsa-sha256; cv=none; b=yRrNuvhESPHAYwJ3yGftfnTC5AEdTliy66w4+hC9XkKhNmTg7E74mu5ZHJ/GGu3tLm64vg wD7/CveYKKpQgvut1Ryhbq19zlnQsvxDwUhpbIOwudTxBDXND2wW8ygVwLbitYDPr2ec9x pwXa6ibeQjrFSBiIdkhv9ujpep/SO0s= Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-6ed691fb83eso688969b3a.1 for ; Thu, 18 Apr 2024 03:58:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713437899; x=1714042699; 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=jaFtFRrU0KjbvX4Vx9yTxdV2ZBONAJq4oIOoPq0zv884gDGuFoJd4lmH6ZJatK0APG z9lfRNvsBPxkl1eiYufy3+W50nhADo4P+fsa69ApFjjLVTMlbJNadxqbC4GbNlNVV1pk hXVm8xudkp70G/7Yvk+DMV3VE3xwt+85/eaE5EbGKYOtXuDaByjGYj4XJm7hzok74sWz h/aQTTU2SzqeLdcHBimOE/fz1tZ1pRu0nZvU7EI9ulFSadlxrEKbP7CJh1xocqQAiKrg 5yHdIHtC54DQOHbV+wYYkb1y5j7pcRvO0e9MFQEEBOTXoCPw7xK/HntJ/Ilxm82jx4vi wjnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713437899; x=1714042699; 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=lG4SGotC44w//Tiuitxa6U77SKv+JjEZemkKjx/J9gDmPBklDNF8ey2SYUS09boKMs 0zOTBCtoPCHb48fzsQeuudMJc64ZZu3zEW7XW1eJ7cN4YrUdaasvb86y7fz8iftoq4Io 7eyiUjnbyBhxcMldhSv9FhsnIa1MZlAkTKF7VzY0TJl2DzFSdi/NUvwDv7TYsQA2JqND SG6JbcqGekRxub41KJB8FRsrIczpF70Gu9bRWmXUC3mEdGzXH2lM35WemHtLxaRsxCvI /gFFCgH5YIfPZCBAp0RqT0MMEDbsgI9vXji2yoR6X8mNG2chJPwQIh1nlzWhsV8yUlTT F/wA== X-Forwarded-Encrypted: i=1; AJvYcCVsOA+R3TRhAXE980b/iHMvPUwsl2wYYtbBvVsy4eKC2YtWRG8QMknAzeN78fGYUBKRSEF4Kv/pzkXfY9v/ohqqpFg= X-Gm-Message-State: AOJu0Yz/eM4Cc5bo7vjwGvjDmfBPY0F1vgMNTQVGFQPx8OKNPBZvKSEM OKxIFtmOKM9iRS+Gi8K+0rqyHcoe2xm7FqrirSaT7Y+xWGp1LPSf X-Google-Smtp-Source: AGHT+IF4GTJLmtDlsAiq1UBHnJLKlM7tfb3a1b5r2w5ICLJMQHsjTAFqJxOVL/DbBjBw6Z9Mr8QknQ== X-Received: by 2002:a05:6a00:1749:b0:6ea:d740:62a4 with SMTP id j9-20020a056a00174900b006ead74062a4mr2701566pfc.25.1713437898934; Thu, 18 Apr 2024 03:58:18 -0700 (PDT) Received: from LancedeMBP.lan ([112.10.225.217]) by smtp.gmail.com with ESMTPSA id gd26-20020a056a00831a00b006ea923678a6sm1200487pfb.137.2024.04.18.03.58.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 03:58:18 -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 v9 1/4] mm/madvise: introduce clear_young_dirty_ptes() batch helper Date: Thu, 18 Apr 2024 18:57:47 +0800 Message-Id: <20240418105750.98866-2-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240418105750.98866-1-ioworker0@gmail.com> References: <20240418105750.98866-1-ioworker0@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 1106218000A X-Stat-Signature: mx3htfpr4juf39z95mtcuan6n8nbudug X-HE-Tag: 1713437899-753715 X-HE-Meta: U2FsdGVkX19lV+AdJSsJjt0aPdAQq1B4MZR7TAwHaKD0yWJ7qOOR4Z/g8EmhHtg4KfgOo/4SbuWowFaFffiH0QSZGnbjvtM4OZyBw4WV4S4B3ZwKpsdhQ8EP83wb4rkHSHAOoDGtMixLZYtn2NKAxhiQtGYubfu0oDjdTHsOqWsmaNDGE1B0BmgyWANlzK6R+jfp25di0uACnxApHSd0J+wT0WyL24K9fcDZKKeVqoCNujrdGnbIXc9XpnurGGWBp2E8FKascFfLeXkCNBqJP7oL5H0xLUkmFKH0Vge5gfjDSFIJYOdy44As2BJ7SSBNDwaPsEwcWVShjegTuP+HEO84N9C/IDVw/ErLIFU/WB6J4g40mDiYCOKJ65HMHAMxIEJ8deJrh5X31sM+qTvHrKP2CwmwSv3O7jnI5F2AMloye0bw5og8fTSVVu2wQZ2YDwHV8lV28DwGekRcKgsFWkO/PsCgzVRbf5K5yF4FNjQ0HJRlXZMC0NkROpxoh7xTN8gdxftGZgXJ/XmBr61ct8gAdc7OKESqYHJX7Wz1C5Hq4pVIFOXVA3uEOTulsltpMQvrkH2XmluXjdIr+8xOsGg2igG0RZY/YB8ihBr+uFwk5CZ9KzP2hxD76O+ODs8Kv0yEKRVqyrv6SfF0MpArEaV80NBgjAfuUq3WYbF+5A+gfbckfTXOgKiAYXgfVwbGM/uVz2KjBvvQT0QlqPtnqtRgLYDA+IbnwG/F5dIRjvoUP7po8zK7WeBUMr18+/42Tjb9GNGXJSxQza2Ex318F7eurmKGeCey5Rpjrs3WDGZ05gDr9XLKeF8315FlveDZSYyS+FP3I1r+kQ0h9zJtDzwAjVXZSjSPgvxPc19yfRApDqfy3sQIbP6c+glGfy7GBonEF3zfwPzC04WowXnO+JW4/BK4mTWWFT1aOKJg4U+xJCKsHuam8ojR/z7wwCJK5tCV5mvfh2MtAHYrKM2 QRIrLQSU jO5jpRyojw5k/a/Re6QdUfw76/b+RZuc8sMpC0pr2WctXIJmpUppnQXThBfquChBIFCWosrzIKFecl9jyOfXmt1Ri+O95vmbh8Ncn3ZlJXJH8c0Ydljqd2JGdiOFsfjlWc2l+xNY0SI3nLgWD4E6ZM4FDcu92/Q3UrlxtJauawE5WgnwDmNiAPtRNYM6EJDFadJDdqeQp59BUO9U0ubV2ZVrYw/OcDWnLxiXW2QWb7O29ux3ZDkdTTVu5UYvx2LtZz7W0eUIEoDuFw2iawnzTsayihEZsOaZi+hR3z/TmsQ+r6MzKDPqX18NTYh9COsMsiORCu3DA63mke78P4lG0yMZKKsMdjjE+0306XGdJL/YhrMPquR5YY6iJMFLcxs+iRui/AbLtztqWVCBQ+zIte0FhjQIqbwnriteof/k30CTu+cQnPEP50SwRKTxHrjvQxf/0n2AedJhNefTZzXda+qWxTPu9waOWwyteWP1E8UAXNkGd5LR2PpVMXjcKR4czNYC8Nq8z7O/706hzz05IaCHmRzSlFcWtfnEsqImt3Dwwa+FpcvysoPGzvZknfSJvxMU3 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); } -- 2.33.1