xtensa-mm-convert-check_tlb_entry-to-sanity-check-folios.patch removed from -mm tree
The quilt patch titled
Subject: xtensa/mm: convert check_tlb_entry() to sanity check folios
has been removed from the -mm tree. Its filename was
xtensa-mm-convert-check_tlb_entry-to-sanity-check-folios.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: David Hildenbrand <[email protected]>
Subject: xtensa/mm: convert check_tlb_entry() to sanity check folios
Date: Tue, 9 Apr 2024 21:22:59 +0200
We want to limit the use of page_mapcount() to the places where it is absolutely necessary. So let's convert check_tlb_entry() to perform sanity checks on folios instead of pages.
This essentially already happened: page_count() is mapped to folio_ref_count(), and page_mapped() to folio_mapped() internally. However, we would have printed the page_mapount(), which does not really match what page_mapped() would have checked.
Let's simply print the folio mapcount to avoid using page_mapcount(). For small folios there is no change.
---
arch/xtensa/mm/tlb.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
arch/xtensa/mm/tlb.c renamed from arch/xtensa/mm/tlb.c~xtensa-mm-convert-check_tlb_entry-to-sanity-check-folios +6 -5
@@ -256,12 +256,13 @@ static int check_tlb_entry(unsigned w, u dtlb ? 'D' : 'I', w, e, r0, r1, pte);if (pte ==0 || !pte_present (__pte (pte))) {struct page *p =pfn_to_page (r1 >>PAGE_SHIFT ); -pr_err ("page refcount: %d, mapcount: %d\n" , -page_count (p), -page_mapcount (p)); -if (!page_count (p)) +struct folio *f =page_folio (p); + +pr_err ("folio refcount: %d, mapcount: %d\n" , +folio_ref_count (f),folio_mapcount (f)); +if (!folio_ref_count (f)) rc |=TLB_INSANE ; -else if (page_mapcount (p)) +else if (folio_mapped (f)) rc |=TLB_SUSPICIOUS ; }else { rc |=TLB_INSANE ;
_
Patches currently in -mm which might be from [email protected] are