From patchwork Thu Jun 22 20:57:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13289610 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 04453C001B1 for ; Thu, 22 Jun 2023 20:58:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 833D78D0003; Thu, 22 Jun 2023 16:58:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7BCC98D0001; Thu, 22 Jun 2023 16:58:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 636738D0003; Thu, 22 Jun 2023 16:58:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 53BAA8D0001 for ; Thu, 22 Jun 2023 16:58:26 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 0C420C0195 for ; Thu, 22 Jun 2023 20:58:26 +0000 (UTC) X-FDA: 80931597012.21.F3216EA Received: from mail-vs1-f42.google.com (mail-vs1-f42.google.com [209.85.217.42]) by imf29.hostedemail.com (Postfix) with ESMTP id EA5ED120015 for ; Thu, 22 Jun 2023 20:58:23 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ABncV8bc; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf29.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.217.42 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687467504; 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=JO1uHT8He+Av5NkiVAKHRKBK8X3I83QFDr1CeWVeYZ4=; b=wKautdzl07XzS+rjvZ9T/gGWzboOf6eL3tlw8Rr6zXg0ERzaMTBjqbGZ58AxLCcihmJ4O5 l9Uss3v0msrp2BDuocWl1i6gKqFDrfwqCgIjUnMPhbvRX8rI0hutdZsvxCCob6tm1RFENE jARORXrV4q5efLcus7uqbBb+RjnSHGE= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ABncV8bc; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf29.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.217.42 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687467504; a=rsa-sha256; cv=none; b=YhvVh0wHC7emX7Z0za/YitvBggPobp68moCz6BtXmOjXHjdBCAKLq3urofO/Jmg6hHrx3B KFu+ksKvt05Exqwe9hpRjlPt8MNzIBzS4Y47H0fk+xTWRIci92gAbxHGln8bA4uGXtX+2E BtNLt5s9ojLBTuIG0Gt63xKOhpg+wbU= Received: by mail-vs1-f42.google.com with SMTP id ada2fe7eead31-440ad8ea514so2000323137.2 for ; Thu, 22 Jun 2023 13:58:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687467503; x=1690059503; 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=JO1uHT8He+Av5NkiVAKHRKBK8X3I83QFDr1CeWVeYZ4=; b=ABncV8bcPnEx/V5hIZt3PK/aoJ0qqGZh9rD70FXARHI59ktAXJSvC9QEDtQfXkDAn0 gPvKhKRqJ9/P2llt1JLv5/rvvesIO3IE1AWOpUXp6uiTrsNqZThkWa1zouEa3Mbcsav1 276BRnzfwGIqQvVb7zax3PpvYwF7X1EO6UUT2ec+v+o19Kw7redekwq60WrGr9r5dly5 iwJZLpkxzloILO701IKBKyiXRNIoFjjYDVD07RCmfWhhF52WoxSilofbL2vgDoXDMBKs Q1/htIPwHXAwm3A3T5s4rqwem2be0Q53PLHeqtpDT4d2+OmrVTF4tJkx6cGzhA/nmIID QsiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687467503; x=1690059503; 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=JO1uHT8He+Av5NkiVAKHRKBK8X3I83QFDr1CeWVeYZ4=; b=gTc8mIlhwrmKXd5cqH/Ad9tg5yGfkjf1UASKbLXMD6/SYcPhsW7C2kqEEjVOtlvBce fIoTk9lVs/ty3J4RYFZz0UGk90B/TCIiNO3sfem36RtwkGY/ZikGLIL8sgV2A8dIMxhL MmoPl8amD4MnlonC+M1csIEM5+MSor1nW2wLymCdHJPrxfuNQDTsnUfMFrdKjC9FGHbl EBy5MHe+iUkFmzQASbJp0kIMX7feoKLtwnBy7XH6s0V4wQdMVVfs0q2Km0E00H7XN0Bi qQaGuyhay+iX2pHQBIqHA7n65HerIgFkrzZ4rLglbGK8jNMkZcd/7JowgVq+wmXLAiTF 7k0A== X-Gm-Message-State: AC+VfDynJrjNodR45JWPaVaDisRLZWbkD1GTEKx+pt2emik69oZCMdwA aAq2pEffYBaxvJiqF8vNHDE= X-Google-Smtp-Source: ACHHUZ6J7vEsrvtjtX6BrmtaxKuDLa21w+gHXjjUWBOcKrlZJaxY4XlKKEFhMBRF8kX2fbwnoUz2mw== X-Received: by 2002:a67:ef81:0:b0:440:8ac0:ef57 with SMTP id r1-20020a67ef81000000b004408ac0ef57mr9038809vsp.24.1687467502842; Thu, 22 Jun 2023 13:58:22 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::36]) by smtp.googlemail.com with ESMTPSA id d18-20020a5b0c52000000b00bc501a1b062sm1684937ybr.42.2023.06.22.13.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 13:58:22 -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)" , Christophe Leroy , Mike Rapoport Subject: [PATCH v5 13/33] powerpc: Convert various functions to use ptdescs Date: Thu, 22 Jun 2023 13:57:25 -0700 Message-Id: <20230622205745.79707-14-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622205745.79707-1-vishal.moola@gmail.com> References: <20230622205745.79707-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: EA5ED120015 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: ahutpj3q8xx3uns4rfttuzeinnxtiye5 X-HE-Tag: 1687467503-151650 X-HE-Meta: U2FsdGVkX18jtqblKVAa7JFD3FvD23MxMVPi1aL4NsZMI9I/8IppjNp3fv/boRQ3jz3f+V5EcumOEfss7S+efWjrP206HfTH0wm2bWid1US6ap4cTwDxQAYVig+N3VCBlyev7JTlmLW0puO7rK2FJTyIod6DO3+5pY/aiKzQdU+ioDycMwLPzzBcw+Wq1q15TcBCQeeTAcAMg9u1TPE9BHCnG5f3QoOa4ygPPB3JH4evennwJkmyyrKJI405tCBKt2paWAdBsjCG5zM4LgIZBXKDA4vIAlGlxvQuw7/ZB/Gbsn3dxYRkQ1ZuX8kLHA8oLFMTRuLJGsWHP72XzQgsivF6/QxD+aFEq0p6uB94BSG8OQM4Ux9YJRbMEM5HextLpSkffe26yE+X9KdFoEDtenIBGdZtw+sI5GbV6JoxY+VMFhR6SC2IKr2NfqdKkQ+LIdBuYIoFq4ssJejHayTNyLFNbu35FSKwPMSTtRvg8iRzuIIXzxydiXiESOa/LvFjMkMPjvBBZzD2zjCL4Fbeo3iVJamAZrjcH9LzIv38SCPnFCH31k6SohINNd0u/TYdR2TqtN+GFnMMmTban0VRtzWbgtOHFy2zrIYM3/LjuAVVkeqBbyaC1coeZ0GtcDWz6Xs3MF0VoVsxdqsfaA74VXdip2/+u4Jyre4fzuCLsJvhzGaw71rTMr086Oq3JuxiFJLDAaGyZMAKVz5QtdUs2iG/td4OnAPuaAaWngoNnd44nEwJsqpO4AAT30yRpjg0FJH3thQe9eowSO1YRnXGKqdvC45YtRSK+3o6ljW+ulgKxOOYOXIN9gycWgzDE51TIyCh4xKdXHrlPwqJVwUTB80f/56x+6dQFZYd+XSVySKXcnWde36hNeVQrPvY1mm0fYA/4TnN5/ObJe89uOOvRHo8XmrIy/K9NKhKB/eswYTedt0IT0Wv7+BmqrN7PslsBxcNp8BJneyEIjopatc Np1esAVA 6Z+F2oE2svQiQXwM2S4LeEmE5Up/Fv9cVqBi7eHCLN+XNMGmHkUI4prY21iwD/9je8ELD2RJAxs+18fiWAK4NHWnrHZiunKtHRfBfQvbYMC0GwlEuYvJQo0a/VIhqSzytlcGdWY6Gbu9v1+3ZXW4VE9oo/V8vRlkcd0dKHopus2LXMoIApE5auyn11HHYpqOvyxHhFDJ1C40eoLXZc/sw6C5omc4mvCDu5LndEbS2VWS3o0CvfVNGDij0sMAmIvEqrHdRRb71Y6NC9Marl+MURTZMvLDLUMPLL1fVa0ffUy/5uY0YU6vxbnvGOc3hDrs4HPB3OL/9RBbV5j34Cyrpt5xx7q1RZgtLaX8VqPsIs0mVMTAtsJxgWRz5z/E/3edp/Tc0SbeuvzNaeucL0RbjHm6ehrGDiPe3Dvvu3MJFDlgMjwTI0WwHnK/r6RCNfOYgiKd/+W7qA6VRSiWNX0P7yNgBCoFjO/rj9xxKFUNutjX68Lz5SpZqYw0e2WG2zlxiokiqYpWn8mFL2GQYwZQ4EaGZ0vJDrfsECah/mO5HWhvBakCrWkKJU+5QobAXpaVKdqJAbzfBmBdu6tij+A7bXQHChw== 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: 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); } }