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 A6C92C4332F for ; Wed, 13 Dec 2023 08:41:22 +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=7HJA62YIgww3Mn0QQHWSQvWGfIOWN0fxOZ0okvwYbSU=; b=xTNgd6tetGkbrOos5buT2pz8RD ENtcTG4hGgW4gr5MW2PcgQ/duOZo0GCIY3wj+PgQMMUB+hNqLm+m4QmPDAvVktnZ4stTtpnrd2cJI 7/+vdNmokC1WH/H7wlDCjo7A7Xy9fofrpkmt4v6cMXlgEq+R4pQWJurpSZYHqskJiyxB8SygsVJEP zsXF+1YiNbVWr5sCPwXyJerl7ZjMdYERxruHUO+vWKeEJUafD/qkrchMG7bgfD8loYVpsj5lf5uhC VAiLeuVpC9Bv3UQwi+ZMa8lvjC+IKYhSvrYH+E8gz4FWTj9Ud8sOL8K/2xBnHVQLS7cu1zL43PXCr 6OkIzH0Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDKnM-00E3GM-2D; Wed, 13 Dec 2023 08:40:44 +0000 Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDKnJ-00E3Fi-1z for linux-arm-kernel@lists.infradead.org; Wed, 13 Dec 2023 08:40:42 +0000 Received: by mail-wr1-x449.google.com with SMTP id ffacd0b85a97d-33331e69698so5499543f8f.1 for ; Wed, 13 Dec 2023 00:40:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1702456840; x=1703061640; 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=GoyUtCF75ewAMKWXP+u8oG8Jk8yBlmCfkzmrWMQ4pXg=; b=ulPvmifj7kRJpNIepqcFo0f68YTYi2MYw7CCUErtrZn7Z21pMVKNW53hEJyIBHarfN yZ22ilPhVsRMZtb3ITvHG6/r4Ubox7e2AX2sdrpsAjm0SktOmIMb3/N9MybP8MrvKLjP n6CauLwSWzz+hPlrSleo5gFPHnBtqDAnvxxwFtcbHh4GgFqioOr8oF4bE3HMzXAYaZnb pZerMsVnUU/p9CHnJ309Bj1aL7cJKTlMfApEix1Mo2gIQUFrt8RJiIiZbCAxPNjWnRmn b2d9R/TANk+qKkIxjLo2MBmW76nmZSFDZsuPYrRQ3MfrnKDDWx0Vzpty1V/GKjQ0irHQ TZKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702456840; x=1703061640; 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=GoyUtCF75ewAMKWXP+u8oG8Jk8yBlmCfkzmrWMQ4pXg=; b=oAUVtFFmhs06i8EhZSh2qaxzzEorQmkFlnIKw+2tGkKHCklsLuFGK0f25RokSZsvAD 3PpL2vguKugunWAWCRFJIEJ6e5fBrMFPpdTYXV3obkRe3YUhc2O6PLEMSDcQrdvszEr6 w/AhrAcEOPoOXSpXL9f6mqEXvNuKeccZzX+Bi8urSE60xZ0sa9zwjJKyG7Msnf8U6eLw gO7ic6i7MpXmQQELSfh+ZT20DvAdwxMbNHPjHanbflVg1z67oAVhdYKpuE+rDRZv9iXs uqA2xtFCjVp+LAunVXeupLQHcdVeLUX5PLhRAKkR7MeTtH3obRnXnBOlnnRgiESXeHad OUjw== X-Gm-Message-State: AOJu0YzpSG1fz8S1NUYO3JEBxkMu/YFBXDmSaaCy6yQ5u4EPsRXIJNvp e0SJ/R8NCN943FNSB1TWoltfFdH+hKh8frsK6PFdh9Rf5/7x4XUCuFbT0NvoRyBvHO9qsxvjyP/ fzFRPn7H5gTfMmF4FTJQSlwfRxU3zvJ2bM/uvnJikZqvAU9JYwSzihHyoC5y1DTb6ABHBHKz9fr g= X-Google-Smtp-Source: AGHT+IEI4wBQwUVJv/h1vCMCJjPbZK8Lx3DuyOCWvjG6iWIa81ZKk58UDLgl77qBBsK0Zd/3cV5ce6Nr X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a5d:6741:0:b0:336:117a:4c9b with SMTP id l1-20020a5d6741000000b00336117a4c9bmr37237wrw.3.1702456839566; Wed, 13 Dec 2023 00:40:39 -0800 (PST) Date: Wed, 13 Dec 2023 09:40:26 +0100 In-Reply-To: <20231213084024.2367360-9-ardb@google.com> Mime-Version: 1.0 References: <20231213084024.2367360-9-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=1960; i=ardb@kernel.org; h=from:subject; bh=XYlN9A4Hc2oFGV0tPBY2kCASm/vXrFv3ZkkR4QiL/FA=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIbUy95ec2fJgnu67Mh3sFjEt1e0i55crZi4ofJUnvfX2h Myz7fwdpSwMYhwMsmKKLAKz/77beXqiVK3zLFmYOaxMIEMYuDgFYCJZvxkZdnku3uLrIim6b1OZ 0nrbsCidbYbXLfTDj3lwvp6nknv2FsM/nReyfhbS8+M/eTi0/Mh70MN54mzz3xexdw/9kRLl6Tr HCgA= X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Message-ID: <20231213084024.2367360-10-ardb@google.com> Subject: [PATCH v7 1/7] arm64: mm: Move PCI I/O emulation region above the vmemmap region From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier , Mark Rutland X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231213_004041_654972_CE5243FB X-CRM114-Status: GOOD ( 12.08 ) 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 PCI I/O region above the vmemmap region in the kernel's VA space. This will permit us to reclaim the lower part of the vmemmap region for vmalloc/vmap allocations when running a 52-bit VA capable build on a 48-bit VA capable system. Also, given that PCI_IO_START is derived from VMEMMAP_END, use that symbolic constant directly in ptdump rather than deriving it from VMEMMAP_START and VMEMMAP_SIZE, as those definitions will change in subsequent patches. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/memory.h | 4 ++-- arch/arm64/mm/ptdump.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index b8d726f951ae..99caeff78e1a 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -49,8 +49,8 @@ #define MODULES_VSIZE (SZ_2G) #define VMEMMAP_START (-(UL(1) << (VA_BITS - VMEMMAP_SHIFT))) #define VMEMMAP_END (VMEMMAP_START + VMEMMAP_SIZE) -#define PCI_IO_END (VMEMMAP_START - SZ_8M) -#define PCI_IO_START (PCI_IO_END - PCI_IO_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) #if VA_BITS > 48 diff --git a/arch/arm64/mm/ptdump.c b/arch/arm64/mm/ptdump.c index e305b6593c4e..46acb2a24da0 100644 --- a/arch/arm64/mm/ptdump.c +++ b/arch/arm64/mm/ptdump.c @@ -47,10 +47,10 @@ static struct addr_marker address_markers[] = { { VMALLOC_END, "vmalloc() end" }, { FIXADDR_TOT_START, "Fixmap start" }, { FIXADDR_TOP, "Fixmap end" }, + { VMEMMAP_START, "vmemmap start" }, + { VMEMMAP_END, "vmemmap end" }, { PCI_IO_START, "PCI I/O start" }, { PCI_IO_END, "PCI I/O end" }, - { VMEMMAP_START, "vmemmap start" }, - { VMEMMAP_START + VMEMMAP_SIZE, "vmemmap end" }, { -1, NULL }, }; -- 2.43.0.472.g3155946c3a-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel