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 E0CA9C61DA4 for ; Wed, 15 Mar 2023 05:15:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E7C98E000D; Wed, 15 Mar 2023 01:14:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3322E8E000C; 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 0200D8E000B; Wed, 15 Mar 2023 01:14:53 -0400 (EDT) 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 C611A8E0005 for ; Wed, 15 Mar 2023 01:14:53 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9F6DBC1076 for ; Wed, 15 Mar 2023 05:14:53 +0000 (UTC) X-FDA: 80569968066.18.2DF147A Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP id 0DC5918000A for ; Wed, 15 Mar 2023 05:14:51 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=QiRYRIYB; 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; 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=ROs4pif/kFvkBiDV3NO8zPcw3ClnbGtqAW0UODiyA6c=; b=ZAX9Qkgbv709m32Tik0q3q0OLSgkcl0enTGyU8l+FqSf3/qM8VirAiAItSTy3GxUukmWdE 7L8h+iT6XQmqpD+4hjmnjndo9JhLYfvjhux19r7E1rw4f0sEHXgY0XjenCdeXM2O2jSHvw eR2fZfNqBLfmRCGYPum2h2Ydl7fx6tQ= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=QiRYRIYB; 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; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678857292; a=rsa-sha256; cv=none; b=jr/Frs6g+gcDLkB4hZb3ysxL3K0RfBr2vX3RYjdD57LWvqGficc42y0HM9ZY1znbgmwEOP zrY6I8X/GGS81JcmP9j2BxGBh3ZDaojLIWj6VJNUzxeWMcidZdDBgRAogyttqy605SirDd RpNNXDuqj+7xWL+7r8Y+PdHDH1qLQXM= 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=ROs4pif/kFvkBiDV3NO8zPcw3ClnbGtqAW0UODiyA6c=; b=QiRYRIYBspVSNMHWy9CUnAGFbg xcAKH5Nyt1RloAq+AVAi+8/quBIfjUxcvLjCl1rcdTZ/d0iEXLxmASA9bmZm3a0v/EQK4JxgBh0wY vT1QYq8dRywPqxRFE5ZeubBsDBIPn0wWWfrEg2thY8M5a+ieIT+gH5ykedXNkD8swAOJEn4CkAsC/ VdJRQG7gDXDj5Zm413uOWcD8k5UVu37BWjQTehVoPwsXUyXj00Cdc0dKWPM8dAKb9l+sx6R8kng3O lVbqSK6QaMiJDR2//MEhScv7dI5AxQitEVZ6B+XpHUfFPe276MEpvRtUpH54AZrA4qwb+xEVDyyDM oHFRuGsQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pcJTM-00DYC2-Ce; Wed, 15 Mar 2023 05:14:48 +0000 From: "Matthew Wilcox (Oracle)" To: linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Jonas Bonn , Stefan Kristiansson , Stafford Horne , linux-openrisc@vger.kernel.org Subject: [PATCH v4 18/36] openrisc: Implement the new page table range API Date: Wed, 15 Mar 2023 05:14:26 +0000 Message-Id: <20230315051444.3229621-19-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-Server: rspam05 X-Rspamd-Queue-Id: 0DC5918000A X-Stat-Signature: poqeiagpf7d9tkxhawk4dssyog6enijy X-Rspam-User: X-HE-Tag: 1678857291-874221 X-HE-Meta: U2FsdGVkX19Azd0ECHyJJAD8njXM53qZ5kE2NIQZ6aSUtf2ep4k1uEvOX578h5gpyr615OiV44h0P7EgsT5u8P45InDyD4u4zW/kN6cp8kofinZhPMNzVOX/7jOSGCv96cMgRwhXe0yWAsrowOyyy8fzUyROQO/N1Oy2vcTTS+tf+dQu279JSgvkJLM/g3s6q3KgkWgFgaDLvE9tizVwGnTah7V6I8sTGCsEXfELM0DO6XRvU19hDhJVBgFuQjNC/6GG3tiTlZKeDFyUICtOigP1pgeVrlU5eQhcKTfOp0mSQwAlliwMFMRrPbj0jKwRcxqITwh0dAEMbjmhoYcV6yRIPQaOpiulgviQ+kI5cNO7wzPm+9tpGRR7EYM0xHNeFL5hPAy7R4H5jd9wkG0rYY74Mxp15jzXim6HB6vEskc12QQbzp4HI1BZwh0Iv76EKSnt3e+x04z5Vj/7oggdh0HPSlLxZIex/lr5Mc1p0qXGwIZ1VCONWZ8EcdC5WZzqfz3QTWlra2YUI50OUaijH49laTrw3DEuvxf/FSJ4EelL0lGPscMWXgfKlWm9ZIWfFPk9eYEdyl59hksn/a/udp8+Fgieo+ftNWmxCfqBRkVZh9AtpMWQamY6FixYQ7wKcDmB9O4EONLOzOLblbSMVkc9bATVgDYI+o/RxBT4DTgKMJ2E7fD1B0NvBtVhat1LgSh/ocKTWLM2/tLm+LR/u9RjIFVOu5MeONaTx7JD/QUHdDtj9Lutqxxv3jxXFF+vk4LfDPXgqVo18Fy+KVBOzQ8ogb3qDvgJX2qOqqzXhP82ZMp0xnoTKUzmSegCiiMqg1ibRZWJ8m4tA51roPPjA80Hng9YbVW71+z3VPqHyscYsVRFfWdnqKN3wTsTr030nH/iF+6BeaLLRTS9LwWwmYeTdSG8XBD4c3eusa4Y+YIh6YYo7C2gcuEmm8TI+W9g5XqQGNB7hmfc0FusCAD NLRh+R2f 0NLhR05GdIGuOtWxT+gM0ouz3paEzGb9jyXZKy3LAE5c0Lyo7zFi5LYViE/U5BPY6HmzLQifrB1nEeS3QJZPiHzkOd1op6CKDYGX/yC8l0A9+qHtY1vv4xl9M7lDqGXXXCKGEnGDKr8UNg+dBnABUM48BHz5P1eIYkR9QZfkW2e/VhtxswbD1o2IBAxD+qoAmc22L2N4ITJ2OnlQD3Dzo9iHwOjm7r79l6XIjg6uOEeCbUo4Nb8sDDA915XkwIZtxGbSlb8vnpqMnXhMGdjjjeBrJPg== 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() and flush_dcache_folio(). Change the PG_arch_1 (aka PG_dcache_dirty) flag from being per-page to per-folio. Signed-off-by: Matthew Wilcox (Oracle) Cc: Jonas Bonn Cc: Stefan Kristiansson Cc: Stafford Horne Cc: linux-openrisc@vger.kernel.org --- arch/openrisc/include/asm/cacheflush.h | 8 +++++++- arch/openrisc/include/asm/pgtable.h | 14 +++++++++----- arch/openrisc/mm/cache.c | 12 ++++++++---- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/arch/openrisc/include/asm/cacheflush.h b/arch/openrisc/include/asm/cacheflush.h index eeac40d4a854..984c331ff5f4 100644 --- a/arch/openrisc/include/asm/cacheflush.h +++ b/arch/openrisc/include/asm/cacheflush.h @@ -56,10 +56,16 @@ static inline void sync_icache_dcache(struct page *page) */ #define PG_dc_clean PG_arch_1 +static inline void flush_dcache_folio(struct folio *folio) +{ + clear_bit(PG_dc_clean, &folio->flags); +} +#define flush_dcache_folio flush_dcache_folio + #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 static inline void flush_dcache_page(struct page *page) { - clear_bit(PG_dc_clean, &page->flags); + flush_dcache_folio(page_folio(page)); } #define flush_icache_user_page(vma, page, addr, len) \ diff --git a/arch/openrisc/include/asm/pgtable.h b/arch/openrisc/include/asm/pgtable.h index 3eb9b9555d0d..2f42a12c40ab 100644 --- a/arch/openrisc/include/asm/pgtable.h +++ b/arch/openrisc/include/asm/pgtable.h @@ -46,7 +46,7 @@ extern void paging_init(void); * hook is made available. */ #define set_pte(pteptr, pteval) ((*(pteptr)) = (pteval)) -#define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval) + /* * (pmds are folded into pgds so this doesn't get actually called, * but the define is needed for a generic inline function.) @@ -357,6 +357,7 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) #define __pmd_offset(address) \ (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) +#define PFN_PTE_SHIFT PAGE_SHIFT #define pte_pfn(x) ((unsigned long)(((x).pte)) >> PAGE_SHIFT) #define pfn_pte(pfn, prot) __pte((((pfn) << PAGE_SHIFT)) | pgprot_val(prot)) @@ -379,13 +380,16 @@ static inline void update_tlb(struct vm_area_struct *vma, extern void update_cache(struct vm_area_struct *vma, unsigned long address, pte_t *pte); -static inline void update_mmu_cache(struct vm_area_struct *vma, - unsigned long address, pte_t *pte) +static inline void update_mmu_cache_range(struct vm_area_struct *vma, + unsigned long address, pte_t *ptep, unsigned int nr) { - update_tlb(vma, address, pte); - update_cache(vma, address, pte); + update_tlb(vma, address, ptep); + update_cache(vma, address, ptep); } +#define update_mmu_cache(vma, addr, ptep) \ + update_mmu_cache_range(vma, addr, ptep, 1) + /* __PHX__ FIXME, SWAP, this probably doesn't work */ /* diff --git a/arch/openrisc/mm/cache.c b/arch/openrisc/mm/cache.c index 534a52ec5e66..eb43b73f3855 100644 --- a/arch/openrisc/mm/cache.c +++ b/arch/openrisc/mm/cache.c @@ -43,15 +43,19 @@ void update_cache(struct vm_area_struct *vma, unsigned long address, pte_t *pte) { unsigned long pfn = pte_val(*pte) >> PAGE_SHIFT; - struct page *page = pfn_to_page(pfn); - int dirty = !test_and_set_bit(PG_dc_clean, &page->flags); + struct folio *folio = page_folio(pfn_to_page(pfn)); + int dirty = !test_and_set_bit(PG_dc_clean, &folio->flags); /* * Since icaches do not snoop for updated data on OpenRISC, we * must write back and invalidate any dirty pages manually. We * can skip data pages, since they will not end up in icaches. */ - if ((vma->vm_flags & VM_EXEC) && dirty) - sync_icache_dcache(page); + if ((vma->vm_flags & VM_EXEC) && dirty) { + unsigned int nr = folio_nr_pages(folio); + + while (nr--) + sync_icache_dcache(folio_page(folio, nr)); + } } -- 2.39.2