From patchwork Mon Jul 10 20:43: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: 13307622 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 75AC0EB64D9 for ; Mon, 10 Jul 2023 20:44:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 445878E0013; Mon, 10 Jul 2023 16:43:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3ABEA8E001A; Mon, 10 Jul 2023 16:43:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 13ADA8E0017; Mon, 10 Jul 2023 16:43:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id A3B1F8E0013 for ; Mon, 10 Jul 2023 16:43:51 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 7F7608024A for ; Mon, 10 Jul 2023 20:43:51 +0000 (UTC) X-FDA: 80996878662.17.52823FB Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf06.hostedemail.com (Postfix) with ESMTP id D362218001D for ; Mon, 10 Jul 2023 20:43:49 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=KQOV3xnx; dmarc=none; spf=none (imf06.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689021829; 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=ACu0coWtToHgVmiLGofuGFdkSZdUJPASY/IVnZUUiqI=; b=YMzW77kOYzjaXuHzPix3qNQANQQ1dd1WNhkq2h1fg+ZB4OsT1VZZLv5jKGO8ZnuH06Fufl dam7OguC2pwp9uVT4nm0X6JJbXIjpqIMJ1bXWGzevyRRzA6cqofKfx6/aOF66D6IUlLbtI Jrg9OVUJ80Gtmv0ND0XD2ovqqZTlgbA= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=KQOV3xnx; dmarc=none; spf=none (imf06.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689021829; a=rsa-sha256; cv=none; b=3RTxLHFImsz6cijOVzUm73Tk9X34HaFnpmL0uk0JrQ4c3+zk6xh+CdLTtGseTxVytUo4Yf Cw4W2fCfLfrmVadSK2SMbiT4Z6RNhMHA2lWro0DfzM5peDGmKzvUokR3GVe8PRVInMcuGN 09lLSBFI+faR5LakYP3098TeHf7old8= 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=ACu0coWtToHgVmiLGofuGFdkSZdUJPASY/IVnZUUiqI=; b=KQOV3xnxHjVz1lKBWRN/GFYNE1 GTBdXlh6aD0aeos173WgoFubkYCHUodGZDmayFlE9FTXCLuhz5xIE+AadrazVBmXfKT39tbNfgOw2 K0iRfSZnxTkWs/5gE9dfpnjaeyyhaWQ54RdmXki7k6/fHGo7TvY2BI+m+rMPm9kpT6ET/U9ve5HvC kigmCWilg4GNeA6mHkAZu+vCFDNFdVxEPrfAjlY70cViC7O6jSSM5hCzEcYZMOvfO8aZ7LjRdXxo8 1+HNso/FGePI0Jwzvi2mfP0b60fd1N7ZvvDiphtMsH5/Byk3Ia3ED0/XU4GFchyjsgBz4v9l4J535 pnYQNKyw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qIxjU-00EuqN-3M; Mon, 10 Jul 2023 20:43:44 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mike Rapoport , "David S. Miller" , sparclinux@vger.kernel.org Subject: [PATCH v5 25/38] sparc32: Implement the new page table range API Date: Mon, 10 Jul 2023 21:43:26 +0100 Message-Id: <20230710204339.3554919-26-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230710204339.3554919-1-willy@infradead.org> References: <20230710204339.3554919-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: D362218001D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: ctbu4q6et6rwbhszxfg7r1gizphkpis8 X-HE-Tag: 1689021829-857966 X-HE-Meta: U2FsdGVkX19kCNGiwytbhYTO5OpqFISEDYV3Gx9KzIhfkjquhjcE7xkqqsx+DUHn4ZmBqSUsSYCpab6fQb7zt9/D+jnNRp5lXNZi2UpRQ1C1hhgBRR9ZZY2fAnrxY8eiOTgNleFnrzHhAhEwGwhCYB//HV7OXppsWm3O8gd+OjOCGJOpqW+0BhNryj8+oN0x6sobgUpLKTNtqT4PDKFBQ0udvMsncpMcpxasRggJXbKN4x5yTB/hrLz6feqiPMUS5ym8vZGiEXXUwKbUlgkWQa7GO+X+3n1wWdoF9oVI+jN0xtt34IOHq/kuNKcnR5N3Y5B093ysYmLGbNVOMvLxKLLRl8pyU4acmVqNlgBjA7UX35Oa9JhR5lxff2JlBGUKH8oIaVCMkJw6HGeT1PVM29XPS8r9oAew2813vNtQKVdSVFdkC26v0tSjtyMZUmNXNSkoRtuVqJaYjTwrtPkUg986nKJWfpolna7nHlRXfYQlNHsIkAeBEQU3tSsFUPt5/ZRhX39laK2Kc0oq1zIqpW7p2Tmr9e/M0R9ukvh1WX3WYK6pOzxhfxgHV2E5GFc48X9O+43xvUxJApmYIKz4BZnhrmZsrB0tX9IuQq6Ac5Q+cNwpeLahpmUGBkeUfy9mdtZMZgyImnFHv+EGlE/64yidUznqder3G6JCUsv/C08rQ/dTd0sk+2Ucem0oJsUUoCHSecnXaSRG9TvZ99c8xephC0c1ZgPgwkuPkLsx6HxNAgm0fNBlZu973ROhMjlCHOwQvfg43JlgLZKoBXlFhylpGiB0iPbGmQI/Q9W6rk4s1Ip8Ou0WF0a2IIzqe0WGiK8YEEhb12TSGbcZHRLwJYrw/j4dYwmNlY26VEat3HWvewhWCSrj9EyVKVhRpq2ZiHxyIwG2+VICLfCTUaofNm0KxxbV2Jl+OcM3ljmCZ/o8TRFRszOnruyJmT11tvIUDU3E7l102XokOUqRVVZ I1/ioF2Y ToqT0ZapJatN714E2qbxjTKG5OVt1rc/l04Itl5rGeP9hIzOB9CJKC0U6tP6kvu/l14IN4aXUkVolZ8Ix+LsThSTLWlRQP8bTqYmCtRj/D3+fm8+cYi7YUdWaofoVHmZXfE33TCvWyyIMksjyeqE/wt1T0c005QhH0Z6IC/CkRir7CPd3o7dQd17olZ4+HNvBQ+0cXqD05SkCfcAMy751o/ZNNwtUjphs/WNPZg534+Yqib8Ez+MVC4Sf5+NNwd/IqKXnBIp9cTc6CRMwafZSzl/Pssm5uZnOvlW8z91SA2TkAY8= 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 PFN_PTE_SHIFT, update_mmu_cache_range(), flush_dcache_folio() and flush_icache_pages(). Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Mike Rapoport (IBM) Cc: "David S. Miller" Cc: sparclinux@vger.kernel.org --- arch/sparc/include/asm/cacheflush_32.h | 9 +++++++-- arch/sparc/include/asm/pgtable_32.h | 8 ++++---- arch/sparc/mm/init_32.c | 13 +++++++++++-- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/arch/sparc/include/asm/cacheflush_32.h b/arch/sparc/include/asm/cacheflush_32.h index adb6991d0455..8dba35d63328 100644 --- a/arch/sparc/include/asm/cacheflush_32.h +++ b/arch/sparc/include/asm/cacheflush_32.h @@ -16,6 +16,7 @@ sparc32_cachetlb_ops->cache_page(vma, addr) #define flush_icache_range(start, end) do { } while (0) #define flush_icache_page(vma, pg) do { } while (0) +#define flush_icache_pages(vma, pg, nr) do { } while (0) #define copy_to_user_page(vma, page, vaddr, dst, src, len) \ do { \ @@ -35,11 +36,15 @@ #define flush_page_for_dma(addr) \ sparc32_cachetlb_ops->page_for_dma(addr) -struct page; void sparc_flush_page_to_ram(struct page *page); +void sparc_flush_folio_to_ram(struct folio *folio); #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 -#define flush_dcache_page(page) sparc_flush_page_to_ram(page) +#define flush_dcache_folio(folio) sparc_flush_folio_to_ram(folio) +static inline void flush_dcache_page(struct page *page) +{ + flush_dcache_folio(page_folio(page)); +} #define flush_dcache_mmap_lock(mapping) do { } while (0) #define flush_dcache_mmap_unlock(mapping) do { } while (0) diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h index d4330e3c57a6..315d316614ca 100644 --- a/arch/sparc/include/asm/pgtable_32.h +++ b/arch/sparc/include/asm/pgtable_32.h @@ -101,8 +101,6 @@ static inline void set_pte(pte_t *ptep, pte_t pteval) srmmu_swap((unsigned long *)ptep, pte_val(pteval)); } -#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval) - static inline int srmmu_device_memory(unsigned long x) { return ((x & 0xF0000000) != 0); @@ -256,6 +254,7 @@ static inline pte_t pte_mkyoung(pte_t pte) return __pte(pte_val(pte) | SRMMU_REF); } +#define PFN_PTE_SHIFT (PAGE_SHIFT - 4) #define pfn_pte(pfn, prot) mk_pte(pfn_to_page(pfn), prot) static inline unsigned long pte_pfn(pte_t pte) @@ -268,7 +267,7 @@ static inline unsigned long pte_pfn(pte_t pte) */ return ~0UL; } - return (pte_val(pte) & SRMMU_PTE_PMASK) >> (PAGE_SHIFT-4); + return (pte_val(pte) & SRMMU_PTE_PMASK) >> PFN_PTE_SHIFT; } #define pte_page(pte) pfn_to_page(pte_pfn(pte)) @@ -318,6 +317,7 @@ void mmu_info(struct seq_file *m); #define FAULT_CODE_USER 0x4 #define update_mmu_cache(vma, address, ptep) do { } while (0) +#define update_mmu_cache_range(vmf, vma, address, ptep, nr) do { } while (0) void srmmu_mapiorange(unsigned int bus, unsigned long xpa, unsigned long xva, unsigned int len); @@ -422,7 +422,7 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma, ({ \ int __changed = !pte_same(*(__ptep), __entry); \ if (__changed) { \ - set_pte_at((__vma)->vm_mm, (__address), __ptep, __entry); \ + set_pte(__ptep, __entry); \ flush_tlb_page(__vma, __address); \ } \ __changed; \ diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index 9c0ea457bdf0..d96a14ffceeb 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c @@ -297,11 +297,20 @@ void sparc_flush_page_to_ram(struct page *page) { unsigned long vaddr = (unsigned long)page_address(page); - if (vaddr) - __flush_page_to_ram(vaddr); + __flush_page_to_ram(vaddr); } EXPORT_SYMBOL(sparc_flush_page_to_ram); +void sparc_flush_folio_to_ram(struct folio *folio) +{ + unsigned long vaddr = (unsigned long)folio_address(folio); + unsigned int i, nr = folio_nr_pages(folio); + + for (i = 0; i < nr; i++) + __flush_page_to_ram(vaddr + i * PAGE_SIZE); +} +EXPORT_SYMBOL(sparc_flush_folio_to_ram); + static const pgprot_t protection_map[16] = { [VM_NONE] = PAGE_NONE, [VM_READ] = PAGE_READONLY,