From patchwork Mon Oct 14 10:58:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13834715 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 49F6CD1A443 for ; Mon, 14 Oct 2024 11:01:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 07D3E6B00DC; Mon, 14 Oct 2024 07:01:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E7F456B00DE; Mon, 14 Oct 2024 07:01:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D1FBF6B00DF; Mon, 14 Oct 2024 07:01:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id B0A5B6B00DC for ; Mon, 14 Oct 2024 07:01:53 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 9A4AC40D90 for ; Mon, 14 Oct 2024 11:01:48 +0000 (UTC) X-FDA: 82671917370.17.6171290 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf17.hostedemail.com (Postfix) with ESMTP id D60C14001B for ; Mon, 14 Oct 2024 11:01:46 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf17.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728903680; a=rsa-sha256; cv=none; b=NvTw7MQTeeFdstKfPtIwyWBiNtxp54VE57zQ/SlVNrJNNPpbrDo4yUvt2T2gaVTUTuFCUs JNPKMhU7bOQ7Ia//emYVxPwLkBVSOKg3rxSZfTo5WYwRzzdJvhTN44PQub4tHO6xwC63EY WUTkJyWG5fMYDrOautJpvBqwlKlQpOE= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf17.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728903680; 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; bh=YPpXHP2mLKgaz5VTCYQnV2Bzp3U6nRyN8VK8UrnJsws=; b=kYN4p4Z5DqvJ7j7Q7zqcd51SML1KIO361fUsUjPYSWM095ufzKMdjr1keaKaSxzgRBZmPZ BwxcT6P3lPzD1kxID1jPkzRrxoodIfDg22BQfEgIivPqeNi+TExsOjU687owdj+GXz+w3L twVfEHtu+dg1bN39TsKS3+0i4fxJTS0= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B1DC6176B; Mon, 14 Oct 2024 04:02:20 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B31C53F51B; Mon, 14 Oct 2024 04:01:48 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Anshuman Khandual , Ard Biesheuvel , Catalin Marinas , David Hildenbrand , Greg Marsden , Ivan Ivanov , Kalesh Singh , Marc Zyngier , Mark Rutland , Matthias Brugger , Miroslav Benes , Will Deacon Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH v1 47/57] arm64: Statically allocate and align for worst-case page size Date: Mon, 14 Oct 2024 11:58:54 +0100 Message-ID: <20241014105912.3207374-47-ryan.roberts@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014105912.3207374-1-ryan.roberts@arm.com> References: <20241014105514.3206191-1-ryan.roberts@arm.com> <20241014105912.3207374-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: joqenu748e6bw8gjf6mgh554p7cbnh1a X-Rspamd-Queue-Id: D60C14001B X-Rspamd-Server: rspam02 X-HE-Tag: 1728903706-777284 X-HE-Meta: U2FsdGVkX1/siQjSLk/TcW34l2s1KC3s3zUfmhvN/2XN0MWFJpvtuD+ayEdpnEAnqP3mpSa0SctWWy3/Y2bYWY01u1sEtgRRkts4nLJgjz1U6xNC3M63FSUVrx78sZIDFbmJhZAuz6ozp5X5NHBNuMjOeA4fMzXKLdUnrhSF0LW2ahJpfi4KLtjDgTFoTOVFEX4xcNEiepnjIILCOhwLjvQ/QQUaixR2i4BA09UzPQKfkMZXI4+mqELK6yJXp+qOufMOGuOuHb7irWTpo8j/e9B48T34NAlJQN9ZSsVwb35M73lumRYpMZynaPQTdb/05EY90DDaSQaRTI8Fy4w2XltwRjmUp5tPyUuCLoFmNVXY7BSLBO7ZRnQWu24y+iiEOYXdTUrw6eTcU/ID0NWvt+TGx87kguPwvJx4wYXZcVH8YsV6wTMV/Zpp5UZ8mk8wqBjJUu+bpRtT5iekedwzQFnt1R0dgdqh+GdjzAig8yebkTc+DL8MokzE2mD0i22QaL9sxmsPC0D49bM/tTgH+FdP/rFHNL+mFl/RjonMrbTi0M/kNN5j5bhBMkUoaloNBPX+6TiPvxywcuNViUzJzrYlPAkVnaxC8uJ5kDrrHwb8MzUp1mGlfDWAd0SOy3we7qFkco2UyPdlGZumYbQSeK8sO8+1wko4VpjArj0o/FHOKxxsGfRSWym4e74R3nJyVlHSRs5bWj2uejdMoNSrMy1wuWH8x0Jzf1UQpD4YpIkeFA+JkO8CmkvlqDYjQ72M8dg/3a2/UvBMZlzSODZyqjN5osn6vrpEA07dJnJ/bf3W3M8dTblHIfxHEFJj/uiUmvtOt/WczBxC60SY/RPO915ko/A32p2r8NMKUEl52PzkKA+VzHbmNjjiP7+ELYeZomzFjlsmw9bteYCa+o6syJeprdOs/b5dm27lktLXjqo7JhwjTTgize42JEGpZaRhxadFr7i013i+JIvI0b7 M1phto1x YQ6iWqOMrLC33P5k+PhnZHY86vibeivUJrhmdLKWFIGjvNL1WpbHEnHmLfovXqEv5mDmg7RqMzodr8/T4gGcyayLPGu+37JxQ9gC1+vUy3LF6y+2uv5MOGpcGdjNxoQUUOgeP4dgONtBlCj8Sx2cDSU8Rnw76xQOiyZ+FCl3zbtI4mZtjSBNiF9WTKg== 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: List-Subscribe: List-Unsubscribe: Increase the size and alignment of the zero page and various static buffers used for page tables to PAGE_SIZE_MAX. This resolves to the same thing for compile-time page size builds. For boot-time builds, we may in future consider freeing unused pages at runtime when the selected page size is less than MAX. Signed-off-by: Ryan Roberts --- ***NOTE*** Any confused maintainers may want to read the cover note here for context: https://lore.kernel.org/all/20241014105514.3206191-1-ryan.roberts@arm.com/ arch/arm64/include/asm/pgtable.h | 2 +- arch/arm64/kernel/pi/map_kernel.c | 2 +- arch/arm64/mm/mmu.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 7a4f5604be3f7..fd47f70a42396 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -61,7 +61,7 @@ * ZERO_PAGE is a global shared page that is always zero: used * for zero-mapped memory areas etc.. */ -extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; +extern unsigned long empty_zero_page[PAGE_SIZE_MAX / sizeof(unsigned long)]; #define ZERO_PAGE(vaddr) phys_to_page(__pa_symbol(empty_zero_page)) #define pte_ERROR(e) \ diff --git a/arch/arm64/kernel/pi/map_kernel.c b/arch/arm64/kernel/pi/map_kernel.c index 7a62d4238449d..deb8cd50b0b0c 100644 --- a/arch/arm64/kernel/pi/map_kernel.c +++ b/arch/arm64/kernel/pi/map_kernel.c @@ -199,7 +199,7 @@ static void __init remap_idmap(bool use_lpa2, int page_shift) static void __init map_fdt(u64 fdt, int page_shift) { - static u8 ptes[INIT_IDMAP_FDT_SIZE_MAX] __initdata __aligned(PAGE_SIZE); + static u8 ptes[INIT_IDMAP_FDT_SIZE_MAX] __initdata __aligned(PAGE_SIZE_MAX); static bool first_time __initdata = true; u64 limit = (u64)&ptes[INIT_IDMAP_FDT_SIZE_MAX]; u64 efdt = fdt + MAX_FDT_SIZE; diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 84df9f278d24d..b4cd3b6a73c22 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -62,7 +62,7 @@ long __section(".mmuoff.data.write") __early_cpu_boot_status; * Empty_zero_page is a special page that is used for zero-initialized data * and COW. */ -unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] __page_aligned_bss; +unsigned long empty_zero_page[PAGE_SIZE_MAX / sizeof(unsigned long)] __page_aligned_bss; EXPORT_SYMBOL(empty_zero_page); static DEFINE_SPINLOCK(swapper_pgdir_lock); @@ -783,8 +783,8 @@ void __pi_map_range(u64 *pgd, u64 limit, u64 start, u64 end, u64 pa, pgprot_t prot, int level, pte_t *tbl, bool may_use_cont, u64 va_offset); -static u8 idmap_ptes[IDMAP_LEVELS_MAX - 1][PAGE_SIZE] __aligned(PAGE_SIZE) __ro_after_init, - kpti_ptes[IDMAP_LEVELS_MAX - 1][PAGE_SIZE] __aligned(PAGE_SIZE) __ro_after_init; +static u8 idmap_ptes[IDMAP_LEVELS_MAX - 1][PAGE_SIZE_MAX] __aligned(PAGE_SIZE_MAX) __ro_after_init, + kpti_ptes[IDMAP_LEVELS_MAX - 1][PAGE_SIZE_MAX] __aligned(PAGE_SIZE_MAX) __ro_after_init; static void __init create_idmap(void) {