mm-damon-paddr-rename-damon_pa_access_chk_result-page_sz-to-folio_sz.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/paddr: rename 'damon_pa_access_chk_result->page_sz' to 'folio_sz'
has been removed from the -mm tree. Its filename was
mm-damon-paddr-rename-damon_pa_access_chk_result-page_sz-to-folio_sz.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: SeongJae Park <[email protected]>
Subject: mm/damon/paddr: rename 'damon_pa_access_chk_result->page_sz' to 'folio_sz'
Date: Mon, 9 Jan 2023 21:33:33 +0000
DAMON's physical address space monitoring operations set is using folio now. Rename 'damon_pa_access_chk_result->page_sz' to reflect the fact.
---
mm/damon/paddr.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
mm/damon/paddr.c renamed from mm/damon/paddr.c~mm-damon-paddr-rename-damon_pa_access_chk_result-page_sz-to-folio_sz +11 -10
@@ -80,7 +80,8 @@ static void damon_pa_prepare_access_chec }struct damon_pa_access_chk_result { -unsigned long page_sz; +/* size of the folio for the access checked physical memory address */ +unsigned long folio_sz;bool accessed; };
@@ -91,7 +92,7 @@ static bool __damon_pa_young(struct foliDEFINE_FOLIO_VMA_WALK (pvmw, folio, vma, addr,0 ); result->accessed = false; - result->page_sz =PAGE_SIZE ; + result->folio_sz =PAGE_SIZE ;while (page_vma_mapped_walk (&pvmw)) { addr = pvmw.address;if (pvmw.pte) {
@@ -103,7 +104,7 @@ static bool __damon_pa_young(struct foli result->accessed =pmd_young (*pvmw.pmd) || !folio_test_idle (folio) ||mmu_notifier_test_young (vma->vm_mm, addr); - result->page_sz =HPAGE_PMD_SIZE ; + result->folio_sz =HPAGE_PMD_SIZE ;#else WARN_ON_ONCE (1 );#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
@@ -118,11 +119,11 @@ static bool __damon_pa_young(struct folireturn !result->accessed; } -static bool damon_pa_young (unsigned long paddr,unsigned long *page_sz) +static bool damon_pa_young (unsigned long paddr,unsigned long *folio_sz) {struct folio *folio =damon_get_folio (PHYS_PFN (paddr));struct damon_pa_access_chk_result result = { - .page_sz =PAGE_SIZE , + .folio_sz =PAGE_SIZE , .accessed = false, };struct rmap_walk_control rwc = {
@@ -157,25 +158,25 @@ static bool damon_pa_young(unsigned longfolio_put (folio); out: - *page_sz = result.page_sz; + *folio_sz = result.folio_sz;return result.accessed; }static void __damon_pa_check_access (struct damon_region *r) {static unsigned long last_addr; -static unsigned long last_page_sz =PAGE_SIZE ; +static unsigned long last_folio_sz =PAGE_SIZE ;static bool last_accessed;/* If the region is in the last checked page, reuse the result */ -if (ALIGN_DOWN (last_addr, last_page_sz) == -ALIGN_DOWN (r->sampling_addr, last_page_sz)) { +if (ALIGN_DOWN (last_addr, last_folio_sz) == +ALIGN_DOWN (r->sampling_addr, last_folio_sz)) {if (last_accessed) r->nr_accesses++;return ; } - last_accessed =damon_pa_young (r->sampling_addr, &last_page_sz); + last_accessed =damon_pa_young (r->sampling_addr, &last_folio_sz);if (last_accessed) r->nr_accesses++;
_
Patches currently in -mm which might be from [email protected] are
mm-damon-core-update-kernel-doc-comments-for-damos-action-supports-of-each-damon-operations-set.patch mm-damon-core-update-kernel-doc-comments-for-damos-filters-supports-of-each-damon-operations-set.patch docs-mm-damon-index-mention-damos-on-the-intro.patch docs-admin-guide-mm-damon-usage-update-damos-actions-filters-supports-of-each-damon-operations-set.patch docs-mm-damon-add-a-maintainer-profile-for-damon.patch maintainers-damon-link-maintainer-profile-git-trees-and-website.patch selftests-damon-sysfs-hide-expected-write-failures.patch selftests-damon-debugfs_rm_non_contexts-hide-expected-write-error-messages.patch scripts-spelling-add-a-few-more-typos.patch