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 E7E08C64EC4 for ; Tue, 28 Feb 2023 21:38:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C1EC6B0096; Tue, 28 Feb 2023 16:37:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 521556B0098; Tue, 28 Feb 2023 16:37:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 39D366B0099; Tue, 28 Feb 2023 16:37:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id F17F46B0098 for ; Tue, 28 Feb 2023 16:37:50 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 9F3FE1C651E for ; Tue, 28 Feb 2023 21:37:50 +0000 (UTC) X-FDA: 80518013100.30.C066881 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf28.hostedemail.com (Postfix) with ESMTP id 7EACAC0015 for ; Tue, 28 Feb 2023 21:37:47 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=bhOA4QdZ; spf=none (imf28.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=1677620267; 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=Nqz7AKc3hPtY/ZHqOcsiEiY49KCNRExEKCVBLCnS/x4=; b=geH7dt8Q0+CUMN+v87cfsQl/0erKy79xMq6UyTBKpXP3NRD8UHbFvY6G+5vjrhibVkYdkJ c+4N8gSMYDCO622IHFXG9byIlcgB5ECdvOe8ip+VT/xwQz5k3rISE5iHCAGDX1Xv3mVHge 8xHEUaTrBQYbJhoZyh+O10gGmjveVjU= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=bhOA4QdZ; spf=none (imf28.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=1677620267; a=rsa-sha256; cv=none; b=UVQu70MBhM3dRx0H4JI7HV2RiKldVLuyv64SmVtqvGbv/MT4InSQUS9Prj6BtORrWAVqe0 kE0Rla8sOCyK03X8KNsVL2Lpcxj9PD5EqjoxGkMiRksgpA78g72Re9N+vJNAMBjtm0CASq cI0llxXTgF0j8x9fEl6EZ1lv1Q0MXZ4= 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=Nqz7AKc3hPtY/ZHqOcsiEiY49KCNRExEKCVBLCnS/x4=; b=bhOA4QdZIDUyBWXUwB66ZVmlbr 92rE+G6ulRW8KUKHLmFDR8kXMC7/eBb2RCNg+w5ZtNI8ADvv85hR8wSba7m5N27fhtl12+ATq7y5t uXcsSVxgCwaptDvWpzVPhKX/Wj/f3XVq8bz1OLP4YPeCMOAtSr73WmdSjQtQNuNryXQrAL63ETzKr C7i7BvTiGxNROIu5JebX2Kq7sMDyBmgqQTr7m9UOOdbMsB7zUvyR01XeUTFME4hkKmN8NPMaLW2TM w5hsEzQzeoW1yXcAvS79gvRQJClLwwWAnsSD6SdD6S8gqpYU1pYrazUsOYZ7ZrWAZGYnIyBy9kMxx zyQX0MZw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pX7fJ-0018pS-45; Tue, 28 Feb 2023 21:37:41 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, Jonas Bonn , Stefan Kristiansson , Stafford Horne , linux-openrisc@vger.kernel.org Subject: [PATCH v3 17/34] openrisc: Implement the new page table range API Date: Tue, 28 Feb 2023 21:37:20 +0000 Message-Id: <20230228213738.272178-18-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 Content-Transfer-Encoding: 8bit X-Stat-Signature: 9kbxqispftep34r6m3xmdzhumaqd7a5t X-Rspam-User: X-Rspamd-Queue-Id: 7EACAC0015 X-Rspamd-Server: rspam06 X-HE-Tag: 1677620267-227879 X-HE-Meta: U2FsdGVkX190xcYJKmLBSA5Yn/U0UdhcvLV/HXR46MIONGnUwU9zdto7tN1xjqxduj4kyRdxVnpDEauG/GBAM5JJBStRtJQnQX/+qwAeprBXBXn+p9/cwmbYmZrdFo0NaxivEtvfVYkobcvSlGpu83eiNekmuszzQOJjy4y/ZBfUv0OEdm6wH39Na2u+5DClouwuQa1BLdo6QZ968uBGOg/ipTYn4NKHPyoGPPfpbD/qS9Xzb2BozJhYLn7qbOEsVBSwy11PdVOZhWUXdOykGwb2I0Zhpub74GsqSBwfM5BITsU08EvvEvMNH4udB7uV89KtT6X8WzlT7qsbuJeGGlHtm54QQzshbjwi07vw6p61dBFCgTBIEaaBHedt3oYDqrNa6XtFvwghzWOzp/ZQFBGbC+6mVeAN/wI8xtWfr6Jik3u0fCFEnvSmBFYlVyaLxEC4vHDmDzpGFLkcEbugVMvnPRGqaA+kv+ymWmPzeHNAjkg+RHO0BboZqE44vv0iq8iLIL6yS5advrZMdtlSzkzNJwki604TxOLEkJaGc3IQEUTiqOoH5ew4toiOw/fVls7BVYNM+/vP5e6j57vF/3MgdXY691lAhZIA+hEKSK/I+bUornuA2KpySRgPO9BTYexFh7RU5/yMe7jHJG8NusfLMltNSUqYLOnbSU0MVU5MUPKIwUI6AgSQ95rlRFS4pyECWHaVGLv0+/Qekvp6pKz+P23Nw2UiNIUmaWAjK7eIgCt6UTR4/l13jOORj6vMF+aVfOdZETTxYz7Pj+qdpLhhWfxdl/oP3UOnQU5sVZZ9UDGnQzBpwOirgoQkf1jrl7gdARbJR7bEJIaeKVAEteSXsHqhyCl0BtW8sMlCQTqa/UVQsSQx0YgVecYmENEWd4YZI11jUF2HQ7xRgRWTuQumLTFAk5mdaVWa192DgTgrvCeVlEpI9+BG8pIIwoCG/4RcZuM9sKnssmkzajt xjYgQcZ8 fn5VxX1fpaVXY8mn7OzqBokO4BQptt2IVYNsdX5/ak0xWFJg3EAlkYegjo5UtJ2bndRrqLQKz5PhvWRy+r+/vCCw6FBIWca89KKgWYunPx0mnJXvF7uWLv8WQB5+nzlIHPYIVxMQZ7wduG2SyiybFXCjKi81k8OAzT/jS4zdvOJgQPspu+9OI+wnSDJJy4zR7jzICaK0TQ9vO0D1GT6uquJBeFHPL/0xswuYCJ5L1mhTkPwpjx/aKq9ej1+R1OJ9NStK20r6sUqcet5or9CRu7rxxMg== 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() 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 | 27 +++++++++++++++++++++----- arch/openrisc/mm/cache.c | 12 ++++++++---- 3 files changed, 37 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..1a7077150d7b 100644 --- a/arch/openrisc/include/asm/pgtable.h +++ b/arch/openrisc/include/asm/pgtable.h @@ -46,7 +46,21 @@ 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) + +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) + /* * (pmds are folded into pgds so this doesn't get actually called, * but the define is needed for a generic inline function.) @@ -379,13 +393,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.1