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 4B66CEB64D8 for ; Wed, 14 Jun 2023 15:17:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CC3FC6B0074; Wed, 14 Jun 2023 11:17:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C7D716B0075; Wed, 14 Jun 2023 11:17:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC89C6B0078; Wed, 14 Jun 2023 11:17:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 99D646B0074 for ; Wed, 14 Jun 2023 11:17:01 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 741031C841D for ; Wed, 14 Jun 2023 15:17:01 +0000 (UTC) X-FDA: 80901706242.08.5970E6C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf07.hostedemail.com (Postfix) with ESMTP id 51F8940023 for ; Wed, 14 Jun 2023 15:16:59 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=a5HfETjk; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf07.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=1686755819; 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=+TTgOm7iAgVY5XZtdDW7jskzvdBkGsydMCWrURmoxBM=; b=dZ0icqmJejJd20E11qlx4okVUf7DMlut85ofCYL6XFdn4QEh7dpjFxr+FncKpwh3tOJQLc JWs3jKdknlJImwW1rftf3JRaEe/6QIApnqS4Ah/dAh4T7PP+sw6T//JmpPApojw+c6wJHv lSSEu7S60n26SejgilrwQAIeY/GSvac= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=a5HfETjk; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf07.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=1686755819; a=rsa-sha256; cv=none; b=pBcfK44pLV9+QrTpTzgnE5RPIhouOAtGpn1+ZB3zmpw4klzFtnPaf2HA+LFb7upmYZE+f6 Nq1cvYpCWmkFZIHhwRwmpYMQCvkjgtsFjYtgzhARox81fNV3ArjaXwimpPadySGjjXAp8d RZpMG6CRTzB9cS1FUNevS+AtiP1xVzI= 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 4C48063E20; Wed, 14 Jun 2023 15:16:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C0C6C433C8; Wed, 14 Jun 2023 15:16:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686755817; bh=YWehRl3xWKEbQP9tq7ePmQYYbNy3P9MQRqza8pSXoQc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=a5HfETjkviYZmB3yycxaStNQCcDjQ92r6U1dHXLCQYNXXuG0AAUSq7jKrB+2l21WE GypEoOApF1rLNsDZqptGPcxmCr0wOSIRfpVC7vWwoWHblSH2+PhDM7ZW5oWZFVA9ML 0FHsMp89h7dErkEWSqM9r5MLgxZuAZm5NLE0GbwBvKGpFqgzoxM2AhuVGiRnrVxHpJ +MEb2WN6DRbMDDPEuOzeya9BK86TjWF0eG9IOlempn4j36CfKy0Jiz99cVNmFKgRnt JUCMMz1gmGbQUt/P8bZ99XYy/Rxm4p9/4bFRzL62I+G/NVscu1YUh+MWxgzqPj29/v 2pSk7JFRzXlsw== Date: Wed, 14 Jun 2023 18:16:19 +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 , Thomas Bogendoerfer Subject: Re: [PATCH v4 26/34] mips: Convert various functions to use ptdescs Message-ID: <20230614151619.GY52412@kernel.org> References: <20230612210423.18611-1-vishal.moola@gmail.com> <20230612210423.18611-27-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230612210423.18611-27-vishal.moola@gmail.com> X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 51F8940023 X-Stat-Signature: 3rpgm1kxhj3xdkkyg9qgi4mgmmbshzjc X-HE-Tag: 1686755819-888167 X-HE-Meta: U2FsdGVkX1/YivWT6FJhVzRLv0CMDwiOlQgck7lParoUgL5GXIcZpUvvXmXmxd21+l9RTEZ2i3No5xu+tJY5/ZKaw1ohZ1O9oTOuapqxEunuTS7P2kqmcMBNOfT6JZdtDG/gZuEyv+UwjQElgIIup3drcCZjepWLM9SKuT3vcyrxqNzx1wIkWRnVGeQHS0TiTaiffUzT+J9e60i9Agu5IfSB4aNPB2a5sATG7UwCdMwFKegudUvWl3ijMFS5u5n8mKFarrz1MxJV69T7EsYIqPBEX8mkvF6DM24HFODsTrAUrwoMXpXFU7/ggctXdHfld/GIzvhzs27ZantBTo+0uSKgZ1KOrgbEOEkXRPXu+rrkViS5fi4zWkx3jfbVP+sMuixSE24m9JmMTPUfmKHy0F65SI4K0WhwgD4nxXAMcxxfHfMvc0jXsM+JnbgsphamWWY1ra7sgVUiCYXh76QWVkNZA0vk8A9/81sZ9YQJ13kd1RvvVG+VfpiZXjKBHnJQQgcBv0jEJlgSH/oeLT7y1TKX4fYSS3jcrEy+Qm8w2E5g16SLsbwWwQFkkib+2ZSFSnyaNSauf/TutjYLs2K29fXkzxMRdEL7+9bGC3GLQER8xLoZ68hJ98JRhoeNWk9oN5dwv60Fbwvgobvadvebs9MSzM83ypXuSUkZ5l/+ZDc96WfOzpMDQ6qxar9zhpaxOQIj/+iGyAxqrBy3EuvL3YS+MFZq/FcUqOZjWWj8Wt/3ROTfsipibzmSHjUaPivvJyj/LRaFDMviqDsA4U4NDu7MKZgf/p1N6IoV/UfU52HDhmU8KUHv0KTTGhH/PClqIHTirESAyiHr2hYvptFhZlnyF5SeHUYhNTZglpAFkTAxcM9GyEBm+yjpybIthrVegmwi7NV9xRbMPGwsIn+PDzgy4uBrL58ChBTWTKjNBYiDMFHGdOdjpXhJqd6ol6gHS3rI8ga09je9okBfSrF Q6TJ4AZx oyY7xEDmoR4A+BynSIfhIvjxjgIGA+h4ljkdXGCidGsoxgVU8MOicNlsaqWhMatCvbo4zYdUDweGKCh97DkQIH0ipWij+Lez2LWLzCuhM26nnIv1LFKgzrc7vNzTbynoBkIzN19ZmCntIbhmChI1ikIsngp27y8Wgag5eFr6lx2TOoouAK4m4vO2A4lcOM2avB63N/OW1nfn9QfoZMLyih+uqf9/uyt5HsMqXB2hk34aGawl/zBPE/I4ewhta4mnnnVziq4Hp6dRdvmnn/tkmR68l5nmiV6PqPPPb0PxIo8Oh89vHKYQ/ZOBZ9vgi0pDnw8trbi9l/qk69WtFX4AstOk0Zvq9ky6FM93xGv6YsLV5mwUyHTrbxz4GAsBMKF3LcMF51xLWTNubEZqy2y2IyzaJ2x4hpvXSmSOckL5RbReM6MiWZKOJ/ZfMAQ2o7S1ZAy27 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:15PM -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. > > Some of the functions use the *get*page*() helper functions. Convert > these 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/mips/include/asm/pgalloc.h | 31 +++++++++++++++++-------------- > arch/mips/mm/pgtable.c | 7 ++++--- > 2 files changed, 21 insertions(+), 17 deletions(-) > > diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h > index f72e737dda21..6940e5536664 100644 > --- a/arch/mips/include/asm/pgalloc.h > +++ b/arch/mips/include/asm/pgalloc.h > @@ -51,13 +51,13 @@ extern pgd_t *pgd_alloc(struct mm_struct *mm); > > static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) > { > - free_pages((unsigned long)pgd, PGD_TABLE_ORDER); > + pagetable_free(virt_to_ptdesc(pgd)); > } > > -#define __pte_free_tlb(tlb,pte,address) \ > -do { \ > - pgtable_pte_page_dtor(pte); \ > - tlb_remove_page((tlb), pte); \ > +#define __pte_free_tlb(tlb, pte, address) \ > +do { \ > + pagetable_pte_dtor(page_ptdesc(pte)); \ > + tlb_remove_page_ptdesc((tlb), page_ptdesc(pte)); \ > } while (0) > > #ifndef __PAGETABLE_PMD_FOLDED > @@ -65,18 +65,18 @@ do { \ > static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) > { > pmd_t *pmd; > - struct page *pg; > + struct ptdesc *ptdesc; > > - pg = alloc_pages(GFP_KERNEL_ACCOUNT, PMD_TABLE_ORDER); > - if (!pg) > + ptdesc = pagetable_alloc(GFP_KERNEL_ACCOUNT, PMD_TABLE_ORDER); > + if (!ptdesc) > return NULL; > > - if (!pgtable_pmd_page_ctor(pg)) { > - __free_pages(pg, PMD_TABLE_ORDER); > + if (!pagetable_pmd_ctor(ptdesc)) { > + pagetable_free(ptdesc); > return NULL; > } > > - pmd = (pmd_t *)page_address(pg); > + pmd = ptdesc_address(ptdesc); > pmd_init(pmd); > return pmd; > } > @@ -90,10 +90,13 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) > static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long address) > { > pud_t *pud; > + struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL, PUD_TABLE_ORDER); > > - pud = (pud_t *) __get_free_pages(GFP_KERNEL, PUD_TABLE_ORDER); > - if (pud) > - pud_init(pud); > + if (!ptdesc) > + return NULL; > + pud = ptdesc_address(ptdesc); > + > + pud_init(pud); > return pud; > } > > diff --git a/arch/mips/mm/pgtable.c b/arch/mips/mm/pgtable.c > index b13314be5d0e..729258ff4e3b 100644 > --- a/arch/mips/mm/pgtable.c > +++ b/arch/mips/mm/pgtable.c > @@ -10,10 +10,11 @@ > > pgd_t *pgd_alloc(struct mm_struct *mm) > { > - pgd_t *ret, *init; > + pgd_t *init, *ret = NULL; > + struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL, PGD_TABLE_ORDER); > > - ret = (pgd_t *) __get_free_pages(GFP_KERNEL, PGD_TABLE_ORDER); > - if (ret) { > + if (ptdesc) { > + ret = ptdesc_address(ptdesc); > init = pgd_offset(&init_mm, 0UL); > pgd_init(ret); > memcpy(ret + USER_PTRS_PER_PGD, init + USER_PTRS_PER_PGD, > -- > 2.40.1 > > -- Sincerely yours, Mike.