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 24117C05027 for ; Wed, 15 Feb 2023 00:05:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 68E546B0073; Tue, 14 Feb 2023 19:05:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 63DD26B0074; Tue, 14 Feb 2023 19:05:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4B81E6B0075; Tue, 14 Feb 2023 19:05:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3A8A16B0073 for ; Tue, 14 Feb 2023 19:05:15 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 06E7E121069 for ; Wed, 15 Feb 2023 00:05:15 +0000 (UTC) X-FDA: 80467581390.10.C00853D Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf18.hostedemail.com (Postfix) with ESMTP id 5CAF11C001D for ; Wed, 15 Feb 2023 00:05:12 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=SEG1Q+pP; spf=none (imf18.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=1676419513; 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=s+L17RxfXCQ5HVPYV7rNHXw7afhlVPPZ+bFT60n+KTA=; b=jk/bI+BmgTaPuRgaznUEb5O6uK6RlhaPJzQRmB9URAzP1cVuTvQELLKvmaMgHJBQ8f/UUE VmlKlP8IfewMQ6lZZj0wy088e7CkyJXN7OVGtqcuwDj7GycPs17a/X06oHb3t1MScHppQ6 fX7n4zoL2yljGXGmfQ6dIUiyVmJwZf4= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=SEG1Q+pP; spf=none (imf18.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=1676419513; a=rsa-sha256; cv=none; b=6kZ1Wl/9gX0oeaoOead3WXS7OuUFg7gr8KKjll10hC+SZCu8bHSZ2vygC/johQAf95vwl6 lK8YTAF/JAXkRMqvWRRhn4lEZWMrTwhumBZXivJG1vKxQMqJkvha2rR5hXNRsY7SApAsNn 3hDYk8jexgI8CwNlQEI5i1czp1/pZE0= 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=s+L17RxfXCQ5HVPYV7rNHXw7afhlVPPZ+bFT60n+KTA=; b=SEG1Q+pPQu2QJMOI6kaTv2LQv1 NVAh09QWWSuOAlT5w2SJ/qY2l17fJJ0+WBL79k7sGJLB2eEvwaqf0DNBgmZMqSYOI21T60nNZuc0B 5dgQ4SJCAQqGZeORfpiPMhqD5/0Ft81JdOy94qCQ8Hv8a2TWikCWigrwSCPhKmnmhV4OtJXJf6FUz wYCEKu/O4esYVzZxSG199TLSwoGqDjXJZeCiqX+jsHIZLaS7zyUF9XR5YrPGjtZEwPGOKfGutx3bH 1uGBJh5rnOvcNzNjsTAz973YyMOMsoJunKCB9ELpfYlgdRzy8UUoVZonGZh5peN82C0D5ubno8Fpr AImeRKTg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pS5II-006wkY-AK; Wed, 15 Feb 2023 00:05:06 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, Catalin Marinas , Will Deacon , linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 9/7] arm64: Implement the new page table range API Date: Wed, 15 Feb 2023 00:04:42 +0000 Message-Id: <20230215000446.1655635-1-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230211033948.891959-1-willy@infradead.org> References: <20230211033948.891959-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 5CAF11C001D X-Rspam-User: X-Stat-Signature: dgeffcugimaohymkezjm5trej6stt8hj X-HE-Tag: 1676419512-247529 X-HE-Meta: U2FsdGVkX1+Byj9n7Skg1LRDkVEH8Iq9GqlGkqvdN4xnu0nJNrs3wKOFWquEWjhuKrHHPhOnj+rQhsjXJQBVwK16XRrAg/K3lln8sfRnWQnZUq4bo1bhJoNxtjGGcDXvc7oQU1FWvGgUof9H5G0K2JX8wRj+BPug9uHkSpOBQuXUGCXVnNtiy0i6bw1zvk/2tIXdAnqgsFS1puH6+vtxSI0AAonlpy6gDf90b0jDjcpmFOJFsHMWOM41jTdw/YkWtNVbmlqzWvxxiPdrzdMQ75IVyAp3BBVP+wlAKmEY9zZ3G1dBTavIS7f8G7mf4geiIfiZ503FKah3Tw3Ty2qHgo6eaJduylpDybvmxO6xgQDuWtuggc9QcAwTIiUEkvwhW9CjuBRPtY3ABWUuFHaHWg1PsRbyv3LRkMv8qfB101PwRhcCDXXGtBmgrSDaWSdZA2wCtIuDPwGUFgc/KWU8CFlvMv+D5+w9bwd5GykprOZcEpnd9PtVnuhTyvT884TfuHsDc6Q/ipBfKaqG5GzbtCtJPbdw/uwruTQ8pU4Thbm8bg9IzRoLwy+F+C0qyR68Ug6GvUxhhHFDj49T5kkG8P1pgHzycR6v7Du0jhZc+xcGXIEt239oG4Gep7rkcM1L9huTgfpWe9y4BCm/YrIcx9DFBFHRLfOTpKkOnPTgJzBdtL3Oq+oER6SraKlG+xCGdu7bOxM1i5uVxJGrLr0WByO4oPZKs6X4vlJaNkFqvyeelhODEhePyWu23n0Dt/uflFi1+Y3trCdz6YVfjgCQI5yODdJs4K08SceSfLP8EO9oS6AeJc6qYzvjpbG9HTLsABJe6XGyT0Ij5QSxQUZsVfBEtkyLget9NWG7eloNVWxzNUvw1CKDAb0ChkD/JGgBdAYDqKQeKVzh3ylQwPen3x1p1ZqvKnA90+aE7korVfK9pW8nwsuBI9HIIt44HEClj5iuQrgWQS1wE6MHBE2 nUE+3+s+ xt39Q7cozJHVt2qKyL+4iT2gtRwS4FdnO/aNp8nh0canTnRD7bnyaKa4Pb+QhjoS2HZ82kLeC2CB6Jj2KsrRI31y2PfXh5gHOUY6yxrz7jlEmGk/5W+//FquK4Lrq8DwRLBhxMVEgjA0BkxK9bTW6WfpqLCUvggrSRObFCLEkK2C/UwcwQDO5/26VX9Amfr+hpvRZ 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(). The PG_dcache_clear flag changes from being a per-page bit to being a per-folio bit. Signed-off-by: Matthew Wilcox (Oracle) --- arch/arm64/include/asm/cacheflush.h | 4 +++- arch/arm64/include/asm/pgtable.h | 25 ++++++++++++++------ arch/arm64/mm/flush.c | 36 +++++++++++------------------ 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h index 37185e978aeb..d115451ed263 100644 --- a/arch/arm64/include/asm/cacheflush.h +++ b/arch/arm64/include/asm/cacheflush.h @@ -114,7 +114,7 @@ extern void copy_to_user_page(struct vm_area_struct *, struct page *, #define copy_to_user_page copy_to_user_page /* - * flush_dcache_page is used when the kernel has written to the page + * flush_dcache_folio is used when the kernel has written to the page * cache page at virtual address page->virtual. * * If this page isn't mapped (ie, page_mapping == NULL), or it might @@ -127,6 +127,8 @@ extern void copy_to_user_page(struct vm_area_struct *, struct page *, */ #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 extern void flush_dcache_page(struct page *); +void flush_dcache_folio(struct folio *); +#define flush_dcache_folio flush_dcache_folio static __always_inline void icache_inval_all_pou(void) { diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 69765dc697af..4d1b79dbff16 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -355,12 +355,21 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr, set_pte(ptep, pte); } -static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, pte_t pte) -{ - page_table_check_ptes_set(mm, addr, ptep, pte, 1); - return __set_pte_at(mm, addr, ptep, pte); +static inline void set_ptes(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t pte, unsigned int nr) +{ + page_table_check_ptes_set(mm, addr, ptep, pte, nr); + + for (;;) { + __set_pte_at(mm, addr, ptep, pte); + if (--nr == 0) + break; + ptep++; + addr += PAGE_SIZE; + pte_val(pte) += PAGE_SIZE; + } } +#define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1) /* * Huge pte definitions. @@ -1059,8 +1068,8 @@ static inline void arch_swap_restore(swp_entry_t entry, struct folio *folio) /* * On AArch64, the cache coherency is handled via the set_pte_at() function. */ -static inline void update_mmu_cache(struct vm_area_struct *vma, - unsigned long addr, pte_t *ptep) +static inline void update_mmu_cache_range(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, unsigned int nr) { /* * We don't do anything here, so there's a very small chance of @@ -1069,6 +1078,8 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, */ } +#define update_mmu_cache(vma, addr, ptep) \ + update_mmu_cache_range(vma, addr, ptep, 1) #define update_mmu_cache_pmd(vma, address, pmd) do { } while (0) #ifdef CONFIG_ARM64_PA_BITS_52 diff --git a/arch/arm64/mm/flush.c b/arch/arm64/mm/flush.c index 5f9379b3c8c8..deb781af0a3a 100644 --- a/arch/arm64/mm/flush.c +++ b/arch/arm64/mm/flush.c @@ -50,20 +50,13 @@ void copy_to_user_page(struct vm_area_struct *vma, struct page *page, void __sync_icache_dcache(pte_t pte) { - struct page *page = pte_page(pte); + struct folio *folio = page_folio(pte_page(pte)); - /* - * HugeTLB pages are always fully mapped, so only setting head page's - * PG_dcache_clean flag is enough. - */ - if (PageHuge(page)) - page = compound_head(page); - - if (!test_bit(PG_dcache_clean, &page->flags)) { - sync_icache_aliases((unsigned long)page_address(page), - (unsigned long)page_address(page) + - page_size(page)); - set_bit(PG_dcache_clean, &page->flags); + if (!test_bit(PG_dcache_clean, &folio->flags)) { + sync_icache_aliases((unsigned long)folio_address(folio), + (unsigned long)folio_address(folio) + + folio_size(folio)); + set_bit(PG_dcache_clean, &folio->flags); } } EXPORT_SYMBOL_GPL(__sync_icache_dcache); @@ -73,17 +66,16 @@ EXPORT_SYMBOL_GPL(__sync_icache_dcache); * it as dirty for later flushing when mapped in user space (if executable, * see __sync_icache_dcache). */ -void flush_dcache_page(struct page *page) +void flush_dcache_folio(struct folio *folio) { - /* - * HugeTLB pages are always fully mapped and only head page will be - * set PG_dcache_clean (see comments in __sync_icache_dcache()). - */ - if (PageHuge(page)) - page = compound_head(page); + if (test_bit(PG_dcache_clean, &folio->flags)) + clear_bit(PG_dcache_clean, &folio->flags); +} +EXPORT_SYMBOL(flush_dcache_folio); - if (test_bit(PG_dcache_clean, &page->flags)) - clear_bit(PG_dcache_clean, &page->flags); +void flush_dcache_page(struct page *page) +{ + flush_dcache_folio(page_folio(page)); } EXPORT_SYMBOL(flush_dcache_page); -- 2.39.1