From nobody Sun Feb 8 05:12:59 2026 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A573515E1EE for ; Thu, 18 Apr 2024 10:58:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713437901; cv=none; b=nwlN68Ov6WY2NSGn9W1pgz72UZoHwOTuiE05eUuAY+VVd4i1S9IcRT0FRn2+33sD7DkdGvgxHLFyydYSh51Bb0G2QyX1RH6x9DcZwuqFZsR0EBVd1IBAVr/WYRY0Yp9vR6HzTJYFN+RaAoHt6YgDBpaWlRnO173RM4wih4WuP7U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713437901; c=relaxed/simple; bh=YS1E84UOxIjSnPESm8G/PnNhVqV2TAef9FqSYBszYkA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rpwQkdyDqvyX0YqFjFsdhN7L0g0Ar1UCIvPNZJ+8lxKAnvlrQqfqyLReK5+PQ0uYUR4wWoCCP+Id19gQpavIn6EKMZqGc3reQ/pZ2cwx17+GJGhfU4yWNoSLNtYH4khSQSqtGXXgE787/b4ajfU8KXfbaZBeff7BjiQfc0ncHHE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WooYMqLb; arc=none smtp.client-ip=209.85.210.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WooYMqLb" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6ed0e9ccca1so765703b3a.0 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=vger.kernel.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=WooYMqLbQWuw4ih3+vlrZIERruXz85GZSfMW810uVOF8nV8hplh1rJ+RARKxSebTj9 JwAzHVvuuSUw02z47rQANtxkfgzFGePLqYin2xkdQLC3YzOh+ALt9lQMYUwlcq6LiabX mSkbFQJ1yf4vy0A+qVwPBrExjrrfASFeARt9dRIh+ZYgolGMh1NzvPIOP4FBeWNOJyfB vPj1A1huHcys+PYFnVwYw1PZEDxmXPf0w7O77Iqtb1yJiSH8WwQobgcrTfoSIzd9L7Da Vx64LQAJEH/yO1+yXAQ/wJxkl7jQ2F4m3/2OZ/v3Uvfyq+8MJVM9yGiPHlIbW4AENhKm r+JQ== 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=AahIU/2gpbckai0Czx67eZrRXQh9WeYo8Z42x+DDbGnr4eV1Ng2YuL2z6HLqLVjWp3 ez6AVpAN6orMu2NN04UadBgJoBaBgQmsR7X6x6L2P4sWYzeZEgXZkTQwlaRNG6/QmDTm joA/WzUQPgmQk3rZ4NiZGlKeBWsjfePBbyU61pqep4NZ2Z6fTGg2iBLtFHZNB16dJnsB 4U3typ4zp1dKJuXNMBAw7GvKblxqoEcL6nsGQOSftbqTL07JLQvVTi5BCYUr6Rg5A7VQ lIjjBpGKGI/vh7jWEBHXXpOCJVJulpxO4JGhFHXJZx4pS3h1QPbUwQJqb5MGhNZVLNVt kDIw== X-Forwarded-Encrypted: i=1; AJvYcCWuRbDu9P6iE2pEb4XSVcNZ8Hb5WePQmKd0Y/6zRBfpzmGMtnKlVzFUoYKzJ96SIAwaonoIWqxsoWSQ/gIaEBVKKwG0mSLfApDpK9Tg X-Gm-Message-State: AOJu0Yx3AhU3HfzKnrrEvwtS+BHMbnKzIRNwd7XvDZ4Ohf97avwUtkdE xNmq9UC1r+6luKTF7o2lESCg28DelnnSaHG/VpNDR3Ux64zJBI7h 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 { =20 typedef unsigned int __bitwise zap_flags_t; =20 +/* 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 =20 -#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 simp= le - * loop over ptep_test_and_clear_young(). - * - * Note that PTE bits in the PTE range besides the PFN can differ. For exa= mple, - * 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 ad= dr, - pte_t *ptep, unsigned int nr) -{ - for (;;) { - ptep_test_and_clear_young(vma, addr, ptep); - if (--nr =3D=3D 0) - break; - ptep++; - addr +=3D PAGE_SIZE; - } -} -#endif - #ifndef __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_ARCH_HAS_NONLEA= F_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_struc= t *mm, } #endif =20 +#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 exa= mple, + * 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 =3D=3D CYDP_CLEAR_YOUNG) + ptep_test_and_clear_young(vma, addr, ptep); + else { + pte =3D ptep_get_and_clear(vma->vm_mm, addr, ptep); + if (flags & CYDP_CLEAR_YOUNG) + pte =3D pte_mkold(pte); + if (flags & CYDP_CLEAR_DIRTY) + pte =3D pte_mkclean(pte); + set_pte_at(vma->vm_mm, addr, ptep, pte); + } + if (--nr =3D=3D 0) + break; + ptep++; + addr +=3D 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; =20 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); } =20 --=20 2.33.1 From nobody Sun Feb 8 05:12:59 2026 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 747A115ECE7 for ; Thu, 18 Apr 2024 10:58:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713437906; cv=none; b=q41jGKyWCfzTKWIIEAd3jXT4q/GKRkPts/WBmYrgPcOIv9OuEIRMu/lUlNUFYCR1CdZ6Xo6HGVYLIzh2vmDtgmvuuhgDJOLx6F/lNHtI/RY9XOFnNZ8d1hjD0KEZgwiUaIlsj2gV1lMaQi6k6oWQ4Pg9hItK7vw8nYtA7wojltg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713437906; c=relaxed/simple; bh=vs6Beq48+kXNT5qsMOGp08C7Ii4wZzzBthcyqUl9lGQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dbvbv2cIdnckBNuVIHCojXP5185Jwu/ZIsHpYJ+EwYAvclXgmiltUD5y4ngiLMSnZniSpRc8QiaKcwIL/QKweWOEnYgwBeoAbLVQcn8NZDrz5jqjetAL5SJHJJpKXep5El06GOb98YVoG71mGOKOLBJ+s0lc1aiNZ+R+mDfiDMA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=d+ZNKWXP; arc=none smtp.client-ip=209.85.210.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="d+ZNKWXP" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6eced6fd98aso718821b3a.0 for ; Thu, 18 Apr 2024 03:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713437905; x=1714042705; darn=vger.kernel.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=d+ZNKWXP2xgwpmKE9rwVmxr1K5GPgU6i3WJeRuO/0a65CVqLG3cYJE/0t5FjmBxISF iKN6nAA+onp7pMnDIhmT/FWVQQw5gtLcd/j8Et1fEVON6AAN6r1VU0MirmEhcKAT7ZPm eYUlbx0fE17w01GFDqkur2Og8BtPStAyEtA+LOUb+BPlYlLHt02K/ziFR5gZ5TDmSDQe b5jJwsSYqYunt8/5g/obV81sF9HTlL0CbbV/Xl0TTvmLcg3HGMWl2mtyIPmZSlsJd5hp 1W3hulBIGtWusj1zIBuBolu0CgrLNBYP3h3xFUySMOwYOOSjCrTTxhqqaQaXkKZfF5JR dIQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713437905; x=1714042705; 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=fFAd7AWrsaQo/EfC/uxEVkZd4ahsjHMC9GKRAs3DZK5zZqNVwNdVHo0fYKJ79/uzpY o8pB5lIy7wdUpquQP938ynuX7OqruPr2odkS/u901HfMemdP7ZWnbXBnSbfQZahlmbck H6pyIfSokI/pRUc3IpYNRITf9eD9kDIT5eGqjyeCFsCiD8ersfverKap6XX2ivWwFCPx zA3WRB2vjRUWdHPvB5ZgGXFdAKTpgmviMUqv7xibfB4TpdBW1H0JKgCe9ccc+3VwOTGw 8bm8lsbA9TnWcBNKuOpzTr2KNzMO/O25jzxq15MpDFg4EB1xMp5p1ZhBfH6ouLdqCpkb 2J7w== X-Forwarded-Encrypted: i=1; AJvYcCUlQ8IiW3NaA1Bsw8m3naxcegM41ZUji3hlK2FDQaAnprNfUd1ukVObJZUbzTSNyE6IriWlHN/JpQDV5tjwNF/N8XS2peSuVOvliTFz X-Gm-Message-State: AOJu0Yxaa+4YXWcv8BNTOuzqWrpKtdXfmwp/fr695FWDaBYb5lSVr5g8 /AhaRD5iZqa7Qle+wLPl5jUXHJ0O0/BrrW+FZvQN0FzmpsfnV9fk X-Google-Smtp-Source: AGHT+IESWKGXs5SVUDQDCP4J36Ikudx/CjpP5NVMmnbx2ui5miMXKMf1AI2xrY+wo35NeL00v+rfzA== X-Received: by 2002:a05:6a00:1acf:b0:6ec:db05:36d2 with SMTP id f15-20020a056a001acf00b006ecdb0536d2mr3186097pfv.4.1713437904694; Thu, 18 Apr 2024 03:58:24 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 03:58:24 -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 2/4] mm/arm64: override clear_young_dirty_ptes() batch helper Date: Thu, 18 Apr 2024 18:57:48 +0800 Message-Id: <20240418105750.98866-3-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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/pgta= ble.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); } =20 +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 =3D pte; + + if (flags & CYDP_CLEAR_YOUNG) + pte =3D pte_mkold(pte); + if (flags & CYDP_CLEAR_DIRTY) + pte =3D pte_mkclean(pte); + + pte_val(pte) =3D cmpxchg_relaxed(&pte_val(*ptep), + pte_val(old_pte), pte_val(pte)); + } while (pte_val(pte) !=3D 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 =3D __ptep_get(ptep); + + if (flags =3D=3D (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 =3D=3D 0) + break; + ptep++; + addr +=3D 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); =20 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_ar= ea_struct *vma, return contpte_ptep_set_access_flags(vma, addr, ptep, entry, dirty); } =20 +#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 =3D=3D 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 */ =20 #define ptep_get __ptep_get @@ -1622,6 +1676,7 @@ static inline int ptep_set_access_flags(struct vm_are= a_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 =20 #endif /* CONFIG_ARM64_CONTPTE */ =20 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, unsi= gned long addr, } EXPORT_SYMBOL_GPL(contpte_wrprotect_ptes); =20 +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 =3D addr; + unsigned long end =3D start + nr; + + if (pte_cont(__ptep_get(ptep + nr - 1))) + end =3D ALIGN(end, CONT_PTE_SIZE); + + if (pte_cont(__ptep_get(ptep))) { + start =3D ALIGN_DOWN(start, CONT_PTE_SIZE); + ptep =3D 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) --=20 2.33.1 From nobody Sun Feb 8 05:12:59 2026 Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 82FA815E1EE for ; Thu, 18 Apr 2024 10:58:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713437915; cv=none; b=lDzJbT+X6Vpn/q0cqBlv6+4wA0s9eo0FALfGl8VasCtrRW7Z2GVUUsGFv3Y0pWrB4b+Kfvi6z29l2wcIjPm/JG0F8lzLyFkBNDPmcMHTKGPw/xgEF33/tLFfQjeAlxkvSlJc0XTzCR9L3ebfIhXLGNCZ7ohrXROf6vaEZKX8Vhc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713437915; c=relaxed/simple; bh=rSOnYKIaNy2WDcnD3ryzRYahieMXCry0i3m8v4tO+t0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZCwT0RhkgEjITnGWxAVETT8bRsjkopQ2wJJkTdpzdZCFYyVYIL4Rc0MPwHT//kaNTs+stt+PI8oHitIMvN3YDbepp/rLPjIvmIutlOOmrDqffDfD38uFgDPC3JZDynoLbYt50MdmaRL22Xam0zC+N7QXFJFMw72YvJwaLu8I89I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ng74V5Of; arc=none smtp.client-ip=209.85.167.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ng74V5Of" Received: by mail-oi1-f175.google.com with SMTP id 5614622812f47-3c709e5e4f9so504199b6e.3 for ; Thu, 18 Apr 2024 03:58:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713437912; x=1714042712; darn=vger.kernel.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=fCDKyy/HK4fLjIHRec29GbYvLewmbRt2hV7S2QYdA34=; b=ng74V5OfR1p+0K8qFGTzZOvwQrsj8e4e7igaZ+4A4NBLxV1jZc1CVDzk3X9Ad6DiAA 6TDn9CCBlCzzqaOj488BvrCHMfkjnIXjhsx0T6RKuW4YeIp08dtieQwjMGJQ7udsquiM yz42KpeICvV4OYxHm0rtfyabZz2mkVIY7cO7QW6PWdD+prncFhLbm6c8vrV16bJIr/8q nS9rJ1bgF4RXdk0ho+qQZlUctfF8qKdfFShaaQ9kPh7zzMzt8WO3RelC32t+ssWJcKe6 geM0VVNeGtUm5OcsP6ylcnYTdtSuzs4ajs6PICGDdzy+lw4Bu5V8wl9kWPQ2CGZJ0fa3 RU6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713437912; x=1714042712; 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=fCDKyy/HK4fLjIHRec29GbYvLewmbRt2hV7S2QYdA34=; b=ctvrXSTupYCn2QLoDrI5Nu36B2lToqCZbqE4j9By/84voovWZUlFlDAbzZ1wePmH8I UDUBhORYzu54bVuULBEOqRPlixgbIhDHqOs0pliGugNQMuuv91t4AZIf0bIy+7D1xikY JfykYYTPFBnt2tXzzhP9iLW1PzZh5ayELzrR+6sSL/1ytwMcWmgrjmEFnyMjXUBy9ve6 yNSjVaTaWlZZmWG9oY2eBgXSClPLwC65cXM+UQYvPB0aE8j/RxNPfhevKrjhO7jURLhf 8PT+ajkVs4fmKnVsGpZ8x00Py5yxm9a8rEG8E+PUtE96uc/NNadBoRK0a5cwe3FMGI+D cbbg== X-Forwarded-Encrypted: i=1; AJvYcCWjoRtKT7/d1U4lmrK9xtOwgfT8/15xqtAQ0w5AQ/Nw7Jav7vwaj5HkgAngMpZlKwnFQ8oLiQBKWiDP8XMcxr/H2fUu9rXUoR8ffRx3 X-Gm-Message-State: AOJu0YzNuZXUIDZJfA+InTXWCw4EhVFMiu6X8/LduRGtrwfn92u0KSYz IiTP5zb49bmevNDT6Bt6pUpSlTBkzXpboB8su5uOr2jizcQo5mT6 X-Google-Smtp-Source: AGHT+IFiJWFYcIrSf2RPRltS/8C34Y5gwlKmlTV5x2wUCcZ1LqdcLz5TQFv4JEnEdVetJ6UiO6Fzxg== X-Received: by 2002:a05:6808:8f3:b0:3c7:3b1d:bb59 with SMTP id d19-20020a05680808f300b003c73b1dbb59mr1553476oic.2.1713437911086; Thu, 18 Apr 2024 03:58:31 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 03:58:30 -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 3/4] mm/memory: add any_dirty optional pointer to folio_pte_batch() Date: Thu, 18 Apr 2024 18:57:49 +0800 Message-Id: <20240418105750.98866-4-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This commit adds the any_dirty pointer as an optional parameter to folio_pte_batch() function. By using both the any_young and any_dirty point= ers, madvise_free can make smarter decisions about whether to clear the PTEs when marking large folios as lazyfree. Suggested-by: David Hildenbrand Signed-off-by: Lance Yang Acked-by: David Hildenbrand --- mm/internal.h | 12 ++++++++++-- mm/madvise.c | 19 ++++++++++++++----- mm/memory.c | 4 ++-- 3 files changed, 26 insertions(+), 9 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 p= te, 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 =3D folio_pfn(folio) + folio_nr_pages(folio); const pte_t *end_ptep =3D start_ptep + max_nr; pte_t expected_pte, *ptep; - bool writable, young; + bool writable, young, dirty; int nr; =20 if (any_writable) *any_writable =3D false; if (any_young) *any_young =3D false; + if (any_dirty) + *any_dirty =3D false; =20 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 =3D !!pte_write(pte); if (any_young) young =3D !!pte_young(pte); + if (any_dirty) + dirty =3D !!pte_dirty(pte); pte =3D __pte_batch_clear_ignored(pte, flags); =20 if (!pte_same(pte, expected_pte)) @@ -193,6 +199,8 @@ static inline int folio_pte_batch(struct folio *folio, = unsigned long addr, *any_writable |=3D writable; if (any_young) *any_young |=3D young; + if (any_dirty) + *any_dirty |=3D dirty; =20 nr =3D pte_batch_hint(ptep, pte); expected_pte =3D pte_advance_pfn(expected_pte, nr); diff --git a/mm/madvise.c b/mm/madvise.c index f5e3699e7b54..4597a3568e7e 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -321,6 +321,18 @@ static inline bool can_do_file_pageout(struct vm_area_= struct *vma) file_permission(vma->vm_file, MAY_WRITE) =3D=3D 0; } =20 +static inline int madvise_folio_pte_batch(unsigned long addr, unsigned lon= g end, + struct folio *folio, pte_t *ptep, + pte_t pte, bool *any_young, + bool *any_dirty) +{ + const fpb_t fpb_flags =3D FPB_IGNORE_DIRTY | FPB_IGNORE_SOFT_DIRTY; + int max_nr =3D (end - addr) / PAGE_SIZE; + + return folio_pte_batch(folio, addr, ptep, pte, max_nr, fpb_flags, NULL, + any_young, any_dirty); +} + static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, struct mm_walk *walk) @@ -456,13 +468,10 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *p= md, * next pte in the range. */ if (folio_test_large(folio)) { - const fpb_t fpb_flags =3D FPB_IGNORE_DIRTY | - FPB_IGNORE_SOFT_DIRTY; - int max_nr =3D (end - addr) / PAGE_SIZE; bool any_young; =20 - nr =3D folio_pte_batch(folio, addr, pte, ptent, max_nr, - fpb_flags, NULL, &any_young); + nr =3D madvise_folio_pte_batch(addr, end, folio, pte, + ptent, &any_young, NULL); if (any_young) ptent =3D pte_mkyoung(ptent); =20 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, struc= t vm_area_struct *src_vma flags |=3D FPB_IGNORE_SOFT_DIRTY; =20 nr =3D 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 !=3D 1)) { nr =3D folio_pte_batch(folio, addr, pte, ptent, max_nr, fpb_flags, - NULL, NULL); + NULL, NULL, NULL); =20 zap_present_folio_ptes(tlb, vma, folio, page, pte, ptent, nr, addr, details, rss, force_flush, --=20 2.33.1 From nobody Sun Feb 8 05:12:59 2026 Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D03215E1EE for ; Thu, 18 Apr 2024 10:58:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713437920; cv=none; b=grhjgI5SRdUSdy7QUzIth+IXO9NKKtf1YDaGaBLShPTV5Mjq3a8cDzLQjaLVe6XybITBgNHECk/kZtOub7xKTXixnKXoiOpMwdEP1cTQpPZP+HZQ5W88lNxsdlrQNcZnw7VZumPxiwHgj2Yjev9kA/lECVavCy34oRvKA4CUQLA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713437920; c=relaxed/simple; bh=sTz2Pp+8IsOE9Kkx3okka4q7c48jbMNCvkE4Ama0VsI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qtZs3R1j016B6E1LOuqwWo9FTAbQHaWaGwfR4ttIPDa/H3PLkNf1Sdfys8U/cqm2qzUOsbbZ81Bktkp1NBg246gbdu8uiV3rXyGjTSwiXn9iUcpDLErg637vuXAnX1IXkM4r8u1su+PWAl1mGBT8alvrBA36QzjDgIpD9RZcljo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=DJVD+lj6; arc=none smtp.client-ip=209.85.210.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DJVD+lj6" Received: by mail-ot1-f47.google.com with SMTP id 46e09a7af769-6eb7b6f92d4so399765a34.0 for ; Thu, 18 Apr 2024 03:58:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713437918; x=1714042718; darn=vger.kernel.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=O8NkjRR32gwNlYRbH1lR13f1NodvtqYs34036pu1WAk=; b=DJVD+lj6ImNBfYh/lYYYyLYPclb5AK7Rzbsmw6VY2ulQhtIDA9IfTRy2RpyqKL0SBO qRU91vH1DlSVfi5hfbJXrnHjcZc6+or7O5Fwi64p+cgMWY5xNd7WJyOwtnoBVZdDk9lm LIbhs738qNwyQq+Fq4Oi87S7YFB7VlEXPfUD29I8PFelYZlm6UOLE9mRQd9srYuA12FA 0Bc6Ssfg1+S3wr6IYWtOqdTdm7fcgGx17wq9kKPCQMJMJVt7o+VmW0VlgQh6xLR1WADF yadhC1nOq3FFc8jYjpF5GfTFSXrgrVEtJCLDMoF1VcFI3kmNhiCeVJLcSPJFPQel3rLu uYhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713437918; x=1714042718; 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=O8NkjRR32gwNlYRbH1lR13f1NodvtqYs34036pu1WAk=; b=Bs34sF7i8zut+OKXmcE+x96xqhcLU/zRvKAgFUDimhFwOpcbiW76DcktstWpKwcRdn rwqS2wrF9An54/5ZX9Frltmy+iGRxNbALQIoIrlSZMBBnVZsGFq/b+VJxcYKeeIyqk4g hs6Qa+bNy8YYhFIYhB7EuZZXHF7y58HdbvsfD5c61DMtx+5WZ0p6o2iDKmrE9XpTTWvD IDhDzD2ljLbVVxOKmnem2RmT4ESHdnvSWa4aF9QhL42ji4EEcWaD7yc/a+32wHIsV76K spV0F0HMQo+QN3cgcSP+6UtZawutK5QNpoma+RPfrKEb8AlO1FIlNQSBsq8oh5OCE26w AEdw== X-Forwarded-Encrypted: i=1; AJvYcCU8tmYT/eucuRKzbP5A9Y+RdIJ6Tynv/Rm3RFgS9skaNcW72DMy9bykGZ+pR8cO73juHdM8cUHivDwfhxCfTcNvwMj2QlNQT8HXopF+ X-Gm-Message-State: AOJu0Yylt8vhj9uSuoGMVei3qSSVGoBoDfztI3spEGj2Gd2G/woAkR0V 3++O0g3O8uNfzaYO4Nd2H3vLw4cG2rjKpamSssUcy0j16MXGBItA X-Google-Smtp-Source: AGHT+IE0Wend3e5EpVQTSC9tsdUxn2WDCsJjwIeBC6hJ6WUDqPXTIzMmKsKYHmthb5COY6jTF/NdRg== X-Received: by 2002:a05:6870:7096:b0:22e:dfbc:4d9d with SMTP id v22-20020a056870709600b0022edfbc4d9dmr2903143oae.1.1713437917381; Thu, 18 Apr 2024 03:58:37 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 03:58:37 -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 4/4] mm/madvise: optimize lazyfreeing with mTHP in madvise_free Date: Thu, 18 Apr 2024 18:57:50 +0800 Message-Id: <20240418105750.98866-5-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Acked-by: David Hildenbrand Reviewed-by: Ryan Roberts ------------------------------------------ 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.c= om Reviewed-by: Ryan Roberts Signed-off-by: Lance Yang --- mm/madvise.c | 85 +++++++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 4597a3568e7e..375ab3234603 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -643,6 +643,7 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned = long addr, unsigned long end, struct mm_walk *walk) =20 { + const cydp_t cydp_flags =3D CYDP_CLEAR_YOUNG | CYDP_CLEAR_DIRTY; struct mmu_gather *tlb =3D walk->private; struct mm_struct *mm =3D tlb->mm; struct vm_area_struct *vma =3D walk->vma; @@ -697,44 +698,57 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigne= d long addr, continue; =20 /* - * 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; =20 - 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 =3D NULL; - err =3D split_folio(folio); - folio_unlock(folio); - folio_put(folio); - if (err) - break; - start_pte =3D pte =3D - pte_offset_map_lock(mm, pmd, addr, &ptl); - if (!start_pte) - break; - arch_enter_lazy_mmu_mode(); - pte--; - addr -=3D PAGE_SIZE; - continue; + nr =3D 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 (!folio_trylock(folio)) + continue; + folio_get(folio); + arch_leave_lazy_mmu_mode(); + pte_unmap_unlock(start_pte, ptl); + start_pte =3D NULL; + err =3D split_folio(folio); + folio_unlock(folio); + folio_put(folio); + start_pte =3D pte =3D + pte_offset_map_lock(mm, pmd, addr, &ptl); + if (!start_pte) + break; + arch_enter_lazy_mmu_mode(); + if (!err) + nr =3D 0; + continue; + } + + if (any_young) + ptent =3D pte_mkyoung(ptent); + if (any_dirty) + ptent =3D pte_mkdirty(ptent); } =20 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) !=3D 1) { + if (folio_mapcount(folio) !=3D folio_nr_pages(folio)) { folio_unlock(folio); continue; } @@ -750,19 +764,8 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned= long addr, } =20 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 =3D ptep_get_and_clear_full(mm, addr, pte, - tlb->fullmm); - - ptent =3D pte_mkold(ptent); - ptent =3D 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_flags); + tlb_remove_tlb_entries(tlb, pte, nr, addr); } folio_mark_lazyfree(folio); } --=20 2.33.1