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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C5334EB64DB for ; Wed, 14 Jun 2023 14:20:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=u7LspO4FFIbwGKvFnICqpXBG1BXOw8ogWG1ld6BzvCc=; b=MNKl+8MAGtzP9e JfSIaiCPDpMVR/D6AcE96iyesPW4oynLHJZKHtV7m0HHYD2VSHKKcTs69hVA/31DGqiLY/P38jwUe yiFra18/mLlW9GZW6uQ6fknTmUngd08D8qmeaV6+hKMmwJ2bsGwSj4qhtdhhnboXjLsnuju6qaCxJ Igig7+7ZA9z5X4XFQzZgvuQUTlyCX5N7PNqXhJnc0u7+TpC+QVXrakQ4Fr/2jNX9S/Ucl44U2cJnX YYH55Scwtg+VpSqTR23YmOOemWvnIAdShJh/z834fqQ02ixwG53tbvpuK6gny3I3QB1VLdlYzSGk1 p9jPQ66xlwaGprgVU2jg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q9RM0-00Bt7u-19; Wed, 14 Jun 2023 14:20:08 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q9RLw-00Bt5u-12; Wed, 14 Jun 2023 14:20:06 +0000 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 C2ECB610D5; Wed, 14 Jun 2023 14:20:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA8CFC433C8; Wed, 14 Jun 2023 14:19:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686752403; bh=msIQzzbJVOpmfYjD76BXOfuKQSvBA8DkGXsTDNo7F6k=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=rDmqmXQ7/igDzWzKHWbbYSxsjI011+Qu0wfAX+xrJpGzScpx6c+TijBp42WTBHVHg NMmFssQgKjcddaqFVOPxQIHovSCNhsGM78nzLy5IbF4NK4cENbZRynU7sbyPZQ0OJ2 u/YLiI/yye6XVAHtU6FTIMwuBcUtFL1dW8Vds6vGnufNWMWundcXWjgqsCICj6W4Dp 4phecE7fv+X9AppCQNzdJLoMn5npv3j2tWHnKsD12s3s/OF7tMN1vBabdXbvjijdFZ e04wiDqE9JOa0+z6hm50Ui8dV1VvUlrYxaQY9WH+tDrmbOoYiIFulWKAMNy2BNR/ES 9cyaCj1LKvc6w== Date: Wed, 14 Jun 2023 17:19:24 +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 , Christophe Leroy Subject: Re: [PATCH v4 14/34] powerpc: Convert various functions to use ptdescs Message-ID: <20230614141924.GM52412@kernel.org> References: <20230612210423.18611-1-vishal.moola@gmail.com> <20230612210423.18611-15-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230612210423.18611-15-vishal.moola@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230614_072004_448695_8EDB2252 X-CRM114-Status: GOOD ( 21.68 ) X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-um" Errors-To: linux-um-bounces+linux-um=archiver.kernel.org@lists.infradead.org On Mon, Jun 12, 2023 at 02:04:03PM -0700, Vishal Moola (Oracle) wrote: > In order to split struct ptdesc from struct page, convert various > functions to use ptdescs. > > Signed-off-by: Vishal Moola (Oracle) Acked-by: Mike Rapoport (IBM) > --- > arch/powerpc/mm/book3s64/mmu_context.c | 10 +++--- > arch/powerpc/mm/book3s64/pgtable.c | 32 +++++++++--------- > arch/powerpc/mm/pgtable-frag.c | 46 +++++++++++++------------- > 3 files changed, 44 insertions(+), 44 deletions(-) > > diff --git a/arch/powerpc/mm/book3s64/mmu_context.c b/arch/powerpc/mm/book3s64/mmu_context.c > index c766e4c26e42..1715b07c630c 100644 > --- a/arch/powerpc/mm/book3s64/mmu_context.c > +++ b/arch/powerpc/mm/book3s64/mmu_context.c > @@ -246,15 +246,15 @@ static void destroy_contexts(mm_context_t *ctx) > static void pmd_frag_destroy(void *pmd_frag) > { > int count; > - struct page *page; > + struct ptdesc *ptdesc; > > - page = virt_to_page(pmd_frag); > + ptdesc = virt_to_ptdesc(pmd_frag); > /* drop all the pending references */ > count = ((unsigned long)pmd_frag & ~PAGE_MASK) >> PMD_FRAG_SIZE_SHIFT; > /* We allow PTE_FRAG_NR fragments from a PTE page */ > - if (atomic_sub_and_test(PMD_FRAG_NR - count, &page->pt_frag_refcount)) { > - pgtable_pmd_page_dtor(page); > - __free_page(page); > + if (atomic_sub_and_test(PMD_FRAG_NR - count, &ptdesc->pt_frag_refcount)) { > + pagetable_pmd_dtor(ptdesc); > + pagetable_free(ptdesc); > } > } > > diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c > index 85c84e89e3ea..1212deeabe15 100644 > --- a/arch/powerpc/mm/book3s64/pgtable.c > +++ b/arch/powerpc/mm/book3s64/pgtable.c > @@ -306,22 +306,22 @@ static pmd_t *get_pmd_from_cache(struct mm_struct *mm) > static pmd_t *__alloc_for_pmdcache(struct mm_struct *mm) > { > void *ret = NULL; > - struct page *page; > + struct ptdesc *ptdesc; > gfp_t gfp = GFP_KERNEL_ACCOUNT | __GFP_ZERO; > > if (mm == &init_mm) > gfp &= ~__GFP_ACCOUNT; > - page = alloc_page(gfp); > - if (!page) > + ptdesc = pagetable_alloc(gfp, 0); > + if (!ptdesc) > return NULL; > - if (!pgtable_pmd_page_ctor(page)) { > - __free_pages(page, 0); > + if (!pagetable_pmd_ctor(ptdesc)) { > + pagetable_free(ptdesc); > return NULL; > } > > - atomic_set(&page->pt_frag_refcount, 1); > + atomic_set(&ptdesc->pt_frag_refcount, 1); > > - ret = page_address(page); > + ret = ptdesc_address(ptdesc); > /* > * if we support only one fragment just return the > * allocated page. > @@ -331,12 +331,12 @@ static pmd_t *__alloc_for_pmdcache(struct mm_struct *mm) > > spin_lock(&mm->page_table_lock); > /* > - * If we find pgtable_page set, we return > + * If we find ptdesc_page set, we return > * the allocated page with single fragment > * count. > */ > if (likely(!mm->context.pmd_frag)) { > - atomic_set(&page->pt_frag_refcount, PMD_FRAG_NR); > + atomic_set(&ptdesc->pt_frag_refcount, PMD_FRAG_NR); > mm->context.pmd_frag = ret + PMD_FRAG_SIZE; > } > spin_unlock(&mm->page_table_lock); > @@ -357,15 +357,15 @@ pmd_t *pmd_fragment_alloc(struct mm_struct *mm, unsigned long vmaddr) > > void pmd_fragment_free(unsigned long *pmd) > { > - struct page *page = virt_to_page(pmd); > + struct ptdesc *ptdesc = virt_to_ptdesc(pmd); > > - if (PageReserved(page)) > - return free_reserved_page(page); > + if (pagetable_is_reserved(ptdesc)) > + return free_reserved_ptdesc(ptdesc); > > - BUG_ON(atomic_read(&page->pt_frag_refcount) <= 0); > - if (atomic_dec_and_test(&page->pt_frag_refcount)) { > - pgtable_pmd_page_dtor(page); > - __free_page(page); > + BUG_ON(atomic_read(&ptdesc->pt_frag_refcount) <= 0); > + if (atomic_dec_and_test(&ptdesc->pt_frag_refcount)) { > + pagetable_pmd_dtor(ptdesc); > + pagetable_free(ptdesc); > } > } > > diff --git a/arch/powerpc/mm/pgtable-frag.c b/arch/powerpc/mm/pgtable-frag.c > index 20652daa1d7e..8961f1540209 100644 > --- a/arch/powerpc/mm/pgtable-frag.c > +++ b/arch/powerpc/mm/pgtable-frag.c > @@ -18,15 +18,15 @@ > void pte_frag_destroy(void *pte_frag) > { > int count; > - struct page *page; > + struct ptdesc *ptdesc; > > - page = virt_to_page(pte_frag); > + ptdesc = virt_to_ptdesc(pte_frag); > /* drop all the pending references */ > count = ((unsigned long)pte_frag & ~PAGE_MASK) >> PTE_FRAG_SIZE_SHIFT; > /* We allow PTE_FRAG_NR fragments from a PTE page */ > - if (atomic_sub_and_test(PTE_FRAG_NR - count, &page->pt_frag_refcount)) { > - pgtable_pte_page_dtor(page); > - __free_page(page); > + if (atomic_sub_and_test(PTE_FRAG_NR - count, &ptdesc->pt_frag_refcount)) { > + pagetable_pte_dtor(ptdesc); > + pagetable_free(ptdesc); > } > } > > @@ -55,25 +55,25 @@ static pte_t *get_pte_from_cache(struct mm_struct *mm) > static pte_t *__alloc_for_ptecache(struct mm_struct *mm, int kernel) > { > void *ret = NULL; > - struct page *page; > + struct ptdesc *ptdesc; > > if (!kernel) { > - page = alloc_page(PGALLOC_GFP | __GFP_ACCOUNT); > - if (!page) > + ptdesc = pagetable_alloc(PGALLOC_GFP | __GFP_ACCOUNT, 0); > + if (!ptdesc) > return NULL; > - if (!pgtable_pte_page_ctor(page)) { > - __free_page(page); > + if (!pagetable_pte_ctor(ptdesc)) { > + pagetable_free(ptdesc); > return NULL; > } > } else { > - page = alloc_page(PGALLOC_GFP); > - if (!page) > + ptdesc = pagetable_alloc(PGALLOC_GFP, 0); > + if (!ptdesc) > return NULL; > } > > - atomic_set(&page->pt_frag_refcount, 1); > + atomic_set(&ptdesc->pt_frag_refcount, 1); > > - ret = page_address(page); > + ret = ptdesc_address(ptdesc); > /* > * if we support only one fragment just return the > * allocated page. > @@ -82,12 +82,12 @@ static pte_t *__alloc_for_ptecache(struct mm_struct *mm, int kernel) > return ret; > spin_lock(&mm->page_table_lock); > /* > - * If we find pgtable_page set, we return > + * If we find ptdesc_page set, we return > * the allocated page with single fragment > * count. > */ > if (likely(!pte_frag_get(&mm->context))) { > - atomic_set(&page->pt_frag_refcount, PTE_FRAG_NR); > + atomic_set(&ptdesc->pt_frag_refcount, PTE_FRAG_NR); > pte_frag_set(&mm->context, ret + PTE_FRAG_SIZE); > } > spin_unlock(&mm->page_table_lock); > @@ -108,15 +108,15 @@ pte_t *pte_fragment_alloc(struct mm_struct *mm, int kernel) > > void pte_fragment_free(unsigned long *table, int kernel) > { > - struct page *page = virt_to_page(table); > + struct ptdesc *ptdesc = virt_to_ptdesc(table); > > - if (PageReserved(page)) > - return free_reserved_page(page); > + if (pagetable_is_reserved(ptdesc)) > + return free_reserved_ptdesc(ptdesc); > > - BUG_ON(atomic_read(&page->pt_frag_refcount) <= 0); > - if (atomic_dec_and_test(&page->pt_frag_refcount)) { > + BUG_ON(atomic_read(&ptdesc->pt_frag_refcount) <= 0); > + if (atomic_dec_and_test(&ptdesc->pt_frag_refcount)) { > if (!kernel) > - pgtable_pte_page_dtor(page); > - __free_page(page); > + pagetable_pte_dtor(ptdesc); > + pagetable_free(ptdesc); > } > } > -- > 2.40.1 > > -- Sincerely yours, Mike. _______________________________________________ linux-um mailing list linux-um@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-um