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 3E551C61D97 for ; Fri, 24 Nov 2023 10:21:11 +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=TQo3VPYE/3/zvRq17XHC3V41qq sM4ChoVZs1yymlooj92bN71prsHzGvQo5ZDwZNgiGQlLnXgN4v0WdWQ87kzSryzz4GbRErPdTsdu1 MXszlzgQwKTjy2pTvsbO5Txb4DKSTbc0zYMTKXRJOEl8z5BNbmvLyuGIWxkwxxmFgIx0BpQ/HPzNj +Pa7Kf6zo4v13XBgUnEdxylxigk9dG9CPjjF9zHWt+fS93u517KJPqrHdSfZ+S8TwpbBC0qP/b0Wb sgjICZYf4ff0YiAX8szUV9GIhZnNQol1/CmyBXpEcgMfFIP2xO0F7T+xnOKFjNFZoYren5Av2xzQZ KfxSInRA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r6TIh-006odf-1Y; Fri, 24 Nov 2023 10:20:43 +0000 Received: from mail-wm1-x34a.google.com ([2a00:1450:4864:20::34a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r6TIP-006oVq-2r for linux-arm-kernel@lists.infradead.org; Fri, 24 Nov 2023 10:20:27 +0000 Received: by mail-wm1-x34a.google.com with SMTP id 5b1f17b1804b1-40845fe2d1cso9635035e9.0 for ; Fri, 24 Nov 2023 02:20:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1700821222; x=1701426022; 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=lpdOjXK1lxY3UuaP1Js++VTZPeai2OZlC0a9IpgajaA55mgyg+y6Gn0Q9s5k5lp/uG ZvlAaQyf2B3J9nvlVuMYi4QQw8RW8dEuJc1P+mevFgvOSjeEHGXGNIKh6Co4iF7pcvTw kdaOC9SURZ0dXnb7A7FwqaxLE8jMDRM072jJS/VrEdBURUQzSfEji8aLt2IPv7vLLjnK Wj84sl/aWtASGV1ufJkgbQtMFcSuzV2oyT/9fcrNQXidycYCh1N+JAoitnfq2sBNEiQ4 fKPmMWOZtuDpzJ7ydz1MVPbplsG9FnKR3p4n5jUJBhW2ThgL2H/JCAuny5V+bcm5fSpW E0pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700821222; x=1701426022; 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=ObnhD+E5BVc+DMngMeuuSi/JAPcLVSNUXwEkSqsAUHCi/t7PElZAR4FS3kxfnEPHVz hjfFzQjOXZLtBObJjakJmzQ6vDiOPQpz1V05bqqie1obiUqLc0upsDWyQuAFQv0ZmpyB NPyOCTvsxuqnIPq7FtY5enG4VmRl+x4KpwXHydI/xlnY7raMa0p3UWNuSIx9KpvT45RO w8ODAUxfGd1hTvF8CnwngjPSvUnayiwfAfMWaXHsfugwnKG9BXiOSGRf413XPlBXoNNr Pn1X2t0FElfXmaB4ki/yT6bbRbKRZPRN2MtdX9B3t2Dq2/6V2t2QAzVEQEvNEWSgA+rf RlWg== X-Gm-Message-State: AOJu0Yyw3h/W1i1uEdnbcsbnWR9B09C3KHaq/G5qxpT5lHP6hFM9cNsS kYVzkhU8SS3P7J8dqZrv4gAr2nTerBxN03xhKTmPlQ48nczoIlGz9Mey1UCetRQ0Cu63VxDAtUv czHJX4BYIIvse9oKrCcZ0f0VwX/pTYhMHQ9zpEFv0ZTaKhEc1v0myso/uXpVBS0/4bsrsOJ+7qG c= X-Google-Smtp-Source: AGHT+IEczOUfDAmOsmeNdwhqK6Ae3oUN/v15v8AKU/ZtD66TkBwof0b9d4m/lCjZ2Rlu2TFTNwEr2yR4 X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:600c:3b14:b0:40a:4554:dd1e with SMTP id m20-20020a05600c3b1400b0040a4554dd1emr45553wms.5.1700821222698; Fri, 24 Nov 2023 02:20:22 -0800 (PST) Date: Fri, 24 Nov 2023 11:18:44 +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=1735; i=ardb@kernel.org; h=from:subject; bh=jbMXLbySNrhkt48hluR0iEseEJX6j5kE6/EXn3ZHfgg=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITWhovXQ7brjx/auEZ3CtfzUhog/m+4w3HM66+NovfiOx MInj286dJSyMIhxMMiKKbIIzP77bufpiVK1zrNkYeawMoEMYeDiFICJ6M9l+Cu8cabo27fTVHmM rpyf7LPJ7MRy4ZlHlz0onpBSqlvcVyPD8Fdyj/tzm26ulVx93Tvaf4j+/v/z3/ct666WhCjvdOA UecsDAA== X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231124101840.944737-45-ardb@google.com> Subject: [PATCH v5 04/39] 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-20231124_022025_923700_046ED2C1 X-CRM114-Status: GOOD ( 12.18 ) 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