mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 18:41:58 +09:00
UPSTREAM: mm/damon/ops-common: refactor to use {pte|pmd}p_clear_young_notify()
With the fix in place to atomically test and clear young on ptes and pmds,
simplify the code to handle the clearing for both the primary mmu and the
mmu notifier with a single API call.
Link: https://lkml.kernel.org/r/20230602092949.545577-4-ryan.roberts@arm.com
Signed-off-by: Ryan Roberts <ryan.roberts@arm.com>
Acked-by: Yu Zhao <yuzhao@google.com>
Reviewed-by: SeongJae Park <sj@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Lorenzo Stoakes <lstoakes@gmail.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Mike Rapoport (IBM) <rppt@kernel.org>
Cc: Uladzislau Rezki (Sony) <urezki@gmail.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
(cherry picked from commit fa8c919dac)
Bug: 300502883
Change-Id: I4414604788996e338ac638c3eb3ec1ef7959223e
Signed-off-by: cui yangpei <cuiyangpei@xiaomi.com>
This commit is contained in:
committed by
Suren Baghdasaryan
parent
ea215c9a10
commit
a548d90994
@@ -35,21 +35,12 @@ struct page *damon_get_page(unsigned long pfn)
|
|||||||
|
|
||||||
void damon_ptep_mkold(pte_t *pte, struct vm_area_struct *vma, unsigned long addr)
|
void damon_ptep_mkold(pte_t *pte, struct vm_area_struct *vma, unsigned long addr)
|
||||||
{
|
{
|
||||||
bool referenced = false;
|
|
||||||
struct page *page = damon_get_page(pte_pfn(*pte));
|
struct page *page = damon_get_page(pte_pfn(*pte));
|
||||||
|
|
||||||
if (!page)
|
if (!page)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (ptep_test_and_clear_young(vma, addr, pte))
|
if (ptep_clear_young_notify(vma, addr, pte))
|
||||||
referenced = true;
|
|
||||||
|
|
||||||
#ifdef CONFIG_MMU_NOTIFIER
|
|
||||||
if (mmu_notifier_clear_young(vma->vm_mm, addr, addr + PAGE_SIZE))
|
|
||||||
referenced = true;
|
|
||||||
#endif /* CONFIG_MMU_NOTIFIER */
|
|
||||||
|
|
||||||
if (referenced)
|
|
||||||
set_page_young(page);
|
set_page_young(page);
|
||||||
|
|
||||||
set_page_idle(page);
|
set_page_idle(page);
|
||||||
@@ -59,21 +50,12 @@ void damon_ptep_mkold(pte_t *pte, struct vm_area_struct *vma, unsigned long addr
|
|||||||
void damon_pmdp_mkold(pmd_t *pmd, struct vm_area_struct *vma, unsigned long addr)
|
void damon_pmdp_mkold(pmd_t *pmd, struct vm_area_struct *vma, unsigned long addr)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
|
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
|
||||||
bool referenced = false;
|
|
||||||
struct page *page = damon_get_page(pmd_pfn(*pmd));
|
struct page *page = damon_get_page(pmd_pfn(*pmd));
|
||||||
|
|
||||||
if (!page)
|
if (!page)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (pmdp_test_and_clear_young(vma, addr, pmd))
|
if (pmdp_clear_young_notify(vma, addr, pmd))
|
||||||
referenced = true;
|
|
||||||
|
|
||||||
#ifdef CONFIG_MMU_NOTIFIER
|
|
||||||
if (mmu_notifier_clear_young(vma->vm_mm, addr, addr + HPAGE_PMD_SIZE))
|
|
||||||
referenced = true;
|
|
||||||
#endif /* CONFIG_MMU_NOTIFIER */
|
|
||||||
|
|
||||||
if (referenced)
|
|
||||||
set_page_young(page);
|
set_page_young(page);
|
||||||
|
|
||||||
set_page_idle(page);
|
set_page_idle(page);
|
||||||
|
|||||||
Reference in New Issue
Block a user