From: Guo Ren <guoren@kernel.org>
To: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: linux-mm@kvack.org, linux-arch@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-csky@vger.kernel.org
Subject: Re: [PATCH v2 08/30] csky: Implement the new page table range API
Date: Tue, 28 Feb 2023 11:17:09 +0800 [thread overview]
Message-ID: <CAJF2gTRXsnZdJBKJGAwvsNstUGRgwi=uW2Zz13PgHUg5g5hNSA@mail.gmail.com> (raw)
In-Reply-To: <20230227175741.71216-9-willy@infradead.org>
For csky part
Acked-by: Guo Ren <guoren@kernel.org>
On Tue, Feb 28, 2023 at 1:57 AM Matthew Wilcox (Oracle)
<willy@infradead.org> wrote:
>
> Add set_ptes(), update_mmu_cache_range() and flush_dcache_folio().
> Change the PG_dcache_clean flag from being per-page to per-folio.
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> Cc: Guo Ren <guoren@kernel.org>
> Cc: linux-csky@vger.kernel.org
> ---
> arch/csky/abiv1/cacheflush.c | 32 +++++++++++++++++-----------
> arch/csky/abiv1/inc/abi/cacheflush.h | 2 ++
> arch/csky/abiv2/cacheflush.c | 30 +++++++++++++-------------
> arch/csky/abiv2/inc/abi/cacheflush.h | 10 +++++++--
> arch/csky/include/asm/pgtable.h | 21 +++++++++++++++---
> 5 files changed, 62 insertions(+), 33 deletions(-)
>
> diff --git a/arch/csky/abiv1/cacheflush.c b/arch/csky/abiv1/cacheflush.c
> index fb91b069dc69..ba43f6c26b4f 100644
> --- a/arch/csky/abiv1/cacheflush.c
> +++ b/arch/csky/abiv1/cacheflush.c
> @@ -14,43 +14,49 @@
>
> #define PG_dcache_clean PG_arch_1
>
> -void flush_dcache_page(struct page *page)
> +void flush_dcache_folio(struct folio *folio)
> {
> struct address_space *mapping;
>
> - if (page == ZERO_PAGE(0))
> + if (is_zero_pfn(folio_pfn(folio)))
> return;
>
> - mapping = page_mapping_file(page);
> + mapping = folio_flush_mapping(folio);
>
> - if (mapping && !page_mapcount(page))
> - clear_bit(PG_dcache_clean, &page->flags);
> + if (mapping && !folio_mapped(folio))
> + clear_bit(PG_dcache_clean, &folio->flags);
> else {
> dcache_wbinv_all();
> if (mapping)
> icache_inv_all();
> - set_bit(PG_dcache_clean, &page->flags);
> + set_bit(PG_dcache_clean, &folio->flags);
> }
> }
> +EXPORT_SYMBOL(flush_dcache_folio);
> +
> +void flush_dcache_page(struct page *page)
> +{
> + flush_dcache_folio(page_folio(page));
> +}
> EXPORT_SYMBOL(flush_dcache_page);
>
> -void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr,
> - pte_t *ptep)
> +void update_mmu_cache_range(struct vm_area_struct *vma, unsigned long addr,
> + pte_t *ptep, unsigned int nr)
> {
> unsigned long pfn = pte_pfn(*ptep);
> - struct page *page;
> + struct folio *folio;
>
> if (!pfn_valid(pfn))
> return;
>
> - page = pfn_to_page(pfn);
> - if (page == ZERO_PAGE(0))
> + if (is_zero_pfn(pfn))
> return;
>
> - if (!test_and_set_bit(PG_dcache_clean, &page->flags))
> + folio = page_folio(pfn_to_page(pfn));
> + if (!test_and_set_bit(PG_dcache_clean, &folio->flags))
> dcache_wbinv_all();
>
> - if (page_mapping_file(page)) {
> + if (folio_flush_mapping(folio)) {
> if (vma->vm_flags & VM_EXEC)
> icache_inv_all();
> }
> diff --git a/arch/csky/abiv1/inc/abi/cacheflush.h b/arch/csky/abiv1/inc/abi/cacheflush.h
> index ed62e2066ba7..0d6cb65624c4 100644
> --- a/arch/csky/abiv1/inc/abi/cacheflush.h
> +++ b/arch/csky/abiv1/inc/abi/cacheflush.h
> @@ -9,6 +9,8 @@
>
> #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1
> extern void flush_dcache_page(struct page *);
> +void flush_dcache_folio(struct folio *);
> +#define flush_dcache_folio flush_dcache_folio
>
> #define flush_cache_mm(mm) dcache_wbinv_all()
> #define flush_cache_page(vma, page, pfn) cache_wbinv_all()
> diff --git a/arch/csky/abiv2/cacheflush.c b/arch/csky/abiv2/cacheflush.c
> index 39c51399dd81..c1cf0d55a2a1 100644
> --- a/arch/csky/abiv2/cacheflush.c
> +++ b/arch/csky/abiv2/cacheflush.c
> @@ -6,30 +6,30 @@
> #include <linux/mm.h>
> #include <asm/cache.h>
>
> -void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
> - pte_t *pte)
> +void update_mmu_cache_range(struct vm_area_struct *vma, unsigned long address,
> + pte_t *pte, unsigned int nr)
> {
> - unsigned long addr;
> + unsigned long pfn = pte_pfn(*pte);
> struct page *page;
> + unsigned int i;
>
> - if (!pfn_valid(pte_pfn(*pte)))
> + if (!pfn_valid(pfn) || is_zero_pfn(pfn))
> return;
>
> - page = pfn_to_page(pte_pfn(*pte));
> - if (page == ZERO_PAGE(0))
> - return;
> + folio = page_folio(pfn_to_page(pfn));
>
> - if (test_and_set_bit(PG_dcache_clean, &page->flags))
> + if (test_and_set_bit(PG_dcache_clean, &folio->flags))
> return;
>
> - addr = (unsigned long) kmap_atomic(page);
> -
> - dcache_wb_range(addr, addr + PAGE_SIZE);
> + for (i = 0; i < folio_nr_pages(folio); i++) {
> + unsigned long addr = (unsigned long) kmap_local_folio(folio,
> + i * PAGE_SIZE);
>
> - if (vma->vm_flags & VM_EXEC)
> - icache_inv_range(addr, addr + PAGE_SIZE);
> -
> - kunmap_atomic((void *) addr);
> + dcache_wb_range(addr, addr + PAGE_SIZE);
> + if (vma->vm_flags & VM_EXEC)
> + icache_inv_range(addr, addr + PAGE_SIZE);
> + kunmap_local((void *) addr);
> + }
> }
>
> void flush_icache_deferred(struct mm_struct *mm)
> diff --git a/arch/csky/abiv2/inc/abi/cacheflush.h b/arch/csky/abiv2/inc/abi/cacheflush.h
> index a565e00c3f70..9c728933a776 100644
> --- a/arch/csky/abiv2/inc/abi/cacheflush.h
> +++ b/arch/csky/abiv2/inc/abi/cacheflush.h
> @@ -18,11 +18,17 @@
>
> #define PG_dcache_clean PG_arch_1
>
> +static inline void flush_dcache_folio(struct folio *folio)
> +{
> + if (test_bit(PG_dcache_clean, &folio->flags))
> + clear_bit(PG_dcache_clean, &folio->flags);
> +}
> +#define flush_dcache_folio flush_dcache_folio
> +
> #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1
> static inline void flush_dcache_page(struct page *page)
> {
> - if (test_bit(PG_dcache_clean, &page->flags))
> - clear_bit(PG_dcache_clean, &page->flags);
> + flush_dcache_folio(page_folio(page));
> }
>
> #define flush_dcache_mmap_lock(mapping) do { } while (0)
> diff --git a/arch/csky/include/asm/pgtable.h b/arch/csky/include/asm/pgtable.h
> index d4042495febc..a30ae048233e 100644
> --- a/arch/csky/include/asm/pgtable.h
> +++ b/arch/csky/include/asm/pgtable.h
> @@ -90,7 +90,20 @@ static inline void set_pte(pte_t *p, pte_t pte)
> /* prevent out of order excution */
> smp_mb();
> }
> -#define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval)
> +
> +static inline void set_ptes(struct mm_struct *mm, unsigned long addr,
> + pte_t *ptep, pte_t pte, unsigned int nr)
> +{
> + for (;;) {
> + set_pte(ptep, pte);
> + if (--nr == 0)
> + break;
> + ptep++;
> + pte_val(pte) += PAGE_SIZE;
> + }
> +}
> +
> +#define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1)
>
> static inline pte_t *pmd_page_vaddr(pmd_t pmd)
> {
> @@ -263,8 +276,10 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
> extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
> extern void paging_init(void);
>
> -void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
> - pte_t *pte);
> +void update_mmu_cache_range(struct vm_area_struct *vma, unsigned long address,
> + pte_t *pte, unsigned int nr);
> +#define update_mmu_cache(vma, addr, ptep) \
> + update_mmu_cache_range(vma, addr, ptep, 1)
>
> #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
> remap_pfn_range(vma, vaddr, pfn, size, prot)
> --
> 2.39.1
>
--
Best Regards
Guo Ren
next prev parent reply other threads:[~2023-02-28 3:17 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-27 17:57 [PATCH v2 00/30] New " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 01/30] mm: Convert page_table_check_pte_set() to page_table_check_ptes_set() Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 02/30] mm: Add generic flush_icache_pages() and documentation Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 03/30] mm: Add folio_flush_mapping() Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 04/30] mm: Remove ARCH_IMPLEMENTS_FLUSH_DCACHE_FOLIO Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 05/30] alpha: Implement the new page table range API Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 06/30] arc: " Matthew Wilcox (Oracle)
2023-02-28 6:34 ` Vineet Gupta
2023-02-28 16:25 ` Matthew Wilcox
2023-02-27 17:57 ` [PATCH v2 07/30] arm64: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 08/30] csky: " Matthew Wilcox (Oracle)
2023-02-28 3:17 ` Guo Ren [this message]
2023-02-27 17:57 ` [PATCH v2 09/30] hexagon: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 10/30] ia64: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 11/30] loongarch: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 12/30] m68k: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 13/30] microblaze: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 14/30] mips: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 15/30] nios2: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 16/30] openrisc: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 17/30] parisc: " Matthew Wilcox (Oracle)
2023-02-27 22:49 ` John David Anglin
2023-02-27 23:50 ` Matthew Wilcox
2023-02-27 17:57 ` [PATCH v2 18/30] powerpc: " Matthew Wilcox (Oracle)
2023-02-27 19:45 ` Christophe Leroy
2023-02-27 20:20 ` Matthew Wilcox
2023-02-28 6:58 ` Christophe Leroy
2023-02-27 17:57 ` [PATCH v2 19/30] riscv: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 20/30] s390: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 21/30] superh: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 22/30] sparc32: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 23/30] sparc64: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 24/30] um: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 25/30] x86: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 26/30] xtensa: " Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 27/30] filemap: Add filemap_map_folio_range() Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 28/30] rmap: add folio_add_file_rmap_range() Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 29/30] mm: Convert do_set_pte() to set_pte_range() Matthew Wilcox (Oracle)
2023-02-27 17:57 ` [PATCH v2 30/30] filemap: Batch PTE mappings Matthew Wilcox (Oracle)
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='CAJF2gTRXsnZdJBKJGAwvsNstUGRgwi=uW2Zz13PgHUg5g5hNSA@mail.gmail.com' \
--to=guoren@kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-csky@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.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