From patchwork Wed Feb 15 20:09:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13142151 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 A8AECC64ED9 for ; Wed, 15 Feb 2023 20:09:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E4C36B007B; Wed, 15 Feb 2023 15:09:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 06DBF6B007D; 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 E55EC6B0080; 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 D37CE6B007D for ; Wed, 15 Feb 2023 15:09:32 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A2A37C105E for ; Wed, 15 Feb 2023 20:09:32 +0000 (UTC) X-FDA: 80470616184.16.77D02AE Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf26.hostedemail.com (Postfix) with ESMTP id AF4F4140016 for ; Wed, 15 Feb 2023 20:09:29 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=RLi9F9Xz; spf=none (imf26.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=J8/1q6frBYGwgbqjjavZ1BISvaOhK/l8i4/4YVlRXgY=; b=R373lxgPv6NKLFROvzJoH/EBuWJ0H6MCO13WRS6EfF6lUrZPfJ4DljpJLnJxsQGBiXNm+J +lEhPAAry5GJvF95q5miX2iOpAKCngWsLWIzlwGvpvvlr+k/bQyTYiPC5otDIA5QZPNKwz hwjbPQrODlxLq9yAI8Z9/6irmi3qDB4= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=RLi9F9Xz; spf=none (imf26.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=yVnENeKPLAfdNrWRrsmUvK3Jfy1E6Dz5TwZhHf3Q5wvODs1lrUzwyqsOb59O8VPmnjCjaA iyD3CWKNPDED54Rz6Z7RGXAMy5X2sCpfwk9sD5aOTd6IXrQFKGYSHULk1IvCxiI7BZeP0z WKV8N/v7yWKAmuMkXH+lKc7knBZX7dM= 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=J8/1q6frBYGwgbqjjavZ1BISvaOhK/l8i4/4YVlRXgY=; b=RLi9F9Xz0A8fF8Tmhtavo1XYMA r8Xf+3tOYAmOgF7m74JMcmt6Gx/ie4sI17SorHbeiyt8M7wpxuFdtuv1d2qb1qq/QZyPcElSaUFWu rAt8XqS7rSk4QUgE9PT9H9Fey21K9TTAs3G0xx8gxL7ONo1tCBZuctczJUAvO7pBg0mcB35Au0qa8 fg5e5qJdRkX6zpJHABfbuLcYwMW7PbVdxt2ruX6Lo1yY403QrceexS25viA0WVFbIQhp47/O12c0L QV5Xg17GQOzsyh3q1FBMKM8oRWmVLM8IwZ3zorcfVWp0zXiGRdULrrKoczXNiPqD+zf9ywi5oTV++ /kFO+MFQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pSO5m-007lAY-V4; Wed, 15 Feb 2023 20:09:26 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, Michal Simek , linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 16/17] microblaze: Implement the new page table range API Date: Wed, 15 Feb 2023 20:09:19 +0000 Message-Id: <20230215200920.1849567-3-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 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: AF4F4140016 X-Stat-Signature: b96wh8z5epkb3nyzy99cgwcmezzmsa8t X-HE-Tag: 1676491769-749738 X-HE-Meta: U2FsdGVkX1/MouNZQpuPnuMlEo9DALi5CqVAjRWxRNt5RKUKLKd59oNZM/UPRFIhNM3ehCSViND7weicTGGsw90z9I7mBkLHLtaAtIX80lGuxI56AQdzviEx6ZNyoeXPLz9A/XF5SpIQYvtIy7U/aC4QI2VEKwjM9UyeIvErWsNNiukUX/LlqKetPexYxCogMWMNdHT+Uhp57YpJDEaN9bhvRL5GfM7EiQ1i5TOkaIAuGUtGfaScGVhWgQcpCegC3CW+Tiakd+XOoiVjlFn87sB9dnwaPp1Bi0gcOi+zh1pc3TztOJTMOYycu0uQLW3RlJM1kQpnkd7KeuMd49nUU+aE1RcN+9s7jdqOgL1ZCLdGYzYHXAlp1F6ULB/rBZ3ueKFH8xHlAdVEnq8gNkHPXbVozsoZ+FqSYcBC3XaIQdczOfu1Zu4MLEnJMjeRQkyTC7sxsbq96os4KdcsHXjRHEOTmDxoat/L8oAfQjdRGnFEErT6sqw8yGceGBZ9aaP9hhUYBdtk62Lk36RTOaDgBTiNgrgyXsgSer9fnJ03wAyVfvQbnbFd/uxW9LycVXw7k1fjZmy4r1gLbGQMlo4DI5tfBf3bj/IacBTWfEowhk5CjXvkIBs7CQd4oEO86kQ6fNHs7UBpapVU2k23zyogF5MhblXWlf0wrjWl99oVZloPguqRV5m9FmVmpGoVQdtrFKYPiTJhrZ08oFvuACmKfcaHcS3X8zduzpetPCDKSgtQTeCq3Ju51HJvQofinxrRTOtvH11KUSxOg7xWHS8TVNV+ccWN0Cwd//uoTRu5H1nfsVpV71U4rT/Mt29qcdvnx2EWZBUi4xwLJkRAAfTiEeLTaR62WK6QQAForBG7+AZqsDAADwXbJbFIiet8RNCcIRJt2946MbhzbL7vgYZcB5c94YlphTk1qQ4egMEpnk0hvORYMpH+kSym5i2ONLEjVD7nOLVyNsUFxCVHbO7 Dm/VVLsL Z4Lc0d4SO/hJ5m8Rz9cTOLjCk6oUzSfnjm43LueGDK2LEYeFdl6vzCwc2gkJRPncaRTTIEBSjihJVSN5ETgYWGGL20XYxoYiqtdc99zA6yox01RefW9lef6XcbgiBzR0N2OeoczmB+DKVgHV4fQtQKH653rItF1JtAql5gE3opKm67iVZqri7kpcaiHBR2uHEpgUYqLJR7t/uwoA= 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(). Also change the calling convention for set_pte() to be the same as other architectures. Signed-off-by: Matthew Wilcox (Oracle) --- arch/microblaze/include/asm/cacheflush.h | 8 ++++++++ arch/microblaze/include/asm/pgtable.h | 17 ++++++++++++----- arch/microblaze/include/asm/tlbflush.h | 4 +++- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/arch/microblaze/include/asm/cacheflush.h b/arch/microblaze/include/asm/cacheflush.h index 39f8fb6768d8..e6641ff98cb3 100644 --- a/arch/microblaze/include/asm/cacheflush.h +++ b/arch/microblaze/include/asm/cacheflush.h @@ -74,6 +74,14 @@ do { \ flush_dcache_range((unsigned) (addr), (unsigned) (addr) + PAGE_SIZE); \ } while (0); +static void flush_dcache_folio(struct folio *folio) +{ + unsigned long addr = folio_pfn(folio) << PAGE_SHIFT; + + flush_dcache_range(addr, addr + folio_size(folio)); +} +#define flush_dcache_folio flush_dcache_folio + #define flush_cache_page(vma, vmaddr, pfn) \ flush_dcache_range(pfn << PAGE_SHIFT, (pfn << PAGE_SHIFT) + PAGE_SIZE); diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h index d1b8272abcd9..a01e1369b486 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h @@ -330,18 +330,25 @@ static inline unsigned long pte_update(pte_t *p, unsigned long clr, /* * set_pte stores a linux PTE into the linux page table. */ -static inline void set_pte(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, pte_t pte) +static inline void set_pte(pte_t *ptep, pte_t pte) { *ptep = pte; } -static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, pte_t pte) +static inline void set_ptes(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t pte, unsigned int nr) { - *ptep = pte; + for (;;) { + set_pte(ptep, pte); + if (--nr == 0) + break; + ptep++; + pte_val(pte) += 1 << PFN_SHIFT_OFFSET; + } } +#define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1) + #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long address, pte_t *ptep) diff --git a/arch/microblaze/include/asm/tlbflush.h b/arch/microblaze/include/asm/tlbflush.h index 2038168ed128..1b179e5e9062 100644 --- a/arch/microblaze/include/asm/tlbflush.h +++ b/arch/microblaze/include/asm/tlbflush.h @@ -33,7 +33,9 @@ static inline void local_flush_tlb_range(struct vm_area_struct *vma, #define flush_tlb_kernel_range(start, end) do { } while (0) -#define update_mmu_cache(vma, addr, ptep) do { } while (0) +#define update_mmu_cache_range(vma, addr, ptep, nr) do { } while (0) +#define update_mmu_cache(vma, addr, pte) \ + update_mmu_cache_range(vma, addr, ptep, 1) #define flush_tlb_all local_flush_tlb_all #define flush_tlb_mm local_flush_tlb_mm