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 A2B8BC001B1 for ; Mon, 3 Jul 2023 13:53:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F155A280003; Mon, 3 Jul 2023 09:53:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E9E10280001; Mon, 3 Jul 2023 09:53:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF028280003; Mon, 3 Jul 2023 09:53:55 -0400 (EDT) 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 B13CF280001 for ; Mon, 3 Jul 2023 09:53:55 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 882311C8987 for ; Mon, 3 Jul 2023 13:53:55 +0000 (UTC) X-FDA: 80970444030.05.C99B865 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf12.hostedemail.com (Postfix) with ESMTP id BA3B64000B for ; Mon, 3 Jul 2023 13:53:53 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=none; spf=pass (imf12.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1688392433; 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; bh=0Xs0/r8JxC0IODzuzWxhN6nl3kLwEjLKvoCF58989ko=; b=Y+qtV42ke3CNIvOUjQkyKSkjCl80PvuAXL0DqSTd8ySX8glq3y1sgKDSi3gICCQzaFjJ+5 XaWUZMquNLJZRR1ud63x9AbwrXICwhQ6CHw3Ga/y9hKvbqO7Qe48Gi9k2RmkCIlSNiLDmK PFsm1CGx7FplKJz2GEzt/JI0N444s34= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688392433; a=rsa-sha256; cv=none; b=0J37pGjpEpD3c78dJfrqu0OvLSixRF811V+dJ/6x9fUgLbtkS1MvopKZ1VvkThJ4SoB6oT hjpQ3AYg8I+3ZU9HhBflXvAI6JYqj8QPtu3X24xQ59kDufcJt3clYfCZ+IJExeHFYKUSGR an/xe3uUhmSj4q+obyfd6MPACQnLF18= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=none; spf=pass (imf12.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6FD552F4; Mon, 3 Jul 2023 06:54:35 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EBD643F73F; Mon, 3 Jul 2023 06:53:50 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Matthew Wilcox , "Kirill A. Shutemov" , Yin Fengwei , David Hildenbrand , Yu Zhao , Catalin Marinas , Will Deacon , Anshuman Khandual , Yang Shi Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 5/5] arm64: mm: Override arch_wants_pte_order() Date: Mon, 3 Jul 2023 14:53:30 +0100 Message-Id: <20230703135330.1865927-6-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230703135330.1865927-1-ryan.roberts@arm.com> References: <20230703135330.1865927-1-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: dfnuxq4yr9u5tx4dk34woca9sjsrxz4j X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: BA3B64000B X-Rspam-User: X-HE-Tag: 1688392433-997186 X-HE-Meta: U2FsdGVkX19IMcged2qWwfax5vaTnZ/lBcWGqvhJmjJQ4y8G+D5oMM59wfGhrGf1TEjZfThvqzfPeglrrLZJw5wcy3tpqQeuEaqo4Spmy/LkbVTKQlKQWp7HewJRsSfSxVqdaR3I0k5N3y3ilabr157OmOBUXKn+bela+Vt0E78H97RQDZmWJNuj/hHsc7Y34HyBizMGpnGT30XnC9mn+c+md3bNZjDGlrtamRBaqXEoOclF4J8YZ22YoR5taYGjcg/CwEjhCQUp62aewyFntN1HZg4qW1uGN8V8LpkjgPogO6nA3F5bWqskKK+EwcU8FCwJVdoLUQhy61fkJBYo1VP2ztvoHqJKtJB8IhQjjjIXOCu0i6Qz+ABhBXNhdtPbpMdClLtERV3E/EXwz8VbHYkl2lYhCshOjV9vAKyyBrpBmUpB12tCapIEwXrFAPgWD1HmM+UXbf+L8GTI2aMVlb1C9OO/h0koWv3FJ/E9W5IYhVPma2fSifJjkA1YL9U9EDXrO0oPGSlwZ2Pz2yMc6xAHOcM0Pv0zdihywdvkWaUB09ejobr6+D0Tdohmspvutbs21FkV+GdtrkA9GNQOjCPPj1faDaG3/mro4hl9fBo1htAQ1Cp9iwswDc6W0ORQRgBWntRpbOXtzPPNGKnEVJro02yA34+xBz//mipbyUf3k/fQP9+kVelDIpodXM9hVmhu9G7OmPgPrJ6njQU2ba0eqqWM9HdZn4e5XVrq0HD9puNqesFgzpFU2bvza348manEJoVFQrmZURlge0Bt7hXQ48EVhxWDmnYQve5PioZWcDKE7QHE94clphwSgJ0mo9DKqasGOmCP8gKIIAmq9DmPTjxrnsUJRqhEiQ14xlzMSXTfosbeQxzrNOzUU7ENjQVqKpaDOiFEzMWO0Po8q2jnovkD84obB36XEOfzg9O+YRqCHvsPJSDsfyh/a3KMyeOJWIC1TH9+xggRjN1 1X8yAaY7 tpOg8WrJmTcPKlfDLDSM77+O7N1w5g7k/5IesFgstK2JY0n7DjFupPsNloihP3G3iUArG68qFYYzyYATEfGuRarijJIZFCRoEn5geQy28VUCu0uBj8l8soXhKM6ApyYZ648R3YwqMpIngTWGte5gTjKLD/ljleoHR6iQPMouoOOzw7sXzoPkG3QgNqIPYtC5xK12sayZEZT3NUck= 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: Define an arch-specific override of arch_wants_pte_order() so that when FLEXIBLE_THP is enabled, large folios will be allocated for anonymous memory with an order that is compatible with arm64's contpte mappings. arch_wants_pte_order() returns an order according to the following policy: For the unhinted case, when THP is not requested for the vma, don't allow anything bigger than 64K. This means we don't waste too much memory. Additionally, for 4K pages this is the contpte size, and for 16K, this is (usually) the HPA size when the uarch feature is implemented. For the hinted case, when THP is requested for the vma, allow the contpte size for all page size configurations; 64K for 4K, 2M for 16K and 2M for 64K. Additionally, the THP and NOTHP order constants are defined using Kconfig so it is possible to override them at build time. Signed-off-by: Ryan Roberts --- arch/arm64/Kconfig | 12 ++++++++++++ arch/arm64/include/asm/pgtable.h | 4 ++++ arch/arm64/mm/mmu.c | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 343e1e1cae10..689c5bf13dc1 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -281,6 +281,18 @@ config ARM64_CONT_PMD_SHIFT default 5 if ARM64_16K_PAGES default 4 +config ARM64_PTE_ORDER_NOTHP + int + default 0 if ARM64_64K_PAGES # 64K (1 page) + default 2 if ARM64_16K_PAGES # 64K (4 pages; benefits from HPA where HW supports it) + default 4 if ARM64_4K_PAGES # 64K (16 pages; eligible for contpte-mapping) + +config ARM64_PTE_ORDER_THP + int + default 5 if ARM64_64K_PAGES # 2M (32 pages; eligible for contpte-mapping) + default 7 if ARM64_16K_PAGES # 2M (128 pages; eligible for contpte-mapping) + default 4 if ARM64_4K_PAGES # 64K (16 pages; eligible for contpte-mapping) + config ARCH_MMAP_RND_BITS_MIN default 14 if ARM64_64K_PAGES default 16 if ARM64_16K_PAGES diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 6fd012663a01..8463d5f9f307 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -1117,6 +1117,10 @@ extern pte_t ptep_modify_prot_start(struct vm_area_struct *vma, extern void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t old_pte, pte_t new_pte); + +#define arch_wants_pte_order arch_wants_pte_order +extern int arch_wants_pte_order(struct vm_area_struct *vma); + #endif /* !__ASSEMBLY__ */ #endif /* __ASM_PGTABLE_H */ diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index af6bc8403ee4..8556c4a9b507 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -1481,3 +1481,11 @@ void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr, pte { set_pte_at(vma->vm_mm, addr, ptep, pte); } + +int arch_wants_pte_order(struct vm_area_struct *vma) +{ + if (hugepage_vma_check(vma, vma->vm_flags, false, true, true)) + return CONFIG_ARM64_PTE_ORDER_THP; + else + return CONFIG_ARM64_PTE_ORDER_NOTHP; +} -- 2.25.1