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 7BF4EC7618D for ; Wed, 15 Mar 2023 05:14:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A38B76B0075; Wed, 15 Mar 2023 01:14:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 80F288E0003; Wed, 15 Mar 2023 01:14:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6B02A8E0001; Wed, 15 Mar 2023 01:14:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 45E736B0075 for ; Wed, 15 Mar 2023 01:14:51 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 08223121065 for ; Wed, 15 Mar 2023 05:14:51 +0000 (UTC) X-FDA: 80569967982.14.DE1C5F4 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf09.hostedemail.com (Postfix) with ESMTP id 65444140007 for ; Wed, 15 Mar 2023 05:14:49 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=cf+tbcgA; spf=none (imf09.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=1678857289; 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=4pf/rLft+uZgd6JDRs5O+Xa8ZHam0KkL1tl8wFZFlZk=; b=NJHNCgugFn2/ZUfmZ22NBB8T4r9kWvK46231vOvcwmcXX9H6oZpylirGe0Ovkm92kGH0m2 yFbWG+JeBHLmrfRHHV0ayh0rmpH4Zv/y4dk/Gh/aLxbS9o823mRe5JEUeNaxjpzhX/bi9N YphDz24hN3L2BwkAgphhsZZeOOpf7L0= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=cf+tbcgA; spf=none (imf09.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=1678857289; a=rsa-sha256; cv=none; b=m3c4/w/0Jb7A/+XGXiibq+dsawkWYP9ZTfn1UvFRlrYYIouuzUytE/ZqsDCu4CPNWHD9ji /Ol7pyiazqTIKnMBWSQF8NHj1NKRrnaW+nRHc52IB1j1wzygmTSKt3krFd5azSJNTeK27/ hEV0uqaSsENwboVQFX1ebfFJMTs+VbI= 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=4pf/rLft+uZgd6JDRs5O+Xa8ZHam0KkL1tl8wFZFlZk=; b=cf+tbcgA7nZNIVAuMabdqjl6VU F5KZvf8zJ+HKhlelPGfge4a8lxHFrx76gg7vi5JO7EEDZXRnP+Z9NBhRNnMC4CaHY1TAicWGG/kdb 5uyAK7J8ZfRNMeVfR1ImsPMfnGNs/iaODI8VVJvU0tioNwVM72nOtg/EhCnBo7te4Wjn1wlcmHIel 4Rd74dCa26lGODfVfEiQB2pxIYQpcuAYkI9gSy7+EaezwJD0swkW6gWR9RVWVqPBAF4Y3RUUil4ky B5aWaCvP2rYuJu+m7dEIuLvZEgh3yrakeOLBArHKNip9eyO02qUAiIcwFIzf/w0wvj0nin63z49St sP2Krppg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pcJTL-00DYBe-Pc; Wed, 15 Mar 2023 05:14:47 +0000 From: "Matthew Wilcox (Oracle)" To: linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org Subject: [PATCH v4 12/36] ia64: Implement the new page table range API Date: Wed, 15 Mar 2023 05:14:20 +0000 Message-Id: <20230315051444.3229621-13-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: rspam07 X-Rspamd-Queue-Id: 65444140007 X-Rspam-User: X-Stat-Signature: r464nztk86co9r71eoc8doorjjxco4kg X-HE-Tag: 1678857289-659876 X-HE-Meta: U2FsdGVkX1/OHBezato9Hz9JGPPI6GkpU8X+zG9KP/Tq5Mh+H8I1IgmWrZ0GtKxCOMFCyfZjddGDbf6lWP0dPmBTjTXOaemMYgUyP/+SfAK4fNEhWD4Uj/dsB5so1V8f62mLF8ethmiwQ0FdfgFN2zeSjkrRpeQRAzRlHtgIznaO9htb3bcUepX9n6SCCcAli8GMD04eIf4kqHOMB7oWJzuJ7PCkfFaZ+IwDk4M/ytTeZMJVAHTSD3uIcvs2mAyAriHlVP7MPhhF3Kjx7eOMFd49oJt5KXqndDTX6LiP9phJVsbIvuhB5aJCxKAbz1qaa6HIJ4loW94EzLb8JrmwQ8BR408sJQjajbH1Gtjw5RfmVUp9wtvYWTvMQJ1RNs0a0gENnoz44h0XzBjJXRFsWf66TCmTymf/oBvnyO8xu7uWkexrREtXXgXq4TfapmvNWWv+oKigl9Ww8AHSNE+ewUnkHGc8ySJhT41NpRA7IEf7UTFMN/2w1jzKjwD8YpHnJ6t3WOHyxi8PP9efSDOpl3Y1IMj1ReeKuaVrUD5XREE7KOssAWyMIW/QsTBd4B+cj6K+vm7LouutW+hCPBpvBazDu84V16Rfx3WrSNVlnH8izn6odjR9mxI1O2D4KtAv04UjPiiF4Lsdmfjey3ded98N7b8q45brAR1kSnhJoNnCAzYunVUalVgNIbZwe6mnSW0rpk0JdSYZil5rUvgy4ly90iddpRZ6t0mOJJhrdx3hDk3WgmVxLNZKzNXyhJDMl71EVriDKpuIkJY0UimOC5KxSyGa875QC2EolPP7Qpy27qtsjt6CaSZ9WsWJS80wjS7p2YEmlmAaivmj4HvTjH28rbQDbBADHz8nr4vGSwmXCefR/H0UyFk+cK/gcRjoqbI5NCLXz4HbNAvCslEUSAgWfZdi8RBBgfomht/k1DeJtyONNoIV1pmf6L0uj1fuRVMAiz6TtXjVjDyl6wP IpM/6UDw Q5RkMFtHfICSS8aSqS/tYBZP91J53RTlblDAxn8tRFESUkMhxoUzC0xDV/h++pKla/MApDpsPhOW+ClK68e3P0KDUkHgb7rIN/M5NECEGZVUrIZs4CU80OVPIMv3kcf3yqkbuQwY5z+FFvQkowsqiu/P4bZSQm8HRD5aQmIzcaZisxe1lsDPgXWCZUoiTqiXEm6aa79KRH7Z1eU0TbQW0MbD3F9WA173od5oJmGR635ZUkUdAIlwxD+gUFQd227vIADnT 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_clean) flag from being per-page to per-folio, which makes arch_dma_mark_clean() and mark_clean() a little more exciting. Signed-off-by: Matthew Wilcox (Oracle) Cc: linux-ia64@vger.kernel.org --- arch/ia64/hp/common/sba_iommu.c | 26 +++++++++++++++----------- arch/ia64/include/asm/cacheflush.h | 14 ++++++++++---- arch/ia64/include/asm/pgtable.h | 4 ++-- arch/ia64/mm/init.c | 28 +++++++++++++++++++--------- 4 files changed, 46 insertions(+), 26 deletions(-) diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index 8ad6946521d8..48d475f10003 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c @@ -798,22 +798,26 @@ sba_io_pdir_entry(u64 *pdir_ptr, unsigned long vba) #endif #ifdef ENABLE_MARK_CLEAN -/** +/* * Since DMA is i-cache coherent, any (complete) pages that were written via * DMA can be marked as "clean" so that lazy_mmu_prot_update() doesn't have to * flush them when they get mapped into an executable vm-area. */ -static void -mark_clean (void *addr, size_t size) +static void mark_clean(void *addr, size_t size) { - unsigned long pg_addr, end; - - pg_addr = PAGE_ALIGN((unsigned long) addr); - end = (unsigned long) addr + size; - while (pg_addr + PAGE_SIZE <= end) { - struct page *page = virt_to_page((void *)pg_addr); - set_bit(PG_arch_1, &page->flags); - pg_addr += PAGE_SIZE; + struct folio *folio = virt_to_folio(addr); + ssize_t left = size; + size_t offset = offset_in_folio(folio, addr); + + if (offset) { + left -= folio_size(folio) - offset; + folio = folio_next(folio); + } + + while (left >= folio_size(folio)) { + set_bit(PG_arch_1, &folio->flags); + left -= folio_size(folio); + folio = folio_next(folio); } } #endif diff --git a/arch/ia64/include/asm/cacheflush.h b/arch/ia64/include/asm/cacheflush.h index 708c0fa5d975..eac493fa9e0d 100644 --- a/arch/ia64/include/asm/cacheflush.h +++ b/arch/ia64/include/asm/cacheflush.h @@ -13,10 +13,16 @@ #include #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 -#define flush_dcache_page(page) \ -do { \ - clear_bit(PG_arch_1, &(page)->flags); \ -} while (0) +static inline void flush_dcache_folio(struct folio *folio) +{ + clear_bit(PG_arch_1, &folio->flags); +} +#define flush_dcache_folio flush_dcache_folio + +static inline void flush_dcache_page(struct page *page) +{ + flush_dcache_folio(page_folio(page)); +} extern void flush_icache_range(unsigned long start, unsigned long end); #define flush_icache_range flush_icache_range diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h index 21c97e31a28a..5450d59e4fb9 100644 --- a/arch/ia64/include/asm/pgtable.h +++ b/arch/ia64/include/asm/pgtable.h @@ -206,6 +206,7 @@ ia64_phys_addr_valid (unsigned long addr) #define RGN_MAP_SHIFT (PGDIR_SHIFT + PTRS_PER_PGD_SHIFT - 3) #define RGN_MAP_LIMIT ((1UL << RGN_MAP_SHIFT) - PAGE_SIZE) /* per region addr limit */ +#define PFN_PTE_SHIFT PAGE_SHIFT /* * Conversion functions: convert page frame number (pfn) and a protection value to a page * table entry (pte). @@ -303,8 +304,6 @@ static inline void set_pte(pte_t *ptep, pte_t pteval) *ptep = pteval; } -#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval) - /* * Make page protection values cacheable, uncacheable, or write- * combining. Note that "protection" is really a misnomer here as the @@ -396,6 +395,7 @@ pte_same (pte_t a, pte_t b) return pte_val(a) == pte_val(b); } +#define update_mmu_cache_range(vma, address, ptep, nr) do { } while (0) #define update_mmu_cache(vma, address, ptep) do { } while (0) extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 7f5353e28516..b95debabdc2a 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -50,30 +50,40 @@ void __ia64_sync_icache_dcache (pte_t pte) { unsigned long addr; - struct page *page; + struct folio *folio; - page = pte_page(pte); - addr = (unsigned long) page_address(page); + folio = page_folio(pte_page(pte)); + addr = (unsigned long)folio_address(folio); - if (test_bit(PG_arch_1, &page->flags)) + if (test_bit(PG_arch_1, &folio->flags)) return; /* i-cache is already coherent with d-cache */ - flush_icache_range(addr, addr + page_size(page)); - set_bit(PG_arch_1, &page->flags); /* mark page as clean */ + flush_icache_range(addr, addr + folio_size(folio)); + set_bit(PG_arch_1, &folio->flags); /* mark page as clean */ } /* - * Since DMA is i-cache coherent, any (complete) pages that were written via + * Since DMA is i-cache coherent, any (complete) folios that were written via * DMA can be marked as "clean" so that lazy_mmu_prot_update() doesn't have to * flush them when they get mapped into an executable vm-area. */ void arch_dma_mark_clean(phys_addr_t paddr, size_t size) { unsigned long pfn = PHYS_PFN(paddr); + struct folio *folio = page_folio(pfn_to_page(pfn)); + ssize_t left = size; + size_t offset = offset_in_folio(folio, paddr); - do { + if (offset) { + left -= folio_size(folio) - offset; + folio = folio_next(folio); + } + + while (left >= (ssize_t)folio_size(folio)) { set_bit(PG_arch_1, &pfn_to_page(pfn)->flags); - } while (++pfn <= PHYS_PFN(paddr + size - 1)); + left -= folio_size(folio); + folio = folio_next(folio); + } } inline void -- 2.39.2