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 CA328C636D4 for ; Wed, 15 Feb 2023 20:09:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F20F6B0074; Wed, 15 Feb 2023 15:09:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 37B9E6B0073; Wed, 15 Feb 2023 15:09:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 21BF86B007B; Wed, 15 Feb 2023 15:09:32 -0500 (EST) 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 0B33E6B0073 for ; Wed, 15 Feb 2023 15:09:32 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C17CAA0A8C for ; Wed, 15 Feb 2023 20:09:31 +0000 (UTC) X-FDA: 80470616142.21.3968A10 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf23.hostedemail.com (Postfix) with ESMTP id 71B34140009 for ; Wed, 15 Feb 2023 20:09:29 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=i50W5RLo; spf=none (imf23.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=1676491770; 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=WK7WV98DmqNoEol8pKIPxUYYZ9kR5i0EUBhp91OqSig=; b=lVSnSfJoWbVbeRm2kO2G64LSDu3ddNstaYh7IDdYMu8NjZGepbUHMnP/bTkG8nCCfJpaQc +RHUwsih/hN8cTJrmittdTGRExp3OyR8ppQTIZQX8wYgM8JTGv0CpQBzmgNUVVuUc7JhXa I5jiSo+/cPN5btXCbDml7TfQh6JIh4A= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=i50W5RLo; spf=none (imf23.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=1676491770; a=rsa-sha256; cv=none; b=Yu9rwTz3QKr18ppWh/WV8xJZT8V+ZipfQxkzzoPk/v3KHFzwQb03v5AeYu1AC7PsZCeSl7 yrfTL2JBTqvG8qarj/28bZ+tP60nvRVvcMWaezTJYHmn14VH23iy7cJVVvkBa0d5Ag+KRy Lt3M1VktEo8TNmhMJfyYH8oE9xtK9Qo= 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=WK7WV98DmqNoEol8pKIPxUYYZ9kR5i0EUBhp91OqSig=; b=i50W5RLoKp2u9dkh3sbtVQHYCW y4vps7i5Zjb9gRIuKQkcVxkB2ZDAJibcvJZTosxgjyG3hUAKblPrrtsj9vVrGxMJYZ72zUaQQqJ4g 82FddwyDg7YViumA8bA3rznbcKchmb7M6R9D0M85AF7H1oJI2+FO5QeKbxtDFjDrDyQsxU11jnDtt 64SCigt+cFtVdBTeqE2xGyWT82tDeJXTKPIHugptpPVoCpe5spakHXlKVf8K/jEPOWv8M7bRUBA4k ZEyndIZz9oMorsB32W9pFxCKwVpaXe+b/dXV6+hykrTOgSI0z5P26m7L9DqJm4/IO/S1d/sKWIXoH /zTE9Kgw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pSO5m-007lAU-Rl; Wed, 15 Feb 2023 20:09:26 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-m68k@lists.linux-m68k.org, Geert Uytterhoeven , linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 15/17] m68k: Implement the new page table range API Date: Wed, 15 Feb 2023 20:09:18 +0000 Message-Id: <20230215200920.1849567-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230215200920.1849567-1-willy@infradead.org> References: <20230215000446.1655635-1-willy@infradead.org> <20230215200920.1849567-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 71B34140009 X-Stat-Signature: ohytor6xmt36eo9ra5on9n6abnxy8ze3 X-Rspam-User: X-HE-Tag: 1676491769-479518 X-HE-Meta: U2FsdGVkX1/rg6b2UJxt274xw68fuco88K+c246w2RLEv1IeaLHNt0Xv/LlikZqQLXpNL7D3RL2QJ/aeh9m0Si2KCqgJpR8CEcdK/cT+ZP9H0zWjhgZXnLWy4Nyf6aJ6nGFUznLW+qVbfctMkmvdisasMfaeLtwSYoH+RVGBaH5s5wxcC3w+hWVh3LPebWlYty61SFMAcxvKbmEHMcmTg4yMb5AQjFV8if1ucTW+wtBLI2NzVjaMcsOv2BXBjIH5e5mIeobDtw3b6JGFigTqh65+arevwmnlzLN7WSxaNX5ArectQc3olRaXdSE1NiUIzSajHWZHRZANTn7Ese7CVG07Yt5aOG1UiB25TTegBrkgcwKdQPJMSUijfRazhdkDTRxxOKYqmMggUAowbvIuSDiS2GMniZhL2Gja95YqaYQQ8MPE8QkYf7YplQstQyjAmCwIHd3AP+nEsN3P0k0JgXoVsotfMPXH8hl1yofsgVkxluDtqAz+ayW0LK1AGHNWd8eHGLHUXQzMkAk8OCQu7hws9VGrX6Li83koBkHH/NMP9GvBLGYkHutyahQQSrSoq+XaZTIGCD8EC/onOKC3I16v2xWgcwMHJTHvGSCbtKyXuD35lG1isIS+3jLrDgy8cPGfmXywimYcqthDAfZ0YsWgQUQbyyKoGefAGGNxA9G8DT7sOrTIEam44y5PYc1EbsKPTegGZ4fGtvEpPH0Vc7REWi0efGwb9KkwdwCkYQ72gSb1CAc6KgLhoJf+HojP6BTy2MiBNUomlV2kqi4X/KEsfP38RJYt35d7cKMJl1Yt1BUq0ae6ByMkCozp6Mh9h3/I6xLHZWFVfVaQeieA8kf9ws2JpBXs9sNDx3Eo7zTCI9cXv1/6m1w8FGMOh2z1KUmNYpB+k3irdzCVib9aR8hr+4tye8jvAymPfgomNE+1JTE6yxCEwyCu5qPKp/b+agTVLFscfwDy/3JFJyh lHxcMlyX GRiaJsEu9vjgjC7VC48snwmgonCCU3FjGIr544TsGb0VJvtx66b1vWAGWOIXWfMBvt8Tey/AdSXjc1mC+kXLGBSpAO+bhqKwxXkFXGaNnb66IB/9kG3k4TZfSOq7+tqo1+SJ/tEKFiHIhVZfVs8ckvrncWviIld4ka1i8RYuDsNlXjEnXx0Zm1Tv096A3ZUTcCeyt 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(). I'm not entirely certain that the 040/060 case in __flush_pages_to_ram() is correct. Signed-off-by: Matthew Wilcox (Oracle) --- arch/m68k/include/asm/cacheflush_mm.h | 12 ++++++++---- arch/m68k/include/asm/pgtable_mm.h | 21 ++++++++++++++++++--- arch/m68k/mm/motorola.c | 2 +- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/arch/m68k/include/asm/cacheflush_mm.h b/arch/m68k/include/asm/cacheflush_mm.h index 1ac55e7b47f0..2244c35178d0 100644 --- a/arch/m68k/include/asm/cacheflush_mm.h +++ b/arch/m68k/include/asm/cacheflush_mm.h @@ -220,13 +220,13 @@ 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; @@ -249,10 +249,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); } -- 2.39.1