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 DC74FC4345F for ; Tue, 16 Apr 2024 03:35:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 791DD6B0087; Mon, 15 Apr 2024 23:35:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 740DC6B0088; Mon, 15 Apr 2024 23:35:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E21D6B008A; Mon, 15 Apr 2024 23:35:20 -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 3F8386B0087 for ; Mon, 15 Apr 2024 23:35:20 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D8EC014010F for ; Tue, 16 Apr 2024 03:35:19 +0000 (UTC) X-FDA: 82013979558.06.19EFC88 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf24.hostedemail.com (Postfix) with ESMTP id 0E46118001B for ; Tue, 16 Apr 2024 03:35:17 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ZlheVcKA; 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=1713238518; 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=Y26dypB16OA0SVhjpIF+OcTwWxmNUbTnikqr5y0M6Fc=; b=CqvbWZXH37eTwYYHwWnaW/Kp88z3R9NRb7H3KhgEL1d6BxZ18ABMIXP5AAKZCXANIafMYJ 7NEw97Q9KNGOay4ABVxYuZDMg0h3tRN9xjnRIbppNYa516DzYzHuDiuZbGnz17uwBLiWV5 1kkvsxLZOBKXYh5Nevb9/MSpeceIcWc= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ZlheVcKA; 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=1713238518; a=rsa-sha256; cv=none; b=NocuCS5UWqL4DUWuSLViDkW5b8D3cH4e0FqwWb1MmtLga5ktG8ulRAvWE+MwXYzjahcWXt G7wdGlwuKQZa10HehXh2Jh+dP+aaJC/ommGyp6pZ8XqPC8iCb5NBc6K9nhhhOZECXR8K9e aqjVLWtx52bX8Rjt3kDqClj+srRUmx8= Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-6ee12766586so2576289b3a.0 for ; Mon, 15 Apr 2024 20:35:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713238517; x=1713843317; 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=Y26dypB16OA0SVhjpIF+OcTwWxmNUbTnikqr5y0M6Fc=; b=ZlheVcKAm1A+VjUpLVtGzhLaiH5mBrxGAOhnd2X0kfmYdUPtH4+TJ+Te69u+LIAZcI LoSzctAZdaV8pZj3Jpc5QHo54x6UZDQtyFyiLu6cUnpl8Kr3fmy+tAu9FIKoctDsnjr2 ttAA/O3s56YTp8YHymJY+2HmUl/JxIiQ11S6k5iekOiDEenKP6HXVhMPTZnyys+tY+2d yQlf+PwCFuIvF+LufC1dGJq74fxA5YpdzppXunvfeUeM62CHfw0fccK9z0PWFaDtvLUj T8nGL+teFuOP1Pfbrtsas4FSI81s4ugv+06uVaiOkeNlK+nmzt1lVWcBRw0Yp9bupOM0 mmbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713238517; x=1713843317; 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=Y26dypB16OA0SVhjpIF+OcTwWxmNUbTnikqr5y0M6Fc=; b=kBWp7yJ6A28G5EhpLYbXKJIHZ2pvj/jwK8gykdBiBrjBcGcvgC3qkuUBtKLdG3VFaV suMBbsTJtEzWgLEWFX0YMO9DuHzSze0m4v/1fQPTvCWTkeMzIIWmSWtHbI5dS2sDmd3f 6H0i8tQcEPOH97QT0UetJgWpe1Mg/j8bVUkBYkw7rJCXarOO5jssLxVZp7OuemZ8lUCC yxWGfOf9gR//vMz+TRhSkSm3uR678qKHUiLDO1G6fPGAFnJi4kZsyZNTzrIGI9URs3My bCgKyYWT2lkqshwV+kLDqNJn+3PUTCTlHHYOsri09SYhg172z7pQyOAhgQgtqg8MMHYB PQ0w== X-Forwarded-Encrypted: i=1; AJvYcCU/GUcF0P6Csn/iospYSEvp2v9TTvRkhimfdvnt2ooBRpAD9JciE/MROcef6BnaCFJE3MXDHDq80EvZ6iSOaMP5Ijo= X-Gm-Message-State: AOJu0Yxw8HtdEtmg1QZitiZ3E7HIvWdhYld6/eG4sA1IyLCrGie/jEOP N9o9i96kRd3T6/qMvNVzwqREVHjS+iCHS+IOJxNnCay4gRCoQwsn X-Google-Smtp-Source: AGHT+IFyV0ITDY9sKZfPnYg4et6b+fPHhV71ixJ7FoSU2qMU9HkaIvNCBw2dcpvFdL4KgCCgbcP34w== X-Received: by 2002:a05:6a00:2382:b0:6ed:ca65:68b with SMTP id f2-20020a056a00238200b006edca65068bmr2029849pfc.4.1713238516924; Mon, 15 Apr 2024 20:35:16 -0700 (PDT) Received: from LancedeMBP.lan ([112.10.225.217]) by smtp.gmail.com with ESMTPSA id ka13-20020a056a00938d00b006e57247f4e5sm7906737pfb.8.2024.04.15.20.35.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 20:35:16 -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 v7 1/3] mm/madvise: introduce clear_young_dirty_ptes() batch helper Date: Tue, 16 Apr 2024 11:34:55 +0800 Message-Id: <20240416033457.32154-2-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240416033457.32154-1-ioworker0@gmail.com> References: <20240416033457.32154-1-ioworker0@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0E46118001B X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: jif16dzbgwqqmcsmmphz6qrswbtsdsxy X-HE-Tag: 1713238517-933246 X-HE-Meta: U2FsdGVkX1863UjDWQAvMnIykR3aCOe8MmRWvrDUKnAtf/+sAhiM5vKfX+EB0BfHDwRP89hm8WXTjoVQZHMLcc6K4h56Fx+x5mp4g09g3X/+xi2gzgBufP9Y/pmUoi2KklQ7xMsBQLbnN+MKxI6CHbkFr62C0bPnxWiGdQj9ihhKmqWeA6r1nTd64C0FcnmspCeLCtLTIEs+EsI5PDoQ9V1OTptns83qUero8CXKA9X3qQQr8tbiIsJFwhQLKdaHMJ0ri6tDsEA0D68feqo0+X4qZsmoui6RKzEg2lBQws1aecisM7MF5lpK3yuwZJsu5BSk0a9w8shoGa+GRenPH4Nwp7v79O3pSTbdxZCZgxFkIirCI2whwNYe7krpeFoKehDI7RoNDJ4WAfquciKCEMdD3yWmYK6JozzSE5wTYNQBfD9eSepH+iBPZcxpAgqzRrO+/ylcP04msUcSC6U03rUYV4dUD8y/NfUvvxFyRSn9FzRqyiTmV3E8iqb+/LPX3V3hTHFMhO0EEyMit3aj5EVzkXwsysG6M8lcpHE5NMU1rHauoPCoFovNEhptUWuo7KgunVPb2KkB0nKn4cmw7ejidaFW06WoohM0nRFaOjSGp3k1+Uvn4NF5QVsyG3kkV5PBkYxE8Sqvb4xZXU3I/xbNggQhP/k8nkq3baDpJ9Pu/nNDeviV+Nlc1CqY1/G/B7po1SlRbM93UID6gGfDh383qJ47EsWKtnT1pJ3BOxLUH6FekvWXpQ/XvPMb0UwgudcCSW0/5cZoQijV5RPHBBVAs2Wnu+z8vc5oeqrLtVy2xI9o734eyKc9YxcaVHpg/75LurDijZeRVzLGjXmZljqwR8pG9ikqb299qkQcM24OMUPsLAmvnz0zielkM5+vICOSKbq8dUYHKLDsjbSXbGxmmYgqZsMZLtcm0a2yK0NieNlfH2sc5X5zm2Q0arKYFXTv47nBs6WT4KHoZum 9zJvtY6j z31seb9s9trLSdFFvWzpyzGcw7VDW+BvjrLSqU56zjXVTCgx/T7TcJQcZu4yBNonsrkbdEcYoKugxYBUfnhhB+UHYMnLMLh7lLM9Efx2X7UESK57sng+h2dzRUBgED+xSTiAPrPjWwXewyOdOFuVeS3oBWNEJv+fXNFCeHbgKyGTEzCGcBBn/I4GOcDabjukK7WKh+xicvX+Z8EaJ+eFjqLuW00d/7mmI3ImpY+b/Nk7sOSfXMeelbLovFFCPhksV9yPibGCAkVRbGj86cOdgoppumTYVIgQJqqAV5FN8iDbNlb+8iDaVL4MxrpOck5VembhgLDsSCepDZsPlyJmee7zhi+sYeu5/OAvFbWP0IHDL872mFbAty9YtSq3Cs9urZwj+d1I360Curi2myGp/26yPhDTfFLXY7OaLSHXWWL110A4c3Y+NPwOyJohLowUzaOKc7UoF10GVAx7wb7nwDmEMTe2ifWDyaMZvjug9Glgvxp73VOEhEjrluurTiAwlPADFEb41lmzrErMjKvS/PZ8V+2uDRQPvOrLHnEcYLi0Ocj4= 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 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 c432add95913..28822cd65d2a 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -1367,6 +1367,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 f59169888b8e..edb592adb749 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