From patchwork Mon Jun 12 21:04:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13277373 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 0C2E1C88CB8 for ; Mon, 12 Jun 2023 21:05:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63D99940021; Mon, 12 Jun 2023 17:05:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5C5A594001D; Mon, 12 Jun 2023 17:05:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4406A940021; Mon, 12 Jun 2023 17:05:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 34EA794001D for ; Mon, 12 Jun 2023 17:05:48 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 023D6802C8 for ; Mon, 12 Jun 2023 21:05:47 +0000 (UTC) X-FDA: 80895327576.14.82AFB9E Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com [209.85.210.49]) by imf30.hostedemail.com (Postfix) with ESMTP id 3215180011 for ; Mon, 12 Jun 2023 21:05:45 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=TKVGiilQ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf30.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.49 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=1686603946; 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=RAmT8w/AncpH6QVoSIrvIComylZ1SrhYEKCy+DX5WSQ=; b=XBkyqlDIQYo2xQu74cIE3wojt0upkoXnqd1jXvScXm2D/7fJsvvdk6cfPJBCiDx9cQAfMD bM5vjS1iAdpFxiSUxc+CNNM/kqWqKwlqrNp+gHyIC7HtZcyaAn/eZj/v0xePbhn8T8KUxJ NsDJuEz5ApBLhD5+zZp9PKh/Ct5Wffk= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=TKVGiilQ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf30.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.49 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686603946; a=rsa-sha256; cv=none; b=g+mTmbo5M6MK3GW2azCbFxiV/FuaAyNUKbyGDZYE63RU4i9Q9kJLhz5I39FLTFClwQAdU0 Ek8hmUJt9kIhsVcYgef6qxzBVjfixMvurwHaSalk8sNnhrQ2gUKMikDYptbkbE1ovzYYBy fQR6i2AQr4yETL887d0JwEdS0P4lrto= Received: by mail-ot1-f49.google.com with SMTP id 46e09a7af769-6b2c6238cf3so2142521a34.3 for ; Mon, 12 Jun 2023 14:05:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686603945; x=1689195945; 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=RAmT8w/AncpH6QVoSIrvIComylZ1SrhYEKCy+DX5WSQ=; b=TKVGiilQ78a/OhIPJrQkIG23uSCTs20i/bAbbkbs/oLPcc63baV2HRxlfziGdsvmbT NGwmW85cSCp6KespeqLEesubwuI3LepWWanH5S5npuzVlt9k5eU+arhtadffMS44bFKz tZe3hNLEkkGFlp7EldonlERGCsKXmABWlm5tuivlOHa4YP48jZLg/NXNUT6fL0OAV+la FfMXzF6x14kaKnLc9TNsZyJBWsa9Csrn4MI3KMBJ6+29vVkgPdAEbVwqoitINTtP8h57 PClm1IA8Ha5Fd3vbc4M29HaqMx1DRRQlZyGElsQzM+NPYmwv6tn2zngJCKwAeXiQVKW2 CRrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686603945; x=1689195945; 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=RAmT8w/AncpH6QVoSIrvIComylZ1SrhYEKCy+DX5WSQ=; b=kS94TG+xuOHhuNQtEUS+EMKJuiVsf3iPh1yw72qkCpn9QoUmxvuHDThSjaolGmplCu o70nphZ4M+OEuTOyunsHF8spRcYiM4Gervah7jbHHZZPFPAvTIPQZ0SJ9rLNVDoqwnyI 6eombBCr48pC0lYudhOEo+NJ44rUGzO84pCmr3jXMOi4t1KwWjD6Z937A/mAg+Az/jEA M7UwAqEGel1VoMt2YvB6U1i+0jAaXywzTSjGLXpXOVprtesviRlxn7bpb4i+gfvmLZ57 zUp3F0S0Rus/qpSQfCEtNgxu/LFM03AMoRzrJm5Qwr75r8nO6mHaDRC2PtXku3qWxP4R GcXA== X-Gm-Message-State: AC+VfDyf4Ngk8vTektI44rvCIY0hkCmP0YFLs30TM/dOchT8sDeiGq/3 5YJ4ZZz22DPGQ86uiCpjIcY= X-Google-Smtp-Source: ACHHUZ47i0W41PgLnIyz22Ca7yXJDqII27mpfISq9Vor76sG0Ii5GTRFPk+r3wb8VVa0pQvvv4TjaQ== X-Received: by 2002:a05:6358:cc1b:b0:12b:de97:1be4 with SMTP id gx27-20020a056358cc1b00b0012bde971be4mr1697129rwb.30.1686603945076; Mon, 12 Jun 2023 14:05:45 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 14:05:44 -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)" , Palmer Dabbelt Subject: [PATCH v4 29/34] riscv: Convert alloc_{pmd, pte}_late() to use ptdescs Date: Mon, 12 Jun 2023 14:04:18 -0700 Message-Id: <20230612210423.18611-30-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 X-Rspam-User: X-Stat-Signature: itcs9h8nnzhx6mwg9qebby5m5ff6ytxh X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 3215180011 X-HE-Tag: 1686603945-800241 X-HE-Meta: U2FsdGVkX1/P8/Aaa1FY2SxgIiJJMu+du2frWpfLK6tCT+9St3xX/cmuyAlzKtByrAi24S7gLC3WO1/zOmM0D+2gIhhFP5chypwRlLSGGNiufRCAEeoZoB74OkodQUfHMZdqa7uTrr5fcFUf3OfZHrKJ4tOW2Q1EmR9KeGYFuoOiKSxC/0GwcP43E5xymVYM+YKeaDWXcsdBfpk5tF3SfKehulXqmQ2ARSRXiCcp7O9HyiWAkmdV6fe2faTUXNmJI+e6e3ipAeEzyWkSz9pafodBvILa7M7lwTwsW+ObT3iBuDhihkFbjU5ezW/pTphFrNbqv6k0d45Wy8Wut+LvU7ftr3H9IEJcKeXXovHlVEA7lsJOZpHpdqK0oE/bS4u1OJzWBpVxyjj/70i5iWEhIuETWg79CGQAi+iwbHdcs3kpP78MVFqtQxkdZY2pwRXr5xxzWy/FPmRYZYrRqUfGUOnB41M4H3NuSn4KrqzqOZvTRjXLRq6+fHN+7hWKk70AIP5dt78qpVtxTqUahw66OJixEqOiQu51cyljWGQXB5xbvZgy/EkbL8j45vf2Cpxq5qzKRuzss8tRC68tFmNvzK23/ZALKWcqaiUUKw/MhLchqEPkVahrxMM4KjUDzWsRTfowGfJLD0JLyrpJTm6zrz6zUxgBhr2wDV2F7UflTF8sf1XUP2FuLzcTGCF9hM6anzo6AEe++7Mc0islPCTIVC9IX5RuV1FWRyf2ROT4uFD5nUPoxEl5VtJPDFmpC4t+BDur9uBsJZcs9dA5vYYRlWrOap2rtiXQb3JtYwGlZXjTehbfW8n7XIaYnJI6c0ycPZCA7IbxrQ0rWju1bmzR6oN0CkJnOyG2wHgMrLUtQn4KEsa5yZOxCv8u/sMpGRYxzfmvPbJXWA/x3wTssRJWXprmmm4z8h1lakIKgultGobqo+hQGmXpgRCA3WTctPNbPhws/8IyvuIGBEKk/DO 9dthZAsH TfVfhhuSVuikxZeWfR8+7Pn8HXHcoKvF98Nz5+DUQVhMg4GKcRczXb+h7/zkE84kmaHwGTv+W0f/JZRNk4NFVzBNsCvAeuoUJBcxHB3yzaoQuYb2g0Zx+oeHYPSZpUxJLdefhAro9xIQsuPF70xJ3+og1CFEJpfRvAf+7eHsVNcLHh0z050zjY9/ABfTfZFKEGJ4fqzpcsRFGDGzDEOCQnHxqgfHR493sdxzRHSbzUjcr7S6uyLPYA/uiI3v6JW5bXZIIxwGPxDTSO3lqxH06Fz2QHmpAvG60Iv3ITFhmd8gqHbfok0/A3AGeiFtj4zIXU0bvTfCMssfROtbcn73qzjCPBrsqLPov/CGVQ1ZEYqxZVB1Txr9N6D4Tsz+qqOPorRoGInefSB3bL4C44q4klHP5GL/zyxk1aHAcOTenfAbHeuqca6rWIZjy8I+x/Q1sk4Va9XGc18D0KPXwTcjmnQRGV2v6csEIzOVzyulh9BizFtGMaqwXl5MEbCtUVllwZMs4t06tsCvtEw+x2vzq1BA7fxjpTros5r5utXmS9K84wxyPN1xStXdh5VT86E5wBJOahveMiA9foVOISDu0ZEdrf39s76KTzE2K+6Shz5fZ+uwfwKfVKz9ELAQYSX4zxncJ 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 3d689ffb2072..6bfeec80bf4e 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -354,12 +354,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, 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, @@ -437,12 +435,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, 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,