linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: <linux-kernel@vger.kernel.org>, <linux-mm@kvack.org>,
	Matthew Wilcox <willy@infradead.org>,
	David Hildenbrand <david@redhat.com>,
	<linux-s390@vger.kernel.org>,
	Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH 06/18] mm: huge_memory: use a folio in __split_huge_pmd_locked()
Date: Fri, 3 Nov 2023 22:01:07 +0800	[thread overview]
Message-ID: <20231103140119.2306578-7-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20231103140119.2306578-1-wangkefeng.wang@huawei.com>

Use a folio in __split_huge_pmd_locked() which replaces six
compound_head() call with two page_folio() calls.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 mm/huge_memory.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 34001ef9d029..054336ecab0a 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2117,6 +2117,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,
 	count_vm_event(THP_SPLIT_PMD);
 
 	if (!vma_is_anonymous(vma)) {
+		struct folio *folio;
 		old_pmd = pmdp_huge_clear_flush(vma, haddr, pmd);
 		/*
 		 * We are going to unmap this huge page. So
@@ -2130,17 +2131,17 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,
 			swp_entry_t entry;
 
 			entry = pmd_to_swp_entry(old_pmd);
-			page = pfn_swap_entry_to_page(entry);
+			folio = pfn_swap_entry_to_folio(entry);
 		} else {
-			page = pmd_page(old_pmd);
-			if (!PageDirty(page) && pmd_dirty(old_pmd))
-				set_page_dirty(page);
-			if (!PageReferenced(page) && pmd_young(old_pmd))
-				SetPageReferenced(page);
-			page_remove_rmap(page, vma, true);
-			put_page(page);
+			folio = page_folio(pmd_page(old_pmd));
+			if (!folio_test_dirty(folio) && pmd_dirty(old_pmd))
+				folio_set_dirty(folio);
+			if (!folio_test_referenced(folio) && pmd_young(old_pmd))
+				folio_set_referenced(folio);
+			page_remove_rmap(&folio->page, vma, true);
+			folio_put(folio);
 		}
-		add_mm_counter(mm, mm_counter_file(page), -HPAGE_PMD_NR);
+		add_mm_counter(mm, mm_counter_file_folio(folio), -HPAGE_PMD_NR);
 		return;
 	}
 
-- 
2.27.0



  parent reply	other threads:[~2023-11-03 14:04 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-03 14:01 [PATCH rfc 00/18] mm: convert to use folio mm counter Kefeng Wang
2023-11-03 14:01 ` [PATCH 01/18] mm: add mm_counter_folio() and mm_counter_file_folio() Kefeng Wang
2023-11-03 14:01 ` [PATCH 02/18] uprobes: use mm_counter_file_folio() Kefeng Wang
2023-11-03 14:01 ` [PATCH 03/18] mm: userfaultfd: use mm_counter_folio() Kefeng Wang
2023-11-03 14:01 ` [PATCH 04/18] mm: rmap: use mm_counter_[file]_folio() Kefeng Wang
2023-11-03 14:01 ` [PATCH 05/18] mm: swap: introduce pfn_swap_entry_to_folio() Kefeng Wang
2023-11-03 14:01 ` Kefeng Wang [this message]
2023-11-03 14:01 ` [PATCH 07/18] mm: huge_memory: use a folio in zap_huge_pmd() Kefeng Wang
2023-11-03 14:01 ` [PATCH 08/18] mm: khugepaged: use mm_counter_file_folio() in collapse_pte_mapped_thp() Kefeng Wang
2023-11-03 14:01 ` [PATCH 09/18] mm: memory: use a folio in do_set_pmd() Kefeng Wang
2023-11-03 14:01 ` [PATCH 10/18] mm: memory: use mm_counter_file_folio() in copy_present_pte() Kefeng Wang
2023-11-03 14:01 ` [PATCH 11/18] mm: memory: use mm_counter_file_folio() in wp_page_copy() Kefeng Wang
2023-11-03 14:01 ` [PATCH 12/18] mm: memory: use mm_counter_file_folio() in set_pte_range() Kefeng Wang
2023-11-03 14:01 ` [PATCH 13/18] mm: memory: use a folio in insert_page_into_pte_locked() Kefeng Wang
2023-11-03 14:01 ` [PATCH 14/18] mm: remove mm_counter_file() Kefeng Wang
2023-11-03 14:01 ` [PATCH 15/18] mm: memory: use a folio in copy_nonpresent_pte() Kefeng Wang
2023-11-03 14:01 ` [PATCH 16/18] mm: use a folio in zap_pte_range() Kefeng Wang
2023-11-03 19:04   ` kernel test robot
2023-11-03 14:01 ` [PATCH 17/18] s390: pgtable: use mm_counter_folio() in ptep_zap_swap_entry() Kefeng Wang
2023-11-03 14:01 ` [PATCH 18/18] mm: remove mm_counter() Kefeng Wang
2023-11-03 14:30 ` [PATCH rfc 00/18] mm: convert to use folio mm counter Matthew Wilcox
2023-11-04  3:58   ` Kefeng Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231103140119.2306578-7-wangkefeng.wang@huawei.com \
    --to=wangkefeng.wang@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=david@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=willy@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox