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 35965C77B7C for ; Mon, 17 Apr 2023 20:53:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 427CB6B0074; Mon, 17 Apr 2023 16:53:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 38936280004; Mon, 17 Apr 2023 16:53:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A370280006; Mon, 17 Apr 2023 16:53:15 -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 E574F280004 for ; Mon, 17 Apr 2023 16:53:14 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 8A48740676 for ; Mon, 17 Apr 2023 20:53:14 +0000 (UTC) X-FDA: 80692083108.01.D275E97 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by imf26.hostedemail.com (Postfix) with ESMTP id C02AF140014 for ; Mon, 17 Apr 2023 20:53:12 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=gYiTGJsq; spf=pass (imf26.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.49 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=1681764792; a=rsa-sha256; cv=none; b=wEQP5ZUV6e0WQcuPC8HOoSriRRQ5A1dHQJcZSdtE9xPb5QfHVJkkx7zjg0+8ymlZOxuoIX LrSibLVSMI2hA+PksCLRFU6MAI/dyW+85/yG9X8gK6rOoSYPyczIg/J7B+8P/GediLvqhJ FqSmbVxQ6uvLvRmCzQKfWFlZpJElPw8= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=gYiTGJsq; spf=pass (imf26.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.49 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=1681764792; 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=gfpIRfFq9zSU9T7uNfhlcYr/W6dIxhZkZgP28wF3SDA=; b=jXIEcIbL+sy7LgDFrqj9+tHsGx3zxXrZ6O/TPgmX4QDCy/wQ+DKNEVrzN9cPjuwLHu1B7M hNliW4tMeXUEuhFK2AWeJwP3L6gKZKoW23NpA+uA+bEC/GE+lEiMA+m5j2Fl4E3PC7lpoQ nVMQ+NmUbSuRzFuvtbYRy42jZCjxRL0= Received: by mail-pj1-f49.google.com with SMTP id h24-20020a17090a9c1800b002404be7920aso27917777pjp.5 for ; Mon, 17 Apr 2023 13:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681764791; x=1684356791; 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=gfpIRfFq9zSU9T7uNfhlcYr/W6dIxhZkZgP28wF3SDA=; b=gYiTGJsq3tS0FDSy3/Ogj5YUQaoNGj6XWEQGKGQUuQuqn1egVSKA3seChXbxd6ie6X KVLVgtxbt+Gl9lkEwLQ+F+iG9Kz1ErH6Jdv2PrLPdPwp/UgBJZIaGw67YMksWIwKnmyC 7jVlh7AKx280dtpirqSUFhv9Pyd2cc0T8yO2lBO5mVRpibO3YWd6y8PCZ2jFDrnw2dOM qIyvjKI6SfUletTh72Za02rULTtpxgw/RsbeOg0p8ic4ZkVJUUvnJu+rLoRN8U3nnoDL 0yuCtQCJj2oWJ5XTJVsuTcfyXkKiXbSXxA+TapEEDARVJ5R07j+Rkpo9klzzaVdh3pXw NvCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681764791; x=1684356791; 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=gfpIRfFq9zSU9T7uNfhlcYr/W6dIxhZkZgP28wF3SDA=; b=gVuLAHrfxIwr6a/OAuMmZ7Ar010JD/FpWR+GscRDlXyj73jH8Cr+aqcrWZvxud94cp iD+F7rSkj9CKP6hbrgaeorvCAxSEDFp9rbmCAx+VKGJIX/dxWllnmknt7cbUWi4cmB13 8cFjl22b+H8i5T6pUidVp2s/Kqh+Cg0HmmNlyWU45um6Rrz+osse7falBA0Ikeex/He3 9RsJ3zsfgoPwt5MjH75HR5Pc2yt5GTScqL2kZGRwnnJpUyRp4l/9U0zD8eJXC5gEXVy0 7GPeOOwLdl3Ezp6//VmxBINgm9PfrsRe7DoK6mYImpbMz6jHrdESh7Wq8kQVPJZczhKU MMDQ== X-Gm-Message-State: AAQBX9fNCuy/D8ZDefgVXIZKCiZRRVmILpBYoihcdpJR65Oe6cgQuBU/ U6gFajB8k8t/2JGBymgTTlE= X-Google-Smtp-Source: AKy350bvWV8yzhiozqrrwWcRpctJK00ZbC2YeKZYOK2IgaSQcSotd8fWuCQxrW1E1m+ogfO6p1yZ/Q== X-Received: by 2002:a17:902:b789:b0:1a6:8024:321e with SMTP id e9-20020a170902b78900b001a68024321emr189655pls.34.1681764791672; Mon, 17 Apr 2023 13:53:11 -0700 (PDT) Received: from fedora.hsd1.ca.comcast.net ([2601:644:937f:7f20::c139]) by smtp.googlemail.com with ESMTPSA id h7-20020a17090ac38700b0022335f1dae2sm7609707pjt.22.2023.04.17.13.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 13:53:11 -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, "Vishal Moola (Oracle)" Subject: [PATCH 19/33] arm: Convert various functions to use ptdescs Date: Mon, 17 Apr 2023 13:50:34 -0700 Message-Id: <20230417205048.15870-20-vishal.moola@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230417205048.15870-1-vishal.moola@gmail.com> References: <20230417205048.15870-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: C02AF140014 X-Rspamd-Server: rspam01 X-Stat-Signature: gzdwp9qtq4j84fifys8sqq45n8juzji9 X-HE-Tag: 1681764792-97516 X-HE-Meta: U2FsdGVkX19E5kMBDDBqsZe7W04C73ChZGtIR4TyWI37TwGvv6lxh7LNsSJfEbqP+rFiEPvR9l4zfUtaXD8SK9iLZLqwS+M5f2IW8/4MZl3YAT/5DUUvGJImwQZDj1GqCw2mn5NaUgkeirfJ+zJTuq7ydWbvM79LvsGLSsptZ5iWHwqdec5DOkZN4Fu0vpZVO+Iw4579HKH+knYtVHMMVRDHfmMW1M70neY0KtpyeSKN/ZIqZ2xCo90VEzGWf4NmFmqsTL/YvyYDl6U7WN3oSTRPLhAj/XrQBrsxWXm+z/CiTkgAECBRpMSYih4Zpnkylmojl0Y2jLS3cD9P9MUBYyijoiMkJOgKGoC2F6yv36ZiW1MGqqOK9jCWdHpP96oz6apw6vzKZPfbbd50r9WuWSlvgf0C3VkeJdeBwXQYGOwe7edZKrZ9QNGQ3lgH0KMwW9z3jFsA1AVvYw/R4OhbPAPr02AJdI5elfP2rbcuPscHExKlHX3UIW8jCMNO64/mY9oqLAaKlz6ViY/hwbaCcoxDYb8OFv+kZEe4hhl1KW9xS2m9exlnsjrE8Dn8JGe5AHeq8eyR+Rsv8NL9UvWdM6083ykSBkWaWzcM1EKq6LQEk5IjRJoWCXE6qKY5fZZi4TgDeE5f8/5jEGXYdGdMyDKshuH1Jsiq4MJLCDdvTz1XTuJR3ZUY83c0/M0SVKyBD8GH0b2hVEZJoUz1GT1qZdpK/qo6RTQ73mZ43eLwsZvGRvs6ET8nA07xXg5MFfXNffVZ54y749TOY7DBWhxXRwOsAsOUgl94fuEhO3VmnWh5wv6QZZJga5ZWgx88Xo4fVgJPgPCjSHPtNA6lpygKliqRZNPMqAucCMBbx7p6cwu4GZGZrMFmkwQ6NR6Qmr6rtinp2c5JLQzVkitSyz0acZK855KNqczaigidNnXNRWNTenjFyiv/TMGq8afOrERBQfj9j1QsfkWdeQpZXIv R/Dr5yfM QRpcPIR1PmyMCSN+qp5CsP8n1X0hURA+MA/jR6FlRT/F7H4HlcxxTqKZsZrXrL0Er/vBkeVLgMiV5fiGaLPcUPi9XTyPklmxSo415qIzs/3Kl7isxwX+tKth2JxECAx52s4k0OYOhWwFp5n6WY2+jGMaAZA1GcGTkVkAz8Ckyi2W0EVUjr1/A7O7zqGpVrnpjbowxCGeD++Bz8g7iMJC2Oo9I1dxCLdKe44of1Cp4aaYiZjp59kPEvNmwvb+8Bt2/AAssGZn/Ay7WLSq/Ng5og44fvrDNszmNHJXZZAtvIKOhSqZYjvePEgPJj/diSedW/C6ZAZI2Exoy9rN0ylt5AHkoV0yUHDVXE8aXXaPSDOgB4QqKFBRM9CYyp18dcODMaWNZ8fjWX24DTAshpgduuysxxnPucwsjS9jAHR9O9KLT4s+fqgab7b/YV+8pZ/RbrQt9giRnBFeOpB1P+nCYOlExK4U1MxJXrYYjpZpe+fySV4fgAN6O0umHQ77AVe0f3m6AhBlSmKsvPjYdTIxWQbmzm3bN8yvIOYmn52BEf2K2SRI= 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. late_alloc() also uses the __get_free_pages() helper function. Convert this to use ptdesc_alloc() and ptdesc_address() instead to help standardize page tables further. Signed-off-by: Vishal Moola (Oracle) --- arch/arm/include/asm/tlb.h | 12 +++++++----- arch/arm/mm/mmu.c | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h index b8cbe03ad260..9ab8a6929d35 100644 --- a/arch/arm/include/asm/tlb.h +++ b/arch/arm/include/asm/tlb.h @@ -39,7 +39,9 @@ static inline void __tlb_remove_table(void *_table) static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, unsigned long addr) { - pgtable_pte_page_dtor(pte); + struct ptdesc *ptdesc = page_ptdesc(pte); + + ptdesc_pte_dtor(ptdesc); #ifndef CONFIG_ARM_LPAE /* @@ -50,17 +52,17 @@ __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, unsigned long addr) __tlb_adjust_range(tlb, addr - PAGE_SIZE, 2 * PAGE_SIZE); #endif - tlb_remove_table(tlb, pte); + tlb_remove_ptdesc(tlb, ptdesc); } static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp, unsigned long addr) { #ifdef CONFIG_ARM_LPAE - struct page *page = virt_to_page(pmdp); + struct ptdesc *ptdesc = virt_to_ptdesc(pmdp); - pgtable_pmd_page_dtor(page); - tlb_remove_table(tlb, page); + ptdesc_pmd_dtor(ptdesc); + tlb_remove_ptdesc(tlb, ptdesc); #endif } diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 463fc2a8448f..7add505bd797 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -737,11 +737,11 @@ static void __init *early_alloc(unsigned long sz) static void *__init late_alloc(unsigned long sz) { - void *ptr = (void *)__get_free_pages(GFP_PGTABLE_KERNEL, get_order(sz)); + void *ptdesc = ptdesc_alloc(GFP_PGTABLE_KERNEL, get_order(sz)); - if (!ptr || !pgtable_pte_page_ctor(virt_to_page(ptr))) + if (!ptdesc || !ptdesc_pte_ctor(ptdesc)) BUG(); - return ptr; + return ptdesc; } static pte_t * __init arm_pte_alloc(pmd_t *pmd, unsigned long addr, -- 2.39.2