From patchwork Tue Feb 28 21:37:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13155247 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 09595C7EE30 for ; Tue, 28 Feb 2023 21:38:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A59CD6B008C; Tue, 28 Feb 2023 16:37:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 94C386B0099; Tue, 28 Feb 2023 16:37:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65B5B6B008C; Tue, 28 Feb 2023 16:37:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 45D4B6B008C for ; Tue, 28 Feb 2023 16:37:50 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 1F89C1C63E6 for ; Tue, 28 Feb 2023 21:37:50 +0000 (UTC) X-FDA: 80518013100.05.6DF502E Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id 6906B80019 for ; Tue, 28 Feb 2023 21:37:48 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=EVNR24DZ; spf=none (imf02.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=1677620268; a=rsa-sha256; cv=none; b=LRw+VyEJWoYcImb2TX0NrAIGOt5MnFM5CLwbT0lAtK046V6FBeMshwA8UdPv6267Et1HbV olqps9ySqq/kSph4RXVad5ZZvqAs5mOA6Zzj9Kdld9zXe8uTV646hXYGZj+3MZEmaNq/FQ y8PhzAHnPXim5yIV6O5CQGxxcbMV3RU= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=EVNR24DZ; spf=none (imf02.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=1677620268; 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=u7mDkU53gCVgq34r9bUs2tkHplV8+tfY4mkfvunD0YE=; b=QE1/mnvdZjxlZdV46ngu09zlzdaD+0nqzx1x0AIWipHnMsSBK7JITIJlHL4HCsHJMWXdNf 5zmMdAzNvQXnpWiqvlWAIVzC14dNupymEOLPQk8dxm7F4FSINr7JGegNEeq3CUq8BsnX9F KxdbwTW15h5sHHd1aZ1Pza86fClkIz8= 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=u7mDkU53gCVgq34r9bUs2tkHplV8+tfY4mkfvunD0YE=; b=EVNR24DZpArKnCSCBaresow5yA Vyhm29cOyzaXLJUNOI8O8YcxcgphzbnZewhX959jro9fKmyPdCaD1Oq0kKZ1Q806YXmVGYjcNEIy7 j/QDNkPxrP//0P8P17QBzkuNGdOFIpJu8gy2eKCOMXRoxY6AsVW5po/gsjXR8jB2Ua1Ug+kyMONrP 0guR4FHrIqyTVjvVe7ol+0GiG8ks9sAJ4LoO1y2HNSTF8qnVwS8P0bxOuz1GKc9V4+Z7XBjEYQexR pNS2aXLc55KzCKM8kBZsInzUsBDUtPJ0F8fb2/FsnR+OiZKi2QHZqsPzS6JFvql9POSWICWWHcSGP obOFf91Q==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pX7fI-0018pG-Q0; Tue, 28 Feb 2023 21:37:40 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org Subject: [PATCH v3 13/34] m68k: Implement the new page table range API Date: Tue, 28 Feb 2023 21:37:16 +0000 Message-Id: <20230228213738.272178-14-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230228213738.272178-1-willy@infradead.org> References: <20230228213738.272178-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 6906B80019 X-Rspamd-Server: rspam01 X-Stat-Signature: t5c6r3ok1t393nans8bjej1ah1defdgh X-HE-Tag: 1677620268-190242 X-HE-Meta: U2FsdGVkX19VFzPLHMLSZu9GIydHAOElTGo21HTmv7BvxfDQdDBfLcKaqhvbE5pNkuqIQHTw/D91L/ZZphgIdUss6Pr0rx6l1TVdcUyyz7QRwlSoC/jr/RuDyGcQ+VdJlEjE5V1q5UgbQwC1D5iNeA65lyZCAH85TJVFX4XPogN362s7uCT8PxtrSyzgcyGMp9qyRec6UWe7MpD/EErMCRI5YIzhzF8Sh36ZJbmi4hWnPTziYECmqs+H9SvYYcYH98/hVa3YFHHIunQlO6fVtzMHu09vRt7Gh5lZYTOJrJnj+CSxOw+WZqdq1g/UBMZhHOObNcEMJEOYDDAYX5ZLwyq4Hh9J9ZQybvPFxHPNl0aUWR5MyD9sgVHsBM8vr0ajQG7pxGiNi9U0VkQXWYYp+/i7X8EJok9Fybkc9yAlo+YpDS1DcLH1K2siqvkNDw5nlJGa/j5zGLlcrXwfR9vCQhti0gYeZXxveMV4qrju7taeGxld15CLU3zcrxbgPRCn00WXWQhUbAnKJuXfEkL8P8Vx3S7ZQXJIQAO0Ww3e3tWgYGi0J5kbpwrfxashxf+n5/bXhPyOYfTC/IFfgwtdkJQSLxoVMMPqsaO7wWB7nUjO2yVyGroKB/7dcCX3ChpJdhftzRCUh0E/1wd2fUdFh8khSnEVAd+GE8BJ3+VibSjxvhpVsFuc+60s5d7LpLuMZno9KvlEvHJJZSIQ8XQ3eMKdk+4lSb3pp/v01uCZf/FH188FuzHZkRJe2Jp1blGauBG4gJMK5ai68tBKDtTgqWwcN6zii6hjXyk0Rtc5XOABwIh1W9K8fNnIHH8wi1X7wlGPRpC3lraF5l7AVUsHlvsXkhOub1zRS96iTwSuAEmhqqoR4PUPLYibrhs+VNJel5Ji9CdkBYxRwh6bJboee2gL1IuVk75ofUUsq9uOq4+pE0VlmyjUEVcjQVZxrxol2KQ9s+1Svy+BKtMUhop AFsG5Ahw 7YVSaY92/Mekzp39hg9UfOzzvRQduCT0Tjf2iLpvumdX9rN4Ik0aOiQQucCpns504UdQi+BUlLCSUlc3Mf6AYetl758ACLxd08C+paA0Ub6CNzjOzcv2+MBZQokI4jWHruJ8c6ckKJkPi99oqAAmMokVtTqlXxnh35jLHvGQdV+4DthUnHFFsdcpAUsvG0EHNuHC/LK5IVvvYJ0L/mEVCU9XSs4d7JWZsunycexsaNxNnSu9QRSixEwEFiMEfSBE0WUN1 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(). Signed-off-by: Matthew Wilcox (Oracle) Cc: Geert Uytterhoeven Cc: linux-m68k@lists.linux-m68k.org --- arch/m68k/include/asm/cacheflush_mm.h | 26 +++++++++++++++++--------- arch/m68k/include/asm/pgtable_mm.h | 21 ++++++++++++++++++--- arch/m68k/mm/motorola.c | 2 +- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/arch/m68k/include/asm/cacheflush_mm.h b/arch/m68k/include/asm/cacheflush_mm.h index 1ac55e7b47f0..d43c8bce149b 100644 --- a/arch/m68k/include/asm/cacheflush_mm.h +++ b/arch/m68k/include/asm/cacheflush_mm.h @@ -220,24 +220,28 @@ static inline void flush_cache_page(struct vm_area_struct *vma, unsigned long vm /* Push the page at kernel virtual address and clear the icache */ /* RZ: use cpush %bc instead of cpush %dc, cinv %ic */ -static inline void __flush_page_to_ram(void *vaddr) +static inline void __flush_pages_to_ram(void *vaddr, unsigned int nr) { if (CPU_IS_COLDFIRE) { unsigned long addr, start, end; addr = ((unsigned long) vaddr) & ~(PAGE_SIZE - 1); start = addr & ICACHE_SET_MASK; - end = (addr + PAGE_SIZE - 1) & ICACHE_SET_MASK; + end = (addr + nr * PAGE_SIZE - 1) & ICACHE_SET_MASK; if (start > end) { flush_cf_bcache(0, end); end = ICACHE_MAX_ADDR; } flush_cf_bcache(start, end); } else if (CPU_IS_040_OR_060) { - __asm__ __volatile__("nop\n\t" - ".chip 68040\n\t" - "cpushp %%bc,(%0)\n\t" - ".chip 68k" - : : "a" (__pa(vaddr))); + unsigned long paddr = __pa(vaddr); + + while (nr--) { + __asm__ __volatile__("nop\n\t" + ".chip 68040\n\t" + "cpushp %%bc,(%0)\n\t" + ".chip 68k" + : : "a" (paddr + nr * PAGE_SIZE)); + } } else { unsigned long _tmp; __asm__ __volatile__("movec %%cacr,%0\n\t" @@ -249,10 +253,14 @@ static inline void __flush_page_to_ram(void *vaddr) } #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 -#define flush_dcache_page(page) __flush_page_to_ram(page_address(page)) +#define flush_dcache_page(page) __flush_pages_to_ram(page_address(page), 1) +#define flush_dcache_folio(folio) \ + __flush_pages_to_ram(folio_address(folio), folio_nr_pages(folio)) #define flush_dcache_mmap_lock(mapping) do { } while (0) #define flush_dcache_mmap_unlock(mapping) do { } while (0) -#define flush_icache_page(vma, page) __flush_page_to_ram(page_address(page)) +#define flush_icache_pages(vma, page, nr) \ + __flush_pages_to_ram(page_address(page), nr) +#define flush_icache_page(vma, page) flush_icache_pages(vma, page, 1) extern void flush_icache_user_page(struct vm_area_struct *vma, struct page *page, unsigned long addr, int len); diff --git a/arch/m68k/include/asm/pgtable_mm.h b/arch/m68k/include/asm/pgtable_mm.h index b93c41fe2067..400206c17c97 100644 --- a/arch/m68k/include/asm/pgtable_mm.h +++ b/arch/m68k/include/asm/pgtable_mm.h @@ -31,8 +31,20 @@ do{ \ *(pteptr) = (pteval); \ } while(0) -#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) /* PMD_SHIFT determines the size of the area a second-level page table can map */ #if CONFIG_PGTABLE_LEVELS == 3 @@ -138,11 +150,14 @@ extern void kernel_set_cachemode(void *addr, unsigned long size, int cmode); * tables contain all the necessary information. The Sun3 does, but * they are updated on demand. */ -static inline void update_mmu_cache(struct vm_area_struct *vma, - unsigned long address, pte_t *ptep) +static inline 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 /* !__ASSEMBLY__ */ /* MMU-specific headers */ diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index 2a375637e007..7784d0fcdf6e 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c @@ -81,7 +81,7 @@ static inline void cache_page(void *vaddr) void mmu_page_ctor(void *page) { - __flush_page_to_ram(page); + __flush_pages_to_ram(page, 1); flush_tlb_kernel_page(page); nocache_page(page); }