From patchwork Mon Jun 12 21:04:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13277365 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 ADEA9C7EE2F for ; Mon, 12 Jun 2023 21:05:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 15CCD8E000B; Mon, 12 Jun 2023 17:05:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E9F58E000A; Mon, 12 Jun 2023 17:05:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E03EA8E000B; Mon, 12 Jun 2023 17:05:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id CF9008E000A for ; Mon, 12 Jun 2023 17:05:31 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9F394160348 for ; Mon, 12 Jun 2023 21:05:31 +0000 (UTC) X-FDA: 80895326862.25.565F62D Received: from mail-yw1-f171.google.com (mail-yw1-f171.google.com [209.85.128.171]) by imf16.hostedemail.com (Postfix) with ESMTP id C0C0F180020 for ; Mon, 12 Jun 2023 21:05:29 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=skq9VJH5; spf=pass (imf16.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.171 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=1686603929; 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=zsW7mi3+X2fEN/3x0Bi+dafPb2wVjOjUR4AWbTKXMQ0=; b=FEEukirijdw0FNvvZSSUlIkKxF1gIJz2fj2rF3uT9QQT3tQhOVqXQTXRV9JHr1D/BN0nVG 5Wy3IHfckRR4aUuWZ47oF9e1K33/TNsxlBobXImZsUgOlEpoTySOsLhNClF4dyugtv3/yL YoNBp4fthIQzZl1JzZgKJR7WWDb+c3I= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=skq9VJH5; spf=pass (imf16.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.171 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=1686603929; a=rsa-sha256; cv=none; b=RcgaZtu7cZhwoDnACg2+yWOFnXQzeB+QN2Xfdl/rCpY4blPDiNlBbYOz2qJ9oO7KhAhLBE 19egDZM+/oo5plSdxkzCFWja5Bgl/9q1VJiT73Xl1fXGXWfNNedaO30zGC8wXcY6Z9Ju78 5pEZUPK/jqh9DWJLjWCuStk3H48EdRw= Received: by mail-yw1-f171.google.com with SMTP id 00721157ae682-56cfce8862aso26680307b3.1 for ; Mon, 12 Jun 2023 14:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686603929; x=1689195929; 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=zsW7mi3+X2fEN/3x0Bi+dafPb2wVjOjUR4AWbTKXMQ0=; b=skq9VJH5dgJqddGwdVt6QPnDFnHLuDHmOdJ+p0cfKrjwcpANWfXjFtOnE+ShUVF4Wp +eZ1oAi7jnx0p4XZ2vlWf2HsUPHPywHFWTLkyBo2gHsKrZMxdedqFJMYHcQirASjKLsR SHXXWS83xBIee1HeZ900C52L0cf1hZAGJBgTBGRkI/olW2eHqyg1aEFYABUX/cDGInxY qBm8udoAWKxdlfWi3VICLCjFw6K8a8OX+rJWjNQ1/2hLUrj/oVGI32qhAulpQwwr+kGa Lu8zhuAzxz28DDQDJR/r5ap4yvwSJYAPMD0veq5+nFM3RaL/7sjJCqWPanMB6gD1jpVC DRIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686603929; x=1689195929; 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=zsW7mi3+X2fEN/3x0Bi+dafPb2wVjOjUR4AWbTKXMQ0=; b=fYTv9u/HkiegHIT+MsTaQidiZMoBkxZyRWRZMTkGcdrlAik05SnoEcFOGHQEEtn6ok zuugntI8bPcwEpNIzZbbZisEVVL/UZPjU3viTpY4dmHzLZEhsFt8evix/NQrV+2WK7vs 0S7pI0aJsKG6OTXm2dT6g2sjK+UzZxbmFQO4/39mPTi524g0fGkCAJq8/Mo+hcdZxyMo /X9AEtNiS1+VpQbc7KgTMuS20PQmmMW9cv5fduQq+vm+KjVttoc1q+pXRCAac++8dBRX McW+cml59jN8Se63nvBi0qDLmW5s834y6JfQdI+3U5p8i3wEXcEAGsbvKbG6sif+wZyA dOLQ== X-Gm-Message-State: AC+VfDx1XCAfWub5vQrZl8DMZv5DPuZwzXOis5CSCmy5i/V1sx4NB2Qn 4g57l7A2MNuTp2fDdSDkUvc= X-Google-Smtp-Source: ACHHUZ6YXnFai1+oazoURBIRxVN/vSubE3IHa08ab+S6MI7hbnWKgAk8qpadPRjUwPnUDYOPSto+cQ== X-Received: by 2002:a0d:eb8d:0:b0:56c:e54b:b4b8 with SMTP id u135-20020a0deb8d000000b0056ce54bb4b8mr8864333ywe.28.1686603928796; Mon, 12 Jun 2023 14:05:28 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id s125-20020a817783000000b00569eb609458sm2757115ywc.81.2023.06.12.14.05.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 14:05:28 -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 Subject: [PATCH v4 21/34] arm64: Convert various functions to use ptdescs Date: Mon, 12 Jun 2023 14:04:10 -0700 Message-Id: <20230612210423.18611-22-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230612210423.18611-1-vishal.moola@gmail.com> References: <20230612210423.18611-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: C0C0F180020 X-Rspam-User: X-Stat-Signature: j4t7bm6rybi4zqzojqkegcdcd4o898dq X-Rspamd-Server: rspam01 X-HE-Tag: 1686603929-285728 X-HE-Meta: U2FsdGVkX1/l30bs/y80+jEC5VcCaeAEte9b4K4+M9lkzGpn1fObzdMLU1zQFHWVdEYuNBZ03uFEF6MvpxQEQtcNoWdr292na9NMeG4RV5Rq9OFYTY1iPbqeNSqtRLglvTOIOpS+wvHI4ZF2i8U9ocoAFi55hvBqvpReiQDC2vYLUSJbhidycSbGo7UUQaTtc5uW53fu08BRBpx4s9dt5cNrFx8TXW0MK4vEUCWFs3ycXrQytq81cAn4nSf8fIQQx84f/pwa/yF/zMRe7iR/eFJeBlKGy3LL5JCAztPm+mqj9T/45Z9CmdmyeboVgOv5+xAnAv20aopTgs6J3YmKrG6errTNerlNdA4O7+fnYP+mYKlyiwNuSkB/o3P5fIDI+k4oFeBePblygXPcn6hjrZ2DUxaoWY5PcKn5tvAauEpb6Sk0sd3nsy/Tn78+tseZj71+ElYC29YgyI5kiqN/8AqLH7AOOERWsP3vaSj6wYLz62N4CMPR/cNaqr+z+W9/ZPoGS5tMUT2MflKJuRYFu0RHap/+irHSAmBBydVb/2y+VT3DZqWjFkiYDn7Z6I9WIvbdkl88wc+RSxuA/0vTeqmA8wa2G2PfjelMhaoigVzqYGNMDoo5NUuZxfOLFTMEfht0FjhY2mIh98PvjlGXSIFRQQjsFlW81+Mu/Xoss86jSqn47zIhmCzUpYFdzcuMWTKc4mwDJL744oNT8/yel2Sa8FpD2gob23tFKhIJC7CfKfX3xLEI0xp8mMwKA7xwIDq6LEerq3RqmAVuaD9nsWtq4nHJNq3Zq30WfBzfItyWgkfZ2fSgtpDCf0vT0SPUppvGXubZVbAzA2lvxFGmNIEOT5rGW3Pf9KbEiDfvxUA6tn5GhPoJysfQ0Fa+bj1gEwQ2wIT6TZCXOtYG6E47NOns+qLVTZFmFFNqencF5csYmBTXKDj7BiDQOR1VmhKp6K8sjCVLes+jlX6cCJ0 ed2oFnMh uoWcwY4cb/UCt9Qd5o2BtJHOLaz5RAMSi57nWWhGrq0UhDILzMaJSbilPTJPMbNQabhUf2QnAYAqZE5jmDIumzopZ3i7aWuEgp2dEY4MS0gfMEu/fx9XAr39ApCQ3vW2rMxWDGApjm/PZ2DNq0cgeL4uhUp2g4mdiJKperOY7FH5Pwg8wIR6UAui0wRqoe99IpTC2enqZRbYiUzes20vpZArgAH+UJRNDwGssFBJ0umoRFOmulp7dYmQwXzLFtD4f3ZhmmZHNJhKdRutRtJIyjSDFTL11NZKb8bmCD4uoTQ+H0OGycXbcTNwAbvgz7SHW5GYItISxRR8es1+vYtA6KjjBtayh2RzcvQemU2n+vbouxU+Tdgi3OwYC6lOHzs47X2mnLb7A/uXk2GEqMKTi4dxjQ0buON4l2AlA2cbGfPSgiimkmqJurw9L0XOrlx3KfjjrPtteY/fWWZcPoMhyT5bPR+V15gzSg3/9NbO5ghkzLbsSbmd5HK+1ovPih7Ploc8t2utgwrduwUPvZCCfmQSFuw== 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 af6bc8403ee4..5867a0e917b9 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; }