Commit 87639783 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton

ia64: implement the new page table range API

Add PFN_PTE_SHIFT, update_mmu_cache_range() and flush_dcache_folio(). 
Change the PG_arch_1 (aka PG_dcache_clean) flag from being per-page to
per-folio, which makes arch_dma_mark_clean() and mark_clean() a little
more exciting.

[willy@infradead.org: fix folio_size() handling]
  Link: https://lkml.kernel.org/r/ZNPlOCe8F+nrzPxr@casper.infradead.org
Link: https://lkml.kernel.org/r/20230802151406.3735276-14-willy@infradead.orgSigned-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 9ff63394
...@@ -798,22 +798,30 @@ sba_io_pdir_entry(u64 *pdir_ptr, unsigned long vba) ...@@ -798,22 +798,30 @@ sba_io_pdir_entry(u64 *pdir_ptr, unsigned long vba)
#endif #endif
#ifdef ENABLE_MARK_CLEAN #ifdef ENABLE_MARK_CLEAN
/** /*
* Since DMA is i-cache coherent, any (complete) pages that were written via * Since DMA is i-cache coherent, any (complete) pages that were written via
* DMA can be marked as "clean" so that lazy_mmu_prot_update() doesn't have to * DMA can be marked as "clean" so that lazy_mmu_prot_update() doesn't have to
* flush them when they get mapped into an executable vm-area. * flush them when they get mapped into an executable vm-area.
*/ */
static void static void mark_clean(void *addr, size_t size)
mark_clean (void *addr, size_t size)
{ {
unsigned long pg_addr, end; struct folio *folio = virt_to_folio(addr);
ssize_t left = size;
pg_addr = PAGE_ALIGN((unsigned long) addr); size_t offset = offset_in_folio(folio, addr);
end = (unsigned long) addr + size;
while (pg_addr + PAGE_SIZE <= end) { if (offset) {
struct page *page = virt_to_page((void *)pg_addr); left -= folio_size(folio) - offset;
set_bit(PG_arch_1, &page->flags); if (left <= 0)
pg_addr += PAGE_SIZE; return;
folio = folio_next(folio);
}
while (left >= folio_size(folio)) {
left -= folio_size(folio);
set_bit(PG_arch_1, &folio->flags);
if (!left)
break;
folio = folio_next(folio);
} }
} }
#endif #endif
......
...@@ -13,10 +13,16 @@ ...@@ -13,10 +13,16 @@
#include <asm/page.h> #include <asm/page.h>
#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1
#define flush_dcache_page(page) \ static inline void flush_dcache_folio(struct folio *folio)
do { \ {
clear_bit(PG_arch_1, &(page)->flags); \ clear_bit(PG_arch_1, &folio->flags);
} while (0) }
#define flush_dcache_folio flush_dcache_folio
static inline void flush_dcache_page(struct page *page)
{
flush_dcache_folio(page_folio(page));
}
extern void flush_icache_range(unsigned long start, unsigned long end); extern void flush_icache_range(unsigned long start, unsigned long end);
#define flush_icache_range flush_icache_range #define flush_icache_range flush_icache_range
......
...@@ -206,6 +206,7 @@ ia64_phys_addr_valid (unsigned long addr) ...@@ -206,6 +206,7 @@ ia64_phys_addr_valid (unsigned long addr)
#define RGN_MAP_SHIFT (PGDIR_SHIFT + PTRS_PER_PGD_SHIFT - 3) #define RGN_MAP_SHIFT (PGDIR_SHIFT + PTRS_PER_PGD_SHIFT - 3)
#define RGN_MAP_LIMIT ((1UL << RGN_MAP_SHIFT) - PAGE_SIZE) /* per region addr limit */ #define RGN_MAP_LIMIT ((1UL << RGN_MAP_SHIFT) - PAGE_SIZE) /* per region addr limit */
#define PFN_PTE_SHIFT PAGE_SHIFT
/* /*
* Conversion functions: convert page frame number (pfn) and a protection value to a page * Conversion functions: convert page frame number (pfn) and a protection value to a page
* table entry (pte). * table entry (pte).
...@@ -303,8 +304,6 @@ static inline void set_pte(pte_t *ptep, pte_t pteval) ...@@ -303,8 +304,6 @@ static inline void set_pte(pte_t *ptep, pte_t pteval)
*ptep = pteval; *ptep = pteval;
} }
#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
/* /*
* Make page protection values cacheable, uncacheable, or write- * Make page protection values cacheable, uncacheable, or write-
* combining. Note that "protection" is really a misnomer here as the * combining. Note that "protection" is really a misnomer here as the
...@@ -396,6 +395,7 @@ pte_same (pte_t a, pte_t b) ...@@ -396,6 +395,7 @@ pte_same (pte_t a, pte_t b)
return pte_val(a) == pte_val(b); return pte_val(a) == pte_val(b);
} }
#define update_mmu_cache_range(vmf, vma, address, ptep, nr) do { } while (0)
#define update_mmu_cache(vma, address, ptep) do { } while (0) #define update_mmu_cache(vma, address, ptep) do { } while (0)
extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
......
...@@ -50,30 +50,44 @@ void ...@@ -50,30 +50,44 @@ void
__ia64_sync_icache_dcache (pte_t pte) __ia64_sync_icache_dcache (pte_t pte)
{ {
unsigned long addr; unsigned long addr;
struct page *page; struct folio *folio;
page = pte_page(pte); folio = page_folio(pte_page(pte));
addr = (unsigned long) page_address(page); addr = (unsigned long)folio_address(folio);
if (test_bit(PG_arch_1, &page->flags)) if (test_bit(PG_arch_1, &folio->flags))
return; /* i-cache is already coherent with d-cache */ return; /* i-cache is already coherent with d-cache */
flush_icache_range(addr, addr + page_size(page)); flush_icache_range(addr, addr + folio_size(folio));
set_bit(PG_arch_1, &page->flags); /* mark page as clean */ set_bit(PG_arch_1, &folio->flags); /* mark page as clean */
} }
/* /*
* Since DMA is i-cache coherent, any (complete) pages that were written via * Since DMA is i-cache coherent, any (complete) folios that were written via
* DMA can be marked as "clean" so that lazy_mmu_prot_update() doesn't have to * DMA can be marked as "clean" so that lazy_mmu_prot_update() doesn't have to
* flush them when they get mapped into an executable vm-area. * flush them when they get mapped into an executable vm-area.
*/ */
void arch_dma_mark_clean(phys_addr_t paddr, size_t size) void arch_dma_mark_clean(phys_addr_t paddr, size_t size)
{ {
unsigned long pfn = PHYS_PFN(paddr); unsigned long pfn = PHYS_PFN(paddr);
struct folio *folio = page_folio(pfn_to_page(pfn));
ssize_t left = size;
size_t offset = offset_in_folio(folio, paddr);
do { if (offset) {
left -= folio_size(folio) - offset;
if (left <= 0)
return;
folio = folio_next(folio);
}
while (left >= (ssize_t)folio_size(folio)) {
left -= folio_size(folio);
set_bit(PG_arch_1, &pfn_to_page(pfn)->flags); set_bit(PG_arch_1, &pfn_to_page(pfn)->flags);
} while (++pfn <= PHYS_PFN(paddr + size - 1)); if (!left)
break;
folio = folio_next(folio);
}
} }
inline void inline void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment