From patchwork Wed Mar 15 05:14:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13175311 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 808AFC7618D for ; Wed, 15 Mar 2023 05:15:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DE7E78E0009; Wed, 15 Mar 2023 01:14:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D19AB8E0008; Wed, 15 Mar 2023 01:14:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B44578E0009; Wed, 15 Mar 2023 01:14:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 9E4968E0008 for ; Wed, 15 Mar 2023 01:14:53 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 7741640D23 for ; Wed, 15 Mar 2023 05:14:53 +0000 (UTC) X-FDA: 80569968066.20.B068F26 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf06.hostedemail.com (Postfix) with ESMTP id C93D5180017 for ; Wed, 15 Mar 2023 05:14:50 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=FELhPHZX; spf=none (imf06.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=1678857290; 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=G+iFhANmqW/Vof6vYlI0ap5wuntAHSlD5mTdwdGqJu0=; b=t7EQ3CAlC+e+RlAkHR482sWihJ8V9hMPMoyCKIrCk49l6uCejqbcacCDH+4jew55Zd6kQc bJVdl+T0Tm+UV3H4gtzT7Tsx6WXEBm3PWp4fDQoquU54QsHh3RoYqcEMTOAR9BEV5s3GQj A07+Hnhpx7g8ZqIYt50Vjpx4cMuYCcQ= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=FELhPHZX; spf=none (imf06.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=1678857290; a=rsa-sha256; cv=none; b=jBvLKtsDV7rEGTVZIji/mKM8kAIGet5wFXcnHOr5KnbFv2JonFOJ3N/pkwYB5RVeZgLAIx 8B0IgVRDwhnbhZ0y7nw+MbKJxEzu0fjr226cTZYv1Y99+jy2vFxu88a1EOZ5FRnYrKKP7T Oab3sHo8fSuOLElWTlWtg7SlL9iZnls= 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=G+iFhANmqW/Vof6vYlI0ap5wuntAHSlD5mTdwdGqJu0=; b=FELhPHZXdQjpXdSMzwkzwDgGRC wBV4aTU8csnaXkIwzr3APqV5LVtGPAApqNJJhz/azMa2mNKMU107TJxC7HvO7rAbF3DmKK211WZIm EoMPwfPo4iAqFItcoh1WkaeH/+Wlji4kJcFERPXCHzCEAon3ZU65PP6ThIpzXMJdavDrdehmh6mi5 esKQXdB4pruCrb/OY8rMZjJBHqYOaGFpMTAXHBs676Z6rabU3vCTrQ4yIGVRJL5s4hkeC9Kuls0kE tUfLLB2V0+5ZVlMfy3zc5J/ZejT+36S8T0bVNDyeSdmafjd5bwgCFqDfN24ZeIph8JU+8qRpT6x1K tGXyT5rw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pcJTL-00DYBN-C8; 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, Catalin Marinas , linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 09/36] arm64: Implement the new page table range API Date: Wed, 15 Mar 2023 05:14:17 +0000 Message-Id: <20230315051444.3229621-10-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 X-Stat-Signature: fa8yr913p1dufphsx7ez1cie9hdq16f7 X-Rspam-User: X-Rspamd-Queue-Id: C93D5180017 X-Rspamd-Server: rspam06 X-HE-Tag: 1678857290-337627 X-HE-Meta: U2FsdGVkX1/WwZjjo5EGkNvqn8RgZxH7DqlUKVAjejVDTv+JpEpHtx1CD6fKxoWs4d5oqiH3gNrwiYHAB2Og63sA1S18OWpg1Rc0sIGIx3s0oRW6AOHz5oG7co2Xh+79v+/6PTOxXByArM/C6FqzQUmKtZVpDQsrBe8SweSVWSlXM9r8zVK0bvDpcT3sg/vTk5X0mHfxg2KXNBuGEBTY85tIFOsZ54AwYxwrPKLKCfFm7A9FmYIge1MP1zvrpCfYN3/mHXcHoIqmnK0QxjRWisDf61fpgvPzvs/J22u0NdthsSprRfdxYZQqV4jk8iv8oEook39HUUHIX4kQPFl/Tpr/rSXc5wZ3T1XeOlq0pMZG+sDJNG7WrgJlGyKt82S2Ug3qD2IC7NDU0g6SeT+IUWFtxDQGf8FcWAnDK/0hvdbtTymAQfjYHZ0GSCxP//Xp01/mKoczPB6r5/yxoXRw0ZX87fTVNAHpMvZPn9qyNhnJu8/oDqjvWuGMZ/2lbbmBg5bTmCw/a5SETw/Gj7CzsIaGQgAlKtd5YfPE/zUKscIFyJHs9wb8xqSadP83xlkpEoVfpPba28SkAZSKd5iR/Ot2jgR+emrIUJH6dq23I7wF7mU9cEBAUlDcKT73ncRHBQSoKWvPQc+RSxJ14o/L7spgwm36eo0MfhN/KqhGjAkr4hBaty9ajhobDGw5Ooz0uDx9pAo3OJ+/i7v8ebKPiUe5Q+pb3YIHX6axLjpJDeUR1hPfpFbQg3gCJXYPVerrmvkWEmYeocePhQnvsk9C/iD6Pa2bjfuhqijr8EVe49UJfpmoXSCxpL/sOlLLY66zSC5EWzunUFiDUGBUhiB/a3k0uLwplIoPgxZDAb2KGNHcp9NdfSY++HICn3Y+tLqOxMI+II+kJF7mSzhpY7KgamRkOIXEmAYH7fkkJQobY9iENYGlspovPbSrgfo1d3oS7WdoEtt3PbKVDlpm5+j OQM2PQiz +UGo0iLPOaR3+Mv5HNmTGSVLpYu8FyTXTCU+LiZdmoyFzNhVqgKQ2PlrXzqOAfUhTpXorZiN3EbWxhXYuGKm+5QBOJoDp3INOsIx83w6SUhUg13t09MP75oTNNsKMAOPOubr2yNvE7CEqXWFAD17mMmW10Vsnp7UMxC+wIdxOfRZhCPPqU6NfKgZbIC+0gs9cxZ/sGMGaDrcMfSBGgZLhj3QhrD0EKKmvrwDurOYR+CxQuj6hQQkBLEtiI/CVvU73UCgx 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_dcache_clean flag from being per-page to per-folio. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Catalin Marinas Cc: linux-arm-kernel@lists.infradead.org Acked-by: Mike Rapoport (IBM) --- 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 9428748f4691..6fd012663a01 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_ptes set_ptes /* * 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);