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 33E97C001DF for ; Tue, 27 Jun 2023 03:16:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D8E608E0010; Mon, 26 Jun 2023 23:16:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D18D88E0002; Mon, 26 Jun 2023 23:16:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B1BA38E0010; Mon, 26 Jun 2023 23:16:03 -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 9CE6D8E0002 for ; Mon, 26 Jun 2023 23:16:03 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 74B6EA087B for ; Tue, 27 Jun 2023 03:16:03 +0000 (UTC) X-FDA: 80947063806.08.7669A92 Received: from mail-yw1-f172.google.com (mail-yw1-f172.google.com [209.85.128.172]) by imf10.hostedemail.com (Postfix) with ESMTP id 9F728C0004 for ; Tue, 27 Jun 2023 03:16:01 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=Rm5e85Cx; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.172 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687835761; a=rsa-sha256; cv=none; b=vO2QtQ/7hziUdolcQj4ofJ48td2LB0x4495paXORJwM0zI/pfFaS0Mmkj24X039zpnzDIR I0XCT3d3MDUcg2uJ5uIlV7vTp6HFshyCg77/T0H9KuIkYcYePTSXERDo4/qHLU83R3jisD kMDvY0sE2VVq5cYi/1itVZrw22dOcEk= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=Rm5e85Cx; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.172 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=1687835761; 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=cUBY6hJLJaY4vPDGYMzYp3IiN9wbgz0G74Sna/d7p7TTSc3JxpszkBJUK37DW55yYjguph YTNb35MNJy6V7nyCspiVz4AgiB3mgcjAwOcflBh+HyABkhDqXxtbgdGAEYwJ4u76oqxGca LyIVMjBmdFMFcLdJ0kv/u+5HyBxt1zY= Received: by mail-yw1-f172.google.com with SMTP id 00721157ae682-57059626276so44704437b3.3 for ; Mon, 26 Jun 2023 20:16:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687835761; x=1690427761; 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=Rm5e85CxLSywqFxegbM92lF42neHfR0fR+lQK4IGVo6rv84p4nUjka/pX4hUXrlpwO WD89hdl3l7+Q82fCWDirVtfl1UdPVGFAIR8Pji+LBlOshyqJG18LS5xzOpOCQe2DamDu jKvOLad62fOFII4Rcx9NR2LrprdDjwL6rx6EBRmhcfI68ty/WxtUVuYaOl3yyA6VAcm8 kllPQdGN+P459ax9lvyxifjF3Qc52jw7EuJ0L5rjpr2rzqsA5k+0IGd/73X59eOaGEjw K+/CutY1Ags92Fdl/Y8Zq5PhNziANc4vxThpN5vTFQCoz8gt8gqyoqM1KvT2g/UvZYfQ zR+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687835761; x=1690427761; 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=aErjN7PrUbXSWpClFaWxLRRD2ECiMF8gZhGWMyM8DLSHDUNNGXx0ALjEbKIB9EfvtV ftEBS1npmdRrhtY5dfpjlS8jAEzgZHbHeL9jT/hdxZYfZl+H8WI34pHwDx/sjDmwgGKv wNpx27VN1EUUz3KPtBgzecoGMXl71clu9oBnQgwa5Bby5ycO979lT5HZMCe6DEbVqEIJ wGh26f/Q7lWdUSTcyEwt/NSzOc2kslIaXkMZo5RZlOfsd3P314frd9pZVg0jnVI49Evf P1pg4DiOk6EdpsoSbFp/vDquoIJqi472ms9/FMHdh8ywY910JuAsJdcYZoIUay2T/rzw eRhw== X-Gm-Message-State: AC+VfDxrdaSecjV/8915yihzNxay+2++Puk/apr2xmHlN12jYmCqVXmD 7Bqs6tr9l4vFYvTrDmc/FFI= X-Google-Smtp-Source: ACHHUZ7ohgVca4eugfFM/saLKJ40V7MYdUNGfKx6MOO12TR+JS8tS/aqfK1zXJTwp/W9GOKug+ymcA== X-Received: by 2002:a0d:d8c2:0:b0:565:8c16:a0e1 with SMTP id a185-20020a0dd8c2000000b005658c16a0e1mr39842823ywe.13.1687835760682; Mon, 26 Jun 2023 20:16:00 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id s4-20020a0dd004000000b0057399b3bd26sm1614798ywd.33.2023.06.26.20.15.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 20:16:00 -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 v6 25/33] mips: Convert various functions to use ptdescs Date: Mon, 26 Jun 2023 20:14:23 -0700 Message-Id: <20230627031431.29653-26-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230627031431.29653-1-vishal.moola@gmail.com> References: <20230627031431.29653-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 9F728C0004 X-Stat-Signature: 7is9zq7shfgpt58gpiypeaeioxrxk8t1 X-HE-Tag: 1687835761-523513 X-HE-Meta: U2FsdGVkX19Mi0EnebukHB8doNN+mvD6PdLGHrT0QOPivBfR5r+YfXRpUF0m2rorVjh9QY/ZAr0UMFbAVGSvQiuzy1jWRnWA41GgCwxPxp6l1MtMOw1IH5mbXCL6evwfH6LEhO4CEZ+DeN2EVBCnHq565eSjnWD93/OrMB02zvJD7evgvvfzhbZc0AfeA1/dGmAeO/0U67Hw15SawhZkP9afjwjjkxlkON9fNm7IjTsVpmOuDcQeez/ZP40Q16eERD/XBBI3yXYdd2dfoZSF5AalM4P+Xz5i0Ivsohc8qI1nVSaqRFiSjHpatInyXJae0OFCifH2e7qQa44I9uEU78TURusNCnfWyitiYkxpjmKWum8llI0p5x3Nx9mWQeot/x/s4DiEpWnoEvlnRLMo5iGft3qhkmBZm+V4dfcjK4wb6+69PAwbVJs7wRHEpriPwqXnOpuzdis6qcrBJHYKT/5NKPh8Qn97qZc7QeUZDKJGJLsHMril5880qJo6Ul9GRUlAWwrlRga3QcYS/5NW1OnYU40syRc5zPMPSgitI8tA1uX5udbzgsyJRg02C78TB7UfXUdJb3HFoF6pzz4+DY/2XIjXzLaaEHUP/UIBSjDahTkisK4Z1FekftK1RqxE88awvafqfO9oS0h2v1/vZE7oSy01qxdvkjHpYrijdTxjlROL1Ex9LPgnLNujuIK7WRDapc1CW3ieINoNXrUktxv29XdnTYphorqtwpi0ZY+Nugho5P6TFb+AVZW3KZiX/5K0Ts38FIngHr6SJ5M3k70El6QD2ge8/SlhuSa9fkXiGb4gyjN4FjeVEWRXlA0fOpSoxXBIQgp82KaJQ4EQ6U6HrcraMFFT54Cp/Y1SJYi6q9pXELX5Yqdf+Pz7RRxD6shzCNsFwNP96evRcwr+53iZIfWuCtWponl3UKeD2kNMs2kS/NruqQ/+0/dqtmbPV4cZU9fYt9+1IqRhgWM 74k0Et30 /+3/ak/raIZkYoaKRzCBCaLw4fekxvD6Gx4AJNE6WFJkaSa0EtAZZL1Sze55du1Wfc50h6D0cEJCHB4L1Jvp9/xnuWAFXg0k1xxQUqz0M0H/QToBgMuW+HWQgk9dhbE4RncN4VO2stXqMUJk5cwCv/exRBaDpUnV7gVfFpdpdqdIdHlg7jKNgciwPECERZtJySa2ktlw+ExVhV1Dtm+z35azGepECsyHhsjJhUJYIyeG/27mYdeunfGY5tpptjPR2sIjp+vJlIn6qvJ2Nnn2CZWDM65Yx1VkCIbw4jIijY9h4+FLbCJ97O1kzc9nq2tFHuxCNOvR267PIiFUdGP7b0z0dO9/1zo/XO0P3BQKr2Pvv/C0Yr4OtOckZm2aZWdB79L9SOcqsXVKx4DtCTZEPZYos/kWjDSFFRbbUp++RQfOS7XPPaqCmc8WrHSvjQKUgLIBykdqHHO5en1EZX/qg6m6ec92xquHM63Gob+TX3RwLuieWZPBAtIaCDxnivuPYZCSTz/lvpDTXK3CAPlbnI+EDmcOH7PXqf39Ld3UVMvVXdbNCWn8rlsIuLGHjQZMasC6vUV5+v4vVC9pshFPr5xtxk+ZXoNIAEz7d3oyq6zVeAlCyqapHM2iOnhv/q1xzIV26/WNMYlxz+AespW1jal++ZTVevvndotev 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