mips-mm-convert-__flush_dcache_pages-to-__flush_dcache_folio_pages.patch removed from -mm tree
The quilt patch titled
Subject: mips: mm: convert __flush_dcache_pages() to __flush_dcache_folio_pages()
has been removed from the -mm tree. Its filename was
mips-mm-convert-__flush_dcache_pages-to-__flush_dcache_folio_pages.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: mips: mm: convert __flush_dcache_pages() to __flush_dcache_folio_pages()
Date: Mon, 1 Sep 2025 17:03:42 +0200
Let's make it clearer that we are operating within a single folio by providing both the folio and the page.
This implies that for flush_dcache_folio() we'll now avoid one more page->folio lookup, and that we can safely drop the "nth_page" usage.
While at it, drop the "extern" from the function declaration.
---
arch/mips/include/asm/cacheflush.h | 11 +++++++---- arch/mips/mm/cache.c | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-)
arch/mips/include/asm/cacheflush.h renamed from arch/mips/include/asm/cacheflush.h~mips-mm-convert-__flush_dcache_pages-to-__flush_dcache_folio_pages +7 -4
@@ -50,13 +50,14 @@ extern void (*flush_cache_mm)(struct mm_extern void (*flush_cache_range)(struct vm_area_struct *vma,unsigned long start,unsigned long end);extern void (*flush_cache_page)(struct vm_area_struct *vma,unsigned long page,unsigned long pfn); -extern void __flush_dcache_pages (struct page *page,unsigned int nr); +void __flush_dcache_folio_pages (struct folio *folio,struct page *page,unsigned int nr);#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1static inline void flush_dcache_folio (struct folio *folio) {if (cpu_has_dc_aliases) -__flush_dcache_pages (&folio->page,folio_nr_pages (folio)); +__flush_dcache_folio_pages (folio,folio_page (folio,0 ), +folio_nr_pages (folio));else if (!cpu_has_ic_fills_f_dc)folio_set_dcache_dirty (folio); }
@@ -64,10 +65,12 @@ static inline void flush_dcache_folio(ststatic inline void flush_dcache_page (struct page *page) { +struct folio *folio =page_folio (page); +if (cpu_has_dc_aliases) -__flush_dcache_pages (page,1 ); +__flush_dcache_folio_pages (folio, page,1 );else if (!cpu_has_ic_fills_f_dc) -folio_set_dcache_dirty (page_folio (page)); +folio_set_dcache_dirty (folio); }#define flush_dcache_mmap_lock (mapping) do { } while (0)
arch/mips/mm/cache.c renamed from arch/mips/mm/cache.c~mips-mm-convert-__flush_dcache_pages-to-__flush_dcache_folio_pages +4 -4
@@ -99,9 +99,9 @@ SYSCALL_DEFINE3(cacheflush, unsigned lonreturn 0 ; } -void __flush_dcache_pages (struct page *page,unsigned int nr) +void __flush_dcache_folio_pages (struct folio *folio,struct page *page, +unsigned int nr) { -struct folio *folio =page_folio (page);struct address_space *mapping =folio_flush_mapping (folio);unsigned long addr;unsigned int i;
@@ -117,12 +117,12 @@ void __flush_dcache_pages(struct page *p* get faulted into the tlb (and thus flushed) anyways. */ for (i =0 ; i < nr; i++) { - addr = (unsigned long )kmap_local_page (nth_page (page, i)); + addr = (unsigned long )kmap_local_page (page + i);flush_data_cache_page (addr);kunmap_local ((void *)addr); } } -EXPORT_SYMBOL (__flush_dcache_pages); +EXPORT_SYMBOL (__flush_dcache_folio_pages);void __flush_anon_page (struct page *page,unsigned long vmaddr) {
_
Patches currently in -mm which might be from [email protected] are