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 E19D9C4167B for ; Wed, 29 Nov 2023 11:17:53 +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=hXCXS/r7qe6ZCmeisWY0SmRpmZ3aN2oujPjs/0uiKJ0=; b=h/HZqH7oaptM0f+3vW3tCHtl6v 3KO7nlJOr6x/71MCjmA4Apq5Ivs/zqShGy4YGNMdbkTPBmMr1TvnfAL1GiGVMgtvTl9OB0bjUXZCl C1Be9HpZK3Vq1eWlSOnCRPqfJRzvpMI745REI2eJs66JqSDRHxHnetI+8MZeLVouyELectWpO0vHd Fw1z6jh3X04GwLlTIK1LOXaks1ZQ/guRiau1jt8qg79S1RScUbyHmxfJR2tlzP9aXWTpICZzS3QWu QTS1SVpDCCscRo58ibMT4EBHLx4DT+pwfOqWKjl7IAVD4ivPk1MecHCmpoygUWJZODNTrjUtitUaq +Z6PDkig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r8IZQ-007z4C-07; Wed, 29 Nov 2023 11:17:32 +0000 Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r8IZJ-007yx5-1I for linux-arm-kernel@lists.infradead.org; Wed, 29 Nov 2023 11:17:26 +0000 Received: by mail-wr1-x44a.google.com with SMTP id ffacd0b85a97d-33306c2a005so1929145f8f.1 for ; Wed, 29 Nov 2023 03:17:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701256643; x=1701861443; 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=GLTAw6Fzy09giJTA8KTIyyYCeJNNJvn+fc4BLUgm6z0=; b=v9vJAofF/jffxGwIrDAxkoT+gQq/PjcgaaBFno36l/M7AX0JCbX+TRuNNsrfRncFE4 8GXFPDC7lqV+uHj3W09bisn4LqRlCzJqAiy3urBLMJESrmICQ9iSIRhCicrlvRjfrOo0 RBGj3sSE+LvQgmEz689mJ0QxDXk/XIDHnjR00gybdPR0VAOrqJlejm1GYEP6SV+0slY0 w9Eiv84K8U/USlyV4BXuQmI4AtF6f6k1fXD4meTT2daGat0udQB0rMvisJ9GSLip/xd5 +WWZAakcWhkCUJHzNaHWVcZJIml+Tui6uLxbDqkxdGuPbBi1qfgBSR+INctRBdLAvqqa ZCtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701256643; x=1701861443; 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=GLTAw6Fzy09giJTA8KTIyyYCeJNNJvn+fc4BLUgm6z0=; b=Q7t9cfP6DHAaZCLpM+WVP1Bo+xRumtQR2QyRC5YHzv33Qn3LTVFM5yOhjIRXsif+lj BgQnJ86LcR9i+ciNCu1R7G5238Zyrh9kNOo4yXqSaL3mN864MCGeGgYrUxEvgtKdhcgX sj0hI8sMZwEag68fFc4VSwjl9O//fng7ijz9WamHptZtbN8qIj/oMI/hKmUoULWaghO/ k4DUSWun6eukcXpQwwBpdhE3KfIHg0t0XkYhU9Zn8Ps1rNBv7zNd4UMbMBwhJNj1tq6Z rFk7cFBEmSoUgAAicF3tlTBwf/7Ll00EuhmZ3dZoii/ZoHWu33O4MuBEP32w8s1Psxkr rBjQ== X-Gm-Message-State: AOJu0YyTYKsMUNWdEAxSa+zT4ZMn+gpMtKNowfy3hzH1E4q446fjm6BN x1PviT1Nz3A3bL0x62SsEYwvfs0cQXznMbC59kQKWTCdL4g2CB4Tcyrj7bRu3sOEEnO6SlM8LPK oE0u4hcFM2O2rEweaozXMfqvZZUZBw2cZs1HbEvx2+gyfkPZZeI7RsR5RHyznBPS8HQAhA8Z1fP g= X-Google-Smtp-Source: AGHT+IFC9t6NLXC7XRRd7W8b+3gzdh7sFzcHU9etP6ySfC/hbubg67IcptTaDhxf5oOpGDzB7O8pMGaj X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a5d:4578:0:b0:333:127f:e42c with SMTP id a24-20020a5d4578000000b00333127fe42cmr39425wrc.9.1701256643283; Wed, 29 Nov 2023 03:17:23 -0800 (PST) Date: Wed, 29 Nov 2023 12:16:00 +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=1735; i=ardb@kernel.org; h=from:subject; bh=jbMXLbySNrhkt48hluR0iEseEJX6j5kE6/EXn3ZHfgg=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITVdtuDQ7brjx/auEZ3CtfzUhog/m+4w3HM66+NovfiOx MInj286dJSyMIhxMMiKKbIIzP77bufpiVK1zrNkYeawMoEMYeDiFICJzLNl+Ct/UDi798ucN3kf 6y+2i6u7fxN5tKbMqUHNbp3gtaOyTX8Z/tfbGu/7fHFx5Y2gn89ufrItMLbaPtuEs4Dvy5JSDeO cGywA X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129111555.3594833-47-ardb@google.com> Subject: [PATCH v6 04/41] 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 , Ryan Roberts , Anshuman Khandual , Kees Cook X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231129_031725_468238_DC634B80 X-CRM114-Status: GOOD ( 12.88 ) 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. 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..d1df56d44f8a 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" }, - { PCI_IO_START, "PCI I/O start" }, - { PCI_IO_END, "PCI I/O 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" }, { -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