From patchwork Tue Jul 25 04:20:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13325739 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 0C1AAC07E8E for ; Tue, 25 Jul 2023 04:22:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6F0B990000A; Tue, 25 Jul 2023 00:22:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6A108900002; Tue, 25 Jul 2023 00:22:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 519CB90000A; Tue, 25 Jul 2023 00:22:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 40CF2900002 for ; Tue, 25 Jul 2023 00:22:05 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 07CE2809E6 for ; Tue, 25 Jul 2023 04:22:05 +0000 (UTC) X-FDA: 81048836610.27.4ED5A16 Received: from mail-yb1-f182.google.com (mail-yb1-f182.google.com [209.85.219.182]) by imf19.hostedemail.com (Postfix) with ESMTP id 315D11A0008 for ; Tue, 25 Jul 2023 04:22:02 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=iu7T9ShR; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.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=1690258923; 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=3wtNkjiFE1rjq7ZRDFNmpMqdu/3EA/QyC8BNR6xlaRk=; b=6Q6HlGb78HKWRXjC7t94BXKPtbySjcZf6BUC6yS+BXgLrtVC0nsb0YRK6pLlQ6PUPplag8 6L4USL2LdnfOsNKPKbOE2vmjybAUm7aASF0fsp09ZZzWWffLdJRWsb1rujpPO1Cl3XZEG4 7X9AuDQ2TzEY2Ju7tgmYG8W79rUDyfg= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=iu7T9ShR; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.182 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690258923; a=rsa-sha256; cv=none; b=448NK199EdcaeY6DMm63NIfoLsD4RQDEP2lh+Az/6NRvHFnR9rfr8ngTzSnr8qz5Ji25u+ VxlzaOS3SJER0DvMy/Fe0/t8zUMKLwNVucTB/aWU31bIf24G1isLHAtSz5qC7CwwJyCeaa vv3En+cJTyjwQ2wohhaRhJPQvfEMuZQ= Received: by mail-yb1-f182.google.com with SMTP id 3f1490d57ef6-cf284f4d7afso5663832276.3 for ; Mon, 24 Jul 2023 21:22:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690258922; x=1690863722; 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=3wtNkjiFE1rjq7ZRDFNmpMqdu/3EA/QyC8BNR6xlaRk=; b=iu7T9ShRTfGWqcA5uJNn48P7ITBijMcZXksGMFFsSIJDj0VmHTYECkWvPEWNMN60a1 IUYR/sDhh53Vy6dzUT6UahYzj05kYwH8neXcRQGMrWnafyF9Nggmi7HojAqo4PR9lKrk 02FdxS1l6wceDUexmcvfeLaN7cB/yf3NJTMHz8qA/qhQubNB4zuidHLrnfC+CD9FthdV DmB6BJ+22VwMurCnw4NmkeKklt87ZDgX5spGKsnDe9xsWqCmiOPReZ8vAaZPSBJPyLEZ EQXlbCfDgq90/zCmmXSE8cDOoCHltzy9M5tcZZJw0IWtubbSaQTI0PoE70blt5u8J64C txJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690258922; x=1690863722; 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=3wtNkjiFE1rjq7ZRDFNmpMqdu/3EA/QyC8BNR6xlaRk=; b=GneURjio7KK7SU/Cun1fz40igpfbLDtFNU5Vhqqv58ed3JVKK/r8bAyf22OmCqZGTB X3/WFhN3v1O9y6wkFnkVhlI/USrTPPuPwNWaFdYnWokw5x8W5+cD5gLrWAmGl+/2lAiX +ItkgIbYDv9ycdT2Ob5epb9GcbsTUBB2yn5TWglvFECFMTu1jKKsUOUZYkuUxzDR+ZLB L2Hc//cONJA4q3FcHkwmpxPiZafMwJWVg+MyL82RLV48XfsuHvKiWQLZ5nAHVxHt0oCP wx1+Adtd5hbgii09CV5iCbkuBDinawWzUbN8FlvbUJ13OZVd8IaqTx33BXPVZahkPoOW 5vxA== X-Gm-Message-State: ABy/qLaZt0EEXksg7MjxXucfrnzNab794UT44Pku9zvIB0THbBlqFuiG x+VmSuPRXImI1zUQcjq23i0= X-Google-Smtp-Source: APBJJlGfBdwhSlxwyOaXtB0+Cx5VSBUjcB1Wb8y8NRWIESkjts+Gr4L0lqHFPdNq/1caH3RyI0GElw== X-Received: by 2002:a05:6902:cb:b0:bc9:92c9:7fd1 with SMTP id i11-20020a05690200cb00b00bc992c97fd1mr8566515ybs.3.1690258922187; Mon, 24 Jul 2023 21:22:02 -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.22.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 21:22:01 -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)" , Paul Walmsley , Palmer Dabbelt , Mike Rapoport Subject: [PATCH mm-unstable v7 26/31] riscv: Convert alloc_{pmd, pte}_late() to use ptdescs Date: Mon, 24 Jul 2023 21:20:46 -0700 Message-Id: <20230725042051.36691-27-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-Rspamd-Queue-Id: 315D11A0008 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: cac85cmr4srcwkmyhhsirjcf59gq6g9g X-HE-Tag: 1690258922-440435 X-HE-Meta: U2FsdGVkX1+VH16fDp+706ls6nZfxv8aPoJq8Pc6g88nB3Fu5n6qrXdguoTZzqLMLCXXrHbYlrJnFgOpj0qiJTH1yGxaPAL6Oa4P1L1kufuBRXGS0SI2+FrNLZzFpEbjd/hHByM0beEG1J2flsfMGqumBlLiYyz3u/ZA7rTvLoWlhpWpqR1m8n/TxIZn01e2sJl1aZztydB5mA8oHZSyGbcfAPVENhNEfeJUmRaBS0yIDHwOHQZ/CWcGT9Rsk5kER+2BlE+X1Zv9nBqoWSnV4vNkoaGUXJqh6TMZnb3hxxW0Tc3XxZ4jYtJFkY6XGpA/N7YS2gfycfzr2cNxnE/UYkqx2H/5H94CJGOGcFm/ERZhufcb4AluiU7k4CnaEZTcdYvcssDLrrjgKHjCaSzorXhfWy3AVjhGHVqOBmzNsnZ52X4Vs1Fg2NdwlT1Wms7J/KkO5B/AIL1CXzbkbLEd7gEnKV+MXoqY9pQIjHkTE8rnNWWizAC6nc8Helw/V1rkLAN9co6umbivQt/liQzEagYHiHQt0rlzRGhzGE4Q5AnAAKhwFnsIr0bLfIAMvnQCgkM7x3aJsp3s8y6O1TEuVie4mHQq8ovcqmwBbDDzhubiKx6uajgS+sFCA+INjKnMvxCwg0q8nIwUzw62fEvOuTvFYGyhu16I0XadSvYNDmf1wMVP8rPmnb4cu2hjFEDgKVMZzA33AnuXmnJIfPvyLiKJv8Yho7HcJLl8Ny8CmBU/9mk6elk3jYyDKxoWI2LJCG/eQrGPbPpTFrrmbyBo2k7zaFeRdHKwqVdOf/LcAu3BfP6eHURw4nQla09EOO4CFqAlZ/7YADONC08af7uAtHcd+BrXg64nerZ3hdS0nKKi6APXUEWiEDEWqJvJKXtiYq6+FO2ZQdQlBdqY1vVrWnt0Ucu+ZimYjbQ43RolT7Z4a0ywxvG9wxLFkc4XSKRHTtxDBSi5push0Etr9rg bry0mn33 onovZDRBTQiJUghAw3ytJPgKPQCxndPpTxEE6Ry44YGorpGCD4cVrxuO0PiWdTzaiIGg+KZkQEPebxfqQJFjYVar/kqwwg0Ji84jJFuwFtB3/z3j4v9e8/QCfDsAYlOamtc1+IoJ/jaKzt8Gx0CdteHzFbGmLDp7b6y4qHHIeFNPVGuGRxUOGlTKaPsWmz3F/sa4mm1V3kAS74uaXqwKL8MLHhEk9MXJPLT+jXGHvyn3RVAj7dPXu/hZV9qObiJrcJyJl3xu8dAIL19QkE7VrF/Dn9LWY0zTlK4u3ZGZWCCN20za0IFg/fSSsF5b810zK+jgm868LAikKvN1YIWoML6dQfRiGHPtUck1tA+x+kBkSbBlFxGgckGMmZmjoywz3YF/fkbT3U3jezqyJJyZBbnOPnU1jocno+0X9oG2c5vturBuJgTRflLXzsS8JfR+MriXN/JGEfwZLh/g6qmoQE0GBfP/kqI2Sbt5HiJo+tYHfYr+4bG4cSi4KChDT/eCqvhe4CFG19M5LZyxJ3AP1MMEV/8ENSG4gN6scsqsCjXKyI8fIZB/fOpJltUU+I26UFa+PQpu9XMqE1z2amD2UoktSxzrrcL0cNERvNCvHnqsbx4xHCbSoAiNVo2z20paWqdqix2yEJ5E9yF+TOyzZEnk4D8ZZFrYou3yFDy2HKKscIE0I7IijbqaoGpuR6osYaiV0 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: Palmer Dabbelt Acked-by: Mike Rapoport (IBM) --- arch/riscv/include/asm/pgalloc.h | 8 ++++---- arch/riscv/mm/init.c | 16 ++++++---------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/arch/riscv/include/asm/pgalloc.h b/arch/riscv/include/asm/pgalloc.h index 59dc12b5b7e8..d169a4f41a2e 100644 --- a/arch/riscv/include/asm/pgalloc.h +++ b/arch/riscv/include/asm/pgalloc.h @@ -153,10 +153,10 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) #endif /* __PAGETABLE_PMD_FOLDED */ -#define __pte_free_tlb(tlb, pte, buf) \ -do { \ - pgtable_pte_page_dtor(pte); \ - tlb_remove_page((tlb), pte); \ +#define __pte_free_tlb(tlb, pte, buf) \ +do { \ + pagetable_pte_dtor(page_ptdesc(pte)); \ + tlb_remove_page_ptdesc((tlb), page_ptdesc(pte));\ } while (0) #endif /* CONFIG_MMU */ diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 9ce504737d18..430a3d05a841 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -353,12 +353,10 @@ static inline phys_addr_t __init alloc_pte_fixmap(uintptr_t va) static phys_addr_t __init alloc_pte_late(uintptr_t va) { - unsigned long vaddr; - - vaddr = __get_free_page(GFP_KERNEL); - BUG_ON(!vaddr || !pgtable_pte_page_ctor(virt_to_page((void *)vaddr))); + struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL & ~__GFP_HIGHMEM, 0); - return __pa(vaddr); + BUG_ON(!ptdesc || !pagetable_pte_ctor(ptdesc)); + return __pa((pte_t *)ptdesc_address(ptdesc)); } static void __init create_pte_mapping(pte_t *ptep, @@ -436,12 +434,10 @@ static phys_addr_t __init alloc_pmd_fixmap(uintptr_t va) static phys_addr_t __init alloc_pmd_late(uintptr_t va) { - unsigned long vaddr; - - vaddr = __get_free_page(GFP_KERNEL); - BUG_ON(!vaddr || !pgtable_pmd_page_ctor(virt_to_page((void *)vaddr))); + struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL & ~__GFP_HIGHMEM, 0); - return __pa(vaddr); + BUG_ON(!ptdesc || !pagetable_pmd_ctor(ptdesc)); + return __pa((pmd_t *)ptdesc_address(ptdesc)); } static void __init create_pmd_mapping(pmd_t *pmdp,