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 A4E1BC001DE for ; Mon, 7 Aug 2023 23:06:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B4C8A940017; Mon, 7 Aug 2023 19:05:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AFDA5940008; Mon, 7 Aug 2023 19:05:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9CEE7940017; Mon, 7 Aug 2023 19:05:57 -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 8ADA5940008 for ; Mon, 7 Aug 2023 19:05:57 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 590D31A0BFA for ; Mon, 7 Aug 2023 23:05:57 +0000 (UTC) X-FDA: 81098843154.29.D1F7755 Received: from mail-yb1-f176.google.com (mail-yb1-f176.google.com [209.85.219.176]) by imf25.hostedemail.com (Postfix) with ESMTP id 93F7EA0010 for ; Mon, 7 Aug 2023 23:05:55 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=p8G6Pt9Q; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.176 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=1691449555; 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=d6BZos7Ybf69Lr9ubs2a6Azcthgsxnr+LK2TqOKvMHI=; b=RyDtdb9whuKy99ptcaYxjroLrvwbAt0toAuPSJANZpD/eF+WTNyihWWvBZ+aya8X3mhJcB Vw2A2Esvbc/Ae8qSFsrza2qileEs8/LmNZ34EYmW9D21U43Venq+CYxZgsSzPnVlAMdPH5 jYCOzcvrXoaZ6Fw49LS8kNxP7KpzoH0= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=p8G6Pt9Q; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.176 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691449555; a=rsa-sha256; cv=none; b=qFQxaEl4hPb4A6lbRom0CJ3tXB5KIINaAt6nvMoOA2HP9fp9rTu02O6dIMxjIUjlMwfNCr cc7KQKQaPQQbmAmMPc3uGthBmn6aF+n5s1Xtg53qvCMrk6yqA2YwDFMulPyMVVhB03Z8IB AXBsaH4uWsjA9aDGylAv3WfIpAqBzQ4= Received: by mail-yb1-f176.google.com with SMTP id 3f1490d57ef6-d4b74a4a6daso2620832276.2 for ; Mon, 07 Aug 2023 16:05:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691449554; x=1692054354; 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=d6BZos7Ybf69Lr9ubs2a6Azcthgsxnr+LK2TqOKvMHI=; b=p8G6Pt9QZsVgDIw5B0YZsM1HO9y9fkrb/cw0HZOe9s94xOMFlEATGdftneo/KGkdaX TwSO+l67/znn0WvrOrRHHntMUuj9nNFXoTE85WKOjzGwb94eB3i84/XFPlTd02w2CLrJ DwESQ9jUYWS2DSwjhw7JNYWMJXOT94ZS609EVQWWoXQdRFNt0hhd7LN+kuo1QQmNKeS0 XHBIPjPF8dy/T4snUiw6ibSJ1ZirvD/sPtDvke5ir6zweBiFnq3ooQs72HZNE6w+OGww eTDTJaym+WVQphZfxFF+BeQU7jP4VlgJoz6RKQntFEtdMFIN0fhGKatr4Jikr9avLVk6 gEYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691449554; x=1692054354; 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=d6BZos7Ybf69Lr9ubs2a6Azcthgsxnr+LK2TqOKvMHI=; b=cAAwjauDVbe6C5Dm5JU22W0C8L2+bi1WwXqEBG3/9X+jf68asbvNZlXXxCNHQn7Lap 0kdpJL/eZPg85G8SkTZ+27lbnSVC4Eobk65iJ+t8xNXL9HnzL05Dvjv6fDLAtkSkqAbM 6EyWn/5x2qs0zUo/YoAH8X6wSGZTiJwjmQLjYF1LVjd27c0V1cdq7ffjkwzK1S69Sigj MS5HfdjUOqkp6jrCw3VDXtpAPrMIu7+QRFg5BiTgZORgGg0dspiaQKssbkts1lfdhlWM 2DPH5yF/ZXP9JHMiDNZFE3zbQOgnJsjfbvCN1s+WV1oLggCGo5cR4HIb7VpE6K4oqHGI +nYQ== X-Gm-Message-State: AOJu0YwCqwPinDaxpxbDg5JopNOE/00PT1kKwzIrtwM5qZ8lNZcHV3ke tpxqEls5BYc0UbS2RHeuzzA= X-Google-Smtp-Source: AGHT+IHnEVFzuxaIlZevFxX1u5N6TSfYAnl0Ngd19zcPS1yyZn6+F2gzJTtnG1yf2qQFJp4HGPdIaw== X-Received: by 2002:a25:aea5:0:b0:d0b:fe82:8b99 with SMTP id b37-20020a25aea5000000b00d0bfe828b99mr10007354ybj.44.1691449554679; Mon, 07 Aug 2023 16:05:54 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id d190-20020a25cdc7000000b00d3596aca5bcsm2545203ybf.34.2023.08.07.16.05.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 16:05:54 -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 v9 18/31] arm64: Convert various functions to use ptdescs Date: Mon, 7 Aug 2023 16:05:00 -0700 Message-Id: <20230807230513.102486-19-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230807230513.102486-1-vishal.moola@gmail.com> References: <20230807230513.102486-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: bt9d5zq1j4esp1giefe5sdnhmedecbk4 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 93F7EA0010 X-HE-Tag: 1691449555-782409 X-HE-Meta: U2FsdGVkX19ehlnghBphAghyfS9uahfprumLF2Q47GHln9qHvu9GIITVYTsRIbVV/NKRUVzWPXCwCK9Hu6qz2NvrzL/dhml+ywdDcO28J0hzaFsVmSo/fHISBxCsQqWsKjqxoYUtFDsnlXl5THJ0RPVjwTL73wdQAxQgN5eV5B4rflpD9qEkWvUIi8DWDQGzWdcqa5eK5YzKKANJM5no8Pch56l5DUoUplN19hhovJCjZImCumEnQ/E1OD4jMhzn1gF5pOzDMoBZHu3IxGlSod5+Jv0ujeOkgwlYTvMbdNHoLm2J4FNLLtdCnFUN0YNldhEjCOMaMDm5O8jEhRy7LN2HCTmckm5TBMVbIq8LbELNIEWv4ISr2yDwuHPVLfPVe3Or2+0YlN3ESZaJlVpMr5X94u6uKHCg7M6NCziS2kG+e0HGJw6CPmBtCVYDX+iHLws+0pvuDZAlUuZN+R7P6nvfebTnZhzl8Jv39RfbzKT78EY9G0+gAfJ/4De3jhDUHiUMGgYl2ODTp0Jih/JxOSd7jYv7jC7XSIEHJrKLoF3aM/m48TCLZtQ+comhThUVqvAI8VDIDdPsGMMmcD7hWqCcfunnUd2u2P3HG0XINS9e0x6gLMfc62dZsjbkmlkls4tn5m0rxBitVYSHgTHdtFH71yHazceYRhvPIC8OGiE9gt8cRXqMqumrh/0lu3w+1IF3ZCpf8j7C3Mw7trJ5EaxWC4VSAUWm3hmcCxWiizpt02RnIMjt6D/ssj1FTDJA2WPRlabIj+gp4UT8uzfMD++AfAPptY9oK95d0/mdUivAKBy+KL1b+ovhEll+73Whcueq0/8RYVI5Ze9C27x0mkzuOKF0aZ+BywRsbuuG5AbxvL/9bbmjw1+NRDdRKa8CmMiwXIrhA1CSxt3KIAMzZ7yOJaWVr6fn9R+bSz4CojEsgI4vIWS1c4NaHVQj450AEfw1wPCnwipkrwKDN9Y XqrQ6GEo 4g24JHgO9Af5/SqrQWTqiGYjxZ8IdP2LiSQyMbZt6bTsuIXnMz0u1tT71biB8/qEc5hY8VBO5lES6qNQEymk82LVmqb7wIQIrUcrUvAdoxvk5cclnSxKMhSQC/o7KZMFFt5sw6LbnL88tnfP1VMJosLa3XgMvlM4AFn/2R4/3+aR/EE+1Fca/rsiaWjzWCIJHzwy5tygptbfNUbIopRFdhk9tZUiVR+/aKEVVacSI3frM4H8b2oW1VtKJ5BnG1I7QxGexiup1789jbtvO74IYvmqaTmBKiK54mcFiu5DbNRzKVnrNiZ7uzWpYhETk8T61LNL5WfuslaGQ7NhAMchDsHx9tbsw5Rwv6jeCe6ba/h3UcslpU35+dx3OgLN0EqfKosILbizUld7H4vW9tQ3zaVuNQFtoj4Nwqh2mNxa9vB8NvLv+qWbvAwYoSvM3LcN71cgfIAMPczRjFLHtryMpzIhoZVjYdRHNK45G3oS2qMJznylL/RQ2omciRw4/RU6ATxBNvVBxj79zq9tfC8Nmo8XwZpUmtXfUK8sp6VrDrIi0Kx5Nf2rIdFawwbrPQHbExTYCKb4payOoU72bAgiZfcMXOn86Z8bB4rzcYVb8rvecOjHEYTVMmqp6Be8+qlGuidmS5lulbUoU1Ia5WlXf94Z+fw== 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. Acked-by: Mike Rapoport (IBM) Acked-by: Catalin Marinas Signed-off-by: Vishal Moola (Oracle) --- 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; } -- 2.40.1