From patchwork Mon Jun 10 05:54:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13691502 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 64CDEC27C5E for ; Mon, 10 Jun 2024 05:55:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B2BD96B0095; Mon, 10 Jun 2024 01:55:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AB3706B0096; Mon, 10 Jun 2024 01:55:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 92D3B6B009A; Mon, 10 Jun 2024 01:55:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 713BB6B0095 for ; Mon, 10 Jun 2024 01:55:03 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id BD4911C103C for ; Mon, 10 Jun 2024 05:55:02 +0000 (UTC) X-FDA: 82213915644.19.100C9BD Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by imf06.hostedemail.com (Postfix) with ESMTP id A7B16180004 for ; Mon, 10 Jun 2024 05:54:59 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; spf=pass (imf06.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717998900; 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; bh=KbMG5m6QO/UsgXgxxCE5Rr6yIXtpJkaFc6c9ROWiNDs=; b=ffNIaE4Tgzu2e+Igwxi+YRBaBFCqbAHng/D7RwIdLSffHJpPxSelP9pgMOSsuqcpIHWdda OvTEVQSL0KwUJksmAI5rxWZqld8ZUg1C7CRU2mZicTRMcjMNRQ4Q5LZ/gjAbJRSlHJDcWw M0E6GtclGdZ2gjrEbJfF7W6BHFV2aEw= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; spf=pass (imf06.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717998900; a=rsa-sha256; cv=none; b=j1Eji3dcm/zdIjCxlglCZjod4ZHSGDaxGc1a+mtWdz3hAeZk4Jhu4rqLGcWcFUs1zHpQ4w QcbetFF5XrGWBqpVZeqf0X+jJEy3tcOhL/OfvTg4gKP9zmWtceymuxo0QlMdrYumBPYOL5 Qe4AMV8o0jGiCQXetjKa6rUDQl4bG5E= Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4VyLcK5Gsdz9v1D; Mon, 10 Jun 2024 07:54:57 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FYMXgu7d8dF0; Mon, 10 Jun 2024 07:54:57 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4VyLcK44HPz9tZT; Mon, 10 Jun 2024 07:54:57 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 867EE8B76E; Mon, 10 Jun 2024 07:54:57 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id rbyhWFOboFmH; Mon, 10 Jun 2024 07:54:57 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [172.25.230.108]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 5FC318B764; Mon, 10 Jun 2024 07:54:57 +0200 (CEST) From: Christophe Leroy To: Andrew Morton , Jason Gunthorpe , Peter Xu , Oscar Salvador , Michael Ellerman , Nicholas Piggin Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v5 00/18] Reimplement huge pages without hugepd on powerpc (8xx, e500, book3s/64) Date: Mon, 10 Jun 2024 07:54:45 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1717998886; l=7543; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=dLmFKlcM0a9m5552lr2q9pQDmaYbgJnuGhonUF0OdMs=; b=KxrG8Htx1isGYeULUf3l1iphrVXSF2JTaIrk8/eg7v1rYuTZB1O2J9uGGBXCgCbO1kvO8WEPj fDaEAGvWnvSAGLvqZr8JKs2gRMzRktuIDaTt2j2EZnzfWxB9oNlGSUD X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: A7B16180004 X-Stat-Signature: yiqa7x3ztua3j5q8estijied8tg343or X-HE-Tag: 1717998899-470402 X-HE-Meta: U2FsdGVkX180XyICX6YwDNgqqnxDBULYiS479fJ70xpq7fr3su9X1EMr9T85AFWJuNeM0bIFihsXaCNKn5R34EABGK8J3mbAV44+vgYCKZYQwGbq/FPUKR3fUa8AzG+ajjcoxPJ7GN1x19/3XnODJ+KZoYNofJh9eP08imZ5y01Sx8vLMUThgbDYszC2GC+OI5fe6lxqnzCC+peKDZe/YiePXu59+z3JZwHvYQPNrrpFCW78PIyPjcHiLINWQcNEA5jNUB1He6gVPeqCzkLsStNP1WHZADCjZbJ5JYydaoK3JWAMjLRGePOM5CJYk5qTgujjwtZXUGg56BBsqkYnSQ/yR5EZ/OKBm3KRtqcTpC2BafBkEs1qi24YhUVIHiHMrst90FWDyOHEfnuAfJLIKVg1FgkWDB37f56nmaVcDi0YnKH6v9+SlGuGq+ea1uoME5d/uXOQ0iJcgJ26HSdQMz6zfdwc22ANPKmQuMHTkObddcfKqoSGT9LQsa78i7QYm1XMQyfXo+H2P9tMoQVuC99RbgJ6pnk0S0vlCYHFpR8eXNVtRvRAs6BQxrmhlI8EGYJEJmTpCWAbisrrQfLGqcFD2KfLdQ0bOCpI74kBeAKKVeoKhBuLFG2ouXp6zAMSe/JxRzKExyk1PCFodXcs7gAyNtW8xEI31Hb6NjFtb0rBSTZtXwaCk+C5PQcuKkNpJsVAe1ugEEL6MjBtsiJKDVDYK+Vj4oSAjdc+z/qA1NzW65+mcYgDE5EC0xM6A6slEv/akcFB1/Q0Vn1Khdi69tchlehO2UCmYH1zpqlERXVRs/fdRsOSrNcTSkFxDyVZDGrVbpMsegJ4VpSvv2cxu7aLbY2DliTldH4nfguCPkA3U/XA/Xit3qpW/VIZeJuE3lUHURbtPcmZxKSuXf+AiAVa9FMZsAO15M7XIT9m0BpF6WpUPvnDCu6NWWE5K0VXTSm7lF6c+QSTOhNAF9P c94pHojX mB96ToSFAsnYoVEMC1ulk1YCtlATUgAdQxj1j16iUH/kqZYXcVXqlnEziWUsXdLhikyyrn+ICX5ahx/v4UO6B46HRtw== 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: List-Subscribe: List-Unsubscribe: This series has reached maturity to not send it as an RFC anymore. Only the book3s/64 part maybe needs more attention. Alternatively we could simply disable HUGE pages on book3s/64 in hash-4k mode if we want to be on the safe side. Also see https://github.com/linuxppc/issues/issues/483 Unlike most architectures, powerpc 8xx HW requires a two-level pagetable topology for all page sizes. So a leaf PMD-contig approach is not feasible as such. Possible sizes on 8xx are 4k, 16k, 512k and 8M. First level (PGD/PMD) covers 4M per entry. For 8M pages, two PMD entries must point to a single entry level-2 page table. Until now that was done using hugepd. This series changes it to use standard page tables where the entry is replicated 1024 times on each of the two pagetables refered by the two associated PMD entries for that 8M page. For e500 and book3s/64 there are less constraints because it is not tied to the HW assisted tablewalk like on 8xx, so it is easier to use leaf PMDs (and PUDs). On e500 the supported page sizes are 4M, 16M, 64M, 256M and 1G. All at PMD level on e500/32 (mpc85xx) and mix of PMD and PUD for e500/64. We encode page size with 4 available bits in PTE entries. On e300/32 PGD entries size is increases to 64 bits in order to allow leaf-PMD entries because PTE are 64 bits on e500. On book3s/64 only the hash-4k mode is concerned. It supports 16M pages as cont-PMD and 16G pages as cont-PUD. In other modes (radix-4k, radix-6k and hash-64k) the sizes match with PMD and PUD sizes so that's just leaf entries. The hash processing make things a bit more complex. To ease things, __hash_page_huge() is modified to bail out when DIRTY or ACCESSED bits are missing, leaving it to mm core to fix it. Global changes in v5: - Now use PAGE SIZE field in e500's PTE to store TSIZE instead of using U0-U3 - On e500/64, use highest bit to discriminate leaf entries because PUD entries are not garantied to be 4k aligned so PAGE SIZE field is not garantied to be 0 on a non-leaf entry. Global changes in v4: - Fixed a few issues reported privately by robots - Rebased on top of v6.10-rc1 Global changes in v3: - Removed patches 1 and 2 - Squashed patch 11 into patch 5 - Replaced patches 12 and 13 with a series from Michael - Reordered patches a bit to have more general patches up front For more details on changes, see in each patch. Christophe Leroy (17): mm: Define __pte_leaf_size() to also take a PMD entry mm: Provide mm_struct and address to huge_ptep_get() powerpc/mm: Remove _PAGE_PSIZE powerpc/mm: Fix __find_linux_pte() on 32 bits with PMD leaf entries powerpc/mm: Allow hugepages without hugepd powerpc/8xx: Fix size given to set_huge_pte_at() powerpc/8xx: Rework support for 8M pages using contiguous PTE entries powerpc/8xx: Simplify struct mmu_psize_def powerpc/e500: Remove enc and ind fields from struct mmu_psize_def powerpc/e500: Switch to 64 bits PGD on 85xx (32 bits) powerpc/e500: Encode hugepage size in PTE bits powerpc/e500: Don't pre-check write access on data TLB error powerpc/e500: Free r10 for FIND_PTE powerpc/e500: Use contiguous PMD instead of hugepd powerpc/64s: Use contiguous PMD/PUD instead of HUGEPD powerpc/mm: Remove hugepd leftovers mm: Remove CONFIG_ARCH_HAS_HUGEPD Michael Ellerman (1): powerpc/64e: Remove unused IBM HTW code [SQUASHED] arch/arm/include/asm/hugetlb-3level.h | 4 +- arch/arm64/include/asm/hugetlb.h | 2 +- arch/arm64/mm/hugetlbpage.c | 2 +- arch/powerpc/Kconfig | 1 - arch/powerpc/include/asm/book3s/32/pgalloc.h | 2 - arch/powerpc/include/asm/book3s/64/hash-4k.h | 15 - arch/powerpc/include/asm/book3s/64/hash.h | 38 +- arch/powerpc/include/asm/book3s/64/hugetlb.h | 38 -- .../include/asm/book3s/64/pgtable-4k.h | 47 -- .../include/asm/book3s/64/pgtable-64k.h | 20 - arch/powerpc/include/asm/book3s/64/pgtable.h | 22 +- arch/powerpc/include/asm/hugetlb.h | 15 +- .../include/asm/nohash/32/hugetlb-8xx.h | 38 +- arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 9 +- arch/powerpc/include/asm/nohash/32/pte-40x.h | 3 - arch/powerpc/include/asm/nohash/32/pte-44x.h | 3 - arch/powerpc/include/asm/nohash/32/pte-85xx.h | 3 - arch/powerpc/include/asm/nohash/32/pte-8xx.h | 58 ++- .../powerpc/include/asm/nohash/hugetlb-e500.h | 39 +- arch/powerpc/include/asm/nohash/mmu-e500.h | 6 +- arch/powerpc/include/asm/nohash/pgalloc.h | 2 - arch/powerpc/include/asm/nohash/pgtable.h | 46 +- arch/powerpc/include/asm/nohash/pte-e500.h | 63 ++- arch/powerpc/include/asm/page.h | 32 -- arch/powerpc/include/asm/pgtable-be-types.h | 10 - arch/powerpc/include/asm/pgtable-types.h | 13 +- arch/powerpc/include/asm/pgtable.h | 3 + arch/powerpc/kernel/exceptions-64e.S | 4 +- arch/powerpc/kernel/head_85xx.S | 70 +-- arch/powerpc/kernel/head_8xx.S | 10 +- arch/powerpc/kernel/setup_64.c | 6 +- arch/powerpc/mm/book3s64/hash_utils.c | 11 +- arch/powerpc/mm/book3s64/hugetlbpage.c | 10 + arch/powerpc/mm/book3s64/pgtable.c | 12 - arch/powerpc/mm/hugetlbpage.c | 455 +----------------- arch/powerpc/mm/init-common.c | 8 +- arch/powerpc/mm/kasan/8xx.c | 21 +- arch/powerpc/mm/nohash/8xx.c | 43 +- arch/powerpc/mm/nohash/Makefile | 2 +- arch/powerpc/mm/nohash/book3e_pgtable.c | 4 +- arch/powerpc/mm/nohash/tlb.c | 407 +--------------- arch/powerpc/mm/nohash/tlb_64e.c | 314 ++++++++++++ arch/powerpc/mm/nohash/tlb_low_64e.S | 428 +--------------- arch/powerpc/mm/pgtable.c | 94 ++-- arch/powerpc/mm/pgtable_32.c | 2 +- arch/riscv/include/asm/hugetlb.h | 2 +- arch/riscv/mm/hugetlbpage.c | 2 +- arch/s390/include/asm/hugetlb.h | 4 +- arch/s390/mm/hugetlbpage.c | 4 +- fs/hugetlbfs/inode.c | 2 +- fs/proc/task_mmu.c | 10 +- fs/userfaultfd.c | 2 +- include/asm-generic/hugetlb.h | 2 +- include/linux/hugetlb.h | 6 - include/linux/pgtable.h | 3 + include/linux/swapops.h | 4 +- kernel/events/core.c | 2 +- mm/Kconfig | 10 - mm/damon/vaddr.c | 6 +- mm/gup.c | 183 +------ mm/hmm.c | 2 +- mm/hugetlb.c | 44 +- mm/memory-failure.c | 2 +- mm/mempolicy.c | 2 +- mm/migrate.c | 4 +- mm/mincore.c | 2 +- mm/pagewalk.c | 57 +-- mm/userfaultfd.c | 2 +- 68 files changed, 749 insertions(+), 2043 deletions(-) delete mode 100644 arch/powerpc/include/asm/book3s/64/pgtable-4k.h create mode 100644 arch/powerpc/mm/nohash/tlb_64e.c