From patchwork Tue Jul 25 04:20:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13325735 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 E4893EB64DD for ; Tue, 25 Jul 2023 04:21:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0129B900007; Tue, 25 Jul 2023 00:21:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F2C83900002; Tue, 25 Jul 2023 00:21:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D5696900007; Tue, 25 Jul 2023 00:21:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id C4483900002 for ; Tue, 25 Jul 2023 00:21:58 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 97A95C0C57 for ; Tue, 25 Jul 2023 04:21:58 +0000 (UTC) X-FDA: 81048836316.25.F5F1237 Received: from mail-yb1-f175.google.com (mail-yb1-f175.google.com [209.85.219.175]) by imf11.hostedemail.com (Postfix) with ESMTP id CC6654001C for ; Tue, 25 Jul 2023 04:21:56 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=fGvrybG9; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.175 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690258916; a=rsa-sha256; cv=none; b=bASdrydT7H5RTcYsAu0dNSq0AY+F1aYwmLbb/dFrpweWKrQpc/cNFgKwBa5H9hF1qZhOX2 PB4emZPrUzoWznZWXkhiy6uy08piDIXdpt/Q24Y+06HTbJbHpi7SMkaB5n09NknC+EW7X2 kzMqQlht/UzPtp98ztPh7RPyFD1lfiM= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=fGvrybG9; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.175 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=1690258916; 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=Z2eVDlXL8alglJUGVXcc8JA7ix0brgT+4DYqdXjkOuM=; b=VapREoF/Pu1+O4xJQDsT47r//zBi+ZTxk3bwCO95n3XQ282kdTnNG3kxbPqMwfJKJEbmfD pn/g8QcaBH/Qmqt0HofzVMilstO/0PzQw1M5zd25EX6eHbJyBB+JGrT76VrCR0M9VcuLxF AD5unZ4fr3ip073uevp9YMm14jksREw= Received: by mail-yb1-f175.google.com with SMTP id 3f1490d57ef6-ca3cc52ee62so5589270276.0 for ; Mon, 24 Jul 2023 21:21:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690258916; x=1690863716; 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=Z2eVDlXL8alglJUGVXcc8JA7ix0brgT+4DYqdXjkOuM=; b=fGvrybG9veCXSoZFXJMA0UtqwNVtXsAlnWuMk/bkXpKkiczqed+HRBg7qpGXw+rftP R8qGxP/khxNNrFznF2hl0CDjqxop72dBkyp4625bQ80IjqR8i+AlFghPxbvHSncIk2dU DIqadiRIjjzhPNPBHKa8Srlv+IgcPTSwuOlmzDd7w7/overcGZcXEJW2ZE2gLlzTkiIr 14q1X4buVUmvyXPkdMqpiQ5xV1g5ijhPBheP6rwOByILYuHwrisg3701wx7CgFQtr2bO RrmWP1BVIW5ubmY7FqAv2e+hZuvZuJ8ivG88vT2nRQQmOHlirL+OU5ylsfQ+AZXaGLB1 RXTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690258916; x=1690863716; 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=Z2eVDlXL8alglJUGVXcc8JA7ix0brgT+4DYqdXjkOuM=; b=cShc/e3d5Xbzyec/cXnW47yfYRbToSv/+nvPrE4JDJyUqv/fM9LpPXeiP2uUaHLduy YS/fgEjZ1QWoz2XhDxr+LS4BEZ4bR9C4IwlQ+6jIYnJ2Iw767F+ykIRSIhgzYRIBKHBP zIGhnV+iNft8boYLsRiykDEM0Vam8StuqmiYfey66pIAO/uNZUShu046i/bvc352/oso jUsI5uKL5chwJrE46H0l7Mm+hmAyTEqmn9b3KoulfGqO8RWNinRQSTREB/7GNZgwryDa q40oCFcse3UsYq+J2kMO3vMTPdBLeJd/TzV7CfyAL3b8G7FyFgi/etx3NKAbSbONWKWR C0LA== X-Gm-Message-State: ABy/qLaRK0eOHQ+ulAvuNH8AKW66qokzblRLqQVzDVG4o0THk6DfGcxB 07jS3EGTT/d+22refYXo8/s= X-Google-Smtp-Source: APBJJlGrUdYE+QekYe04OLVV4hTwe68IN9aeZvp7joelMErKuv+FL/dozsxuFXjvhOH/EvJSITLrDw== X-Received: by 2002:a25:ac88:0:b0:d16:7ccc:b407 with SMTP id x8-20020a25ac88000000b00d167cccb407mr1735614ybi.39.1690258915878; Mon, 24 Jul 2023 21:21:55 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id h9-20020a25b189000000b00d0db687ef48sm1175540ybj.61.2023.07.24.21.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 21:21:55 -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)" , Thomas Bogendoerfer , Mike Rapoport Subject: [PATCH mm-unstable v7 23/31] mips: Convert various functions to use ptdescs Date: Mon, 24 Jul 2023 21:20:43 -0700 Message-Id: <20230725042051.36691-24-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230725042051.36691-1-vishal.moola@gmail.com> References: <20230725042051.36691-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: CC6654001C X-Stat-Signature: 3e9ojzgxnxhtcf4kxgnxupw9nmw7wa86 X-HE-Tag: 1690258916-912957 X-HE-Meta: U2FsdGVkX1+SDBqD4kLyqQEXg37gLfaBza7GPkPKd4LZ3bezwc4WqXE2lDLKsA1xdeZQ8vSLzAOp0jxHWw/GnmDYFYug45OeO9H1jbbBYtRiHEjCu3f7pqRX203pX6gf9XvnXQ+rchMkooWnhRvPXFexu5iFXLJnrDxrlFUtiJDiedhMAWdVsVKzB2UgjtFp5loh2DU8ihCl0XgM2tIkdrC+dgh+UCt4cjBmzE7+OXKdrgCB2moubUXsa4ZoPbNzkCp1l9r3e0txkG+HmfMIpYXuqxC67MY2pzA7uOCsoSZWl3E7OLFxza1KCZKSaWVJypIyW/H9NxXgVI1a64JiPt6AsHg0j9s+7Ycop9Kd9reQoaxT6V6LTCC1p8ZBue0c9qWzh6ClNtabMjBzUDJUCLf+2z9FaFVYiNLaC21eajeDYvg59w4YoBHXqanHABOxTbiCyl2opguUD5aWnWuC7nYbRQDNQOfvkMiziko9g1LIjE+vgLPW/6aJ4byRST2HMDzwHRgV223C/7cl1C18btPl9OQ31siPH19Sa6Oq4p27YNB9NRUsczYfgZ0k9KLnUh3G/YdMUVn3f8WNfEA5c28/H29x9mom+UxXnuZCNgomqP9sN0LUYgp3DKiLOKIWDk8+gkdmjjXseBOD1VMNUlTpsxhxQTr8mQvfVlwwCEZPULHYg7oYJbRxSvNHXDbHa7wIsoCXgZaw2lZEOJE7lsQFL7Z2DjP/ntm5gkEnEhvYMqOrNRkw6n01O4pLeE+HV0I6A+z/O/82seYTRqk4CgiTn6ocazRgh/9XoTFywBqZ94SyUAgPMhlQbg91T2ThYupZ6TYhCmsTVtItcm7e8APKpUCYvRFXsyjdQvPF5qdkehqiVjl1i03pyg24eQ/wWmIjUo0iQlROaPjDB7ou4UoRsmjjvAVGGvA2TUxAhfe3BmbDbD/0g0wDId4gVI7lEG+8QkxfFPeI8yiSKxi GGqpOYRJ TNkCCNbfbuAln27E5xPRxpV6FMxNp2mnZplrUUMWGuWxBsbeJEc79GSkvsaDSv9KyZgyCgxDrJSMpNm8BVM8NS4paW7vZO2m2Tzxftobg+hP5/2420ks6eXyG8U59wUnpe5SXz6HkqOhlPl0leKe91tvPfc+R75VCqDAZ+JyBVXREqIA9JwtxdNJQsXovc0oJXqjrfh6ZiZhaNK1au2cBL8tHHak57TdUAqRZQWOjpO1YoAI/UI5xBGRIjNOBfaejpRGXMxLlpTItBYcU092IxAH3GHEp735IuBjfs8Kes+CYxXEEZYiU7h4nzvptNZAL13mNawvJBHpB6MwtfvySEtOJQE7mxipeMfPMxMhEgtmAkExMOcWhlS94fo18yGkRbByadS6ORqsjMH7KrS0NtdTCCSxVwZvGqA/6Z0FAZHdOe2mKj8zwkhAH55fZXOVK1UuQZKpiA5qjOVyrMCsDjQjMGkCVggug1xhmi4VaRhETIkv9bmsliXVIhA== 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: 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 | 32 ++++++++++++++++++-------------- arch/mips/mm/pgtable.c | 8 +++++--- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h index f72e737dda21..40e40a7eb94a 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,14 @@ 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 & ~__GFP_HIGHMEM, + 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..1506e458040d 100644 --- a/arch/mips/mm/pgtable.c +++ b/arch/mips/mm/pgtable.c @@ -10,10 +10,12 @@ pgd_t *pgd_alloc(struct mm_struct *mm) { - pgd_t *ret, *init; + pgd_t *init, *ret = NULL; + struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL & ~__GFP_HIGHMEM, + 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,