From patchwork Mon Aug 1 08:04:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 12933610 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 93F47C00144 for ; Mon, 1 Aug 2022 08:06:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZYQzoLhEUEzlSiX1J0FO/KuFRSy14KnVM+ZgRZLacro=; b=gAS2SBZVon1m3u 8Vn7JV0+dP9IC10C+zSIclxDqkWRvSlg1dQgzECO95K+gSt+qwcKRUbnO97pU9xLMoAYxb5EpYM4d oVxw6Ov2aqc7QPrLDn6Ga2LunBJngAGwaPt9h5VjsczxbiFKLgFDQIMyxWG8Brng4pQDAuB7D8DMz dTNd1Lgew0dam2euJXOZh9+5BQjXtcVZm8Epq8ZoOHdAFX5vBNoZvgTjHO4tCvpZTFpe4v7EBRqid K2o7IMBRL1nwd2OORvt5Y3SYltr9A7sgSJfLg7GztuN22kRqM5aCsSh677ZK1lglls4Usvl+WO0CZ oeRtl3psdhwuT5mIm7rQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oIQQD-003kvk-Kl; Mon, 01 Aug 2022 08:05:05 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oIQPq-003kkx-Kx for linux-arm-kernel@lists.infradead.org; Mon, 01 Aug 2022 08:04:44 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 10A3860F6C; Mon, 1 Aug 2022 08:04:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1A1FC43470; Mon, 1 Aug 2022 08:04:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659341081; bh=ZL4ATVbziZrOALfir8Dz0aCrysF/GVyZD7Hah4EI7BU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HUktLeef3Hq29EFtuQWBwxp6i1t6pcS7qd0boRJ3PBt2FpzjdRKJp56846sTSzkqX vkpkrYO6rKrDNp8m4/0zMYJldaAPt++kFGatcVoCMRu7JWfv+Nlw+QvemlVIopJ2YN ZeMTaqiAYlFIL+CMtzvAt2D3+BV56y3Di43CZPYAKuCQoHtDb2EKs0r1W3HOIKGlXt nL0wCsni4U/qz9HRNCKfAaLq+NyizM68reJPJUHuxSO6x9eEZ1H73MwdtC4j14FRxN ZBg7LNcRqAF4gYVG3M9ZCxWeiCL54/8OMED4BBTsokEFhkM2cQ4lALkPFbH9gkFc3+ Kj661lsXZr31g== From: Mike Rapoport To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Catalin Marinas , Guanghui Feng , Mark Rutland , Mike Rapoport , Mike Rapoport , Will Deacon , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH 2/4] arm64/mmu: drop _hotplug from unmap_hotplug_* function names Date: Mon, 1 Aug 2022 11:04:16 +0300 Message-Id: <20220801080418.120311-3-rppt@kernel.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220801080418.120311-1-rppt@kernel.org> References: <20220801080418.120311-1-rppt@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220801_010442_802841_D210870A X-CRM114-Status: GOOD ( 13.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Mike Rapoport so that they can be used for remapping crash kernel. Signed-off-by: Mike Rapoport --- arch/arm64/mm/mmu.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index d170b7956b01..baa2dda2dcce 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -861,7 +861,7 @@ static bool pgtable_range_aligned(unsigned long start, unsigned long end, return true; } -static void unmap_hotplug_pte_range(pmd_t *pmdp, unsigned long addr, +static void unmap_pte_range(pmd_t *pmdp, unsigned long addr, unsigned long end, bool free_mapped, struct vmem_altmap *altmap) { @@ -882,7 +882,7 @@ static void unmap_hotplug_pte_range(pmd_t *pmdp, unsigned long addr, } while (addr += PAGE_SIZE, addr < end); } -static void unmap_hotplug_pmd_range(pud_t *pudp, unsigned long addr, +static void unmap_pmd_range(pud_t *pudp, unsigned long addr, unsigned long end, bool free_mapped, struct vmem_altmap *altmap) { @@ -911,11 +911,11 @@ static void unmap_hotplug_pmd_range(pud_t *pudp, unsigned long addr, continue; } WARN_ON(!pmd_table(pmd)); - unmap_hotplug_pte_range(pmdp, addr, next, free_mapped, altmap); + unmap_pte_range(pmdp, addr, next, free_mapped, altmap); } while (addr = next, addr < end); } -static void unmap_hotplug_pud_range(p4d_t *p4dp, unsigned long addr, +static void unmap_pud_range(p4d_t *p4dp, unsigned long addr, unsigned long end, bool free_mapped, struct vmem_altmap *altmap) { @@ -944,11 +944,11 @@ static void unmap_hotplug_pud_range(p4d_t *p4dp, unsigned long addr, continue; } WARN_ON(!pud_table(pud)); - unmap_hotplug_pmd_range(pudp, addr, next, free_mapped, altmap); + unmap_pmd_range(pudp, addr, next, free_mapped, altmap); } while (addr = next, addr < end); } -static void unmap_hotplug_p4d_range(pgd_t *pgdp, unsigned long addr, +static void unmap_p4d_range(pgd_t *pgdp, unsigned long addr, unsigned long end, bool free_mapped, struct vmem_altmap *altmap) { @@ -963,11 +963,11 @@ static void unmap_hotplug_p4d_range(pgd_t *pgdp, unsigned long addr, continue; WARN_ON(!p4d_present(p4d)); - unmap_hotplug_pud_range(p4dp, addr, next, free_mapped, altmap); + unmap_pud_range(p4dp, addr, next, free_mapped, altmap); } while (addr = next, addr < end); } -static void unmap_hotplug_range(unsigned long addr, unsigned long end, +static void unmap_range(unsigned long addr, unsigned long end, bool free_mapped, struct vmem_altmap *altmap) { unsigned long next; @@ -989,7 +989,7 @@ static void unmap_hotplug_range(unsigned long addr, unsigned long end, continue; WARN_ON(!pgd_present(pgd)); - unmap_hotplug_p4d_range(pgdp, addr, next, free_mapped, altmap); + unmap_p4d_range(pgdp, addr, next, free_mapped, altmap); } while (addr = next, addr < end); } @@ -1208,7 +1208,7 @@ void vmemmap_free(unsigned long start, unsigned long end, { WARN_ON((start < VMEMMAP_START) || (end > VMEMMAP_END)); - unmap_hotplug_range(start, end, true, altmap); + unmap_range(start, end, true, altmap); free_empty_tables(start, end, VMEMMAP_START, VMEMMAP_END); } #endif /* CONFIG_MEMORY_HOTPLUG */ @@ -1472,7 +1472,7 @@ static void __remove_pgd_mapping(pgd_t *pgdir, unsigned long start, u64 size) WARN_ON(pgdir != init_mm.pgd); WARN_ON((start < PAGE_OFFSET) || (end > PAGE_END)); - unmap_hotplug_range(start, end, false, NULL); + unmap_range(start, end, false, NULL); free_empty_tables(start, end, PAGE_OFFSET, PAGE_END); }