From patchwork Mon Dec 6 10:46:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 12658155 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 B22F1C433F5 for ; Mon, 6 Dec 2021 10:47:46 +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:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=VeuME0ZWmEKLJ8G3hREwd6Afz17sZrcWSjb1lhizJVE=; b=uC9g/3oX3R+Eqc +JlNlmt0kvq4eqwvU5B0imYsjKNNINIJqe4j2PYnCZDcicvwwnh3iLVLMILK9psmUzS55lajwURaw eqQtdBPGgt7duz9sy2V+TZJ/bEMLpeTxbHlxpP5XufAqNxFV8hpGeB72fA/vuH6sW8bsXRk4nzIjB S1S2xtCKWo10ABGJ4EfQ6ajcYo37mM0JJIMzQGcLb2oFgxVsKbJKsaW9fMWqeSQBOiExsYAbqeKzV hHEd60q1u4D2C0HVjPnBg9psFoXnwUIuDChZ4AzgLOPrChgM6mow2UeS6rGxKEPngPMYURkMtLSOE d58Ea1NQxHmmedu4IUMw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1muBWw-003OnV-6F; Mon, 06 Dec 2021 10:47:34 +0000 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1muBWk-003OiL-61 for linux-riscv@lists.infradead.org; Mon, 06 Dec 2021 10:47:23 +0000 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 4C69D3F1F9 for ; Mon, 6 Dec 2021 10:47:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638787637; bh=b2gB9kgbziNsEGldLluKkZRlwEDdrCHFdkBhlX9f0m4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=pE7TgXBmV7e7afuWAfmk6CdK/BcySZgA3ire1sl2aaIWYRsOdmo2vj8VZHCEXZ8hT ViFN9tyN6c1rIiLKsAlkDbF1NzT7CqYZnH3FDzPpK6OfchTunJ7URg2/HOkMguvr2J QPX8FW0Cpz/6QzNmfN8ruWdgliQmJABfg78+oajsyOKdT/B3kniH17loLgkAzQsSsu /uPes68r8ARt5UXxZX1dTT969sgvCUdIEl848KjPJytc+hOw23zTgDrQ5xbwAVNmDL aW0I0Ol/3DOC1ie4U9hK3mMn2Jy373/2fA6Py8V7Gs/eT7XkiRwfMQYBvFLDzIzxRA u12LiKRs53GHg== Received: by mail-wr1-f72.google.com with SMTP id h13-20020adfa4cd000000b001883fd029e8so1897444wrb.11 for ; Mon, 06 Dec 2021 02:47:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=b2gB9kgbziNsEGldLluKkZRlwEDdrCHFdkBhlX9f0m4=; b=EeG55gmcyXLpcFdsem+NJOv7JD4v/QZZQCtHIDQ8P3485uayjmeDChU/mENepUUwSw 7gaD8Ldjvr6l1PWC+dYdwpEOeVt6I9oyeskZiyAvWq2uppAfrkJDMt0s55buFA8R3CiZ HHoTF4G8Bee/JKFb+WlOSPv3gxB+sl6Y9WSfvFMFLdG9rGMYbXv23ZAFZ2w4ELbi/zdn /0Nwn0CamJ3E9kzrdNelgiGMCB3reIn4fiZyp4JzQmXtfm3OBirQ1SbQg8fJlKxwr57b ypTagl4R+Jt7+BhZFtvWXzz6hEV6txR1lorgM6z5e8W2gvDFD4tqYbP0lnk3INRCGyQG QQYg== X-Gm-Message-State: AOAM530UbgA9YkpnfXB1ovowSMRgiB4sT8Rtq4ddPJ5eEoogZOLwGxJ3 0J6AsgLbfe1Xsd9wJU5u9u9TzS9vm53WC93BGPzlOtz3ZF7n6CP0uFWLJL1cr9nehPov32EyWES 3Sxa4vdDzH6tPL39/f/qTwjWHzfL5wo7pt3msI/SEtQhPpg== X-Received: by 2002:a1c:488:: with SMTP id 130mr38244197wme.157.1638787636699; Mon, 06 Dec 2021 02:47:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJxWZaiohJDJ1lQrollH/HRqPnkkgWQVvVCi2sIDNd8r3nh+P2AJqc+yB6yDeZN9kdCc9VCG1w== X-Received: by 2002:a1c:488:: with SMTP id 130mr38244150wme.157.1638787636435; Mon, 06 Dec 2021 02:47:16 -0800 (PST) Received: from localhost.localdomain (lfbn-lyo-1-470-249.w2-7.abo.wanadoo.fr. [2.7.60.249]) by smtp.gmail.com with ESMTPSA id u23sm11755158wru.21.2021.12.06.02.47.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Dec 2021 02:47:16 -0800 (PST) From: Alexandre Ghiti To: Jonathan Corbet , Paul Walmsley , Palmer Dabbelt , Albert Ou , Zong Li , Anup Patel , Atish Patra , Christoph Hellwig , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Ard Biesheuvel , Arnd Bergmann , Kees Cook , Guo Ren , Heinrich Schuchardt , Mayuresh Chitale , panqinglin2020@iscas.ac.cn, linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-efi@vger.kernel.org, linux-arch@vger.kernel.org Cc: Alexandre Ghiti Subject: [PATCH v3 00/13] Introduce sv48 support without relocatable kernel Date: Mon, 6 Dec 2021 11:46:44 +0100 Message-Id: <20211206104657.433304-1-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211206_024722_410607_42231A3B X-CRM114-Status: GOOD ( 16.78 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org * Please note notable changes in memory layouts and kasan population * This patchset allows to have a single kernel for sv39 and sv48 without being relocatable. The idea comes from Arnd Bergmann who suggested to do the same as x86, that is mapping the kernel to the end of the address space, which allows the kernel to be linked at the same address for both sv39 and sv48 and then does not require to be relocated at runtime. This implements sv48 support at runtime. The kernel will try to boot with 4-level page table and will fallback to 3-level if the HW does not support it. Folding the 4th level into a 3-level page table has almost no cost at runtime. Note that kasan region had to be moved to the end of the address space since its location must be known at compile-time and then be valid for both sv39 and sv48 (and sv57 that is coming). Tested on: - qemu rv64 sv39: OK - qemu rv64 sv48: OK - qemu rv64 sv39 + kasan: OK - qemu rv64 sv48 + kasan: OK - qemu rv32: OK Changes in v3: - Fix SZ_1T, thanks to Atish - Fix warning create_pud_mapping, thanks to Atish - Fix k210 nommu build, thanks to Atish - Fix wrong rebase as noted by Samuel - * Downgrade to sv39 is only possible if !KASAN (see commit changelog) * - * Move KASAN next to the kernel: virtual layouts changed and kasan population * Changes in v2: - Rebase onto for-next - Fix KASAN - Fix stack canary - Get completely rid of MAXPHYSMEM configs - Add documentation Alexandre Ghiti (13): riscv: Move KASAN mapping next to the kernel mapping riscv: Split early kasan mapping to prepare sv48 introduction riscv: Introduce functions to switch pt_ops riscv: Allow to dynamically define VA_BITS riscv: Get rid of MAXPHYSMEM configs asm-generic: Prepare for riscv use of pud_alloc_one and pud_free riscv: Implement sv48 support riscv: Use pgtable_l4_enabled to output mmu_type in cpuinfo riscv: Explicit comment about user virtual address space size riscv: Improve virtual kernel memory layout dump Documentation: riscv: Add sv48 description to VM layout riscv: Initialize thread pointer before calling C functions riscv: Allow user to downgrade to sv39 when hw supports sv48 if !KASAN Documentation/riscv/vm-layout.rst | 48 ++- arch/riscv/Kconfig | 37 +- arch/riscv/configs/nommu_k210_defconfig | 1 - .../riscv/configs/nommu_k210_sdcard_defconfig | 1 - arch/riscv/configs/nommu_virt_defconfig | 1 - arch/riscv/include/asm/csr.h | 3 +- arch/riscv/include/asm/fixmap.h | 1 arch/riscv/include/asm/kasan.h | 11 +- arch/riscv/include/asm/page.h | 20 +- arch/riscv/include/asm/pgalloc.h | 40 ++ arch/riscv/include/asm/pgtable-64.h | 108 ++++- arch/riscv/include/asm/pgtable.h | 47 +- arch/riscv/include/asm/sparsemem.h | 6 +- arch/riscv/kernel/cpu.c | 23 +- arch/riscv/kernel/head.S | 4 +- arch/riscv/mm/context.c | 4 +- arch/riscv/mm/init.c | 408 ++++++++++++++---- arch/riscv/mm/kasan_init.c | 250 ++++++++--- drivers/firmware/efi/libstub/efi-stub.c | 2 drivers/pci/controller/pci-xgene.c | 2 +- include/asm-generic/pgalloc.h | 24 +- include/linux/sizes.h | 1 22 files changed, 833 insertions(+), 209 deletions(-) --- 2.32.0