diff mbox series

[09/18] mm: memory: use a folio in do_set_pmd()

Message ID	20231103140119.2306578-10-wangkefeng.wang@huawei.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; 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 09/18] mm: memory: use a folio in do_set_pmd() Date: Fri, 3 Nov 2023 22:01:10 +0800 Message-ID: <20231103140119.2306578-10-wangkefeng.wang@huawei.com> In-Reply-To: <20231103140119.2306578-1-wangkefeng.wang@huawei.com> References: <20231103140119.2306578-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII Precedence: bulk
Series	mm: convert to use folio mm counter \| [rfc,00/18] mm: convert to use folio mm counter [01/18] mm: add mm_counter_folio() and mm_counter_file_folio() [02/18] uprobes: use mm_counter_file_folio() [03/18] mm: userfaultfd: use mm_counter_folio() [04/18] mm: rmap: use mm_counter_[file]_folio() [06/18] mm: huge_memory: use a folio in __split_huge_pmd_locked() [07/18] mm: huge_memory: use a folio in zap_huge_pmd() [08/18] mm: khugepaged: use mm_counter_file_folio() in collapse_pte_mapped_thp() [09/18] mm: memory: use a folio in do_set_pmd() [10/18] mm: memory: use mm_counter_file_folio() in copy_present_pte() [11/18] mm: memory: use mm_counter_file_folio() in wp_page_copy() [12/18] mm: memory: use mm_counter_file_folio() in set_pte_range() [13/18] mm: memory: use a folio in insert_page_into_pte_locked() [14/18] mm: remove mm_counter_file() [15/18] mm: memory: use a folio in copy_nonpresent_pte() [16/18] mm: use a folio in zap_pte_range() [17/18] s390: pgtable: use mm_counter_folio() in ptep_zap_swap_entry() [18/18] mm: remove mm_counter()

Commit Message

Kefeng Wang Nov. 3, 2023, 2:01 p.m. UTC

  Use a folio in do_set_pmd(), which save one compound_head() call.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 mm/memory.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/mm/memory.c b/mm/memory.c
index 1f18ed4a5497..09009094a5f2 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4313,12 +4313,13 @@  vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page)
 	unsigned long haddr = vmf->address & HPAGE_PMD_MASK;
 	pmd_t entry;
 	vm_fault_t ret = VM_FAULT_FALLBACK;
+	struct folio *folio;
 
 	if (!transhuge_vma_suitable(vma, haddr))
 		return ret;
 
-	page = compound_head(page);
-	if (compound_order(page) != HPAGE_PMD_ORDER)
+	folio = page_folio(page);
+	if (folio_order(folio) != HPAGE_PMD_ORDER)
 		return ret;
 
 	/*
@@ -4350,7 +4351,7 @@  vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page)
 	if (write)
 		entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma);
 
-	add_mm_counter(vma->vm_mm, mm_counter_file(page), HPAGE_PMD_NR);
+	add_mm_counter(vma->vm_mm, mm_counter_file_folio(folio), HPAGE_PMD_NR);
 	page_add_file_rmap(page, vma, true);
 
 	/*