From patchwork Mon Feb 27 17:57:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13154054 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8ED83C7EE37 for ; Mon, 27 Feb 2023 17:58:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A18E96B00A6; Mon, 27 Feb 2023 12:57:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9C74F280001; Mon, 27 Feb 2023 12:57:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 841A96B00A9; Mon, 27 Feb 2023 12:57:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 64C536B00A6 for ; Mon, 27 Feb 2023 12:57:57 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 489A8AAF82 for ; Mon, 27 Feb 2023 17:57:57 +0000 (UTC) X-FDA: 80513830194.06.A318108 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf08.hostedemail.com (Postfix) with ESMTP id 87E35160023 for ; Mon, 27 Feb 2023 17:57:55 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=GeDQkA41; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677520675; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=E51MTWtc4kvJF42CxWT2/h/jjoo3XaciyQ6YJuFHeTk=; b=tGhAcrJGnAf9a5ihrViZM6tC383hnQzEPPK/ZKKaa1AhEsYpO0P+XBXAE5XxA0wwfXRH0d GGJurUcChQSKM879TXdzTnhwGVsoPRQjPsUTPjzs5LPaJl37YkvBRK97iVgnHYxsQOf4WX qllW+y+J591ZLlsKs1T+C7BE/fY7ME0= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=GeDQkA41; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677520675; a=rsa-sha256; cv=none; b=ZqH1AEf9MqHRg8XOp5uK/pJUH+/3WIHs2vxhaA/8KlI5d1TCjg7hDmsHn54jIKsJe1bhrh JJ/yq3KpHzKg1GKRaMXtKddN+PEDac+ZvuQ6hxh8fUAkc3cKd36Pvz19blBCMP1Lm7gmZu EUrU7+dtU85WBZCIw3ML5s996Xo9HZM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=E51MTWtc4kvJF42CxWT2/h/jjoo3XaciyQ6YJuFHeTk=; b=GeDQkA41WjVMRYX41bAXIE0pxw S7mWXtSUrphYxU2AkuJ/MUjta01txm9RNEGytGtkWxJCcWLLvECLgQ56RNNS8iARF1xrMmtiUueRI eV75XMIRQ4Lqthyf5Gy4kCZfxsk2APym+VdR38T1SDvk6zZ8EQLa0CQnG2iWgLq3JUSBWzWvsGFEq 3cBeWTaGvm9MwhkgZsJSWezHDVyn82qhNc7xtF+wYMoeNyI1njLeHTecykmsHu2JfdES9Hyu5jmtW 7LqKCt2gyxVudV9D+yTXwTcZhCIH/fRHZC3JW56Z3P1qbmURbhjmpftffB+x0ARZSTedjdkF9+0MB sjQp2FGg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pWhkv-000IXf-0D; Mon, 27 Feb 2023 17:57:45 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, Dinh Nguyen Subject: [PATCH v2 15/30] nios2: Implement the new page table range API Date: Mon, 27 Feb 2023 17:57:26 +0000 Message-Id: <20230227175741.71216-16-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230227175741.71216-1-willy@infradead.org> References: <20230227175741.71216-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: tknj1sp7j4c5r3ji3qjen7eyot48ucfr X-Rspamd-Queue-Id: 87E35160023 X-HE-Tag: 1677520675-521890 X-HE-Meta: U2FsdGVkX195KZWmCqDWdPTFfHoNhJEgqDnk/JYQr1FikdKOZ/unGRrMEioXa3DJIA1bbARCRh6x1KeCnu6w+1I7Nh4K7SuA/B02blCrGJfzonvWI6+68ehPocA8IXYc5N28iOSEUrzOqUr+09IRfDQcy5lWiMgTU7uLn3S+62WuMviLje93hespYWcj/892/wENxfk9bUiDURXBlGEnHVvG+kgsqFePS6ogBI6LlRVazT2D8xMZBwR8XrMAe+uFa+dof9p9ZMofTt1b4AuIZhR9VUM+p25luQm88ZhftNAhEZVx10mxbOM+vnFX/aVWlTD7/gVRX1jY/73KZBCCWghH2YRjPzh+ROPqAt+qXuHv4qygRZzXHiAjyYzXpmsMv1bZ3JKK6nzWSlX7KDgdzX4w3UiQwvUnh3dOOPydo3r03zm/cdJvHl3RDmtySCP9lSdcZnwJEuyN9/w1viEPMEL575POCBbVlkElkhTzW6QA4WB6DnuoEmk4ybUDl9WU3PJ4LCANnur5hgYyk06ptt0576E3lDAQz6i8U0EP/5EVtRpfeLo498QgZwkJyncdoXpV5Akg91tnbXzozT+rvERBSR8sDsT+Eo4E9GuAw729HuN8EBnlx/ns/2GunH/RMAbqs6KqFkF5slSWO/rgsUla7mP5jH6FbLZ7ZDJErRRP+JWNkz1SSrq1MWUrWwfRhryK1VKbzRGgf0z5q2R+p8cA63ZvxJEjjHm7WKeLqAazJht27ZqrNHffCAkyYq/SqVYOotI1+TdbdJEpmuZh5EImtY+F+MmswQRILtSE1EGPDUQfBNMvPnkavNp+RlrRgl7EzoWhj0RS52B8SETGzEm3xkbRgA0Uy4YlDe1FSiAIrSpFQqHdDFGMcqZfiElcxVpD7VWYLTEqFRX1Fy/6iSG6orTuvO4/rEdLAVx/lar4ZLMLBEKTdNvNxOoAZXJeKCkb8gFinlyhMJwrJMA V+gq3bJQ 2bM7oNSzhM3II8n2ox1XoTETCuin/IZ7ZHr2nWtn3gE59hH9JD3wFFuSZRqdQEmf7+eJqhHjVIzqYZYUQLYHpffIM5beRNdGfHVHzbNKkAX/3+vajP0YdXwwgoD0VvWQpmytxvC6hTov0fss2uC4DDixvMm1/weRUH1RA9mBjBoGo4fRq18xipZjmdUVH58LOKMlJ1GyS6GcWN1RaX0NYcFUvCG/4x4kIWlDgu4V7c4XC6KdzOOBPsPG+5A9/QVu2R/sM X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Add set_ptes(), update_mmu_cache_range(), flush_icache_pages() and flush_dcache_folio(). Change the PG_arch_1 (aka PG_dcache_dirty) flag from being per-page to per-folio. Signed-off-by: Matthew Wilcox (Oracle) Cc: Dinh Nguyen --- arch/nios2/include/asm/cacheflush.h | 6 ++- arch/nios2/include/asm/pgtable.h | 27 +++++++++---- arch/nios2/mm/cacheflush.c | 61 ++++++++++++++++------------- 3 files changed, 58 insertions(+), 36 deletions(-) diff --git a/arch/nios2/include/asm/cacheflush.h b/arch/nios2/include/asm/cacheflush.h index d0b71dd71287..8624ca83cffe 100644 --- a/arch/nios2/include/asm/cacheflush.h +++ b/arch/nios2/include/asm/cacheflush.h @@ -29,9 +29,13 @@ extern void flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned long pfn); #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 void flush_dcache_page(struct page *page); +void flush_dcache_folio(struct folio *folio); +#define flush_dcache_folio flush_dcache_folio extern void flush_icache_range(unsigned long start, unsigned long end); -extern void flush_icache_page(struct vm_area_struct *vma, struct page *page); +void flush_icache_pages(struct vm_area_struct *vma, struct page *page, + unsigned int nr); +#define flush_icache_page(vma, page) flush_icache_pages(vma, page, 1); #define flush_cache_vmap(start, end) flush_dcache_range(start, end) #define flush_cache_vunmap(start, end) flush_dcache_range(start, end) diff --git a/arch/nios2/include/asm/pgtable.h b/arch/nios2/include/asm/pgtable.h index 0f5c2564e9f5..8a77821a17a5 100644 --- a/arch/nios2/include/asm/pgtable.h +++ b/arch/nios2/include/asm/pgtable.h @@ -178,15 +178,23 @@ static inline void set_pte(pte_t *ptep, pte_t pteval) *ptep = pteval; } -static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, pte_t pteval) +static inline void set_ptes(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t pte, unsigned int nr) { - unsigned long paddr = (unsigned long)page_to_virt(pte_page(pteval)); - - flush_dcache_range(paddr, paddr + PAGE_SIZE); - set_pte(ptep, pteval); + unsigned long paddr = (unsigned long)page_to_virt(pte_page(pte)); + + flush_dcache_range(paddr, paddr + nr * PAGE_SIZE); + for (;;) { + set_pte(ptep, pte); + if (--nr == 0) + break; + ptep++; + pte_val(pte) += 1; + } } +#define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1) + static inline int pmd_none(pmd_t pmd) { return (pmd_val(pmd) == @@ -273,7 +281,10 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) extern void __init paging_init(void); extern void __init mmu_init(void); -extern 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 *ptep, unsigned int nr); + +#define update_mmu_cache(vma, addr, ptep) \ + update_mmu_cache_range(vma, addr, ptep, 1) #endif /* _ASM_NIOS2_PGTABLE_H */ diff --git a/arch/nios2/mm/cacheflush.c b/arch/nios2/mm/cacheflush.c index 6aa9257c3ede..471485a84b2c 100644 --- a/arch/nios2/mm/cacheflush.c +++ b/arch/nios2/mm/cacheflush.c @@ -138,10 +138,11 @@ void flush_cache_range(struct vm_area_struct *vma, unsigned long start, __flush_icache(start, end); } -void flush_icache_page(struct vm_area_struct *vma, struct page *page) +void flush_icache_pages(struct vm_area_struct *vma, struct page *page, + unsigned int nr) { unsigned long start = (unsigned long) page_address(page); - unsigned long end = start + PAGE_SIZE; + unsigned long end = start + nr * PAGE_SIZE; __flush_dcache(start, end); __flush_icache(start, end); @@ -158,19 +159,19 @@ void flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, __flush_icache(start, end); } -void __flush_dcache_page(struct address_space *mapping, struct page *page) +void __flush_dcache_folio(struct address_space *mapping, struct folio *folio) { /* * Writeback any data associated with the kernel mapping of this * page. This ensures that data in the physical page is mutually * coherent with the kernels mapping. */ - unsigned long start = (unsigned long)page_address(page); + unsigned long start = (unsigned long)folio_address(folio); - __flush_dcache(start, start + PAGE_SIZE); + __flush_dcache(start, start + folio_size(folio)); } -void flush_dcache_page(struct page *page) +void flush_dcache_folio(struct folio *folio) { struct address_space *mapping; @@ -178,32 +179,38 @@ void flush_dcache_page(struct page *page) * The zero page is never written to, so never has any dirty * cache lines, and therefore never needs to be flushed. */ - if (page == ZERO_PAGE(0)) + if (is_zero_pfn(folio_pfn(folio))) return; - mapping = page_mapping_file(page); + mapping = folio_flush_mapping(folio); /* Flush this page if there are aliases. */ if (mapping && !mapping_mapped(mapping)) { - clear_bit(PG_dcache_clean, &page->flags); + clear_bit(PG_dcache_clean, &folio->flags); } else { - __flush_dcache_page(mapping, page); + __flush_dcache_folio(mapping, folio); if (mapping) { - unsigned long start = (unsigned long)page_address(page); - flush_aliases(mapping, page); - flush_icache_range(start, start + PAGE_SIZE); + unsigned long start = (unsigned long)folio_address(folio); + flush_aliases(mapping, folio); + flush_icache_range(start, start + folio_size(folio)); } - set_bit(PG_dcache_clean, &page->flags); + set_bit(PG_dcache_clean, &folio->flags); } } -EXPORT_SYMBOL(flush_dcache_page); +EXPORT_SYMBOL(flush_dcache_folio); + +void flush_dcache_page(struct page *page) +{ + flush_dcache_folio(page_folio(page)); +} +EXPORT_SYMBOL(flush_dcache_folio); -void update_mmu_cache(struct vm_area_struct *vma, - unsigned long address, pte_t *ptep) +void update_mmu_cache_range(struct vm_area_struct *vma, unsigned long address, + pte_t *ptep, unsigned int nr) { pte_t pte = *ptep; unsigned long pfn = pte_pfn(pte); - struct page *page; + struct folio *folio; struct address_space *mapping; reload_tlb_page(vma, address, pte); @@ -215,19 +222,19 @@ void update_mmu_cache(struct vm_area_struct *vma, * The zero page is never written to, so never has any dirty * cache lines, and therefore never needs to be flushed. */ - page = pfn_to_page(pfn); - if (page == ZERO_PAGE(0)) + if (is_zero_pfn(pfn)) return; - mapping = page_mapping_file(page); - if (!test_and_set_bit(PG_dcache_clean, &page->flags)) - __flush_dcache_page(mapping, page); + folio = page_folio(pfn_to_page(pfn)); + mapping = folio_flush_mapping(folio); + if (!test_and_set_bit(PG_dcache_clean, &folio->flags)) + __flush_dcache_folio(mapping, folio); - if(mapping) - { - flush_aliases(mapping, page); + if (mapping) { + flush_aliases(mapping, folio); if (vma->vm_flags & VM_EXEC) - flush_icache_page(vma, page); + flush_icache_pages(vma, &folio->page, + folio_nr_pages(folio)); } }