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 C6503EB64D9 for ; Wed, 14 Jun 2023 15:06:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 43C286B0074; Wed, 14 Jun 2023 11:06:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C5B06B0075; Wed, 14 Jun 2023 11:06:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 265DB6B0078; Wed, 14 Jun 2023 11:06:39 -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 12A536B0074 for ; Wed, 14 Jun 2023 11:06:39 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C0C8B406ED for ; Wed, 14 Jun 2023 15:06:38 +0000 (UTC) X-FDA: 80901680076.13.5CFC8EC Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf21.hostedemail.com (Postfix) with ESMTP id F29241C0180 for ; Wed, 14 Jun 2023 15:04:06 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=j5Ugc1ko; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf21.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=1686755047; 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=xbw3ao/LxPieP7nUuzcMikRxf88N0H1IUQEpCMVI8QA=; b=xYglWPZ2HAWSNWSYwzr/2nbzIsBUEmzgDIKN1YM1jyzMYptCs9FG2QvggicVXCxC1aVlLN jePqA3K0BgFaHf4rEQeKc1L2rEqg4iESTfsRuSBoz/jd8EjsLK2V6u8H95YfVbkx4co/bh 7toto4nDf/w9yFQilBuEoWOH5A30Pcc= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=j5Ugc1ko; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf21.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=1686755047; a=rsa-sha256; cv=none; b=fLraYYQpKcvpkQNTjcrYgdTWHse5E8wlkFktOjKUPKNogNlhAkQQsRyB0bPyMWM5Kxy7rG cGsBnZztF+UU4qgP4U0AIlF8Fapp49MVUuMZmQGdxdFDnu45M+LJL1xcdy+m/LpXzbdxcX rYoHI10k3o/Oi67oWo7SvEJ7eVuZODM= 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 F175B60B85; Wed, 14 Jun 2023 15:04:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B074C433C9; Wed, 14 Jun 2023 15:03:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686755045; bh=9A+PDe1vPCUMDrQYdu5z8EQPSeOjm0q+6tl+clXFAfM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=j5Ugc1koC28gH2KkEPLkPoTIPNK11ApEJ+qx3mv6eyx57zInMns1iK9e2ZeYWZtaS d6VTROxAYi4QnXIkn3k8NB95BIGVtq/48gNq3/0I/WMA49BRIKydm5cPzbMITNJFuZ ukIwVNbIGFF0ylO7WubZ38JabSGFDmsGB/tgUH9+2GD4DtHbeAr300i11RRFVklrjO zXwlgRZnQv07KKoC7y7mb9Y81PZOH2N9ueNVcmIy2/IhSmwSzwFpOrdGsiFw0fBA3k Xwkm0A1j+e4mOhYVoVB8lslu0VNwTEUQ6zk7ZxZcwqL0ZAjNIDJH5uFFjVn0dxTv++ vvViLh1xvoRTQ== Date: Wed, 14 Jun 2023 18:03:27 +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 20/34] arm: Convert various functions to use ptdescs Message-ID: <20230614150327.GS52412@kernel.org> References: <20230612210423.18611-1-vishal.moola@gmail.com> <20230612210423.18611-21-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230612210423.18611-21-vishal.moola@gmail.com> X-Rspam-User: X-Stat-Signature: bqguqbkiyx3nfsujy96fqdwud4tbnqkd X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: F29241C0180 X-HE-Tag: 1686755046-273534 X-HE-Meta: U2FsdGVkX1+H4Xho3Z47oAkhdv2u8yn8Ps/yK0tb9wOHnk4lCA+i2dqryV1LPtujqJcD1u/nbYok8BVga60BkH6CA8FiJ065I/SSjAJsejbnCzHROc4wMmXUNu0ge+Z4oDWn38pNyXCClEmpS97uIKO06t1KPuwXDpQebSRCdDHxBOqnGuhEHOp/NCnKBeQdCZamaOZbpLB6rRyVlFPHvhpni3xF/kauLLumrtPeOIkAxWXo+MllMnqdo+/XZJXrQPWz1hDqPgaE4cq1Fm0Lw3L9a02nh2QO+nfxAbvJRXDuX3HSVRCqcYzOXQljqchASwu3dBUhjTJTiDSW53kjts3b+9P+dXm43cgraBAkN4LBXD06YgkfdpMyPrVFUiyEB0lq5qDpFGipIHh31QBmluaxumhVUGwCtDwaNnHKz8LeGbZvW1Lcnw9bDSW3LK6CBb+Nx/VeADkrEqpOdyygbVpwH7TxJmBwbBqKKem0dvUeianuXlqK9VSD35ZvhmjAkfDOnpxbF23LefdcIaq2x/1WM3TGW8FQX8uxDXoZSs6semm9XwFpoke8bvxKRdpPI6CJqMhvduQ7LZCmX/aCRx2+DLxf0/JBIC1o0PQzPNbLYs8wgtUV1Qwp7tDRz4ipSKiLl5ZNIuXVhey0pTHkNMNyJkXKF6fEG7CEhbTViq3U0UJIGm4Ac4TNCwUokJSkjgq7Av4ITZO2AKPuMwD06m05m8IY7uabFNxQ7o9zRA3shCGSitycjubigLm4ptxHrLkSzNYkonhJndzaOKylQEGp023+Q3jn8WT2YRYLCcAPoPpppyHJcNWHGjDHiHONiq3l54qp5LY/zf2q0pVHaIGC+vKOAmUUPNH7kAefOAp0rEbBKZh+PorUanZ7Jr5WBC8WEphL+kxTryjACJ+BqJnXGOX3/jiO5HTl2RCfxRevSA6sfM/vUe8K+VYGrjCekNEOGQYF6+5C8zdZfwb 20AU3MVi Atf3vqcZq+EXX9SSV/woS1kvynZJa4Fnu6lyEBJOcsVzAbrZGtpBYXcZ4gl6kmScv8ztH8t9ANCJG0GHE6gmMQjkJTBWPBk0aNLdTKpgh6jgYzZvUu/rmqV0zQFCGykFQjP4E0LLs+cz3/Y+BqU2CAXNBPmf1jz6PwEcgl3wmSg0VmjmEdnBoa3OhCIicxHlAWmyU8Bky8T8J24/kL96XYIKSWcgDsnqNG3ymXjFxYgrdW7Wa0f/bOrCBDJip/W3wL3F851j7D2XiWrueGoACoTTdxneXcV5+6iPHnQLY2YUBnScpP9ya43kbtBw89+ZRNnp5NfFWK6kVPYyn/zwF491SAH0U970v2l3h02AFidHU0Fy5gKyDqzqtPgoYUjl2abzSHZ1SJd6fRAwpMs7/sxvA0L0BJSTH5F0JbyyUvD92AV3XbCneL7FO/EGfB1gLZRuX 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:09PM -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. > > 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) One comment below. > --- > arch/arm/include/asm/tlb.h | 12 +++++++----- > arch/arm/mm/mmu.c | 6 +++--- > 2 files changed, 10 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 22292cf3381c..294518fd0240 100644 > --- a/arch/arm/mm/mmu.c > +++ b/arch/arm/mm/mmu.c > @@ -737,11 +737,11 @@ 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, get_order(sz)); > > - if (!ptr || !pgtable_pte_page_ctor(virt_to_page(ptr))) > + if (!ptdesc || !pagetable_pte_ctor(ptdesc)) > BUG(); > - return ptr; > + return ptdesc; should be return ptdesc_to_virt(ptdesc); > } > > static pte_t * __init arm_pte_alloc(pmd_t *pmd, unsigned long addr, > -- > 2.40.1 > > -- Sincerely yours, Mike.