From patchwork Thu Jun 22 20:57:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13289616 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 B2CFCEB64DC for ; Thu, 22 Jun 2023 20:58:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4B2058D0015; Thu, 22 Jun 2023 16:58:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 43B608D0001; Thu, 22 Jun 2023 16:58:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 28CEA8D0015; Thu, 22 Jun 2023 16:58:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 1B34B8D0001 for ; Thu, 22 Jun 2023 16:58:38 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D75AF1A04EA for ; Thu, 22 Jun 2023 20:58:37 +0000 (UTC) X-FDA: 80931597474.13.4034DF4 Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by imf23.hostedemail.com (Postfix) with ESMTP id 12CC8140018 for ; Thu, 22 Jun 2023 20:58:35 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=aYnvKxdc; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.222.174 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=1687467516; 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=jHkn+4hWn6cNWfQmftBQOtWQYQb9iJJIYcRZZNmu6iY=; b=3MyRrykA8HbhRrDfEBM2FceZ6dDcPvsgx7rmtuwyyfP9isCBYFOpTSP8Y6+11SFsdWvW1z fY83P0RYf5b9vjLW9d9UCq7ugQ/xCk4zVWzr/yS1H837ETkDQjZqSY2KGvhSNSyxkmYXO6 +LjP6fNhy24ZlT7qgcx6t9z5qTbzl3o= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=aYnvKxdc; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.222.174 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687467516; a=rsa-sha256; cv=none; b=dCxncF709dm+gIH9uRdY/VKP4Zo875/KTnx5Gt1iYuCLNzCZRBJbG4kgKUiQj65v22D7t0 pVqvIWdPkorBrklqQwfMuJDNpSBSv248YVGtM56yubpwHOAu+IFINjwdLipm4LlukC0uuj zOaNNEPVppsQNGVb3qvWf8pqLU1xGAI= Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-76244657caeso578959585a.0 for ; Thu, 22 Jun 2023 13:58:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687467515; x=1690059515; 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=jHkn+4hWn6cNWfQmftBQOtWQYQb9iJJIYcRZZNmu6iY=; b=aYnvKxdcWv6qwRiCaWGJVXxgi34L6bq8ffoeujUnALIHtFuBXRmM+bcP9XCahDm+sX c/aqF5jzy/t6hTOr4VmOAf00WcyCDW4uBsXDaSxBnZc2Y5pzs1DtJ08u48NaJcU33gxe biARDPsxQJJ1M4wS/EW+UE7Jv4/5cxI8wBjMD1x51K3UK2lYTvqb8DS6s/XFH10WDh2J VablBYi+dZASmJrgz36uvDp4UJXSq36XOIyfuFYT8xy605670eCEF/XRu34qeL3h/9QF NP9Vpp+QW87o+p8FpzexMhKxgQg/GTdeD91r7OzfnHYpx/Em9cW4zYexsWWaxdvDLTnY 5oIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687467515; x=1690059515; 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=jHkn+4hWn6cNWfQmftBQOtWQYQb9iJJIYcRZZNmu6iY=; b=GTy99RLN1uIwxEkJCVGu3QU5rAHjKdKKtAqUTft6KyMt+dCxXcrdUzCylme7dG5B9G 6Rt1yS4u3UN1srTwkGHJ0mvN9q4Quoc3kJ5msfXiWCbPG6UMaG8y0icyTd4GCaanct96 vSAccJh45iLEuwcSXAr4YoxrpHse17e+muRW+mKFGsH5LQx2+DSpkbX/k5rzSu63mdxj 8iwERkWBn/W+d44IWI/cQM7po0T1dtVs+6LeLDh+kYIQA6HglYSg+PijqnxpCPRYpCPf Zp5vb8kBG2PnlVVJ/+rWtX25rtVu4rKW0v4Hza5zbr5Epo736ieGwNpEY3BxxrP/h77i kWrQ== X-Gm-Message-State: AC+VfDxopmLs0YZwZ6GIpxJg1dxSQp8/gzgfaptBn3/gwFPeCGFqFEX/ xwHaPXjoGPpDI8kktyURZGw= X-Google-Smtp-Source: ACHHUZ60juxfhAagNO6Es1Dw+TzUsWcwO9UH0sU+P0uZ6ZZDjPscGIIYCumcyS40JVtPdjZ8M8DAow== X-Received: by 2002:a05:620a:21dc:b0:763:a299:7235 with SMTP id h28-20020a05620a21dc00b00763a2997235mr11483461qka.0.1687467515158; Thu, 22 Jun 2023 13:58:35 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::36]) by smtp.googlemail.com with ESMTPSA id d18-20020a5b0c52000000b00bc501a1b062sm1684937ybr.42.2023.06.22.13.58.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 13:58:34 -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)" , Catalin Marinas , Mike Rapoport Subject: [PATCH v5 19/33] arm: Convert various functions to use ptdescs Date: Thu, 22 Jun 2023 13:57:31 -0700 Message-Id: <20230622205745.79707-20-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622205745.79707-1-vishal.moola@gmail.com> References: <20230622205745.79707-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 12CC8140018 X-Stat-Signature: z9cdb1wopgx3dgsubw6d193wfwigts4p X-Rspam-User: X-HE-Tag: 1687467515-449175 X-HE-Meta: U2FsdGVkX19r7092ZDWlR7lFypQ9228Bx3aU0+x27pVhx4QRsaZw8qZahIJNqBenfq7IM4b2I/jFNOmubwQzsjslYUdgFQ5xndAiBTc05WXOBPbhibrYws1Mavd6Ds2ZuJ6qCx1r86lpMJweT7He5USj0qaF0I1XuVYwp0S2e0Q+Zf0eR1bBxLOBuBXhPHzWgM08c7i6K4q1GLtNebaHPzvbHApTL0n1jT/pJ4Uyxdfz1UShWLpbP0gP/HM5N1R5pfgqk1SyvSmhqn1uSZkOBMhOFsGA4FEptpqFJJfftR8z6zgzq04pkqZHIfJ/nsKUm6BorkzE6zFEPi5fr0selZt6KFYHqkIGMXL0gMSRlM2vCzkRm01R1dq7vasEwTG4LHPaKYUuQNCyD6MdQN+5usTuQb13vXpn/hch0m50FsiplBCBT7PQ9FksAUAIGTebTTE+GUI9XnohcFqiKLrVwuPSIobpCyCfJEy1C9hed0LFsY1Vl2/cP38NFTq9ZYVJdRQjQGG5yS+J9XGGQ7/ToF+/wFVqTn2Vi/kv0tS3JUszX/c7Jt9HRcvKCUd2flIbTGp2jrKHky49PoCV+v7m2bPY0qrsgaUZSeI5zo91+jpLV7EXneUJD/IQCrEuxkDiQY7P17/iO8bi41Bz6Sk7wlQA8Zr2VZbbMCOe/GNUsvcoxnUCDfkN6FpHFFWOwc6jPq4s7t9T+NnDKG4zF2e1U9HFPWf6Q853ZYVWUIr8U8Odg+wIsSRrQ/dGHgXk9fNaCLx+ay4gwCnC2jeSQMIcCXL5dOoRLHpdipS9VLzrQlAinyINS5jerivh2yFyZnZQKKAm90/+A0RE9bhUauTE3vq21jx8JyAr3yLuWReOeoM+JpiIsA23Q6hsybJNE10+fcTNjd9Pkcu88V7U3gNfc4Di59AAk7OdAijim/gfJYjg1/MNR5wRBV2sAv8GhFqKheItfPMo4GNpZpDAwYy 1zgxcNiz Q0XEfbDZDR8ZKRYd2PXbUdQfXuNRy8Yd4Wp6427HkjEQX07tkrr6htf831ICsk7+aJs5zbub3pcueDJkaekcRMAyngJectdzMtx/z46OMHtV5512CJLx+0vlXgG9h7lhWGtkX4qZAIbkkBNDbd+n3PXubxY4MQyaqhIjuomXssuC94vdqC4lXp5XcCK/AgHyvRFjsJZpa+BtITQrs7EmXwhIWVRX7IG9EwjSI7Mejaqk+TCbNOYlFK5eEBLuo0YlpO4T3CViYodsUqhAP3gLNFcUQxemONrk8g69z+aXU7IpRaM9oH/+FOkQS9IbWGfytEfp1pZwXJ/alFy+FdatvDGoRKwy3gerWTgyWB/fW+rEK4OdyEDCHlUSkzRwpW7SSZzmizk4U4dITSZs4B6Nx1Qp/Y69hI0/nlpQklx2K1eGi96azGN2cirEFn7dmq56OitZhZzifTFF3WBHFakTHVCuP69p3zHoqk+1vOmY+xGbQJEX9gWEVnt1/elSnlFAY0404n9QDqOTcMjQwPlk01hwScSXKFqq8JLoZSzdSeHVi++Y9rvaNW0Mm2nY8IIqU3jtIwFr1XYJx0JGlRUpecXvVlQ== 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. late_alloc() also uses the __get_free_pages() helper function. Convert this to use pagetable_alloc() and ptdesc_address() instead to help standardize page tables further. Signed-off-by: Vishal Moola (Oracle) Acked-by: Mike Rapoport (IBM) --- arch/arm/include/asm/tlb.h | 12 +++++++----- arch/arm/mm/mmu.c | 7 ++++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h index b8cbe03ad260..f40d06ad5d2a 100644 --- a/arch/arm/include/asm/tlb.h +++ b/arch/arm/include/asm/tlb.h @@ -39,7 +39,9 @@ static inline void __tlb_remove_table(void *_table) static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, unsigned long addr) { - pgtable_pte_page_dtor(pte); + struct ptdesc *ptdesc = page_ptdesc(pte); + + pagetable_pte_dtor(ptdesc); #ifndef CONFIG_ARM_LPAE /* @@ -50,17 +52,17 @@ __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, unsigned long addr) __tlb_adjust_range(tlb, addr - PAGE_SIZE, 2 * PAGE_SIZE); #endif - tlb_remove_table(tlb, pte); + tlb_remove_ptdesc(tlb, ptdesc); } static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp, unsigned long addr) { #ifdef CONFIG_ARM_LPAE - struct page *page = virt_to_page(pmdp); + struct ptdesc *ptdesc = virt_to_ptdesc(pmdp); - pgtable_pmd_page_dtor(page); - tlb_remove_table(tlb, page); + pagetable_pmd_dtor(ptdesc); + tlb_remove_ptdesc(tlb, ptdesc); #endif } diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 13fc4bb5f792..fdeaee30d167 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -737,11 +737,12 @@ static void __init *early_alloc(unsigned long sz) static void *__init late_alloc(unsigned long sz) { - void *ptr = (void *)__get_free_pages(GFP_PGTABLE_KERNEL, get_order(sz)); + void *ptdesc = pagetable_alloc(GFP_PGTABLE_KERNEL & ~__GFP_HIGHMEM, + get_order(sz)); - if (!ptr || !pgtable_pte_page_ctor(virt_to_page(ptr))) + if (!ptdesc || !pagetable_pte_ctor(ptdesc)) BUG(); - return ptr; + return ptdesc_to_virt(ptdesc); } static pte_t * __init arm_pte_alloc(pmd_t *pmd, unsigned long addr,