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 BCBC7C4167B for ; Wed, 29 Nov 2023 11:18: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: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=0hbBjEwgpT6KtMizxgk70hrI7w JJMUmuZQjJAdBhnCxYa3vn9IGfMyAQ7rZUlzOXwR1s5mwV2k8fIBXKoUtBW3g7rI+SvvCTyz8DIma gRwgb7/OX23ubzAkrTmIHwg0L5JyrRAfWvEUw6DExbx35qRaGJASB487HR18lH5nLd/iE3It32Hku x1D8zt75U9zsrDYH1skaIpGQQ5eg+WUkrsQZzxVDN3l5cN3GNhDhKrhlZskgJwnmC1JxGvRjfhgUf +IFw6TBJ04DobA899h/qXLwbDKZ5bOE6RCIaKAXwlQUycbzK1y0KUwo8IDTz8xTvgD9OpB4ugO8/G /mrKQF3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r8IZm-007zOx-2y; Wed, 29 Nov 2023 11:17:54 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r8IZN-007yzG-1D for linux-arm-kernel@lists.infradead.org; Wed, 29 Nov 2023 11:17:30 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5ca61d84dc3so87538007b3.0 for ; Wed, 29 Nov 2023 03:17:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701256646; x=1701861446; 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=aBqDFrkLLYqFS/lgXr/CxuqD4kobnrvf5NTJtM9mL4zwDU+2SN3YtAc6ZbapfophE1 2Vt8z1/gmbo/0Pf9aKsse7IsT/MvtT/NI5veCEEF5NayWZjTnDZpYNFVlu/wR3sBJqaC ipWG3TLLM8ImXcW0OWNm9Vup5IW+ah0+BXDq9jWSZa1m7UqQ9r0haRMUV4A+dh+G7xnM 6wlzCR0m7s7Ac02JZLpbxqZ5A4p+StKDJUIpJCLJI/Mmo2HaMTjGdn1PDdKiIe2kilmR WTiej8axQhNEt5/jkhVApgv/7OeBivDLbWbQHi5sDEBlireUo3GzhRhiMogxWV7aJ5sz TyDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701256646; x=1701861446; 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=aqVf7ISwbQ5cESkzhI3lOaMhiD+/Ju3NxXnzcgBuPDwVmALiYTdmWb0nnUx/yq683z UMy2OSMjo9tVl06TclGyCGGc/xcCnqSPb/YHdm7Dima8ZORTkX2QSEe2gFEfi35JymYF UqPm3L8UHH8et5KbUHB6qo8nL0Eyf1AZuMaLjKy1nPI01uKELv+gn0pc2Gk1Ge156VjO fGmA2Xxmj00pHxEgs2rvqezkAolrPuN76yrzsQ61/3Vc/4xnC8ytxb4usXYkQqR0ymQb sW+6/PsuXyvuMGq11KQn8vfQ3N0dECYaXP5nq+a9NaomAxzQ8R8hQDEgyuHimO8tuDi8 OKaQ== X-Gm-Message-State: AOJu0YxrwqfosyAatzrdQV3l+E3nu4E0SccQ5bodAOSZZkG8SakbqP7A 5k8yv4UQflN0yA4LBA54WpXfB+uxvuuVD1xU6EkUeBR1M39lETd5nEIqNTiDr/I32byi0T/cNjR s/H5PUiJjTn+Z+zpd9epXL07OM244xiVB54WpCla4FA7UjHSAq6Vi0/EdeCEu+F1deEvCy+f3fb 8= X-Google-Smtp-Source: AGHT+IHeh1mXGUimt+ocbzjdkV1/loMbX911W3Ese9JuQ+9niAYDpmUBA7Lnt9oCgBw4jWoKiraciuOZ X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:690c:480d:b0:5ce:a88:8436 with SMTP id hc13-20020a05690c480d00b005ce0a888436mr496669ywb.10.1701256645722; Wed, 29 Nov 2023 03:17:25 -0800 (PST) Date: Wed, 29 Nov 2023 12:16:01 +0100 In-Reply-To: <20231129111555.3594833-43-ardb@google.com> Mime-Version: 1.0 References: <20231129111555.3594833-43-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=owGbwMvMwCFmkMcZplerG8N4Wi2JITVdtnDp3VWyuzZVrrXKYenSsg+5lvhCOvmznNuGbXt3X JPkXLauo5SFQYyDQVZMkUVg9t93O09PlKp1niULM4eVCWQIAxenAEykeiHD/7rziqIcvGxvzYW2 L2P86Dtzj7PYmU2T2tcbsCpnn64u+MvwP0ZA+g2bn8KelPfHtFr2qTzVrq3p67hdPn2/oyy3bFA 3EwA= X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129111555.3594833-48-ardb@google.com> Subject: [PATCH v6 05/41] 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-20231129_031729_416159_D6527484 X-CRM114-Status: GOOD ( 15.34 ) 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