Skip to contentSkip to conversation

mm-damon-paddr-remove-folio_sz-field-from-damon_pa_access_chk_result.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jan 19, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/damon/paddr: remove folio_sz field from damon_pa_access_chk_result
has been removed from the -mm tree. Its filename was
mm-damon-paddr-remove-folio_sz-field-from-damon_pa_access_chk_result.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: remove folio_sz field from damon_pa_access_chk_result
Date: Mon, 9 Jan 2023 21:33:34 +0000

DAMON physical address space monitoring operations set gets and saves size of the folio for a given physical address inside rmap walks, but it can be directly caluclated outside of the walks. Remove the 'folio_sz' field from 'damon_pa_access_chk_result struct' and calculate the size directly from outside of the walks.

---

 mm/damon/paddr.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
mm/damon/paddr.c renamed from mm/damon/paddr.c~mm-damon-paddr-remove-folio_sz-field-from-damon_pa_access_chk_result +1 -6
@@ -80,8 +80,6 @@ static void damon_pa_prepare_access_chec
 }
 
 struct damon_pa_access_chk_result {
-	/* size of the folio for the access checked physical memory address */
-	unsigned long folio_sz;
 	bool accessed;
 };
 
@@ -92,7 +90,6 @@ static bool __damon_pa_young(struct foli
 	DEFINE_FOLIO_VMA_WALK(pvmw, folio, vma, addr, 0);
 
 	result->accessed = false;
-	result->folio_sz = PAGE_SIZE;
 	while (page_vma_mapped_walk(&pvmw)) {
 		addr = pvmw.address;
 		if (pvmw.pte) {
@@ -104,7 +101,6 @@ 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->folio_sz = HPAGE_PMD_SIZE;
 #else
 			WARN_ON_ONCE(1);
 #endif	/* CONFIG_TRANSPARENT_HUGEPAGE */
@@ -123,7 +119,6 @@ static bool damon_pa_young(unsigned long
 {
 	struct folio *folio = damon_get_folio(PHYS_PFN(paddr));
 	struct damon_pa_access_chk_result result = {
-		.folio_sz = PAGE_SIZE,
 		.accessed = false,
 	};
 	struct rmap_walk_control rwc = {
@@ -158,7 +153,7 @@ static bool damon_pa_young(unsigned long
 	folio_put(folio);
 
 out:
-	*folio_sz = result.folio_sz;
+	*folio_sz = folio_size(folio);
 	return result.accessed;
 }
 

_

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