From patchwork Tue Jul 25 04:20:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13325731 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 275DBC25B77 for ; Tue, 25 Jul 2023 04:21:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B5CEE6B009A; Tue, 25 Jul 2023 00:21:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B0EBE900002; Tue, 25 Jul 2023 00:21:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 986026B009C; Tue, 25 Jul 2023 00:21:47 -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 8935D6B009A for ; Tue, 25 Jul 2023 00:21:47 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5111CB23FE for ; Tue, 25 Jul 2023 04:21:47 +0000 (UTC) X-FDA: 81048835854.19.35EB2DD Received: from mail-yb1-f182.google.com (mail-yb1-f182.google.com [209.85.219.182]) by imf06.hostedemail.com (Postfix) with ESMTP id 4E92B180006 for ; Tue, 25 Jul 2023 04:21:45 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=llZNAcL5; spf=pass (imf06.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.182 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690258905; 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=1W6z1I6yvWrQZbHmgHYBEGZZDstSbvELOPET/EcKlKw=; b=XKOT4G0a/8uDtC5rvWuUkNWwDPe4WCCi4xfDksAQYZf61r4VarL6ENvkqrivO5SDCesACH sMTrKZdt5eRuz9dLP6hfSZIVRwmCGgAglfFdRmEpUA0Nlvx6yRvdj535HnlWjvUCkGjwko JKM25/AUckzBvrFE8HUhYikuMod0vw4= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=llZNAcL5; spf=pass (imf06.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.182 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690258905; a=rsa-sha256; cv=none; b=r02XJ6/stcXuauTi0RMkgEedVU51II6c9oeOh9sAmOWyoG/KDztid/KPuBG0CloFzS4fEM ifYGaJ6+uM0MnJiTQALUmDUFtXC4kS4puOr2t4v6rXQPK0VzJot8kVS3i2Jo7ZA0dt11Eq uN2xFwtYS/eA/d7o3wDTfs5pQ7vvJO8= Received: by mail-yb1-f182.google.com with SMTP id 3f1490d57ef6-d16639e16e6so691797276.3 for ; Mon, 24 Jul 2023 21:21:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690258904; x=1690863704; 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=1W6z1I6yvWrQZbHmgHYBEGZZDstSbvELOPET/EcKlKw=; b=llZNAcL5ycBFvzQAJZ6/7pTtXuYWij53XzPtouHMRbZn6leKQwmdyrNb7ZQDIKMG1m dR4kHDNfHjwFzi7thvuqMg/yyonddaX76H366KbzQfr0mkb337gkTgeXtW8fYA7C7vgk 0JX1efxIqLTVNU9f3lKJPAHDACzn61fxVyoRKEpyP8P7ERItPl34MD7TyhY45+GL16eR 5mEH9l98a4BvtK/z9rHYNj8+yyPV+LgacWgOs4WnwTXzC4ltuUCUEGWdaUuvQRw4+9rt VkJRX5ILuNF3nkwEu0MY2t+Msy6Bxfzl0kRhh6mJAuamIH8rB6hnYqiG0nMAmPPj+VFo IfmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690258904; x=1690863704; 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=1W6z1I6yvWrQZbHmgHYBEGZZDstSbvELOPET/EcKlKw=; b=E1imSvFrGCjndHW4+zcNgWGqUZ5cMrGfoapnr/obv8JZc0ZeciJODzusL0vuRtB5Rw DBvdiYNw8olstF85nV491WzjoOUSSVaZ+N6VlGgHQ142/7w5v2fc2bA5eeYUVEUdMzTx n0JCDOEkuqzcfDyTsu/quV2foi3W3FZsZ2PBDd12WWhLf84M2TRrzTYzQY2EVKm2fc9k EV7qZBvPrTNbWvpL5y1yKQowL7fxVJn+VWSOsPizzS1J4kDUvB8HO+Mq3n44ry9gvgJ/ +LnVKeoUZkll3sv3gNy6grhuADm5gYfzSsBx7eq0EniLtJY26fv9FqfElY2oH1gyeCdC FmaQ== X-Gm-Message-State: ABy/qLbsFxzbeDP1GdqAq6PJaONcQ3t7lOPec3aJAEUgTCK74uWoOWN7 xmO5E76BPSFBrrlp/9V5Su4= X-Google-Smtp-Source: APBJJlHNukUfyrx8d4ygarvYMYKc0qsL214/d3tYWYQLTsgvH0ZFNOJIIblBNYsFgmKRmFutGU4Hyg== X-Received: by 2002:a25:cc4f:0:b0:d08:50cc:4733 with SMTP id l76-20020a25cc4f000000b00d0850cc4733mr5932948ybf.45.1690258904372; Mon, 24 Jul 2023 21:21:44 -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.21.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 21:21: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)" , Mike Rapoport , Catalin Marinas Subject: [PATCH mm-unstable v7 18/31] arm64: Convert various functions to use ptdescs Date: Mon, 24 Jul 2023 21:20:38 -0700 Message-Id: <20230725042051.36691-19-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: 4E92B180006 X-Rspam-User: X-Stat-Signature: 6hs7jtdq5idtac6tysde5sp88oeuxobq X-Rspamd-Server: rspam01 X-HE-Tag: 1690258905-822132 X-HE-Meta: U2FsdGVkX194UL7GWV9p7m5epO/QNCmezEzkRzrdlqpN9wbK/RIjUyjtcgcUxhJMIDL1FoRuWJvazAYw8/BzBa7Y0BcXiePyG/DUgVyn6XEidbRZPdWbux8Yp0UI8xBsMtA12MJoQGxPq5A7OmBp43HxnLyoF0IZhHAo6JsIfX9tzPwesb6J1J6q5sB5ZfiAKA2onmYC+z0yuUCXxBRubV2Es+10qcgt/8F1X4vFh9l98gGUBvQ8YNwvfYujSt4wPlJ6keG8tiSwaY4nC/OXkjJ1Ksd8pblvbl6WHNvT+fDsRAZE4QN1xZaIAOLZJeuE1X1E7pDcSOA6s7Gf6iCz5FWeXH/QZ/pz9hr65j/9EJ/J+jjXOQp+23wPohwFpA+OhHdksH10fsioDX8F0w+ncdFcTkVYtXaIba3vplaMbKZh5NN9Xy9m+AEn35Bd+/NoTQ3nfUQRauQy699zk4NCf0S0xuzqqteT8AphitbXLK6y/yYgf6PlsoGGBtsQsANa6HHrMK/oaDEv22mAzIBqMbEvsxIJHz5yScPLtXTEmPb0XvE8q1Ni1cVdpJlni5lSTra93tK8EMte0+3m8LFRJ47eNOpPmhjRVAT5VIQsrx8EaoRNJP35RxJCpgnO8SKDri5Hbp5V8a3kOO/EP9FAkWvUssq+Ccz+YwmdRHP3XMBO32tWWLKLjK/2NfEeuNIaU74bGLQNZLHL+NPXFYt2LkqhNiQoDmBWBCr2Jc3PTvt2wr86hnf5NlcU89RGXtdXu3kIGNpzMwc6oSPEvmAwrDIYizYhmXR15wcEla8EDXFeJyooV6+nSgNwAWwB7TgABZHft6hUadreTCyCI/ipJcXcMYClTjrhuU+jx3HR9emMaOsSJPI4LCjn4IoRD8vGQcXIe/spDenSIQVqN2XlnitVGno6BEm2axUzwc8L18mHE2oOCU0b1msHyNtmSLaRTpgkV5ev/+WCBOROGCz kvsVdwMh QejRC+m5Zjcana2hLpq+Gf2ca+lNsAKX37qkBhRE1vaZ83AclKXfDl2O7VRfh5U2gC7D+kgVipJeRa9DnxQzx9mYHEkuWqdWBuNdZdbjQGwDNj4gmwyWA1+K7SLWHzFOwOC8QiJSm0p6Ls+jS8zlPUDYfAGdRy4muxUjoARxJQx8UEERVQVTzxHqgXI7d5zGyebPIPTf8WA8zwrh4cwWCFptpCTbrzSIMHLOnPbYfWy9lCRtBqVLAuD5XJd1w2MnFoGoODeipsowx9qNan0r7ckLCIA1IuDWpxGla1siL5lXR81Kj4V9sX5xBBzefjufkMGyS2cT7zq7lGEmITRyqB/Nbs/9pGfLfr62uZmzWr1ycyYQuKDlfwLVmxfrFLv/M2eyduAY4DXmfNNkwJRu/PFynAS3hpPCH93ezu9qXeLkSlON9rggwB0wVd9RM/ofK77n1yyjP4Ce7o9NGqX0tz+e8u1sgFv4Dn6Ysz6IpDzEea9A7wTMPAbg03dSOk+bTOfTOhF2pq6+GzLripYCxtMeuNX1m9RiCZ4U6/18gE/B1IV2xe14x5UQlHJeSTknsvwljbbggylf6cmj3K/WO7bsUh4K1/p0ZFQdD2Hsi+OX1Gd1WLJfUX8wD7TA182a6JSQQAnpBFd/IzZPSuL2nsi+fBg== 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. Signed-off-by: Vishal Moola (Oracle) Acked-by: Mike Rapoport (IBM) Acked-by: Catalin Marinas --- arch/arm64/include/asm/tlb.h | 14 ++++++++------ arch/arm64/mm/mmu.c | 7 ++++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/arm64/include/asm/tlb.h b/arch/arm64/include/asm/tlb.h index c995d1f4594f..2c29239d05c3 100644 --- a/arch/arm64/include/asm/tlb.h +++ b/arch/arm64/include/asm/tlb.h @@ -75,18 +75,20 @@ static inline void tlb_flush(struct mmu_gather *tlb) static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, unsigned long addr) { - pgtable_pte_page_dtor(pte); - tlb_remove_table(tlb, pte); + struct ptdesc *ptdesc = page_ptdesc(pte); + + pagetable_pte_dtor(ptdesc); + tlb_remove_ptdesc(tlb, ptdesc); } #if CONFIG_PGTABLE_LEVELS > 2 static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp, unsigned long addr) { - struct page *page = virt_to_page(pmdp); + struct ptdesc *ptdesc = virt_to_ptdesc(pmdp); - pgtable_pmd_page_dtor(page); - tlb_remove_table(tlb, page); + pagetable_pmd_dtor(ptdesc); + tlb_remove_ptdesc(tlb, ptdesc); } #endif @@ -94,7 +96,7 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp, static inline void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pudp, unsigned long addr) { - tlb_remove_table(tlb, virt_to_page(pudp)); + tlb_remove_ptdesc(tlb, virt_to_ptdesc(pudp)); } #endif diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 95d360805f8a..47781bec6171 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -426,6 +426,7 @@ static phys_addr_t __pgd_pgtable_alloc(int shift) static phys_addr_t pgd_pgtable_alloc(int shift) { phys_addr_t pa = __pgd_pgtable_alloc(shift); + struct ptdesc *ptdesc = page_ptdesc(phys_to_page(pa)); /* * Call proper page table ctor in case later we need to @@ -433,12 +434,12 @@ static phys_addr_t pgd_pgtable_alloc(int shift) * this pre-allocated page table. * * We don't select ARCH_ENABLE_SPLIT_PMD_PTLOCK if pmd is - * folded, and if so pgtable_pmd_page_ctor() becomes nop. + * folded, and if so pagetable_pte_ctor() becomes nop. */ if (shift == PAGE_SHIFT) - BUG_ON(!pgtable_pte_page_ctor(phys_to_page(pa))); + BUG_ON(!pagetable_pte_ctor(ptdesc)); else if (shift == PMD_SHIFT) - BUG_ON(!pgtable_pmd_page_ctor(phys_to_page(pa))); + BUG_ON(!pagetable_pmd_ctor(ptdesc)); return pa; }