From patchwork Wed Aug 2 15:13:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13338365 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 A27C4C04FDF for ; Wed, 2 Aug 2023 15:15:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 379482801AC; Wed, 2 Aug 2023 11:14:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 326E92801AA; Wed, 2 Aug 2023 11:14:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C5242801AC; Wed, 2 Aug 2023 11:14:27 -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 03FD82801AA for ; Wed, 2 Aug 2023 11:14:27 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 64B73B2441 for ; Wed, 2 Aug 2023 15:14:26 +0000 (UTC) X-FDA: 81079510932.30.87B2FB0 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf21.hostedemail.com (Postfix) with ESMTP id 5DC831C0016 for ; Wed, 2 Aug 2023 15:14:24 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=reUF7Dre; spf=none (imf21.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=1690989264; 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:references:dkim-signature; bh=xWweELSXPPkUx6IBTiPlDlvwlk+fCAzYYmIEq3PX+8Y=; b=eRraEcUaP4famxJ+yEJFjsH4qB3U1ZSniRjeGKCtRKxAq1NvXX2bzGDb3OaIC7cul7/3Af 5oNVHfv3N44o0C1Ue/tGMPlyBCSl8qPj/93PMbhmjp/f2K0QToWxNnJ0nbEI6J0aLn9i/v d1hmLHddEz39asCQrbQfbvFtdLOWoVk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690989264; a=rsa-sha256; cv=none; b=KLSCd319LuzzeSCi73DoRmlO2BTYQ9xf9JDvxj3tSyB6jKrr/HC5utYwz+hF4Fx6caIUy5 px8kWiXlftWW8tSQN7LpYBdFdROJL6OcQxgmSrdhilMg28FMst7QkVNqLTOFiN5hvptNP3 uUpH28devXlDA7oF+xhM3H9RcWUVF7w= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=reUF7Dre; spf=none (imf21.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none 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: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=xWweELSXPPkUx6IBTiPlDlvwlk+fCAzYYmIEq3PX+8Y=; b=reUF7DreMHR7Q83ERfYygfiVcz HmGE+bI1Gj+Zho+xBnzul/+bA5bwoL/xrnjHlymnyQqdS8H74MWpVeqzVOY9YcgiIwITI+XE5VIDW inX0j7O30Ouw9IlZjbrv2bCJgxYxloJplDT6CKuj6Md+oHGsBPq4TqK+jH7l6SOt2U4fhVlxKToIG 9C8kRpWP/EkKEvuVizrZV/a4Q9+xYOw4sFtKRRzGVKRmFC4iwroYaU+O47rDm37IxP5Z8sa9ZSG+2 oQ19lXIzohe8IhUJ6cxakwagHnhbjyU7mzz4sDAyZ1pFP6fJWrsDhJP5J0gFp7vscFrGJAj/a5+fK 5jVfWRSQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qRDY7-00Ffia-Um; Wed, 02 Aug 2023 15:14:07 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 00/38] New page table range API Date: Wed, 2 Aug 2023 16:13:28 +0100 Message-Id: <20230802151406.3735276-1-willy@infradead.org> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 X-Rspamd-Queue-Id: 5DC831C0016 X-Rspam-User: X-Stat-Signature: eodtfqgxa3sg4yxeczzmpodobsp3yhtt X-Rspamd-Server: rspam03 X-HE-Tag: 1690989264-39491 X-HE-Meta: U2FsdGVkX19TEHOVZE2c2pyBHgmKWHJ/AzoXXe89yTz4rU0US77iM3wTs9hF119qk21iYgBHj2oHZzGIvOYeeeWTX2m6wmyYqXigp1r06YpnirdloVw3fWaaLiEDMSOMxCPcfs4GOtA+ZbxO37LfxC05pJGhDWT0umklBkkcqsMmsCy2uGTRY7PvB88IL5PfQavtc+mHB8VuoGz2UySWsZ2YSbTnJWTmz85Igxbfb+3CiM99iluTEF08VO99gX/QAeyw8CDOB86AmQP14pzbtmaIYM7+AR4v4unSE/CNE1QasJgG+nesdrflZy5K+RjEFwdvOLZG5F5BLre6wQZ2iDS5s3qrg4FjIN7IoLgqjsv+a1bMSInXf49Hrz/ffLozXWxCG+xrXRH4v/dF4QIGQHWVxZwY4AD80AeRho0PrFfBp/8wRBTbRYQ954j8DWLuDa32s9jmB/PjJvLY5SmwsY71JlcYQb+/M1hEcFV5YF25aV+gLydDeKvH6fHc5FUzkHVvywWbPJD6LpTcr8DFUQ5h+IM2kJRqKPRmHcnXiYbfbgaIet7xuo5oh8PThIxpr9yuKpeFmSzj5Z6GctMQz8ycKAy+nZiYUxF8WOEVluE5lfOeDB1PHGyFwjVH3AUKEQkK5mF7cAN5GDL5c6ZBW9bFT7PSaeMe4DH43cMZK0GaM8nhH60v5UCvWQN6Zoenwf3yLsIJZ5RXmsxBBijNLUskMOZPXfHPagXBbcXUCV4YRaiKUmiynsrAGDXZzQVstNMUmpkYvYcjNLkkCA5w4daHYkVIvEGrBsb1UDUlwdzKR6fvkK7PVnLL76g3YWVAYtpBXQgru2lcS6irDAqGdgXWH74DeCfM9HnevHbRnxtNVL7LgpONgvvKw+m/LAUSbJ9JQJ3YFzKtpMteSiq9gbJoINY6IRc9zoozvbmgErXf0IuFirJyycfV690ZPBeOfdSHuH1P/ZMnyFELlci lyVKpJyV tq1PD5gMzkc2IEnnhdBHytS8/IFvunYZ/zaMdySS5TtNTdI8uah3+PxFGRhaZ5A7a16HocMUEDYNs1mswgEJK+VTiDUlHpWyW6ignXVwf/NXl/zTLqZqJW2EbQhyKl6MwDsWs/Xu7FOKhgBY8o0fZzq0sMwbR1wWbXPgRrNHcs/+Wyg86oFDOmE3liCJlqNVqDaHuQ7dhshRvWqDV9w8I64ezNP3nULmbvE8H6C9QQJt/vig= 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: For some reason, I didn't get an email when v5 was dropped from linux-next (I got an email from Andrew saying he was going to, but when I didn't get the automated emails, I assumed he'd changed his mind). So here's v6, far later than I would have resent it. This patchset changes the API used by the MM to set up page table entries. The four APIs are: set_ptes(mm, addr, ptep, pte, nr) update_mmu_cache_range(vma, addr, ptep, nr) flush_dcache_folio(folio) flush_icache_pages(vma, page, nr) flush_dcache_folio() isn't technically new, but no architecture implemented it, so I've done that for them. The old APIs remain around but are mostly implemented by calling the new interfaces. The new APIs are based around setting up N page table entries at once. The N entries belong to the same PMD, the same folio and the same VMA, so ptep++ is a legitimate operation, and locking is taken care of for you. Some architectures can do a better job of it than just a loop, but I have hesitated to make too deep a change to architectures I don't understand well. One thing I have changed in every architecture is that PG_arch_1 is now a per-folio bit instead of a per-page bit when used for dcache clean/dirty tracking. This was something that would have to happen eventually, and it makes sense to do it now rather than iterate over every page involved in a cache flush and figure out if it needs to happen. The point of all this is better performance, and Fengwei Yin has measured improvement on x86. I suspect you'll see improvement on your architecture too. Try the new will-it-scale test mentioned here: https://lore.kernel.org/linux-mm/20230206140639.538867-5-fengwei.yin@intel.com/ You'll need to run it on an XFS filesystem and have CONFIG_TRANSPARENT_HUGEPAGE set. This patchset is the basis for much of the anonymous large folio work being done by Ryan, so it's received quite a lot of testing over the last few months. v6: - Fix other definitions of in_range(); either renaming them to not conflict or removing them and using the new common definition. - Use arch_enter_lazy_mmu_mode() and arch_leave_lazy_mmu_mode() - Fix a compiler warning in the riscv implementation - Update to next-20230731 v5: - Add in_range() macro - Fix numerous compilation problems on minority architectures (thanks LKP!) - Add the 'vmf' argument to update_mmu_cache_range() to help MIPS and other architectures that insert TLB entries in software, rather than using a hardware page table walker - Get rid of first_map_page() and next_map_page(); use next_uptodate_folio() directly - Actually move the mmap_miss accounting in filemap.c - Add kernel-doc for set_pte_range() - Correct determination of prefaulting in set_pte_range() - More Acked & Reviewed tags v4: - Fix a few compile errors (mostly Mike Rapoport) - Incorporate Mike's suggestion to avoid having to define set_ptes() or set_pte_at() on the majority of architectures - Optimise m68k's __flush_pages_to_ram (Geert Uytterhoeven) - Fix sun3 (me) - Fix sparc32 (me) - Pick up a few more Ack/Reviewed tags v3: - Reinstate flush_dcache_icache_phys() on PowerPC - Fix folio_flush_mapping(). The documentation was correct and the implementation was completely wrong - Change the flush_dcache_page() documentation to describe flush_dcache_folio() instead - Split ARM from ARC. I messed up my git commands - Remove page_mapping_file() - Rationalise how flush_icache_pages() and flush_icache_page() are defined - Use flush_icache_pages() in do_set_pmd() - Pick up Guo Ren's Ack for csky Matthew Wilcox (Oracle) (34): minmax: Add in_range() macro mm: Convert page_table_check_pte_set() to page_table_check_ptes_set() mm: Add generic flush_icache_pages() and documentation mm: Add folio_flush_mapping() mm: Remove ARCH_IMPLEMENTS_FLUSH_DCACHE_FOLIO mm: Add default definition of set_ptes() alpha: Implement the new page table range API arc: Implement the new page table range API arm: Implement the new page table range API arm64: Implement the new page table range API csky: Implement the new page table range API hexagon: Implement the new page table range API ia64: Implement the new page table range API loongarch: Implement the new page table range API m68k: Implement the new page table range API microblaze: Implement the new page table range API mips: Implement the new page table range API nios2: Implement the new page table range API openrisc: Implement the new page table range API parisc: Implement the new page table range API powerpc: Implement the new page table range API riscv: Implement the new page table range API s390: Implement the new page table range API sh: Implement the new page table range API sparc32: Implement the new page table range API sparc64: Implement the new page table range API um: Implement the new page table range API x86: Implement the new page table range API xtensa: Implement the new page table range API mm: Remove page_mapping_file() mm: Rationalise flush_icache_pages() and flush_icache_page() mm: Tidy up set_ptes definition mm: Use flush_icache_pages() in do_set_pmd() mm: Call update_mmu_cache_range() in more page fault handling paths Yin Fengwei (4): filemap: Add filemap_map_folio_range() rmap: add folio_add_file_rmap_range() mm: Convert do_set_pte() to set_pte_range() filemap: Batch PTE mappings Documentation/core-api/cachetlb.rst | 55 ++++---- Documentation/filesystems/locking.rst | 2 +- arch/alpha/include/asm/cacheflush.h | 13 +- arch/alpha/include/asm/pgtable.h | 10 +- arch/arc/include/asm/cacheflush.h | 14 +- arch/arc/include/asm/pgtable-bits-arcv2.h | 12 +- arch/arc/include/asm/pgtable-levels.h | 1 + arch/arc/mm/cache.c | 61 +++++---- arch/arc/mm/tlb.c | 18 ++- arch/arm/include/asm/cacheflush.h | 29 ++--- arch/arm/include/asm/pgtable.h | 5 +- arch/arm/include/asm/tlbflush.h | 14 +- arch/arm/mm/copypage-v4mc.c | 5 +- arch/arm/mm/copypage-v6.c | 5 +- arch/arm/mm/copypage-xscale.c | 5 +- arch/arm/mm/dma-mapping.c | 24 ++-- arch/arm/mm/fault-armv.c | 16 +-- arch/arm/mm/flush.c | 99 ++++++++------ arch/arm/mm/mm.h | 2 +- arch/arm/mm/mmu.c | 14 +- arch/arm/mm/nommu.c | 6 + arch/arm/mm/pageattr.c | 6 +- arch/arm64/include/asm/cacheflush.h | 4 +- arch/arm64/include/asm/pgtable.h | 26 +++- arch/arm64/mm/flush.c | 36 ++--- arch/csky/abiv1/cacheflush.c | 32 +++-- arch/csky/abiv1/inc/abi/cacheflush.h | 3 +- arch/csky/abiv2/cacheflush.c | 32 ++--- arch/csky/abiv2/inc/abi/cacheflush.h | 11 +- arch/csky/include/asm/pgtable.h | 8 +- arch/hexagon/include/asm/cacheflush.h | 10 +- arch/hexagon/include/asm/pgtable.h | 9 +- 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 ++-- arch/loongarch/include/asm/cacheflush.h | 1 - arch/loongarch/include/asm/pgtable-bits.h | 4 +- arch/loongarch/include/asm/pgtable.h | 33 ++--- arch/loongarch/mm/pgtable.c | 2 +- arch/loongarch/mm/tlb.c | 2 +- arch/m68k/include/asm/cacheflush_mm.h | 26 ++-- arch/m68k/include/asm/mcf_pgtable.h | 1 + arch/m68k/include/asm/motorola_pgtable.h | 1 + arch/m68k/include/asm/pgtable_mm.h | 10 +- arch/m68k/include/asm/sun3_pgtable.h | 1 + arch/m68k/mm/motorola.c | 2 +- arch/microblaze/include/asm/cacheflush.h | 8 ++ arch/microblaze/include/asm/pgtable.h | 15 +-- arch/microblaze/include/asm/tlbflush.h | 4 +- arch/mips/bcm47xx/prom.c | 2 +- arch/mips/include/asm/cacheflush.h | 32 +++-- arch/mips/include/asm/pgtable-32.h | 10 +- arch/mips/include/asm/pgtable-64.h | 6 +- arch/mips/include/asm/pgtable-bits.h | 6 +- arch/mips/include/asm/pgtable.h | 63 +++++---- arch/mips/mm/c-r4k.c | 5 +- arch/mips/mm/cache.c | 56 ++++---- arch/mips/mm/init.c | 21 +-- arch/mips/mm/pgtable-32.c | 2 +- arch/mips/mm/pgtable-64.c | 2 +- arch/mips/mm/tlbex.c | 2 +- arch/nios2/include/asm/cacheflush.h | 6 +- arch/nios2/include/asm/pgtable.h | 28 ++-- arch/nios2/mm/cacheflush.c | 79 ++++++----- arch/openrisc/include/asm/cacheflush.h | 8 +- arch/openrisc/include/asm/pgtable.h | 15 ++- arch/openrisc/mm/cache.c | 12 +- arch/parisc/include/asm/cacheflush.h | 14 +- arch/parisc/include/asm/pgtable.h | 37 ++++-- arch/parisc/kernel/cache.c | 107 ++++++++++----- arch/powerpc/include/asm/book3s/32/pgtable.h | 5 - arch/powerpc/include/asm/book3s/64/pgtable.h | 6 +- arch/powerpc/include/asm/book3s/pgtable.h | 11 +- arch/powerpc/include/asm/cacheflush.h | 14 +- arch/powerpc/include/asm/kvm_ppc.h | 10 +- arch/powerpc/include/asm/nohash/pgtable.h | 16 +-- arch/powerpc/include/asm/pgtable.h | 12 ++ arch/powerpc/mm/book3s64/hash_utils.c | 11 +- arch/powerpc/mm/cacheflush.c | 40 ++---- arch/powerpc/mm/nohash/e500_hugetlbpage.c | 3 +- arch/powerpc/mm/pgtable.c | 53 ++++---- arch/riscv/include/asm/cacheflush.h | 19 ++- arch/riscv/include/asm/pgtable.h | 37 ++++-- arch/riscv/mm/cacheflush.c | 13 +- arch/s390/include/asm/pgtable.h | 33 +++-- arch/sh/include/asm/cacheflush.h | 21 ++- arch/sh/include/asm/pgtable.h | 7 +- arch/sh/include/asm/pgtable_32.h | 5 +- arch/sh/mm/cache-j2.c | 4 +- arch/sh/mm/cache-sh4.c | 26 ++-- arch/sh/mm/cache-sh7705.c | 26 ++-- arch/sh/mm/cache.c | 52 ++++---- arch/sh/mm/kmap.c | 3 +- arch/sparc/include/asm/cacheflush_32.h | 10 +- arch/sparc/include/asm/cacheflush_64.h | 19 +-- arch/sparc/include/asm/pgtable_32.h | 8 +- arch/sparc/include/asm/pgtable_64.h | 29 ++++- arch/sparc/kernel/smp_64.c | 56 +++++--- arch/sparc/mm/init_32.c | 13 +- arch/sparc/mm/init_64.c | 78 ++++++----- arch/sparc/mm/tlb.c | 5 +- arch/um/include/asm/pgtable.h | 7 +- arch/x86/include/asm/pgtable.h | 14 +- arch/xtensa/include/asm/cacheflush.h | 11 +- arch/xtensa/include/asm/pgtable.h | 18 ++- arch/xtensa/mm/cache.c | 83 +++++++----- .../drm/arm/display/include/malidp_utils.h | 2 +- .../display/komeda/komeda_pipeline_state.c | 24 ++-- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 - .../net/ethernet/chelsio/cxgb3/cxgb3_main.c | 18 +-- drivers/virt/acrn/ioreq.c | 4 +- fs/btrfs/misc.h | 2 - fs/ext2/balloc.c | 2 - fs/ext4/ext4.h | 2 - fs/ufs/util.h | 6 - include/asm-generic/cacheflush.h | 7 - include/linux/cacheflush.h | 13 +- include/linux/minmax.h | 27 ++++ include/linux/mm.h | 3 +- include/linux/page_table_check.h | 13 +- include/linux/pagemap.h | 28 ++-- include/linux/pgtable.h | 75 ++++++++--- include/linux/rmap.h | 2 + lib/logic_pio.c | 3 - mm/filemap.c | 123 ++++++++++-------- mm/memory.c | 56 ++++---- mm/page_table_check.c | 16 ++- mm/rmap.c | 60 +++++++-- mm/util.c | 2 +- net/netfilter/nf_nat_core.c | 6 +- net/tipc/core.h | 2 +- net/tipc/link.c | 10 +- .../selftests/bpf/progs/get_branch_snapshot.c | 4 +- 134 files changed, 1520 insertions(+), 1056 deletions(-)