From mboxrd@z Thu Jan 1 00:00:00 1970 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 561DAC761A6 for ; Wed, 15 Mar 2023 05:15:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D9AF58E0005; Wed, 15 Mar 2023 01:14:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BB9218E000E; Wed, 15 Mar 2023 01:14:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80F518E000C; Wed, 15 Mar 2023 01:14:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 1F4298E0005 for ; Wed, 15 Mar 2023 01:14:54 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E1E4A140906 for ; Wed, 15 Mar 2023 05:14:53 +0000 (UTC) X-FDA: 80569968066.17.36BEAAD Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf08.hostedemail.com (Postfix) with ESMTP id 4564316000A for ; Wed, 15 Mar 2023 05:14:51 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Bn827xvC; 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=1678857292; 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=E+qaM1m3GAxfI6UYUGryaj1jY7UeUF5LhRTvOfinifs=; b=6tra7b7Q+rDMdY9xgPY5xjtOcsCMWNwO+i7Pe4GZjTx8BXgX524qYuYuZUBaWBRcEpOStc LrxsLeGuOoJtJ5ug67fx+OMqvyuyWMYufLIt5fxk/cSZqwCkrGn/nnSMRkOu9bIuFGqYr0 Ppw2hQOLv4myiLbdkP8F2eerJrMJs7E= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Bn827xvC; 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=1678857292; a=rsa-sha256; cv=none; b=V5yGO1NfKyU1mZs5RUPS6eWObduYq8FfdCaLeoNV98v3H8N5DMmQ7uhTEcda5NoPAoUzwe StcqU6STpwMbEd/1F/ZCS/nqsXujuuhf5XxO+b5tuxq6neRpnyJvKkIuTWBNTS6M0Mx697 BGHL+E1RHvJNjci3kjdFQh3+wiMIg5w= 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=E+qaM1m3GAxfI6UYUGryaj1jY7UeUF5LhRTvOfinifs=; b=Bn827xvCQmVylfF2Yl+v7IvyIz y1/dym7q2L3h/f9lYFKGMaGvaxIFAyijlm9E8NLKKFp4y9n76kvpnmYfdj/qTXqHr/NSHDY4CZErW XWJxOXB2/nFn36gbTXBsQPx7qkDSzPUBhFwlmbppNv2DRmI5xeO18IrtOqlZC0rfahPdkijc4g5ci ZGmGa7UwXAhe6g4xAbCFvmQoLuXqrw3twueIKBdwpPbQBoZYsjuwIzoQy/t2MR0av0AAHwAmlQxaO MVlMO2gELeNyNUFhpsY+tEHO7N9vNE3Cy2NIuVpxWEnKEGuFbPzzavp/7ZbIATHXRttwfYiG1CmC5 czXDl38g==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pcJTN-00DYCi-7A; Wed, 15 Mar 2023 05:14:49 +0000 From: "Matthew Wilcox (Oracle)" To: linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, "David S. Miller" , sparclinux@vger.kernel.org Subject: [PATCH v4 24/36] sparc32: Implement the new page table range API Date: Wed, 15 Mar 2023 05:14:32 +0000 Message-Id: <20230315051444.3229621-25-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230315051444.3229621-1-willy@infradead.org> References: <20230315051444.3229621-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4564316000A X-Stat-Signature: mo9bctinggg8omj8n6s6ynmp9kwyw4jy X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1678857291-22450 X-HE-Meta: U2FsdGVkX1+d76wj4ND6aUbqX31jJBbI4XZjfbI636HFolcJYxB25HwKll7ZJkh0FUhxtYKL0IxPZ3F2ooWkSclkcmnkoenrYikgILBjyiFLEvlALNE4PE9Ds78kNesuD+LoByNpzMdBXeMGiFbHJf6PklVJE+jPeUuHi8mToB136YURYSsPhQp1d0t20D8yroMedMnoVgJKsUp7dlIIctt5eACMSq4oVFUKweVYbWdzIUxpAaL0Xis0QjFkGhhuznZOWyyzWXnDc2PBBxOBhq9zZ/hlA8xvXXG0+T7s6DufeCemW0pkByg1DNZILbN/LZRMHHk0ADgnN+NcPxwqTpYZd1iZTEE46JUPibnErLlFEmr3DyoDfm7s5BfE04hTXtymAtTIhBjnmt4nUgJjuBYW/uuPzji+YgngdW6ecHFM5SYB9RVsD1q9jQ2u+xBYBv+5XYXMJs2SH7k9CcylaD9Yy8F9OHV/qKa4X6rk2JH2OIoiMkHgtWcZVl3IN0vbJa/JbqW+trvkExUP63tSOQPrSJoT0jMym928gnnkLE3C9AdbMUddQ92UvhbHhqgvuMeJ7hslhS02RzAVfnR2aGe33AzShkDMu2eTOkUXBJU2C5Cb7LWq9QLrTd4gAOIzspocGLm4SH9oHNA0/icKmSzjq+vVcyjiHUlqYgam8clmpDY4DDRzV3OCGvxz4hTeonjQ91FhO4PRMjbxDxUknj+77nqECd2BhdaxAb1useIfsT2Aq2ND06IHq6yKMKi67ganunpJFpuFmCbaDSmiltyhYMH7GrNRal0y2iCulBPo0S1lynEEnUCgKujNB5Hre0/9POqX059mjQhnG1cJwploDA2K/oTRYWII3dmq02ShW1qygIotFg9zRT2PLiLrn51hK2dMp1DE4ktb+ZxEtB7Bf0NQW6cpIsQYaULcb3RlHjWISjSFB7CpShTVItJHqXmdAHEZXFpPLjkvnBW bLSrn0aU dhRCjMThUB1j0ZxSUQt4F7YXsQJe4IccT9/sGOrCYBTjHo+TTB4v+o+rdIh392PSH9pA+IfBTtRcXAmEnGxk5d0VzaiWCiEipaijmmGjgkLOVHcF2XhLMZIkER/uIB1HtPLIgTbdCUUBFJG3qcUWRLtmd2ixsCAtEmmHaO2mN9pwWY4/f8cTy0U7IVrO1PA6oyGBPiDc99kagYRq/A6kdTK2ZFXV/uo5q+52R2x8OPFkUOlznlk1jAYif4Tw3C0Q4OQ/s1+u5OJBUFuapote565xDXtosg7Tu0pNETnsK5iKuoBXr2r9htOKktW8CVFLpqN9X 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) 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..7514611d14d3 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(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, -- 2.39.2