From patchwork Tue Sep 12 14:15:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13381757 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 38E2BCA0EED for ; Tue, 12 Sep 2023 14:17:49 +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=vXC3QlPAVtLXrs7VZjasden5z3KQLg0ZzjgpQoH7Bnk=; b=iBhWv4HW7B3rAwwwDo/2zxjFDL q+p3fp4ixDPs/PyTisteEk8OTrxI1EfBmtKc+6LOv/MLHYPOlmVjuV2HJ8BbUyuzGdCAto4ph2p4K TOYf2P6edZjgyjLBIdSaaQIDA5fpYa/kUanU0ynkwDgBlvN/cR6aUH/wqEcxbPEFfL9kAtqytJBhN OakU8mc/u88qu0hMT2gkdsPWPwbFs4PZ2R/iaswFIxzhQlN3yIBpyTiq0k1HZFJSgumDo7JIFkvCp /p55eMx0GosOVMfv7ozFVS70n0431Vpy9mCKMj/k4GeH7i77euKuUAMRYRmoNlYlLHAkyjZHyVM/o mCxPjNRg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qg4Cl-003Vrc-0D; Tue, 12 Sep 2023 14:17:27 +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 1qg4Ch-003VpT-2H for linux-arm-kernel@lists.infradead.org; Tue, 12 Sep 2023 14:17:24 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-58d799aa369so67562007b3.0 for ; Tue, 12 Sep 2023 07:17:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694528241; x=1695133041; 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=Kyf/ErPiip1ApkBGDB/QoNksVTDqpAoO4jDwl90YVbY=; b=Kkzdk79a1G/uF3f9MrBUgyXnsVlxdwu3Im6EQFrHQ77MpDviesq8n92q+ta5viz+n+ /KbNyBNvqxa40XhLE0r/Slf9EhCSUSIp9mpj076H1rIonlrcDIPX1XjMNgPopG8FTDfG xWu+3cYZ/2Y9u1RKLTbE4GgGNY+hlTCY+8DiknlOPQf5uLFHXTn+CLC1WvZyufxZQxrG ZnWzNkOAbKcd1WXCb8Ph+6xjKCaZdYJ6VaQqGR4VlrEUUWF0M3DxWosvaNdqrfsg09FP DAz2w1kOWUrCU+VzLC43R4IAOtZWscY3KtZc5WpP1FU42BCnNyrYd4qdX1qYpETCq39E Uhug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694528241; x=1695133041; 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=Kyf/ErPiip1ApkBGDB/QoNksVTDqpAoO4jDwl90YVbY=; b=fXmTtmkdvqLikeA/pIHk9mqJ2lNqiOjlsb36OBGG40hMIIFjvHdypL/suX3W5lpgRR JW/8n46061fuSDVB9pYbisnhhFChB91XZPYC7J0Dq2Iri5i/KLCSFe8BjGfCMKg/+vJ4 +SGR1sipbBjaONMCZ65R8tjkLUj9HEeknOJSmV9fu/9m8Q10FLU1e4xyyubITZyGEYI/ byMUO6d0z7t1M/AsEnT37AF5ADqSQnIYR8eyYD50YTCH6lvHbZc2ANBD7PSBaBUN9bcR D74c8JNcYpgZvmZE1zVATN/r6RmPcijCRnkT4ipWAT/2mcxGJ6Zk8JDePWMnGP3mUw6W Ip6Q== X-Gm-Message-State: AOJu0YwEw8x5nXpa+5qHa6La58bLy0IJGPExe3Rd/3WGxRVUAVmPaUUr yFdIfAZnm3C0+A2D2kq6drEsBBXTo0rQPQGIGCOBEw9jaC07bFvil9tBCo0izIYToH1Oh9YFCa8 nR1zpDQp/7bBmz9WCc84LpapMv6A8HegftlfrIXdc1Y1YNsJKGZjbDfA0YeJMyPiv/oUEK+fbmT E= X-Google-Smtp-Source: AGHT+IGsMQs5BRzvvckE6UTsrKhuxuNS0gYdWHDRTz7KPhja+s8DSmjgzuaQZvoysANQYtO+gobJmzak X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a25:d002:0:b0:d7f:8e0a:4b3f with SMTP id h2-20020a25d002000000b00d7f8e0a4b3fmr311685ybg.3.1694528241619; Tue, 12 Sep 2023 07:17:21 -0700 (PDT) Date: Tue, 12 Sep 2023 14:15:54 +0000 In-Reply-To: <20230912141549.278777-63-ardb@google.com> Mime-Version: 1.0 References: <20230912141549.278777-63-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=1731; i=ardb@kernel.org; h=from:subject; bh=LZS9DkdmR4a/TLcyjNXw6Rkmd/jkYDwqoR8m8lI9T4U=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIZWhaNYdvffiFYWXO+7c0DpdbijxklX5jvT/upl7th0tO LrF71BxRykLgxgHg6yYIovA7L/vdp6eKFXrPEsWZg4rE8gQBi5OAZjIzCKGv8J/xffsvnPn7vx8 3VVM2433zkgKrLvYmu414Yrz08ntj5cxMrzKvi2nFC+/W6zo8pbyiw2Ht0esqtzp6rbGqfJcn2W DFgcA X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog Message-ID: <20230912141549.278777-67-ardb@google.com> Subject: [PATCH v4 04/61] 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 , Joey Gouly X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230912_071723_741914_B5C1B066 X-CRM114-Status: GOOD ( 13.58 ) 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: , 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 }, };