Skip to content

[Deepin-Kernel-SIG] [linux 6.6-y] [Upstream] proc: convert smaps_account and clear_refs_pte_range to use a folio #1998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
opsiff wants to merge 2 commits into from
Closed

[Deepin-Kernel-SIG] [linux 6.6-y] [Upstream] proc: convert smaps_account and clear_refs_pte_range to use a folio #1998

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63b1e21
proc: convert clear_refs_pte_range to use a folio
Apr 2, 2024
4d4c325
proc: convert smaps_account() to use a folio
Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions fs/proc/task_mmu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,34 +443,36 @@ static void smaps_account(struct mem_size_stats *mss, struct page *page,
bool compound, bool young, bool dirty, bool locked,
bool migration)
{
struct folio *folio = page_folio(page);
int i, nr = compound ? compound_nr(page) : 1;
unsigned long size = nr * PAGE_SIZE;

/*
* First accumulate quantities that depend only on |size| and the type
* of the compound page.
*/
if (PageAnon(page)) {
if (folio_test_anon(folio)) {
mss->anonymous += size;
if (!PageSwapBacked(page) && !dirty && !PageDirty(page))
if (!folio_test_swapbacked(folio) && !dirty &&
!folio_test_dirty(folio))
mss->lazyfree += size;
}

if (PageKsm(page))
if (folio_test_ksm(folio))
mss->ksm += size;

mss->resident += size;
/* Accumulate the size in pages that have been accessed. */
if (young || page_is_young(page) || PageReferenced(page))
if (young || folio_test_young(folio) || folio_test_referenced(folio))
mss->referenced += size;

/*
* Then accumulate quantities that may depend on sharing, or that may
* differ page-by-page.
*
* page_count(page) == 1 guarantees the page is mapped exactly once.
* refcount == 1 guarantees the page is mapped exactly once.
* If any subpage of the compound page mapped with PTE it would elevate
* page_count().
* the refcount.
*
* The page_mapcount() is called to get a snapshot of the mapcount.
* Without holding the page lock this snapshot can be slightly wrong as
Expand All @@ -479,7 +481,7 @@ static void smaps_account(struct mem_size_stats *mss, struct page *page,
* especially for migration entries. Treat regular migration entries
* as mapcount == 1.
*/
if ((page_count(page) == 1) || migration) {
if ((folio_ref_count(folio) == 1) || migration) {
smaps_page_accumulate(mss, page, size, size << PSS_SHIFT, dirty,
locked, true);
return;
Expand Down Expand Up @@ -1169,7 +1171,7 @@ static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr,
struct vm_area_struct *vma = walk->vma;
pte_t *pte, ptent;
spinlock_t *ptl;
struct page *page;
struct folio *folio;

ptl = pmd_trans_huge_lock(pmd, vma);
if (ptl) {
Expand All @@ -1181,12 +1183,12 @@ static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr,
if (!pmd_present(*pmd))
goto out;

page = pmd_page(*pmd);
folio = pmd_folio(*pmd);

/* Clear accessed and referenced bits. */
pmdp_test_and_clear_young(vma, addr, pmd);
test_and_clear_page_young(page);
ClearPageReferenced(page);
folio_test_clear_young(folio);
folio_clear_referenced(folio);
out:
spin_unlock(ptl);
return 0;
Expand All @@ -1208,14 +1210,14 @@ static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr,
if (!pte_present(ptent))
continue;

page = vm_normal_page(vma, addr, ptent);
if (!page)
folio = vm_normal_folio(vma, addr, ptent);
if (!folio)
continue;

/* Clear accessed and referenced bits. */
ptep_test_and_clear_young(vma, addr, pte);
test_and_clear_page_young(page);
ClearPageReferenced(page);
folio_test_clear_young(folio);
folio_clear_referenced(folio);
}
pte_unmap_unlock(pte - 1, ptl);
cond_resched();
Expand Down
Loading