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 4D755EB64DD for ; Thu, 22 Jun 2023 20:58:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB5768D001B; Thu, 22 Jun 2023 16:58:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D3B318D0001; Thu, 22 Jun 2023 16:58:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B6A368D001B; Thu, 22 Jun 2023 16:58:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id A2FA38D0001 for ; Thu, 22 Jun 2023 16:58:50 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 77F29A0218 for ; Thu, 22 Jun 2023 20:58:50 +0000 (UTC) X-FDA: 80931598020.26.17A00C5 Received: from mail-yb1-f179.google.com (mail-yb1-f179.google.com [209.85.219.179]) by imf06.hostedemail.com (Postfix) with ESMTP id A7936180013 for ; Thu, 22 Jun 2023 20:58:48 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="DbS/FVmf"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf06.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.179 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687467528; a=rsa-sha256; cv=none; b=Voc5IfSaflz69gJt3dVzjmp+ZIk/T+KmeFvchIYvd/vRpvwETobocnNrceaF4YoTeQWKiX ZbkMW6TA5mlhYfmHktPXJ8ACpPEyWpP7h9hy0n00eqfog8IFRWajpL6hmEZabn9TMQQd3O kCnhofxP0aWp8kTh3sJfNg+x98JSxRI= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="DbS/FVmf"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf06.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.179 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=1687467528; 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=INFvABlBGPZei79/94Knc0BJDqaawscgQvpgGElSn4Tjd1szAqH8o67dJaKQg2+EgsHgPG aw/v0lwV+jTg70fJR+wCsCBfuhDaPWS2GvmPmpOzUG/2h2GywJrMWpq+xpC6MHNKRExlb4 W1eGpYIHQHUyKG3D+RxnFWEQHSn7wUc= Received: by mail-yb1-f179.google.com with SMTP id 3f1490d57ef6-bfe6ea01ff5so2380990276.3 for ; Thu, 22 Jun 2023 13:58:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687467528; x=1690059528; 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=DbS/FVmft5J2VICO+Nf92XNy2wvgGSGG4msWs7E9V6KxYzm+tSzGTprRX7LY1Az4z2 YpRpjh1gFRRLJ/li9beG6PIvlUHG9ZRwTYplGkWymenSAyOrWC24owgK1fhjKR3yrEtN hDpVadLC+93vTqzcu4H8sHAK66wH4JJJgH7pIr7Eko07frtpGYI2AQVOUDXreCJkOXFd 1tssjWaKiQ/O8SbW0+/XdEB5l3eXLYaeBTMZyr+OokbQWbFNHBYbcUGqZxcWlMHvdqKX xSAVDlOu/6aRWjk6xB/QGaUjzCCA1KdGOVBnKZ7vKSpcGAQnSE9HW2pjZqAURJ5Ds3lR MAFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687467528; x=1690059528; 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=FYUDo67BKUsNGhJLLOdBQCItYHjImNHqChWbLuy7A0UYAbJaySeH5Hi18sNi5cr5Ww eXN203Vt5WaX18XyyWl1MF84uh7zaMVpDefBpE7QK9qOTCBJwTIhySCMDoeGIEODOMd4 ZaE6S6qbGX0lwc7npPcN11/X/u/A2EEWFvCoGSdzsUEV3sms/gJaJLub7QUwF3UGxub3 qcBL9wyOxaBdEDEv3MLiTdVoPhkM6y33H6jvmwA5ASuxX33y7/SQVmxoMAtx5M1goNW1 scYSP6RGK8dhXCYtwWXzpCffD6TYkAXydJvOVOueina5upmHX8Pkc/uPWS26+VJx55WP zD1Q== X-Gm-Message-State: AC+VfDxMoVAq2i4zw6rkLItIdRxuBRc7OP1qJR5+ZAbaIvfGRlxeFnD6 lLVXxjqqSKviNF8i2MrDpy4= X-Google-Smtp-Source: ACHHUZ6vkVdQ+2aFbexAEsw0zpg6DZHD2/vRtLHLUIl/mOJbyXKI4RGZmCd4L5PdfTZt6ngBy4nBHA== X-Received: by 2002:a25:44d:0:b0:bfe:e65b:cd1 with SMTP id 74-20020a25044d000000b00bfee65b0cd1mr5470842ybe.46.1687467527711; Thu, 22 Jun 2023 13:58:47 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 13:58:47 -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 v5 25/33] mips: Convert various functions to use ptdescs Date: Thu, 22 Jun 2023 13:57:37 -0700 Message-Id: <20230622205745.79707-26-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 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: A7936180013 X-Stat-Signature: j95p99d6ndty7fckbiymbe4rb476xmw9 X-HE-Tag: 1687467528-92662 X-HE-Meta: U2FsdGVkX18VD4xGWKAkj1GshhEtW1EHT2/Px8rdxYy0dVRE02EK+NHlIB0tGEv7QBjjwerEFakT9YTH4vgJDs4nR5trKNYp1QdrkJdFJCtx1zWnAFGj4UgiLc0Xh/v9842YN+ZUST2lOLHUVqb8bG7xgRGC6EdAkJuR2fZoDVMLomoQamgaJma8ckDsQa4rC37YkJ29ZNNrl97mJCuxa5dNNH2Mz39mQSvwr5/1BU+kJdvbpTXzaKiXTelfUl0lPGBf1DLR+qeNWyZLFVKCjVrp4pzI9dSClPW7VdU0z1d338K+vGTm4V9SCLoIwZi2z8bUiIgUpq3Ri6dAPCBY0WZKT0YMPOoyTLR1sDN/N6h0vvJ1bYn2PFsg9EOVdiICeEPJaISaHaWk0qJSV2F2aN8Il+VUlbgvfIRCp1OynZRKFlsb2UFLVlUpF6bn35C+0791RNQ7nQ962mLeXEKocUhsA/N6qGLzFm4hXgejrKalNjuHjMyky+5z4sCeP64k0/ilaAyTZKUSXf23abKNU5pV6WdrjJOEektLY4w/sWBKJ5wBtL8VWMoR9/x3DL3tm86Xh2X2Q5a151NTe9VOZ34X2A3HusbxqIJe2uZ6jdPfaPtEdBqT8nQsQPAC1oUona5tU3jg5hNgJwZ81riEgzPjjvqFdDNcnJ6du4qZHGtsxQyFAZrQZQQhsn5eLDBIuXt2S7LJ6+7UOlv2M1svhB49C/lYPxCpj4LePRFATfTzGZup+TTQGriYwzjoXZxv6bGymw7e652oaIMnYeKZVWt2kfFQMUIF20NTQ6t1UiQknaWQU7SVUwUBb0TKzauC4Q88oUd52R/LSfjmJM5P40S35+1WFuxAe04mJ8SFpbJYID9RTza1fssGVird8gldSmFcpzYmHT8xmL8LDruF42Y29gKLpi2nnSmW+S5wczjTO6R2e+1K/6eLEPKGzd1JKClR5UgBOHp+Ae8HuWC TAuOeqP9 FVS/rM8GQDGW+GxpSBXAP1LAAtVM0GzlP2DPe6zPHiiL4IoXP0gddVyjZhZjel0UebN9ZmtpI5t3NWTXhxkoL1PrrPvtVL8N7owH+aINVNh2NrpJOxrdbiqvqwsF75bCjPp0MYOtuBzP6SSNL2HPNm5p83S5lgRnOypFrhM6dPat8oxxwzcqp+C16Z/4RyIYalKEeQANMExnLqgkzs2Jfqzcu9v7jwu4klLnP49FneXEKjxjVQgdHsP/ZH8EihhuQGscs8rnV0xYw1kVjJOga6bHackhVVPSGTvq+KF7Zp8kkDfhRf4GUdDHa+BtLT34EeFtNKvSDds6Ng2E1r2DA5IkXxwpQWSIEZhKHH/gkobBP6/vs9HWedtGLVBSEw0RWKHhJBsOVlIHkaWBZm4YpFY1K27qTFVMySFB5Df8126ODx95wLV15zN496wWaOfnfw7BBkbhruqp6gra9GGeCuHgHxostRLtYdtXs/tj8XqYEIXYyHU7Qww+vtgW8trnx5MGs5AdWzQFo35XeJbIWkvuPzV/RSbGRCOQI04kPBs6i22G/59SvZKIBc0OlgqaLvlJOXLR9w6dVee80dp32+fQeHQ== 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, -- 2.40.1