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 C8622EB64D8 for ; Wed, 14 Jun 2023 15:07:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3EE2D6B0078; Wed, 14 Jun 2023 11:07:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 377496B007B; Wed, 14 Jun 2023 11:07:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 23F348E0001; Wed, 14 Jun 2023 11:07:34 -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 10CAA6B0078 for ; Wed, 14 Jun 2023 11:07:34 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id CFE4C1606D1 for ; Wed, 14 Jun 2023 15:07:33 +0000 (UTC) X-FDA: 80901682386.13.BB28CFC Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf14.hostedemail.com (Postfix) with ESMTP id 0FAB7100141 for ; Wed, 14 Jun 2023 15:06:07 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=STNRxM+Y; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf14.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686755168; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Lg7piic680uFW9h9t3JT65dXf/z8bF6GGDGlc7PLy6g=; b=x+H2pFwYWJmxhakbWkyg1pb7qG6utx10/abAFiZDB3hAox24FK3A5tXac1S0fU+dFRljAq blsD0WfIk2rMcMnVY6sRiyTatxl/zbi5SBMoB6nXOhel4lqQFN87n1cHu/ISs97fu6SrCk FOiGncRlM+muTcd0hhrewrE8rCXenSo= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=STNRxM+Y; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf14.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686755168; a=rsa-sha256; cv=none; b=WUh2Q0vy4eDav/nnTGwDxcslRyRW0vceO23FXYdHWk2sUImlxiOi9ZM7v6bJuaLlOL34cK nJovj6VMmpaznDCcV0YjOmuC+9PtYJqRUqJCG9TG9JBefQYNZcU8x4uf4pzflFsB2cCyzE F/SUN9hGPjQSLXw/jWNcmg3T4yZiMlw= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id AEB8463C32; Wed, 14 Jun 2023 15:06:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69A5AC433C8; Wed, 14 Jun 2023 15:05:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686755166; bh=mYL5daBcxMikalMhh9cCFY+r9XquqesA54K3hjfOLTg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=STNRxM+Y/xkG0QyBoc53kcCb5yG1Ly+XJdRdHc/zJ1TCbDaJDD0OuxmfQFFT6l7Kq qCp4eYGEWaY44zLye/aA/Sc6bwWU7i2YmGCf+enSLd3bLx7RIr/9d9ksK/M8XETdpa h/shck3gYngL3WCudQKzi54g1OqDGBTFn+RvxrwG+iuix2d51fV9RXhELY1o9p6nzP PK46LJSg5B9o0xTe73U8Gbss933xivoRdOgA30zw2Sz2WY7mXiXJkZyDnMtU6ViDZX 9gqDJzLtn1zUkTLc7vaWLzH0+Q5q/9ETD/YLmVjUjGTzC8B0nzsq7nYMwwuGkaFucZ jo9CN9hwdi+0A== Date: Wed, 14 Jun 2023 18:05:28 +0300 From: Mike Rapoport To: "Vishal Moola (Oracle)" Cc: Andrew Morton , Matthew Wilcox , 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 , Catalin Marinas Subject: Re: [PATCH v4 21/34] arm64: Convert various functions to use ptdescs Message-ID: <20230614150528.GT52412@kernel.org> References: <20230612210423.18611-1-vishal.moola@gmail.com> <20230612210423.18611-22-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230612210423.18611-22-vishal.moola@gmail.com> X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 0FAB7100141 X-Stat-Signature: q8sjijfa1o7b8785ehkbru6ttx4jnyou X-HE-Tag: 1686755167-616742 X-HE-Meta: U2FsdGVkX1/hhc9l4HUNS7Th+k/3zMwHrxbh6ZB5MtkmAq6nc05RFm5zqwIE3YAnZwmD/0giZLjjPrv37kGNQUAGhZUZI3I96nII0FpE4DifxI+qQ8mypl0irT8hVRgdm1kz4cCEfS4FdzGkyTKkT37ZfggHyAYetQwd6UMtwPYBiTdllaoeejrO6O1GOs0n+wMezXQt1Rs6vzvxCS6F4XiSRlVeF/CFqBrYqQZ04laBvQhpQc91XNG+cKELfsX38Wcx7fCJuBdrE4hKvOiOBesAUfxpGMXXp0fFr/GtXZJ7ijZs50LCMRjNDuSvC7oYARInSoqa4SvxHIOuOE2b6c4l7Bz+PKlIZR2prHD81ncqObREHGfgrL297sZOz43vocHMi2JcA3jjupuJL8FacRXwZARgHQFTphwuclDCNSEZKz2VoMuFxtUkrvmCH/le+7VbDMq0G57DGuJl+WRe/uauQbnZl0kfh1OEoDqUbh9zEh4be0/+lpM5wjAON1orGiMYnZfm29nXW8C/jJc+aXv66R5DHG1Knz/671b2QwgV1bPD1ky9JqS+KDJgiDhyHOKKKipIGOIPhWLRwHUGFvUmcQYatOKbX16fhIVg/kKnZXL/pSYR5hqLKn/gg7++vE0RF/GoiyAGRn7rJPfc2N4UXnPiNPPuagkJc+BxVBZLLCZZQvUxOS+G5H2TMB6DNbgosKlJeR67RShQpz1L6yzXC0eUN2ZxA2Wj44yF3dO0pW0gQ+DDplIAqNEJK2F/jWNyp6olZ3vktWSDcgf/TdEl2gvTMzWjx6dwjxL96JOioW2wUX++afEVxgfR1W+wtbljuaU27SYoy/Dvg8X9gJKMaI9Bk79E1OgQKtpMszGOchTfmoAm4+07eBOu+BlorYHu3O3njehpfiz/w7EK9jaFhNLu0TaU2vtwMcbeB7uMSMHrVKkIf+FkGnPQHElBsyzU4Wrp1Hy2WllER0y UR08xJGo uzUDzJ3KArUYFW1xhRMYFlNA3TxK3TaPEUOveK2123o/ckQEr9uzuee6A3IqnCPOoY/Y9/OM2EJUascoEEy4fg510QY+LtwoTAE27fr1PHIF1dcKfRxfqatZPEiqy8StVWG8pRLWJgs34C4uAWGScijsXr4rnxE6ogjT3isHFNpg6XwxuZCcI8KafFg+ct3DZEPwGVr1eBJDYNFYbhu9IsBKn2DiA1AaOWzXuUHhW6ffLYRHltLwKyae6dmMuPlKwdakM6YJrgVECAWJPryAOj/tzPqbC2mfrE9j8q1RCOROzjXZ12dj3V24JqIFW1jIU8oqxO6VGHohQ6/PSgWmX2/ZFW76hXupKDr44hzoxitdd2HcTd6PYn/srtzRglh1rWbmxCig1wINocqkiDPtfFdG8XXTn7HWHdiBnhXLR2xWhUn6rxhgzo6NjQnFEMOy28l7z 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: On Mon, Jun 12, 2023 at 02:04:10PM -0700, Vishal Moola (Oracle) wrote: > 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) > --- > 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; > } > -- > 2.40.1 > > -- Sincerely yours, Mike.