From patchwork Thu Jun 22 20:57:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13289620 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 3EDB1C0015E for ; Thu, 22 Jun 2023 20:58:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CC69F8D0019; Thu, 22 Jun 2023 16:58:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C77CF8D0001; Thu, 22 Jun 2023 16:58:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AF16E8D0019; Thu, 22 Jun 2023 16:58:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 9D1418D0001 for ; Thu, 22 Jun 2023 16:58:47 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 5FBFC12016A for ; Thu, 22 Jun 2023 20:58:47 +0000 (UTC) X-FDA: 80931597894.21.1D07AE6 Received: from mail-vk1-f182.google.com (mail-vk1-f182.google.com [209.85.221.182]) by imf20.hostedemail.com (Postfix) with ESMTP id 8AD211C000E for ; Thu, 22 Jun 2023 20:58:44 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=kdaaDiZK; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf20.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.221.182 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=1687467524; 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=pBiyp2dfMpzV+NvCt1JbKOh6Ic1GEYp83948mVxRzoc=; b=i7gBmadxzCHf63MPYIjSUQ98PEac8ZNdfmGvUXdCEHlLplu5pGLaERSMkWq4NGI36wZ0bK w3xUoZMSFAsGW92t4zLkDXo7XgmD4YX1dV0Fy1eXklFDj3xBN+YFOX2Kbq12A8JRGgY+ds p5vwBfEEMaHe0fX+axKnWfFDSrwZQVs= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=kdaaDiZK; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf20.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.221.182 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687467524; a=rsa-sha256; cv=none; b=6FaePcWxMJVyVJmOJxwGF/rvFIOX/r0aAE7SJND6COqH0cHWuUprhl1s8NcSA/0O0L5N8U 7VobNND81PqtXyOT38LiP3QU7B9QtUXg0ooxRfMp4f2Id0pFdQH72xWYsGrgRuVGpcmoxh vBgSQHns3I5LvkjszFnp1ua03tv79tw= Received: by mail-vk1-f182.google.com with SMTP id 71dfb90a1353d-4718f761333so2381571e0c.0 for ; Thu, 22 Jun 2023 13:58:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687467523; x=1690059523; 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=pBiyp2dfMpzV+NvCt1JbKOh6Ic1GEYp83948mVxRzoc=; b=kdaaDiZKntiVJqU6E+Fdy3gZ3zaYbFA4aZZ/ujglTgT5Y9qcAssURDthairv7t75pp DZxvPr4/eKE0doRm+U97EupNPOOTaxsU7MNWazhNoOvbWE4XMk615RzVbyQxpiQSMZLV teIZa5P2Nka6xv2fZj5Vm1X3bRNUsisHvvXMCnaK2ZkQVxJ23k+YXES8hxX51riBNGcy dBs/ll9Jvj9PkoRHnWQsnOHXYAxD19XHIBiXUNkDRQVqZwqJb6khPxnLaSebog2ECYc2 chI66X4PTb46Q3YOBBlw9vYeA9+HI9TiAAm+zkoHCKp+jdKVA4Qb45V8N3EiJFN0K5gl bLCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687467523; x=1690059523; 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=pBiyp2dfMpzV+NvCt1JbKOh6Ic1GEYp83948mVxRzoc=; b=UzQeUJE2gr6u4cyIJa83ceSTPstTUdCj17yXEKDvD3+bfdoP1C5h0/iEolvUmqU/UW FzVwrkJ+fz5ttrUn3f0VNjfNmIwsgNo57Czj2Yu753xIy/mf1SoiiDMuFQVTtBkD9c7m Vt9pkT6UBF/S2scqxhwbARMI20JbjQynDI8vQBBq6OLfXufZVgHkTGDxMDsQhvuDJVHS TY95Y3HThdhpnjDzr2kuKXyUMSPCK03Yzurfig5kiiXK/vKV0p3T7GfDH8WjqGsv4Gnp Bj8vw0o89sMUnLchkkFQ5UeHUpyyKsvqoUYCkONcngB8hr8e7KB0A9RM3Ao3kJSDi8z1 AjIw== X-Gm-Message-State: AC+VfDy1XiNfdrwYHCb2nYSmyo0u5gRXhDVlzEadPFt8yp/MGolbJSkb fzmyMyI57LIESKfW+TLZnzE= X-Google-Smtp-Source: ACHHUZ4CnESNgKf2MlezH4s3DCtDkik+QVMr2WtnXejWDaMJ55d+3hRh640wmo8yJZi9qvEIVubjUg== X-Received: by 2002:a1f:c1c3:0:b0:463:b57a:e927 with SMTP id r186-20020a1fc1c3000000b00463b57ae927mr9637913vkf.4.1687467523563; Thu, 22 Jun 2023 13:58:43 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 13:58:43 -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)" , Huacai Chen , Mike Rapoport Subject: [PATCH v5 23/33] loongarch: Convert various functions to use ptdescs Date: Thu, 22 Jun 2023 13:57:35 -0700 Message-Id: <20230622205745.79707-24-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-Server: rspam09 X-Rspamd-Queue-Id: 8AD211C000E X-Stat-Signature: 33mjp9en33n16zabnsze73n9qfu49xr6 X-Rspam-User: X-HE-Tag: 1687467524-524987 X-HE-Meta: U2FsdGVkX18mBC298G7LVq687o+peAFjD3wfVV9A7EaowxaBSjC166T+HMf53z+gqzuErd29jZ4efRqlGiWFBpXn0/5e9kI2RfE8QrP/XBwssPCArtB5wy8x8AfW8OWfrea+AhLhRz2lQ2+KrTH47CwHsff9B7OqZ3a4ZkZL+vqh3gEylnZAvr8/5XdbeUC7LajdH09/hdLiPObQRRti+dJUw0jSpS83RH43CMHZQHqz/37kVPv3Jep5sk4XkBUGg4SIqyLQMthuu4EE1anrVfjmeazhAOPb0qPiwDvwO9FM0uipHhMiNJcYrUiR8G9uSH774KqN+6zgazBRaOyFB7yIaRIGrZdHj6Q8nL60WkwtnFNVWOLPSfKIL9ufxqi3AxZ+bEmee0bnxAnaj/4odOuHVTONGI29eBQA/Ue6hMLxHvugAcotW20+PXZnT8DvvcYOZWl5gpz7ZxS3l//PRly89w8Hz8pNROAkxBjFJSg02oODFdFhvBqls8jB4qzlp588DXsN4JZMOL26pQAYry9A9L/Dt2Ff8hn2FadPsy/Cinv3Z8lMyuaOGemSnMB/L6QNSqhd7LKK0VYbxoTac8hH27VEkyMwGnJVtfkSRoSOooRjK6uDVebX497MJZtHu23m9qcfG0PWJvsw3VjLBgwQvkRB7EIVUfRKTmrImVHXRwxwaKzY3BNwbRZpXX1+Tzct24yxeYV4R2F+K2Hej0LlU2HBRXNz2VMGVQHdIbE8h5kho7rvdEpfv6Cwhi1vdIJp55OG1kVtzMtcaCJtW5Nz6JkUzlp6p1lGb4VGrwBGfxxRAl0/tfdhwdmHp8ggQiDckZINKELeg/ccTHZDSGYAxTrqJqxzzE5hOXw6kBUG/fF7ySmA3mXgmdGUjiEoR08+Ldi7vJaXn45J6O1bQKm8HkpWDQq2C136PQBR4z80wSLzQRpafmK8WGRVw8XvgXWrgTjYEbhSXO6yXc2 5C2y7fTM 1c3mhGsRFb1lRhiIvPFUfv2jDyNo9US6bH9tPf5O1Uz41eL+zNRaYqDh1sQmoB4bYT1iEpbxPbbAWpXz0ya5x+Zz1q82ZAjjIDohfEAzf5Sy6X077GBytlBZuaBD3eKSUCWWUrLXXBKENRNSkBr9+cPpbjw2acf5iwSCaIYlgG2mT3e0d+wDYSM0/SP7GAFnEfkdLVSTa+X7/rxRowLGQzGpgEbKs4JWjj1S7+I1Nr2hisQhsMKBde9SZoUQRIKeoP4supL8jqRIi54GPO17G1edM3CRzsg2E+18mUPWM8LZR51HLyDEvE38h5wMko6D4iWSF/ElOOJzo1gv6OVUqaxC3jGY/BefcOpQ+pRGR7aebu7eAC4vcXAP11lG70+Auq9MmcK7MDkSlO4M5sNoGVGW8BWdR9GWV1AgYsGD/Z0HODEx0o8oUzV+TRZIjlnkZgEmwYGouYnLXwmmO1kHiDguic2bTDV3b2bItJZvyHxUeEdmBpOKLSuSnPCUEe+Z8A3s+LQqSQIEvTfMektPKMKXRDHKRU+YDyWlyGIWJYpg4Lkgp5tuUhDA/UATUN4yTiDVB6omq2IWZLD9S01VUAE8xvRp78Ume312XqhW3+UJZV3o5mI4sGdjXl6jajYSHKwNm 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/loongarch/include/asm/pgalloc.h | 27 +++++++++++++++------------ arch/loongarch/mm/pgtable.c | 7 ++++--- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/arch/loongarch/include/asm/pgalloc.h b/arch/loongarch/include/asm/pgalloc.h index af1d1e4a6965..23f5b1107246 100644 --- a/arch/loongarch/include/asm/pgalloc.h +++ b/arch/loongarch/include/asm/pgalloc.h @@ -45,9 +45,9 @@ extern void pagetable_init(void); extern pgd_t *pgd_alloc(struct mm_struct *mm); #define __pte_free_tlb(tlb, pte, address) \ -do { \ - pgtable_pte_page_dtor(pte); \ - tlb_remove_page((tlb), pte); \ +do { \ + pagetable_pte_dtor(page_ptdesc(pte)); \ + tlb_remove_page_ptdesc((tlb), page_ptdesc(pte)); \ } while (0) #ifndef __PAGETABLE_PMD_FOLDED @@ -55,18 +55,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_page(GFP_KERNEL_ACCOUNT); - if (!pg) + ptdesc = pagetable_alloc(GFP_KERNEL_ACCOUNT, 0); + if (!ptdesc) return NULL; - if (!pgtable_pmd_page_ctor(pg)) { - __free_page(pg); + 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; } @@ -80,10 +80,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 & ~__GFP_HIGHMEM, 0); - pud = (pud_t *) __get_free_page(GFP_KERNEL); - if (pud) - pud_init(pud); + if (!ptdesc) + return NULL; + pud = ptdesc_address(ptdesc); + + pud_init(pud); return pud; } diff --git a/arch/loongarch/mm/pgtable.c b/arch/loongarch/mm/pgtable.c index 36a6dc0148ae..5bd102b51f7c 100644 --- a/arch/loongarch/mm/pgtable.c +++ b/arch/loongarch/mm/pgtable.c @@ -11,10 +11,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 & ~__GFP_HIGHMEM, 0); - ret = (pgd_t *) __get_free_page(GFP_KERNEL); - if (ret) { + if (ptdesc) { + ret = (pgd_t *)ptdesc_address(ptdesc); init = pgd_offset(&init_mm, 0UL); pgd_init(ret); memcpy(ret + USER_PTRS_PER_PGD, init + USER_PTRS_PER_PGD,