From patchwork Tue Jun 27 03:14:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13293845 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 912F6C0015E for ; Tue, 27 Jun 2023 03:16:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EC8738E000A; Mon, 26 Jun 2023 23:16:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E295B8E0002; Mon, 26 Jun 2023 23:16:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CA53C8E000A; Mon, 26 Jun 2023 23:16:09 -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 B2FBD8E0002 for ; Mon, 26 Jun 2023 23:16:09 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 957391C82C2 for ; Tue, 27 Jun 2023 03:16:09 +0000 (UTC) X-FDA: 80947064058.02.D038B02 Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) by imf13.hostedemail.com (Postfix) with ESMTP id CDFFA20025 for ; Tue, 27 Jun 2023 03:16:07 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=BTT3Mzd5; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.175 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687835767; 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=0VT4pshsioiI3cvxCaccwxS3QnyiZywL9n+n1KwplTM=; b=BhJb1bT9vrcA2cBjCP2Pi/qk/1yD+Fp+bb8mksUwPHdCROkZiuNe/OvAmCq+DHV1E4N9we GU9GlapyzfGJoRZctfTmlfv5JEkQjEKx6PQitxDS2l4rpGC/OT2UHdfwxrFREilrJRxzms Eh7m6gRn0tMlvw7ZIuNbXujx0XekRI8= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=BTT3Mzd5; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.175 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687835767; a=rsa-sha256; cv=none; b=tarCCzdBvadMnk1UWbji35lnWa3gQ8FFj1WPPJJqUjnmitNP5vv77zJsglvRLM3xZN4rkv VjLx0TBsmTyz1ep0ZESlu/vI96PhdZv2EjWeSOGZWFiomI/976n9RbDhWxFxdoTACpaXNi m16coZgneebX3dVdAKLI4641MQ9gjeM= Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-5704ddda6dfso44579217b3.1 for ; Mon, 26 Jun 2023 20:16:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687835767; x=1690427767; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0VT4pshsioiI3cvxCaccwxS3QnyiZywL9n+n1KwplTM=; b=BTT3Mzd5pMJTg1qQFpEMV1yFnXFEE6dhiGZIFIlGfqbhlgUNcX3lP+0Xoq0dD8MFSr RK3vHi5QnyAo7T8lNR0m2sSqGWtPBPRWNiWjHN3rFdDhGGO7T9MFTERmHBgNR4sgVMS+ JUT/NdTfBaBAKs5kycCS3l/TBhEAp+C90btW4rno0I/EAboZKF9q6wEak2gDddjsGCi1 q2GUAru2ftFNSTo28kLQL6bJa4wXILET/IeOTUMnQplkR5BiuM2QbQkizw1eBdbmDbmG 65E54NzNO8/RkUogmqdZk7khZ+p+IpCeUb+CDcGS40pgjK7sLmx4u40SPJ3RJUKs7fxl Kwyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687835767; x=1690427767; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0VT4pshsioiI3cvxCaccwxS3QnyiZywL9n+n1KwplTM=; b=XTicPymmX/kd36HYRw+mTIpSJS4+Zt7/Z6kJknLjPi6PpbVOYlYSR+lvpTS/TRkbFZ ur9giazNRKhO9ZN3mZmv/0uolINEj2n0btQpg3DalVrCYbCRl9+xfsmKCdWSiQ/fbpQz Vy5qQV26BCjzZA6AyAx0kf/4OCMB91E1OtyDsiciNw7+xzO1olCX4up/jDQV+SFMkZso tjH9ppgn9+7NtL23iE00mI+DfK6EA0q1PIPEk3aWnecL9xM3WaVXD8ZhphVQ4MUILi1t IR+cwwK+NTRRoeLBNE7gUayYYeRljsaduD8FIy48+FxCF1XqePABHbyMJX0SM6VymeAD YTwg== X-Gm-Message-State: AC+VfDzNrbMzCt2e9ClWLr7sG1WThTfXI8lc8ygKo65UlKjHraebWJzl r2VAK2lbHfXDutQo7kLCbi4= X-Google-Smtp-Source: ACHHUZ4rZA4ZO6uIUbBCVKZtf01FpSGP007O6nK+owIo75GKh2wlbCSJx7/xiS4iS/AR11yVX11PjQ== X-Received: by 2002:a81:6d53:0:b0:570:6665:4646 with SMTP id i80-20020a816d53000000b0057066654646mr37647298ywc.1.1687835766960; Mon, 26 Jun 2023 20:16:06 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id s4-20020a0dd004000000b0057399b3bd26sm1614798ywd.33.2023.06.26.20.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 20:16:06 -0700 (PDT) From: "Vishal Moola (Oracle)" To: Andrew Morton , Matthew Wilcox Cc: linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, xen-devel@lists.xenproject.org, kvm@vger.kernel.org, Hugh Dickins , "Vishal Moola (Oracle)" , Paul Walmsley , Palmer Dabbelt , Mike Rapoport Subject: [PATCH v6 28/33] riscv: Convert alloc_{pmd, pte}_late() to use ptdescs Date: Mon, 26 Jun 2023 20:14:26 -0700 Message-Id: <20230627031431.29653-29-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230627031431.29653-1-vishal.moola@gmail.com> References: <20230627031431.29653-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: pz8im4m69umd8xtri5bdodycaqs8qyyw X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: CDFFA20025 X-HE-Tag: 1687835767-669700 X-HE-Meta: U2FsdGVkX19y+Cnx9wDwH1JMS+v+NyDP+XV3Fl8WrvdXD8AGnkkPgB/AaZ5Yp8Gk+5qkeU9KygSEZfk0ej+gcl8VnYLwOesbNLNwLTU7akcRN8P/GY+PmoUYNbaM/WBlnGGVazskYzZOCK/1aPR1cxMvQHu+CCL7OXAQbVeM4x4Boe4jkRUIjNkdhmcqLmIo9rjQ9y/4vl4MyqlghXC4px7OYt3PE9vk+iAftN15jpo+AFOa3FULCDB3ryc8PWoIyV+jugYWP1UhCDmjb7C5bRkxQRUl4eIIZP6daDltfOlE5+JIzSSL//NEzv7++bfWHkKYbYV7QrJs3jvmqiumEVzxB0cuatAyCk/JJ9t8ImhduG/ePvhBCSbe127/xV4jL+dSRQ2s3OUWSIfMnc1SRecsx3sjvpnZvLy2c57Z9GAAymCwgHASOWblgIUlwvtxLqpiJmstqChAor/wDI69N1QrQfhU3hY83/gJrCykF7yfCYHPc8TSzLLyhlq9Zze36c3S+aebs2r/znQBKF+Oi3Zx8CnMbvQLu0KVINXE5BWWFV2KY0Gx3BbLPSGNLSF8XhfouMWHTYEfxMlc8V72yhIDWxkduIFa91sLkg/vGEjGV3lObFrYZ2SN5wtiX5UlfeMlzqwtr3dHNkaTH3o+mPCmAu+iXEL8/ZVLnkelJ71VknDk75jx4bhe70uyXiTS7Fqhsx8/bKmQ2J58oRUdQyPTVDCRzSpdb29FOuLA6/gM7ygxd9Y9gJq1Ti4GlKCqqAuSUpENlaW0zEl2zLXHpVTG13d5QbnFnOSGm+5gJdvmRoktAdmeTEPozF0ad8kVMg/2sNO54eEFoiGie1hjFwQZXqv0l1kZ4YIDVm1No9/RJfunUfpYKF9YOBKfAOTK+jZazmd5aF/Wat1gDxpLbQ4z54MdUv8BbB1wzioyYf8msvPfaQGes0qr+JtPUkl1se5+MM0s1g1t2d9MaFx eYMrafZK vXC0jxdr4j/vkXmHjRP5mGEeTWLiztnIX2ABOm9WbtIBpzabQJ2Jaeo9L9nGmIF7BEZRSqSELKxWF8V9pDtS6xO/A5f3+B0lc3ELzGADAiIldmjyqwWXiprY9MA8YiA1PT/uMR/NYXZe7cOJnhmQPFIAnJ4rfNzpCib3zwYYsmjnbONb6k60hl0RU4RQ9nHh531Fdlbn/kfj1eYiBZayxj4yAEssirL7JS8pA7w4BkbdpMWmMiUl/+i12TNKNdhEpwgWVZzgfnXFYekAznGHZTBsIQzZQ2RNqUWnAVWEzkAiOH+qnX4vVTUJ43LcX8OoEbA8SDEoDubBRU6Ew6oDSFVUY3DHo8kZOGtyM8Qu41/YTbc7JMZwzb9yy5lBMWQ6eVPeYrXSuByPXGk2eA0W9mqLKK/nG+8OB2JKFZdrJfAtbWLYTJzD3pg4cozj+5rUoE3p35saWVWPAtiaw5J7NyV9KmKJ78l3iIps2PfK8ovWE4Ufne1Pns/ct39xL8JK7LX7xa7WnARThLZ0JE6rPsn3nZjiQ6F6Y3PgU/Ix/lM4lL9ukkbabsvqoP0N1OmOy9HVdUm1aLMyhZYYoJnjYfdeVdVwXvvfNNKh09K6QmXCmQEdnGpaRs+0k2s6c14F59DFyyv/y0dYA2cO0V9ic8dD7Gi8p7FPTlavfYqR/+wXaSWJFE1jcBSdN2jqFbGIJhuiEjM8LknR3ewVnb+kaKzK2V9LkMD2s2tytA7PqltMz8ZDcTrDtf+ATlhZfXx+bUIUnsNjL4vQos3M= 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: As part of the conversions to replace pgtable constructor/destructors with ptdesc equivalents, convert various page table functions to use ptdescs. Some of the functions use the *get*page*() helper functions. Convert these to use pagetable_alloc() and ptdesc_address() instead to help standardize page tables further. Signed-off-by: Vishal Moola (Oracle) Acked-by: Palmer Dabbelt Acked-by: Mike Rapoport (IBM) --- arch/riscv/include/asm/pgalloc.h | 8 ++++---- arch/riscv/mm/init.c | 16 ++++++---------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/arch/riscv/include/asm/pgalloc.h b/arch/riscv/include/asm/pgalloc.h index 59dc12b5b7e8..d169a4f41a2e 100644 --- a/arch/riscv/include/asm/pgalloc.h +++ b/arch/riscv/include/asm/pgalloc.h @@ -153,10 +153,10 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) #endif /* __PAGETABLE_PMD_FOLDED */ -#define __pte_free_tlb(tlb, pte, buf) \ -do { \ - pgtable_pte_page_dtor(pte); \ - tlb_remove_page((tlb), pte); \ +#define __pte_free_tlb(tlb, pte, buf) \ +do { \ + pagetable_pte_dtor(page_ptdesc(pte)); \ + tlb_remove_page_ptdesc((tlb), page_ptdesc(pte));\ } while (0) #endif /* CONFIG_MMU */ diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 4b95d8999120..efff9c752fcf 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -354,12 +354,10 @@ static inline phys_addr_t __init alloc_pte_fixmap(uintptr_t va) static phys_addr_t __init alloc_pte_late(uintptr_t va) { - unsigned long vaddr; - - vaddr = __get_free_page(GFP_KERNEL); - BUG_ON(!vaddr || !pgtable_pte_page_ctor(virt_to_page((void *)vaddr))); + struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL & ~__GFP_HIGHMEM, 0); - return __pa(vaddr); + BUG_ON(!ptdesc || !pagetable_pte_ctor(ptdesc)); + return __pa((pte_t *)ptdesc_address(ptdesc)); } static void __init create_pte_mapping(pte_t *ptep, @@ -437,12 +435,10 @@ static phys_addr_t __init alloc_pmd_fixmap(uintptr_t va) static phys_addr_t __init alloc_pmd_late(uintptr_t va) { - unsigned long vaddr; - - vaddr = __get_free_page(GFP_KERNEL); - BUG_ON(!vaddr || !pgtable_pmd_page_ctor(virt_to_page((void *)vaddr))); + struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL & ~__GFP_HIGHMEM, 0); - return __pa(vaddr); + BUG_ON(!ptdesc || !pagetable_pmd_ctor(ptdesc)); + return __pa((pmd_t *)ptdesc_address(ptdesc)); } static void __init create_pmd_mapping(pmd_t *pmdp,