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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5FF0C433EF for ; Mon, 6 Dec 2021 10:47:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239926AbhLFKvG (ORCPT ); Mon, 6 Dec 2021 05:51:06 -0500 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:45358 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240100AbhLFKu5 (ORCPT ); Mon, 6 Dec 2021 05:50:57 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (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-0.canonical.com (Postfix) with ESMTPS id F0CCB3F1F0 for ; Mon, 6 Dec 2021 10:47:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638787647; bh=b2gB9kgbziNsEGldLluKkZRlwEDdrCHFdkBhlX9f0m4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=K+jhhEdWi12szEDW+DNCwbkyQ03CVFv4j00eMrhiZVDmThe1oOS2W5BcyeZknkCwL DvsTD/AgpuLnUKiJn3mNS0cSrbIDL766Gi3VIBwhttgnHFAoxSVbGkLuPEvhsZdQ7+ UCFO16yt3mnO/C5r0Vp/+iAX0ugoXy3AWFv6aTSo4ZL0Rx6oxW4li87V66tZwCBguQ V4uIIr3t7umExTsbbbhjBcR01WUuoTwHupVpUFz48eKndWA1rkc2Cu/SuS3sWzogyH +kFSibEQM9BsuggyIzRKKgOVJSHCIO4rudolAtygJXl2dbZIGiaf3qC69LW455orjO MYUYjaYK93WWQ== Received: by mail-wm1-f69.google.com with SMTP id 205-20020a1c00d6000000b003335d1384f1so7687467wma.3 for ; Mon, 06 Dec 2021 02:47:27 -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=ApKSYAEjIe28i5kMvfdlKnqwTNQlnAItD6KxCk/A4Gk8FExefloqUkEx6EvFq2PO7C T6oOLenEWCRf80th68UCzAruWV6jmsK/7ousW2uvic955fl95YZ9ZeK8VkOH55XLQvMh vHSlX4WSqozC2qN8M9LAEH6GHV0kAZxxa5xLSOdzlNzvjCKT3wzvofM5f8XEhj1TE28G oUAJsFJvxMFmZW/eaGobu9cAaV4hqhVe1EE+ZlQHfMr+rx5NHKWOqskAM3cgP9FiH4Ba 1i2cPjnsfTSd8npSbHUgDZuGgVhVgkKT76WWP0MprKzA9vD6zBjx2QbrzdPpMHCKwXa2 868Q== X-Gm-Message-State: AOAM533z1yyoZjHWKhkV4RpUTd6hd/8Bub/TmAWZ6qT6K/OZnej2boBd 9ZoWwp1EdID2KNdiu0kJpgNbxt8oLyo2R/nLa3FYi1DNmaeh3M7TWW4o8OJqC9DEteR+88VCPlc TDisvHo+rXFvBADjTlV9HvrYzu+f/DEoLLs6dh5De/g== X-Received: by 2002:a1c:488:: with SMTP id 130mr38244185wme.157.1638787636695; 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 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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