From patchwork Thu Aug 22 07:15:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 11108581 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D4B2A112C for ; Thu, 22 Aug 2019 07:17:29 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B2400214DA for ; Thu, 22 Aug 2019 07:17:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="L3tnBXsL"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="k3AwL400" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B2400214DA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=K624Gr9JsLtYL26uEEULhTDo6iOCNoWqD/on/WkcXk4=; b=L3tnBXsLM0QCPZ 74DraK3f5E6DzIodfzi8Bv83sGJzmnKJncICd8jt8MCgag66ANN65qJ0tp/seQLCSXdgHzPJ1wozJ GkFtqshhVxbo/KnxAcaidJwg08Or7aE6FFGb3mqm94QtUwncMZjxM1dQfymGybV2VTbwkR1gYKeRZ i9DsLkhoT/mkrNhTS/I4CaD6c4aMbSysWAJxRNwhU3Jetl19QiFYfmyGj1tFr2B8UfjBoALDn3BQo 7QjSwgGq1PDf2fRgBGNxT+YQb9+h36TvY40p1X6PwPgd+XTse5rTOZdr9oAOEl1WpaAbSc7wpkQmA geMBgz3WtVdP52MbDsqw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i0hLc-0001a6-JE; Thu, 22 Aug 2019 07:17:28 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i0hKm-0001NP-Bs for linux-arm-kernel@lists.infradead.org; Thu, 22 Aug 2019 07:16:38 +0000 Received: by mail-pf1-x442.google.com with SMTP id d85so3324463pfd.2 for ; Thu, 22 Aug 2019 00:16:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FsYAbyyVOvui4W1PGmMvF7GV/7KfxkXvMo1U8B5BQKI=; b=k3AwL400TCUfP2pJ3zMkn7d01aseAKgIOXhjF711UISeZcTqMLFugAKWjcjBCPVMWP QoGhTlPPCaBb3Z5u+blJCwDqiYyC5R4KG7qolxGPf39x1Q8xjmRKGYpdq0cQ1Vw84C2s HmQFZhJeBJkADAj19f5FIQN98UnveTCOfhUfQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FsYAbyyVOvui4W1PGmMvF7GV/7KfxkXvMo1U8B5BQKI=; b=ZNRWXpF+NJZlwMDN8X2An0XJPaHvUVl3a3w7lHRxpig1PpY7HzAGUDiszOuczJsYjw XbvlX+lGSkcq5dx5iiJ7+tKPNboo5TyGBGuirOpkJZDFBesdR1LMN+pGO0xZ0qIoxfNi COSifiJbShvVjsNUCyVY66Dw3aAwt1U64NNErlhep4DfzjF5Sbbf33t3c2b6GFRB8c3g +M35Bwl9F5qZ9S7Z3xJfksq3XWAybBnk4QcrPrHdeEh9lMIdRa95IyAxk/WXgpqeI+G2 xO4ngp0grRYDMQh0rcavZADqJ0O50ukxE71mC2X9DhBLzl9DSJ34euNMzbfJwtwntmSJ xKqw== X-Gm-Message-State: APjAAAWjC76Rwl6fAizze3ffIoULax4n9rtVOpxoRHNp33XtLMouB5Lz wNqjqvhiRkga3iS9cIdSGV5JDkBJBhleqA== X-Google-Smtp-Source: APXvYqzqWwsyb/YjtbA0HBEMoI1h1pXc+102QUXZUqVanUAmU89eoH+ASqCBZyjgrT1S8DuMSx5Vgg== X-Received: by 2002:a17:90a:fc90:: with SMTP id ci16mr4008713pjb.48.1566458195608; Thu, 22 Aug 2019 00:16:35 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:b852:bd51:9305:4261]) by smtp.gmail.com with ESMTPSA id w26sm30233450pfq.100.2019.08.22.00.16.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Aug 2019 00:16:35 -0700 (PDT) From: Hsin-Yi Wang To: linux-arm-kernel@lists.infradead.org, "Theodore Y . Ts'o" Subject: [PATCH v9 1/3] arm64: map FDT as RW for early_init_dt_scan() Date: Thu, 22 Aug 2019 15:15:21 +0800 Message-Id: <20190822071522.143986-2-hsinyi@chromium.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190822071522.143986-1-hsinyi@chromium.org> References: <20190822071522.143986-1-hsinyi@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190822_001636_793427_58EC1199 X-CRM114-Status: GOOD ( 18.42 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:442 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kate Stewart , Peter Zijlstra , Catalin Marinas , Mukesh Ojha , Grzegorz Halat , "H . Peter Anvin" , Guenter Roeck , Will Deacon , Marek Szyprowski , Rob Herring , Daniel Thompson , Anders Roxell , Yury Norov , Marc Zyngier , Russell King , Aaro Koskinen , Ingo Molnar , Viresh Kumar , Waiman Long , "Paul E . McKenney" , Wei Li , Alexey Dobriyan , Julien Thierry , Len Brown , Kees Cook , Arnd Bergmann , Rik van Riel , Stephen Boyd , Shaokun Zhang , Mike Rapoport , Borislav Petkov , Josh Poimboeuf , Thomas Gleixner , Greg Kroah-Hartman , Marcelo Tosatti , linux-kernel@vger.kernel.org, Armijn Hemel , Jiri Kosina , Mathieu Desnoyers , Andrew Morton , Tim Chen , "David S . Miller" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Currently in arm64, FDT is mapped to RO before it's passed to early_init_dt_scan(). However, there might be some codes (eg. commit "fdt: add support for rng-seed") that need to modify FDT during init. Map FDT to RO after early fixups are done. Signed-off-by: Hsin-Yi Wang Reviewed-by: Stephen Boyd Reviewed-by: Mike Rapoport --- No change since v7. --- arch/arm64/include/asm/mmu.h | 2 +- arch/arm64/kernel/kaslr.c | 5 +---- arch/arm64/kernel/setup.c | 9 ++++++++- arch/arm64/mm/mmu.c | 15 +-------------- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/arch/arm64/include/asm/mmu.h b/arch/arm64/include/asm/mmu.h index fd6161336653..f217e3292919 100644 --- a/arch/arm64/include/asm/mmu.h +++ b/arch/arm64/include/asm/mmu.h @@ -126,7 +126,7 @@ extern void init_mem_pgprot(void); extern void create_pgd_mapping(struct mm_struct *mm, phys_addr_t phys, unsigned long virt, phys_addr_t size, pgprot_t prot, bool page_mappings_only); -extern void *fixmap_remap_fdt(phys_addr_t dt_phys); +extern void *fixmap_remap_fdt(phys_addr_t dt_phys, int *size, pgprot_t prot); extern void mark_linear_text_alias_ro(void); #define INIT_MM_CONTEXT(name) \ diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c index 5a59f7567f9c..416f537bf614 100644 --- a/arch/arm64/kernel/kaslr.c +++ b/arch/arm64/kernel/kaslr.c @@ -62,9 +62,6 @@ static __init const u8 *kaslr_get_cmdline(void *fdt) return default_cmdline; } -extern void *__init __fixmap_remap_fdt(phys_addr_t dt_phys, int *size, - pgprot_t prot); - /* * This routine will be executed with the kernel mapped at its default virtual * address, and if it returns successfully, the kernel will be remapped, and @@ -93,7 +90,7 @@ u64 __init kaslr_early_init(u64 dt_phys) * attempt at mapping the FDT in setup_machine() */ early_fixmap_init(); - fdt = __fixmap_remap_fdt(dt_phys, &size, PAGE_KERNEL); + fdt = fixmap_remap_fdt(dt_phys, &size, PAGE_KERNEL); if (!fdt) return 0; diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 57ff38600828..56f664561754 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -170,9 +170,13 @@ static void __init smp_build_mpidr_hash(void) static void __init setup_machine_fdt(phys_addr_t dt_phys) { - void *dt_virt = fixmap_remap_fdt(dt_phys); + int size; + void *dt_virt = fixmap_remap_fdt(dt_phys, &size, PAGE_KERNEL); const char *name; + if (dt_virt) + memblock_reserve(dt_phys, size); + if (!dt_virt || !early_init_dt_scan(dt_virt)) { pr_crit("\n" "Error: invalid device tree blob at physical address %pa (virtual address 0x%p)\n" @@ -184,6 +188,9 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys) cpu_relax(); } + /* Early fixups are done, map the FDT as read-only now */ + fixmap_remap_fdt(dt_phys, &size, PAGE_KERNEL_RO); + name = of_flat_dt_get_machine_name(); if (!name) return; diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index e67bab4d613e..1586d7fbf26a 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -877,7 +877,7 @@ void __set_fixmap(enum fixed_addresses idx, } } -void *__init __fixmap_remap_fdt(phys_addr_t dt_phys, int *size, pgprot_t prot) +void *__init fixmap_remap_fdt(phys_addr_t dt_phys, int *size, pgprot_t prot) { const u64 dt_virt_base = __fix_to_virt(FIX_FDT); int offset; @@ -930,19 +930,6 @@ void *__init __fixmap_remap_fdt(phys_addr_t dt_phys, int *size, pgprot_t prot) return dt_virt; } -void *__init fixmap_remap_fdt(phys_addr_t dt_phys) -{ - void *dt_virt; - int size; - - dt_virt = __fixmap_remap_fdt(dt_phys, &size, PAGE_KERNEL_RO); - if (!dt_virt) - return NULL; - - memblock_reserve(dt_phys, size); - return dt_virt; -} - int __init arch_ioremap_p4d_supported(void) { return 0; From patchwork Thu Aug 22 07:15:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 11108583 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5885B13B1 for ; Thu, 22 Aug 2019 07:18:23 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 3617E214DA for ; Thu, 22 Aug 2019 07:18:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LvM9yQgC"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="jyOzhTFh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3617E214DA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TstLvbFbfFnI7WMTrM+cMA+XcNlb566p9Ng64i4ucc4=; b=LvM9yQgCdbSL3N sjhxPal/SV8c3wTAy236zKHA5rzx2eUNtR/+fDsa/+ZFDxN4u5LmZkqGXGRWs99Af9tLnzkw7qLwP Ui75PbUjNVYch/mUlGiaYtA6dxP+92rA4OoOpwWTJhzSV709wpmcX/qzd7oJFajCCjC5C66ZIElWP mXakIlNYu5QRhE6Y9qSMuLlUTz0Qe2bQJ6EiZIE+VtZvKf7mxcd3B55177YH0pK/YT++hLUy592hl vWVxKkc4ROHaaHZ4PX5nkyNtp3FE1t7F8BE6gGBFpoUQpKP1WCYQH+mJy1o4jltcJusGoxAlW1VGR /rODSMqeg9RXr1IdRgYw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i0hMT-0001uS-Hn; Thu, 22 Aug 2019 07:18:22 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i0hKw-0001Qa-1n for linux-arm-kernel@lists.infradead.org; Thu, 22 Aug 2019 07:16:48 +0000 Received: by mail-pf1-x441.google.com with SMTP id o70so3316325pfg.5 for ; Thu, 22 Aug 2019 00:16:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u1M0h1fse5fWcD6TExQsXpSrhJTc/UmTdvcIiT+sTi4=; b=jyOzhTFhEpT0F8vv04j2INavdeUrerCYnwz08j2DyPbn/ksQ1D/zzsYav4RTqZ3jvh met3GnRNZPdjm/iarcVQbwLySgdKIjkUnfqolpTzUJziFzR3D7wTvFDDsydcFGYVPwws I6sGoA3MwMa88O6C9ba2arRlSpOy3xm2L2HbA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u1M0h1fse5fWcD6TExQsXpSrhJTc/UmTdvcIiT+sTi4=; b=EMTCkENmSHOLBlSbjfVjSJvBTmmr+8kXEXARHnckKK9rt8AczVxGGHMv0vtEWpf+gw d53yHqq6K5qB1/sICSPUy7gOAEVPK8g9U81z11PvJlwY3yhS4VI1W+2DggM3t0gcKQLu 1Rj88US0JjT44eN3PJRjtkiLk5OmKaEwBdLtQiVT7bxLqHHV350Xwx/TCHcl4OpDUOQt NqTN3t07gbmzIyoMJ71k/WBWuqgpc+Sh826alLpRtfpoM1Jd5S9niYR98+bxm7edqQmW 6XVaj7IBUa2e/Ci01YTca90u2j2v87/1a4aAGQwuGWL5gkykDEQ/rT4aHPqbHwist6mE 1hhQ== X-Gm-Message-State: APjAAAWonYEic5AYZrFk5/4A+OHxvUGnXhlI2Lp2bN403WRG5wBMWDC/ SjQIl9DOOKI9NW4Bmm5mBdRKTWFUrPc= X-Google-Smtp-Source: APXvYqywLFIAaNaYsXu1OfGGVmmvmZGXRzd+bHimaWcDa4BRxGcbhjI6qIAuKVbwffys+v10Uq3gKA== X-Received: by 2002:a63:ed55:: with SMTP id m21mr32583711pgk.343.1566458205158; Thu, 22 Aug 2019 00:16:45 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:b852:bd51:9305:4261]) by smtp.gmail.com with ESMTPSA id w26sm30233450pfq.100.2019.08.22.00.16.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Aug 2019 00:16:44 -0700 (PDT) From: Hsin-Yi Wang To: linux-arm-kernel@lists.infradead.org, "Theodore Y . Ts'o" Subject: [PATCH v9 2/3] fdt: add support for rng-seed Date: Thu, 22 Aug 2019 15:15:22 +0800 Message-Id: <20190822071522.143986-3-hsinyi@chromium.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190822071522.143986-1-hsinyi@chromium.org> References: <20190822071522.143986-1-hsinyi@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190822_001646_356728_EC6FEB0C X-CRM114-Status: GOOD ( 21.78 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:441 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kate Stewart , Peter Zijlstra , Catalin Marinas , Mukesh Ojha , Grzegorz Halat , "H . Peter Anvin" , Guenter Roeck , Will Deacon , Marek Szyprowski , Rob Herring , Daniel Thompson , Anders Roxell , Yury Norov , Marc Zyngier , Russell King , Aaro Koskinen , Ingo Molnar , Viresh Kumar , Waiman Long , "Paul E . McKenney" , Wei Li , Alexey Dobriyan , Julien Thierry , Len Brown , Kees Cook , Arnd Bergmann , Rik van Riel , Stephen Boyd , Shaokun Zhang , Mike Rapoport , Borislav Petkov , Josh Poimboeuf , Thomas Gleixner , Greg Kroah-Hartman , Marcelo Tosatti , linux-kernel@vger.kernel.org, Armijn Hemel , Jiri Kosina , Mathieu Desnoyers , Andrew Morton , Tim Chen , "David S . Miller" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Introducing a chosen node, rng-seed, which is an entropy that can be passed to kernel called very early to increase initial device randomness. Bootloader should provide this entropy and the value is read from /chosen/rng-seed in DT. Obtain of_fdt_crc32 for CRC check after early_init_dt_scan_nodes(), since early_init_dt_scan_chosen() would modify fdt to erase rng-seed. Add a new interface add_bootloader_randomness() for rng-seed use case. Depends on whether the seed is trustworthy, rng seed would be passed to add_hwgenerator_randomness(). Otherwise it would be passed to add_device_randomness(). Decision is controlled by kernel config RANDOM_TRUST_BOOTLOADER. Signed-off-by: Hsin-Yi Wang Reviewed-by: Stephen Boyd Reviewed-by: Rob Herring Reviewed-by: Theodore Ts'o --- Change from v8: * Add a new interface add_bootloader_randomness * Add a new kernel config --- drivers/char/Kconfig | 10 ++++++++++ drivers/char/random.c | 15 +++++++++++++++ drivers/of/fdt.c | 14 ++++++++++++-- include/linux/random.h | 1 + 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 96156c729a31..5974a5906fd0 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -551,3 +551,13 @@ config RANDOM_TRUST_CPU has not installed a hidden back door to compromise the CPU's random number generation facilities. This can also be configured at boot with "random.trust_cpu=on/off". + +config RANDOM_TRUST_BOOTLOADER + bool "Trust the bootloader to initialize Linux's CRNG" + default n + help + Bootloader could provide rng-seed set in /chosen/rng-seed in DT to help + increase initial device randomness. Assume the entropy provided is + trustworthy, it would be regarded as true hardware RNGs and update the + entropy estimate. Otherwise it would be regarded as device input that + could help mix the entropy pool, but won't be added to actual entropy. \ No newline at end of file diff --git a/drivers/char/random.c b/drivers/char/random.c index 5d5ea4ce1442..29d3ff3de1e1 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -2445,3 +2445,18 @@ void add_hwgenerator_randomness(const char *buffer, size_t count, credit_entropy_bits(poolp, entropy); } EXPORT_SYMBOL_GPL(add_hwgenerator_randomness); + +/* Handle random seed passed by bootloader. + * If the seed is trustworthy, it would be regarded as hardware RNGs. Otherwise + * it would be regarded as device data. + * The decision is controlled by CONFIG_RANDOM_TRUST_BOOTLOADER. + */ +void add_bootloader_randomness(const void *buf, unsigned int size) +{ +#ifdef CONFIG_RANDOM_TRUST_BOOTLOADER + add_hwgenerator_randomness(buf, size, size * 8); +#else + add_device_randomness(buf, size); +#endif +} +EXPORT_SYMBOL_GPL(add_bootloader_randomness); \ No newline at end of file diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 9cdf14b9aaab..7d97ab6d0e31 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -24,6 +24,7 @@ #include #include #include +#include #include /* for COMMAND_LINE_SIZE */ #include @@ -1044,6 +1045,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, { int l; const char *p; + const void *rng_seed; pr_debug("search \"chosen\", depth: %d, uname: %s\n", depth, uname); @@ -1078,6 +1080,14 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, pr_debug("Command line is: %s\n", (char*)data); + rng_seed = of_get_flat_dt_prop(node, "rng-seed", &l); + if (rng_seed && l > 0) { + add_bootloader_randomness(rng_seed, l); + + /* try to clear seed so it won't be found. */ + fdt_nop_property(initial_boot_params, node, "rng-seed"); + } + /* break now */ return 1; } @@ -1166,8 +1176,6 @@ bool __init early_init_dt_verify(void *params) /* Setup flat device-tree pointer */ initial_boot_params = params; - of_fdt_crc32 = crc32_be(~0, initial_boot_params, - fdt_totalsize(initial_boot_params)); return true; } @@ -1197,6 +1205,8 @@ bool __init early_init_dt_scan(void *params) return false; early_init_dt_scan_nodes(); + of_fdt_crc32 = crc32_be(~0, initial_boot_params, + fdt_totalsize(initial_boot_params)); return true; } diff --git a/include/linux/random.h b/include/linux/random.h index 1f7dced2bba6..f189c927fdea 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -19,6 +19,7 @@ struct random_ready_callback { }; extern void add_device_randomness(const void *, unsigned int); +extern void add_bootloader_randomness(const void *, unsigned int); #if defined(LATENT_ENTROPY_PLUGIN) && !defined(__CHECKER__) static inline void add_latent_entropy(void) From patchwork Thu Aug 22 07:15:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 11108585 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 582EA112C for ; Thu, 22 Aug 2019 07:19:04 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 3615F214DA for ; Thu, 22 Aug 2019 07:19:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gLUwEdD2"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="eA3CVPHO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3615F214DA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EBYGNM8qJI7LIjT/2NyvFHCsOKGIMFaf/VkY4Ad7wf4=; b=gLUwEdD24ZJCbr bWGPnr3z89Ld0XbTQ8d+uGOJvyLmcY1mDZb8ezMYH1ab+4LYCDNi6c+DMYeITs+t80/1G0fqh5BQP KBrZKuZPFjf+7PRv9I+1psWkI2kS+xUJnpeC+NfdSe3nUBASxQeLo2dgTHpe9YXPBBo+QYWmY7jrj vtdRnFG7LDmWiG78WJrqJLtfNMUgeOA+tdqOScjW/s1ferSLH99joqNBieZWyD6Yw+fd1eUaTIiry L1ftCJx8shfR6qTCGEKtdjHbeftLkf/JiqMkNdcxNtUa3qq6kkTvRtMNCSOGQV28lr0L/FHz63srJ /IMGMvswSR3uCQmj2QWA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i0hN9-0002AB-CZ; Thu, 22 Aug 2019 07:19:03 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i0hL4-0001TC-DE for linux-arm-kernel@lists.infradead.org; Thu, 22 Aug 2019 07:16:56 +0000 Received: by mail-pf1-x444.google.com with SMTP id w2so3318712pfi.3 for ; Thu, 22 Aug 2019 00:16:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KDK904pFN7jivNdco2xyrNcDuDX6KrPhUsZA40Vbhtg=; b=eA3CVPHOYL8XiTCU7ukjfFiS+M57k8US/Lwpr50Q4O3lT8by8UYD373rTuAnCa+GjK C52hQnD5tSzHl+YWf5voBAdHnUS6+HTn3s+59Z6+u9rHrSiwZBNbV8NCcBPTdT2Rc12g MngDDmJrh3ew2YkVw93QmvDja6lgsyZgbhf/E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KDK904pFN7jivNdco2xyrNcDuDX6KrPhUsZA40Vbhtg=; b=EDfB6Q1W3IimB7QkigKchM4FaE5E4wbb11WQ0pf3o9biVxhnBcYpTa828TlUg5U1Ar ePNnOUaR0GjsyIJtAAGm8igFGpFAmf/DFxu5pWuSz6Xsj4IZqHGWgWBOZbBM3omlxDCz 70TpljjB3tw1EgJs9AveVdxVal6JNvSmR13xWh5ETKZgmg/FrdLztCAxJMgwMqk1OjOj lgSK3V0LIvquoOGGGX3GE0nxSxEz8fdJEuTAoheyNsqPF1NrklB64ntk1LX1V6ClvAeY VOE2ZktXGzpLx7e/iZsu3+6FPnmfys38lX7crI0iif/w1epcGj0AWgrIQ9Tj+P+kSmYZ ZHPA== X-Gm-Message-State: APjAAAXX8ChfISOH9KdnvJfuZ32ko9awG5PFHkazkStSKXOJvbGO6dVL qNMP3RV7XiyFQ2ICWGtZi+4OfZBoULA= X-Google-Smtp-Source: APXvYqxdasLiYU//BopbU4CHgppxD5KX1YKpYkS67ssYX7XEfeVynJBp2KHO6i85bqDNk9/dEa3BUQ== X-Received: by 2002:a17:90a:e983:: with SMTP id v3mr3839574pjy.81.1566458213442; Thu, 22 Aug 2019 00:16:53 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:b852:bd51:9305:4261]) by smtp.gmail.com with ESMTPSA id w26sm30233450pfq.100.2019.08.22.00.16.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Aug 2019 00:16:52 -0700 (PDT) From: Hsin-Yi Wang To: linux-arm-kernel@lists.infradead.org, "Theodore Y . Ts'o" Subject: [PATCH v9 3/3] arm64: kexec_file: add rng-seed support Date: Thu, 22 Aug 2019 15:15:23 +0800 Message-Id: <20190822071522.143986-4-hsinyi@chromium.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190822071522.143986-1-hsinyi@chromium.org> References: <20190822071522.143986-1-hsinyi@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190822_001654_854636_9C8A967A X-CRM114-Status: GOOD ( 15.73 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:444 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kate Stewart , Peter Zijlstra , Catalin Marinas , Mukesh Ojha , Grzegorz Halat , "H . Peter Anvin" , Guenter Roeck , Will Deacon , Marek Szyprowski , Rob Herring , Daniel Thompson , Anders Roxell , Yury Norov , Marc Zyngier , Russell King , Aaro Koskinen , Ingo Molnar , Viresh Kumar , Waiman Long , "Paul E . McKenney" , Wei Li , Alexey Dobriyan , Julien Thierry , Len Brown , Kees Cook , Arnd Bergmann , Rik van Riel , Stephen Boyd , Shaokun Zhang , Mike Rapoport , Borislav Petkov , Josh Poimboeuf , Thomas Gleixner , Greg Kroah-Hartman , Marcelo Tosatti , linux-kernel@vger.kernel.org, Armijn Hemel , Jiri Kosina , Mathieu Desnoyers , Andrew Morton , Tim Chen , "David S . Miller" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Adding "rng-seed" to dtb. It's fine to add this property if original fdt doesn't contain it. Since original seed will be wiped after read, so use a default size 128 bytes here. Signed-off-by: Hsin-Yi Wang Reviewed-by: Stephen Boyd --- No change since v7. --- arch/arm64/kernel/machine_kexec_file.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c index ba78ee7ca990..7b08bf9499b6 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -27,6 +27,8 @@ #define FDT_PROP_INITRD_END "linux,initrd-end" #define FDT_PROP_BOOTARGS "bootargs" #define FDT_PROP_KASLR_SEED "kaslr-seed" +#define FDT_PROP_RNG_SEED "rng-seed" +#define RNG_SEED_SIZE 128 const struct kexec_file_ops * const kexec_file_loaders[] = { &kexec_image_ops, @@ -102,6 +104,19 @@ static int setup_dtb(struct kimage *image, FDT_PROP_KASLR_SEED); } + /* add rng-seed */ + if (rng_is_initialized()) { + u8 rng_seed[RNG_SEED_SIZE]; + get_random_bytes(rng_seed, RNG_SEED_SIZE); + ret = fdt_setprop(dtb, off, FDT_PROP_RNG_SEED, rng_seed, + RNG_SEED_SIZE); + if (ret) + goto out; + } else { + pr_notice("RNG is not initialised: omitting \"%s\" property\n", + FDT_PROP_RNG_SEED); + } + out: if (ret) return (ret == -FDT_ERR_NOSPACE) ? -ENOMEM : -EINVAL; @@ -110,7 +125,8 @@ static int setup_dtb(struct kimage *image, } /* - * More space needed so that we can add initrd, bootargs and kaslr-seed. + * More space needed so that we can add initrd, bootargs, kaslr-seed, and + * rng-seed. */ #define DTB_EXTRA_SPACE 0x1000