From patchwork Mon Feb 27 17:57:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13154045 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 7616EC64ED8 for ; Mon, 27 Feb 2023 17:58:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 50FBB6B00A0; Mon, 27 Feb 2023 12:57:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4701F6B009D; Mon, 27 Feb 2023 12:57:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F3DE6B009F; Mon, 27 Feb 2023 12:57:51 -0500 (EST) 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 E923B6B009D for ; Mon, 27 Feb 2023 12:57:50 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CB7131A0244 for ; Mon, 27 Feb 2023 17:57:50 +0000 (UTC) X-FDA: 80513829900.05.5CC0763 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP id 2D5AA180016 for ; Mon, 27 Feb 2023 17:57:47 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=cbxS9VK9; dmarc=none; spf=none (imf16.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=1677520668; 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=hq3kISoFqRozP9bJJptL5dM/gm/mC87Ff3e3oJGmMC0=; b=Xz1cT7a68qWdbZZpIJzaKHF6E32t+ceEikDmx6u/YfqKRfhJOIZinScNcJyPRLq4l2j12o 3uDZVAAruQ6/PSQ3PUCZ9oXhCXghWF0HZsO7uZ7iALaFifhg0v8aAa4nhPj6tyYLSAArYd s5SleCdx+kOmMd6/DmW5D5St/gpgezI= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=cbxS9VK9; dmarc=none; spf=none (imf16.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=1677520668; a=rsa-sha256; cv=none; b=ULpGvTJAwlPty4wi92Ldx5m0DLt6leL0Evznh+ey6I7o4Cs6kcvb13SiG7kh43AGrohqF2 3L6qKix2R95G8fNLSRKlxkIRcnaM9+dmKlHlONKEC4hZUkPkp859jxVwOdJynLRJoDFX83 TsOzp9N36rDmoaJVJQrLP6NJiYgEaYI= 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=hq3kISoFqRozP9bJJptL5dM/gm/mC87Ff3e3oJGmMC0=; b=cbxS9VK9MYXMYT01A3bZZGFF2W B+5ggsaBa3ENEQKMM98W0IbxREG8/YKxl4Oa1VjlFjSJTABMyP++zzgiAqIP/AE9Nsnq451nC3o2X x68Zw0mxe34XSOukJOKU/oroID010FCbGAg1rD9zoj/qyVCbA1ENaXUooQYhIpD2NOpWq3OZzo8ro drqDLU+3QpES4i6hCkkQln/Li6B7vidBoDv1yOabITrqNfD+4mtnF3U1ESzfeuHk+eBYhNtbf1LoX O8T/CtmQum8hNP5OJ77LkEmnpAAB4hUefV6hsby8pFNfFokt6C/lOLjr0WLWIOjwBpPOKd8TL4ShZ JWSKxPVg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pWhkv-000IYJ-Sz; 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, "David S. Miller" , sparclinux@vger.kernel.org Subject: [PATCH v2 22/30] sparc32: Implement the new page table range API Date: Mon, 27 Feb 2023 17:57:33 +0000 Message-Id: <20230227175741.71216-23-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: rspam02 X-Rspamd-Queue-Id: 2D5AA180016 X-Stat-Signature: i7qbnsbj3659xft3a814qob9gnpw5she X-HE-Tag: 1677520667-834327 X-HE-Meta: U2FsdGVkX1+WVMxcwNR7bMjQ1+ibNH/zVnAB2vD+ieDMkSwUYkPWtxjQdIrPxSZrzCEHg29MsZGKaMFuv/3U3e3ZkNv/TaFzt6LmR4AgygN7g8s6ZpzUqaWk98RAHtn5Fosw0+olv08dKSHoSK/wl1Dg3OU2ded2qzsgbvpySZ37P7Yuu+pYGhL3Od8mGv0O17/xJ97wS6Y5vGXeIE154I7bAnPo6TDmp/GpUhwM/2SnjN0MHG9/0RCA7MNMMnV03a5EA/zKjVBgVGPUAr61JL11jwRHDKhL23QxliN8hry8ADyQzz9UkM3yGDmn1nepGA8DQSr1hGRL5z4vp/07kL5aAQ1WxfyTWflrelx6Z4KyFMM9kT1hpuMZpS3tNkuJAcWBPx3DfesLQPdU3LT2cgx+J3gTGKwij9wWLiejjpnNzc+35zORW3l2rRlwii3FNVGzKyaOdXRmEDhyw1aWl5eJ9xLNuxCudbgwPkvexfLPnZj7Urt7pPIdbIIBVUumm72zAmcCYkxm61Sij4WJNluK1ye6/Rl97bxPOPRp12L+ux3zKk8G/DraQoVVQYpunHTZIRYdYMyjoD2hrV4XTHWxUdV4EhH6BYHH4ryAZ5DvfyxcnaLOUNGxcZK5EcU3jUBoM4L9bA+k3vxqPFfL0DGitr5bS4BMf2TdGyq6NKy6ZzX79F5LZU6YhqKPDrtnDT2hJdrIsYd4LLgCimhNQI2hOpHIQ6FMNhbqf2wd29gvohs66zwfrLc94tEHvoJ3iZweUDxtF0j39lMr3NUFFL6OEhQvelDUFpgvj9daj14f+CjvfpTPdatHssFduvSdnR4wAjVlYWzW6o0Gal2dVTOEUHKW3EAKbLoZv9ow+tI/IA5shDc9iU2p8k1BdhVfHB3T8zyth1Ts1aJkbKZSQKZ5lDJkO0tsyOdRHl5O6nCIMu662vKdVihNJxnN8ZUUvr41HUp59wofSV7yLLk SvXWYdvL kMX0ouvi/Pv5JDWxIdMPMvwyjRN/vabz1BwlRKhe6QU4iwoi/DNKlRAQYX2AzsKyPRck7qxsXmuNsAlwyzeBuEzcBxz+UmklvX1Eqp4AtgEh8z+pvsYpI3yH2t8sw3Bkp+jHUONvz26q1uoxfiKN1fIdEiqL7RQbZ1ZJfJDl4o70Zu3kULVTL9+zVXEPpjB05ltBOM9RyqGn1/dNOjI4f3WhkhHHGiA+XBVS07eqe6Ckh6lLSa871wBzH0ywjq4tc2ShmO2trhprv45dD+qmwSJ+EPgWvty18GbQs6z6trhSDSuYj9qyq+pH0KdYVHCSC6Hh6 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_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 | 15 ++++++++++++++- arch/sparc/mm/init_32.c | 13 +++++++++++-- 3 files changed, 32 insertions(+), 5 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..47ae55ea1837 100644 --- a/arch/sparc/include/asm/pgtable_32.h +++ b/arch/sparc/include/asm/pgtable_32.h @@ -101,7 +101,19 @@ 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 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 int srmmu_device_memory(unsigned long x) { @@ -318,6 +330,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); 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,