From patchwork Fri Jul 21 07:48:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 13321518 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 94697EB64DD for ; Fri, 21 Jul 2023 07:49:20 +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=YkwrcusvX3i5uIAeYiBSrSacea6KDycUEvlDipL7nys=; b=qiY/zxTzoRcMt5 M/uhgrZ92cY5uAdj9jTvd6yiE6mMUUS7nptiIIEIPJNGAFrPMOhZwHPPRLtof0iZClp8Jxcp6JGRp 1YNshuaQ6Pk5RLlufc2+9QQOmqqQAW5mrhSfnELBz6iD4WHTAFBtauyPvivJaKR0Ga54CauUDvN9o I/5oLKH9XABa3+N62qd6NQiQEVHxVq8vxep/KXh0o/nSo/TnPSbDgBE+A+1bBMZW/rHis8elx6b1G kSABKUbfrbAQNF9fey9Jck5QyV6BrZzf/QtIqn8Z6hJCY0c9t9pkOO/p6IP8431Iks9oGAfbXpc+/ +xrKYT1q6GIyss65Ai0g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qMksl-00DEaa-1a; Fri, 21 Jul 2023 07:48:59 +0000 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qMksi-00DEZ4-2a for linux-arm-kernel@lists.infradead.org; Fri, 21 Jul 2023 07:48:58 +0000 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-31590e4e27aso1213048f8f.1 for ; Fri, 21 Jul 2023 00:48:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1689925732; x=1690530532; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=LJbdqgE6rPWGrAZXEIoITNtpmirnzN+6ReuxV7VdPDA=; b=ywqx+S8KXdN+x47WQ8bW/Vt7y1IB4iO5NYQjHEyDmpo1l+kaRgvYx62RP/ED+PUrvO C2kB4hWtz8WBrNtGPpydotxs2lswkc4rsr1xjSCBJgHSql+j2Jagt/mM9JNUA4iB1dfl 0Ad8bjNTWVyk6hECaIycphKHCKbmxWegRQw0KrSQ8lfgcLAyYyOb9EHOG+x3TERl3yG+ 6NN8FfsSCvu87pzHhFDsSEuzHEzwbuRlbi9Seyoz9cgJCMSbEOpOsoY16oBFCkGlh3JB 3Y+muD0TAVZnnIF57+SeO9A3hJb4xf2p7azfDADOxuDh4OS7Gr8a6JByym8URxj7i7Jd koxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689925732; x=1690530532; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LJbdqgE6rPWGrAZXEIoITNtpmirnzN+6ReuxV7VdPDA=; b=foQnbRf63/lhAQ12hCUaGCwIpLnyUnkj/uMvK517h7lTFhvbi6frFUehUIDprh/l/v cPmHvDcLJWV6eE7oOABtQbK5BlZKWw7tSgOPnzpB0Po4sT+7wCdytu3XTq8X2wRZlrhc k2L2qnqCS7yQjjJHrdt0O23a+vO8e+xOEiIt6zz7pgJlTGArY6vryLPywu27lA9D2rL0 kupLoDY/WFDmeSs9Zt1g8RzpmhSVpJrLNlPb98hD0M/KhS8kiVdjIdAVuVj+n2utPqw+ U54b4R0e51MES2WWKqCapJREsmFoJFz/vuAnVgfNHI16TWzZ4mgM4NjqHokU07zktwDO ysww== X-Gm-Message-State: ABy/qLbhN+Am7cEBI84LO99qmpKN5zq3gqoGoKRRUYgV7/zWF8g3vn0p f9dGIStDdSc91sSXFhARVyOsGw== X-Google-Smtp-Source: APBJJlE3FlxkcRT8Ksq53OMvhBnx7QbuDFYS9BKGqdSdR+S1yqatJDbL5rDW6LmpyFmfglyjTESmlg== X-Received: by 2002:adf:dccf:0:b0:313:fce9:c568 with SMTP id x15-20020adfdccf000000b00313fce9c568mr841802wrm.31.1689925732461; Fri, 21 Jul 2023 00:48:52 -0700 (PDT) Received: from alex-rivos.ba.rivosinc.com (amontpellier-656-1-456-62.w92-145.abo.wanadoo.fr. [92.145.124.62]) by smtp.gmail.com with ESMTPSA id a17-20020adffad1000000b003143cdc5949sm3457710wrs.9.2023.07.21.00.48.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 00:48:52 -0700 (PDT) From: Alexandre Ghiti To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Ard Biesheuvel , Kees Cook , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Alexandre Ghiti Subject: [PATCH v5 0/5] riscv: Introduce KASLR Date: Fri, 21 Jul 2023 09:48:45 +0200 Message-Id: <20230721074850.310644-1-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230721_004856_836840_BDFA8E63 X-CRM114-Status: GOOD ( 16.87 ) 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 The following KASLR implementation allows to randomize the kernel mapping: - virtually: we expect the bootloader to provide a seed in the device-tree - physically: only implemented in the EFI stub, it relies on the firmware to provide a seed using EFI_RNG_PROTOCOL. arm64 has a similar implementation hence the patch 3 factorizes KASLR related functions for riscv to take advantage. The new virtual kernel location is limited by the early page table that only has one PUD and with the PMD alignment constraint, the kernel can only take < 512 positions. base-commit-tag: v6.5-rc1 Changes in v5: * Renamed efi-stub-kaslr.c into kaslr.c and fix commit log of patch 3, as suggested by Ard * Removed stubs since the kaslr functions were moved to their own file (and then does not trigger any build failure for architectures that do not call those functions since they are in their own compilation unit) Changes in v4: * Fix efi_get_kimg macro that returned nothing * Moved new kaslr functions into their own files to avoid zboot link failures, as suggested by Ard Changes in v3: * Rebase on top of 6.4-rc2 * Make RANDOMIZE_BASE depend on 64bit * Fix efi_icache_sync and efi_get_kimg_min_align which were undefined in x86 (and certainly other archs) * Add patch 4 to fix warning on rv32 Changes in v2: * Rebase on top of 6.3-rc1 * Add a riscv cache sync after memcpying the kernel * Add kaslr_offset implementation for KCOV * Add forward declaration to quiet LLVM Alexandre Ghiti (5): riscv: Introduce virtual kernel mapping KASLR riscv: Dump out kernel offset information on panic arm64: libstub: Move KASLR handling functions to kaslr.c libstub: Fix compilation warning for rv32 riscv: libstub: Implement KASLR by using generic functions arch/arm64/include/asm/efi.h | 2 + arch/riscv/Kconfig | 19 +++ arch/riscv/include/asm/efi.h | 2 + arch/riscv/include/asm/page.h | 3 + arch/riscv/kernel/image-vars.h | 1 + arch/riscv/kernel/pi/Makefile | 2 +- arch/riscv/kernel/pi/cmdline_early.c | 13 ++ arch/riscv/kernel/pi/fdt_early.c | 30 ++++ arch/riscv/kernel/setup.c | 25 ++++ arch/riscv/mm/init.c | 36 ++++- drivers/firmware/efi/libstub/Makefile | 3 +- drivers/firmware/efi/libstub/arm64-stub.c | 117 ++-------------- drivers/firmware/efi/libstub/efistub.h | 8 ++ drivers/firmware/efi/libstub/kaslr.c | 159 ++++++++++++++++++++++ drivers/firmware/efi/libstub/riscv-stub.c | 33 ++--- 15 files changed, 328 insertions(+), 125 deletions(-) create mode 100644 arch/riscv/kernel/pi/fdt_early.c create mode 100644 drivers/firmware/efi/libstub/kaslr.c