From mboxrd@z Thu Jan 1 00:00:00 1970 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 1BE43C05051 for ; Tue, 27 Jun 2023 03:15:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 505288E0007; Mon, 26 Jun 2023 23:15:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4B33C8E0002; Mon, 26 Jun 2023 23:15:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 305518E0007; Mon, 26 Jun 2023 23:15:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 18D258E0002 for ; Mon, 26 Jun 2023 23:15:53 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id ED4761408B3 for ; Tue, 27 Jun 2023 03:15:52 +0000 (UTC) X-FDA: 80947063344.10.6AFB16C Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com [209.85.128.173]) by imf07.hostedemail.com (Postfix) with ESMTP id 331FE4000B for ; Tue, 27 Jun 2023 03:15:51 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=VXFgZtIL; spf=pass (imf07.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.173 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687835751; 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=1W6z1I6yvWrQZbHmgHYBEGZZDstSbvELOPET/EcKlKw=; b=lnRVVDvBnGLi60Y26WyWi0/L0JN3WP37M1qumGLTvc53Hil0oW4nh/gzvA1i1VMiR/VuWl A1pDj0m11VJuWEaAwSAckw6XiQWweFA1kMRO7TvvMpUB2o6vmyheQSQlUHocVdzvmSeVqA SN6qP8gK6tHwVGpOv6gjMGHP37ywFlY= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=VXFgZtIL; spf=pass (imf07.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.173 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687835751; a=rsa-sha256; cv=none; b=KAQuJd3b0jp5ypJckbKiptzP6ihx6CR1ixzYaHc2b35r9fnFw9EEagN/NnRw7EcwvOPA/i wPZvXX0JKREzwWoDcJuJzl5LfJTsEo3DFg5wr8deEkjQujMYG/bd0m87ZSbI9+1iQQ9yBE xk8vMMq41jK2DpEq+6DnFNRahmwJYwM= Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-57083a06b71so40015547b3.1 for ; Mon, 26 Jun 2023 20:15:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687835750; x=1690427750; 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=1W6z1I6yvWrQZbHmgHYBEGZZDstSbvELOPET/EcKlKw=; b=VXFgZtILJXGVZEJYMvHJGtbDmmBoKn8mX0/dAC+EY4RvTpIsJK+gJ5UUjyLzd+tcaA Wa8E/Q/hReN0LGOCZNJ2CPK66hXv4CHL1RcwD7G2hwKgrVV+r9MdE8P4UKG8hPoTp4Um SIrbyRIEF8122yBtjbfkSdTM8KV9j17ll3YIHe1LlzxS/E/9XISE37/ArykIbO2T/+U0 rkTOBMVwTfe5aMKf0k+p5UGbW9JxArSdzVKMpa8hS9FCRAuPQzNFBaUszCNNpnt8LHI6 yAZrECaEr3SZfaO8vcK6fiSyK9T57SgwrpEkJPc2S/OPeKfITI7S9cxAkwbxJnf5XUxM do4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687835750; x=1690427750; 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=1W6z1I6yvWrQZbHmgHYBEGZZDstSbvELOPET/EcKlKw=; b=SbhPLlQp3Qh+YhpLQsvLqxmy44Hdau8cQFpzXmFNytLtpfr2et3dGyvbalaYvX/8G/ c7wkhjO//+krDtlG3BaKXbDkr7LBP5nbpfZ4g8GGVBpetvjXHLm/Udh8dorb1bI8ocNa WeheqcOlyNciSQB8sgneFD8p70/FFXzn0U/W3k1ImijT4PH8lTzGebhfgC8Y81A+8inW OmbljJKyATi27ATD3tMyOI0wmvZ/nVk35kE9tjA5Zkrgi+5nw6PV5pjrC/JHw7bG1lSl YoXuc1kLUdT50KQFlCha1h/oEc6TDbwez8cXyKjgU7gJIRdXdf6+vP3GrYIlSeocph8I iTaA== X-Gm-Message-State: AC+VfDyDizwcSjc24pXAoxAf2rLpTQEbivJWdZ2c7Ox1W+6L9HLhFud8 fNBAW7rtIJqwOFXKFoXGDUM= X-Google-Smtp-Source: ACHHUZ5fFv9vf2BaGzqImDQ1UeHA1UgOFch4VJlKuLrykfvZA/f5SK3BTYMlrNUhfUsCVi2Zl8lSjg== X-Received: by 2002:a81:498a:0:b0:570:215b:190 with SMTP id w132-20020a81498a000000b00570215b0190mr27857555ywa.31.1687835750176; Mon, 26 Jun 2023 20:15:50 -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.15.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 20:15:49 -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 v6 20/33] arm64: Convert various functions to use ptdescs Date: Mon, 26 Jun 2023 20:14:18 -0700 Message-Id: <20230627031431.29653-21-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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 331FE4000B X-Rspam-User: X-Stat-Signature: snonetw7e5ow4tgqwz6xjmre5p7wss3q X-Rspamd-Server: rspam01 X-HE-Tag: 1687835751-894251 X-HE-Meta: U2FsdGVkX1/koKw7vRiMigaAWRRs1nATu+TXIMRcuMEui2NA573vtgNDfi+rQn2DeCK7858mseCWY0MUPedO3UsdVQ89H5ZB3aKXd69FrckjsOTMDttgqBm37zVWSIduKONCVVloIBqTjLrh74WpiQ8GfdtA30m/VS/uYHjBCkZ32vkeIAXEybVGvIvJgh6CRo96pN+zGykzI/bI8C7Hh+Rsj98ohnW28qksv0/aJTOsgxS9E+aU7BNQbcCh6ukwQ5+4tHX88fVSSuvtrTGqYOnT9FVxTo/n1n/poLYFxxfOoSKXprvQ40Ec3oqwbBwGklmgBwjzYkDBjjlfCQNzUajV34er4lG4dSYow3i1RNjmWE2KUYOxzwNtixC5bh3uHYTbLklaiTa1Ml65nWEB0dEyvF1eYf3jxpfa2RD6ag0cyoIUopkfrj3ysdWHiSp6e0M9szlvbGTWfucp6QFBLtEKolNHPvrVmbdT70/WrZ1t2Wu5a3d26thTWpFF26rFwWF/NNf8GYfTeMAVXoXJsd5oW+emfHBdjxVYry8dqrt0VFMZ8tKyBXMA811N5XLKfVni5JzVPmB8fOKM8q/zvUa621wzqZFMcVkvbwfDRaIsN8G1hqrDIGDENul67JajMCSbkckQcDoN4ZXwRChU5Pt8Q+SIHaImrKdC0Z1/T5Nbe04yA3NaAsfota+Eczb1tkuph/hraiElOylW1MEp4TQyJFdT2qjFK6DfrqKQXfEbxZQ+lr5fSPSOhWAHywG3Yzb6YUu/rX3hN1en7O/mpMhXsICZeOP1hr68E1BYPp0GisKmRBKxJVE6f/VMs1Ni5a5rRajPdNO9OyRDKSvBitlnMAhsMoGXeQFoxH+BG6/ESYSJvYKxZGBSp7F6B4jjQWoKzGLUDoVsNSvqgt88/rQPDsDUkCsQU1xy/xWuKPHh6LwS8NsAhbIrqu/w7vKeMhdWsYk3AbytUIBF5WH WvFnJIp4 O2thb4h5p4fhW5XqQbJbg3lkkwOZPq/LRfGykWPXmNyDAUh7gkUXTATA50fxqlj28Lml1ECDniwjWszxqkiTjpitpRCpWyN6Q0MaFH0hToaLiXthLBuJyeB90VTXQtvwsSWeF6cxYcrDJ2OKgVFGRYaef4mvSK5wo2UjwsYSjGvBDZNHFBizpx3dMr4DG662u1ReFsdD0/T95wwrMBZi4OuiDi/kS91si6aA011eRaeWAhvnoIUTguckl9qSiPT5X1kBSzfaWRRREq+qN0JzovRUIJxDOv5wnUeBulE5zt9uq6TdCRJLGv4yIGNSyMavuBAlgDaFswcJ/JrQqAFWq1djTkM8ngpUNn1JPBBIz0VGH2Q06UxoGRH3J8f55vl81KegLRpHjs8DK3GmmWz0ZosMde+lfTJkn0WpB8k12dq7kFW2roCVyOnmLmh3KhhfCYgxHqHfrpyhVOpiWOUZrf0AM3eSB986Tc+KT4Lv4Y6D8357/8qswnBeh96JL7DGBUwTou9Ezc1ZEjpF6eo7/AAh9xu5jM4jhzvqGhIICvVQ9i2yLf2thZNGAsGeeQKmkZHQ0e3mG6jw85z1mTe0l3RXyVyZiDkLyJ5Zwa+RHqdD7PHhl35xnoKOgh8XAhnfEWOpAb3V5gSN1Ew6mvfirAJLgOA== 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. Signed-off-by: Vishal Moola (Oracle) Acked-by: Mike Rapoport (IBM) Acked-by: Catalin Marinas --- arch/arm64/include/asm/tlb.h | 14 ++++++++------ arch/arm64/mm/mmu.c | 7 ++++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/arm64/include/asm/tlb.h b/arch/arm64/include/asm/tlb.h index c995d1f4594f..2c29239d05c3 100644 --- a/arch/arm64/include/asm/tlb.h +++ b/arch/arm64/include/asm/tlb.h @@ -75,18 +75,20 @@ static inline void tlb_flush(struct mmu_gather *tlb) static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, unsigned long addr) { - pgtable_pte_page_dtor(pte); - tlb_remove_table(tlb, pte); + struct ptdesc *ptdesc = page_ptdesc(pte); + + pagetable_pte_dtor(ptdesc); + tlb_remove_ptdesc(tlb, ptdesc); } #if CONFIG_PGTABLE_LEVELS > 2 static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp, unsigned long addr) { - 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 @@ -94,7 +96,7 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp, static inline void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pudp, unsigned long addr) { - tlb_remove_table(tlb, virt_to_page(pudp)); + tlb_remove_ptdesc(tlb, virt_to_ptdesc(pudp)); } #endif diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 95d360805f8a..47781bec6171 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -426,6 +426,7 @@ static phys_addr_t __pgd_pgtable_alloc(int shift) static phys_addr_t pgd_pgtable_alloc(int shift) { phys_addr_t pa = __pgd_pgtable_alloc(shift); + struct ptdesc *ptdesc = page_ptdesc(phys_to_page(pa)); /* * Call proper page table ctor in case later we need to @@ -433,12 +434,12 @@ static phys_addr_t pgd_pgtable_alloc(int shift) * this pre-allocated page table. * * We don't select ARCH_ENABLE_SPLIT_PMD_PTLOCK if pmd is - * folded, and if so pgtable_pmd_page_ctor() becomes nop. + * folded, and if so pagetable_pte_ctor() becomes nop. */ if (shift == PAGE_SHIFT) - BUG_ON(!pgtable_pte_page_ctor(phys_to_page(pa))); + BUG_ON(!pagetable_pte_ctor(ptdesc)); else if (shift == PMD_SHIFT) - BUG_ON(!pgtable_pmd_page_ctor(phys_to_page(pa))); + BUG_ON(!pagetable_pmd_ctor(ptdesc)); return pa; } -- 2.40.1