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 466FCC88CB7 for ; Mon, 12 Jun 2023 21:05:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D1A3A940013; Mon, 12 Jun 2023 17:05:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CCBD38E000A; Mon, 12 Jun 2023 17:05:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B6AFF940013; Mon, 12 Jun 2023 17:05:37 -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 A40748E000A for ; Mon, 12 Jun 2023 17:05:37 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 814E7C0340 for ; Mon, 12 Jun 2023 21:05:37 +0000 (UTC) X-FDA: 80895327114.26.8EC688D Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) by imf23.hostedemail.com (Postfix) with ESMTP id AF91614000E for ; Mon, 12 Jun 2023 21:05:35 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=SoTIqHuL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.175 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686603935; a=rsa-sha256; cv=none; b=ggSyuwwB8x3Qxv2vrIjHr1SxjuVYVY1/u+kStmnet2AP7+tq9QJUO7qSuhvBeJtXfn7LtA n/LkwVAAYhrIAkrJvAqDXhTir+ghBwY5uYDq2Jf+RfOv2q1pym/Zaq+VxdFHOkYEMGlzlp mayc1qcjO1yr9uc7GqLzYYUykAZtveY= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=SoTIqHuL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.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=1686603935; 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=KVp6CEv5MRUGdp+2H8Cti9WenGhaFTTbvrfHRtAH9kc=; b=HPKouB+jhIIec5adOX+Ryi6mDQO3bbL9P/zOvVHoj+aT/+MNAiB2mQD3DvJr1NScDDTCIn 2EJOKI37MbQ0qIBFDrAsYbcuqdYzOsUq3wla/bxYcUFfRif/j1yWiVOHRlLrS54DHocfwS 6B5uVmKpca4z3na3OflK71s09vbXadg= Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-56d17a5d786so19490067b3.1 for ; Mon, 12 Jun 2023 14:05:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686603935; x=1689195935; 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=KVp6CEv5MRUGdp+2H8Cti9WenGhaFTTbvrfHRtAH9kc=; b=SoTIqHuLCAWfEiaWrP9H5RMeBUfw/4blxWiNTbN+EgENMXgximV8iyAXgGOp4XDuw0 D58PnjKgFper5JHCNJspm8td1YpFLE0wlV4KRGzp+/fPbBvQvEKYiEzI6FQgDegSQMJA W98fOojhxmIMYwSI3q765OUKGKExSDNbpRlItg5xCIvhjN0428xf4HNUJQQ5P+6zPMLU Ma3chacqOtGRi3R200/qVHAxMt5ARo9Z4Ra2qg/4Z+GPUMiMBJG7HmJrnWozDqrgtVLb PcdJ9jNUuMMACxveQJzaFtzM2eOsEwEww1xM2Q56gVCjb83OZCynZYnfeNSiDloj+NNW ogTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686603935; x=1689195935; 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=KVp6CEv5MRUGdp+2H8Cti9WenGhaFTTbvrfHRtAH9kc=; b=SgiRLtOfdDAWvD3MbACzQXMFyo3EA/qoiuyqFnS9PJ6zMgBackCwBn/e28a4P22byP qBONmn4qXrowIJDaQBM9KPpNktVLODXdGEfFPDI5ftmO6zGIiuHx59eI2hd1CI+9gXjX aqc1g6K3hDFvQLkPPCIoBnZO+HdDBBB5dSUQC7mpKUwrOF/1AcN3Aj8km40xeyAFY2n+ ENDeQS71Yex0WBfbStARzp94MG+/tzAx+6AHhIr7i8G6NwA9AN0GzYnCVzU7fQkuNZXC W3ARNpnL1DmOAgyz50KN4nzb8zjZkGEylt0zSd0nhtl5fX9GbwF4Z82XtfohTNTqhbc2 9hiQ== X-Gm-Message-State: AC+VfDxpjErh/lXkv9cIgo76Tjq6MGqH9A8RnYL0S47xoRKFPVCjCcbD CzXQckl/tfiVFLtVrZEs/Xc= X-Google-Smtp-Source: ACHHUZ67Z3iEzfMJBv1FKsvF9wmF9wb7PLhtVh2H16srVVINddDnAoJ1jY9AaH4fP20t9BaRYfthGg== X-Received: by 2002:a0d:c7c7:0:b0:568:b10a:e430 with SMTP id j190-20020a0dc7c7000000b00568b10ae430mr10170669ywd.25.1686603934783; Mon, 12 Jun 2023 14:05:34 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id s125-20020a817783000000b00569eb609458sm2757115ywc.81.2023.06.12.14.05.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 14:05:34 -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 Subject: [PATCH v4 24/34] loongarch: Convert various functions to use ptdescs Date: Mon, 12 Jun 2023 14:04:13 -0700 Message-Id: <20230612210423.18611-25-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230612210423.18611-1-vishal.moola@gmail.com> References: <20230612210423.18611-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: AF91614000E X-Stat-Signature: yna9izficfkgek99m4pg9az8fjjdjh6p X-HE-Tag: 1686603935-6226 X-HE-Meta: U2FsdGVkX1+1BZ+1761UuCCiZujrPPl2WWoQFhOebZXTnSriGMoD9x6tRmpobyhsdTmJjBk28OMVBI6f2CVsVDkYjrhglKBcEUFkr1Sf1O9QcR5K2od0PMJDZbnU72gTF3QdC9ScU352gMHCMIqNgb/4VmcwGtcCXKADU0CynXdDxPyhzTVP6mc0RWkXZvTTQiDejIIbOlmNxagEtXJN0JDyhqMQdC0Qisgd+izymchaOP17/okH/DNJqgi4Ltd+OHVW+8lYnGGaExiXTRXIdQWEsQQGhecpPpzWvlHON6z/x/7UMCFBH69ear/wAXal+In7v0svtSkVMKJQ8SYFjE18Iffsq+LgYwW22rVgGYIaCO5p96Kd74S7tz2ywMA6yeEPB4agykTlvz4tcM/3G+KnQUK5HwtEtlljxck4nuFUM1B9nJefHGUK9e0oDnUN/es++dMUKWjrdzomXiYNZXYRSMltYT2P+J4IKbktH0LdZWIJz8r8ia07of8V6N3eLtC6g+oZ5VJsnY1gCG8tifMKLTP9dJ0LEPjKXNzAp+P0Wufh70APzIJckTBAi3XVbe2p5cyFY666yEkspztKzmIHqvB88FWYlB+34WJ0H8maYwjpeRjdjLukglBWiPZT7KIuSiMhT6Qp3F3YbeAU+K2XchGOVPqhoYDNTAYSSOoLmWbB6n8DT/436Ay2WLuwUBgwriy9rVPir0ufz/SwxMpS9hh/QKo1/wlMU5U3VXUJmvozfYiz30PfPlDvUA8sL4+nVdzjUGE5CcW0c2eIYUMENlgpa5Oscnn+wiNcHLRWItseCRmIsRAoKLR+vTnZmXRymtCsM8AdJRv9RmXBisZcVuesjcaB/opv+RmyZsrglOsVF7fnhR5yd+IE/dTbT7oc+wnUBoTRB7FhTTB4cGcfIjRmnFNXfHbwoHjhWqb0sAGC5n4i7jTqnuRcNt5YjdMqeZz4VQbATrb1ulU paDNNtu7 +oTyO/5Szta99OvDWx5LDAhASoS5IgfEllNrkM4/dSLm4u2HWu3jMjsfyZJRLVQB2jSE4nXfGSs7wEpwxNplaOVe6v/AoxR05r6x2Iql13qDuYbEvgzQ0CLRr5VS6EK572e0z+Nq1FJ8uUMXLDXOIs17WcKhWO5Mnl18O7sLzqbu1WJtIFUnMRfT20bReeLVQiO8fEzwVAaw7GQQlnCj6gs4GHae/O1Hc/dca6mF+9yJg00GXSBipQtgYNBTS9gYCqeaLjHRFvJ1XlIZBFu9kQ7E7P7wiNpqQa0Y+UuA3Tv7AucZdCr2mL5ndfdv/I3VpIJfZD9Xau7pHf3rXPccvqSClcVZnggsoGUWzJ1Z3ExGEYK/H9iEt3h7kSu1WmWSyxSiDtmgZUjzszuxJdMcDarKV0GGFv6i9loXIMXjJ5PM0W8RSqNIm5ygoRzDD47axO2wzwRK2fViSRR8kV8oFjuzxol2+hWB7yLTY/bEJ96bf6E0LSy2+ien4TJNrELskckicDGtMgWZTn4tvsbinzZny4w== 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) --- 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..70bb3bdd201e 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, 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..cdba10ffc0df 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, 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, -- 2.40.1