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 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 5BE1FC61D97 for ; Fri, 24 Nov 2023 10:21:16 +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:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=i4uFqrh7mJUTEvAXP5HoQD/OA61eAV5WHKSAlEEtRYo=; b=b0oToE5JNYI2x+eZi9xUJG5z7H Bw8RJtnyQWlLXR1huWrPD11QNG/eCLPuxtGPW8hueK6Bmm1nXbs7WyodbUY4x9seRaRZSCIChlmS3 xGlrVz3v+7QOB6E1x7hyEcb1Of5mOzMvwXJqCSyohv+hmrtZRrVivHonYBGJlWMyTm0E7UriEC4KQ UpWz8Q1XGvSbehHyf3KBneCyAAXs044G6uBsTm4Rdf7xCc4iPgC+Ch/Yi8l8gwLfV4IvxC3HN2YjH v+Ymzqu7GOn1W5bw5kBWu/yvn703x8NB79j1HKf3iceoidRXhPaUqL5eZJ9xl0nDZ7bEXJm2bKuqQ L62E6owQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r6TIi-006oeG-0S; Fri, 24 Nov 2023 10:20:44 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r6TIR-006oWN-2B for linux-arm-kernel@lists.infradead.org; Fri, 24 Nov 2023 10:20:29 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-da03ef6fc30so1890568276.0 for ; Fri, 24 Nov 2023 02:20:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1700821225; x=1701426025; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=t56SIbSQ4jhUIaRNPn2NUOn72ywmn1puZUeTkaD6WSo=; b=RuXO/aj4O+rzKXUd4GmD9A75SC4bQTZxwAoCl5jXR/hflijD1dDZ+EjRiDGWYoKD1o OWB9vmkxGa8co2q1czDvzubcsdWiZlAypTwvK98bYHU9MgZLDWvrHfQ6ApOVKMCAgeiE bAt0WINYnH1zncf3Awb6qRcFFIo4TE0zuXNHPOkEyePO+q7zYk6tsw8sxsqWu//JAeSc PgyD30J7rszJb+WtdNAHkOqHCYuwEaas083iGKdUWhzqXbRvfGDeftCeohCOC1cfT11/ QPiGbzLyh59P5/oOtgOY3BGu4dR4ScVNQgefFIDZ0HhdWKmm+lOhBvLW3HYG56YaGn3n UYBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700821225; x=1701426025; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=t56SIbSQ4jhUIaRNPn2NUOn72ywmn1puZUeTkaD6WSo=; b=uIGire/XHAtt4WIxnmEfj1Tdo50n6WLXxWvAqZcWvcKuqE32jwA1/MlqBOJ7nJE2Kd HRLOIwVmwpzN5seGdCPEiwyzf05sq8n45BZuSen/mB5ankwRX5R914o0P0z7Z52uv009 c2ZWbneGC5yynVt26I4uj7ES+WwTt4Yti6YB6hiiNcCAEcmQZf6z/0ODPOwT7u6sN8zZ AP4NMux4iilf3RVMmTaSxhBeHdRL5eYlrH64uzNGpqtuFpff9ypfIOCDt8/uUagetoUZ Z4MVzkiiYN88s29GczspF0lomBTVGcieyTtBte9FHJOweOcSdriZ55wUl/ok+wFD2RZ9 zTjQ== X-Gm-Message-State: AOJu0YxWe7Ksua8zN8tMfMEjZyQh+XHNopTKebxaDlQHXz9U1mzRJlEB gvVx0sGzJ8BgSUXyZQFMI9AdxgDrALf6ATSVWuKtipn7Es7umIjE+E7ysPx7TPM3uz4Xf/RPUrF dvIEKkaWPJNxyjQYhI+5A2/dV/ke/603f7fQMOw72wT6iLFPbsXXI6YBkuVWmQwTFsoYYjEyROE Y= X-Google-Smtp-Source: AGHT+IHtdZXMKUdmFc+sAaEkq3R39NRqcq+N/nbFxsq+JG7XpncajNcdqJGKRXddNnrqVfkCrdLFshha X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a25:6f8b:0:b0:db3:f436:5714 with SMTP id k133-20020a256f8b000000b00db3f4365714mr81880ybc.0.1700821224902; Fri, 24 Nov 2023 02:20:24 -0800 (PST) Date: Fri, 24 Nov 2023 11:18:45 +0100 In-Reply-To: <20231124101840.944737-41-ardb@google.com> Mime-Version: 1.0 References: <20231124101840.944737-41-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=2528; i=ardb@kernel.org; h=from:subject; bh=VDbck9uGRLHEcTODagyQXSJqFVu7bfeIZMFY24kXmn0=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITWhom3p3VWyuzZVrrXKYenSsg+5lvhCOvmznNuGbXt3X JPkXLauo5SFQYyDQVZMkUVg9t93O09PlKp1niULM4eVCWQIAxenAEzkkQ7D/4DdrbpLdx50tJvd KFTkdFJqhfb+v5VFk+t/G05aaPfy+1JGhhul+9emhu6UUXzc/Ka3tCDM8q7b6Q2OzxfN/WOTF7L xBB8A X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231124101840.944737-46-ardb@google.com> Subject: [PATCH v5 05/39] arm64: mm: Move fixmap region above vmemmap region From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier , Mark Rutland , Ryan Roberts , Anshuman Khandual , Kees Cook X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231124_022027_718490_740B24EC X-CRM114-Status: GOOD ( 14.74 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Ard Biesheuvel Move the fixmap region above the vmemmap region, so that the start of the vmemmap delineates the end of the region available for vmalloc and vmap allocations and the randomized placement of the kernel and modules. In a subsequent patch, we will take advantage of this to reclaim most of the vmemmap area when running a 52-bit VA capable build with 52-bit virtual addressing disabled at runtime. Note that the existing guard region of 256 MiB covers the fixmap and PCI I/O regions as well, so we can reduce it 8 MiB, which is what we use in other places too. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/memory.h | 2 +- arch/arm64/include/asm/pgtable.h | 2 +- arch/arm64/mm/ptdump.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 99caeff78e1a..2745bed8ae5b 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -51,7 +51,7 @@ #define VMEMMAP_END (VMEMMAP_START + VMEMMAP_SIZE) #define PCI_IO_START (VMEMMAP_END + SZ_8M) #define PCI_IO_END (PCI_IO_START + PCI_IO_SIZE) -#define FIXADDR_TOP (VMEMMAP_START - SZ_32M) +#define FIXADDR_TOP (-UL(SZ_8M)) #if VA_BITS > 48 #define VA_BITS_MIN (48) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index b19a8aee684c..8d30e2787b1f 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -22,7 +22,7 @@ * and fixed mappings */ #define VMALLOC_START (MODULES_END) -#define VMALLOC_END (VMEMMAP_START - SZ_256M) +#define VMALLOC_END (VMEMMAP_START - SZ_8M) #define vmemmap ((struct page *)VMEMMAP_START - (memstart_addr >> PAGE_SHIFT)) diff --git a/arch/arm64/mm/ptdump.c b/arch/arm64/mm/ptdump.c index d1df56d44f8a..3958b008f908 100644 --- a/arch/arm64/mm/ptdump.c +++ b/arch/arm64/mm/ptdump.c @@ -45,12 +45,12 @@ static struct addr_marker address_markers[] = { { MODULES_END, "Modules end" }, { VMALLOC_START, "vmalloc() area" }, { VMALLOC_END, "vmalloc() end" }, - { FIXADDR_TOT_START, "Fixmap start" }, - { FIXADDR_TOP, "Fixmap end" }, { VMEMMAP_START, "vmemmap start" }, { VMEMMAP_START + VMEMMAP_SIZE, "vmemmap end" }, { PCI_IO_START, "PCI I/O start" }, { PCI_IO_END, "PCI I/O end" }, + { FIXADDR_TOT_START, "Fixmap start" }, + { FIXADDR_TOP, "Fixmap end" }, { -1, NULL }, }; -- 2.43.0.rc1.413.gea7ed67945-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel