From nobody Sun May 5 06:24:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=zx2c4.com ARC-Seal: i=1; a=rsa-sha256; t=1658400689; cv=none; d=zohomail.com; s=zohoarc; b=aMhZF1XZRIE4stbpcUTihL0fqC3Ad7YZqhc0mkS8vPlkGUdMWHjkfC900JLa6QzZzO+fo/MDUYRxJbwsnw1NuFKjLRK4Gq9uVZC01GSleSTl2RNwg2zZA+2uTD1MciWn2PfcrOMGV9XfEWpyNPOIOI9v5WmekrmXEl3PG+wTQ5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658400689; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fN/w6gegnQOs4DOJwfQprTiKG82Jv+JUCJ50zi4y3D8=; b=KG9uO9nP9AhIgCPbFZ1OgVr7aSQ3dmlkZPnKvbIf7i1N8XhktQiJ1rYArWPf7hnvT2gbAZSbm9NzOkjQz6m3YAoTtU7OW85AMOLLO3xMmiRPzidQj+QDetEOWz+BII40owGa3Lr7/KkIOOsvAfW0TWlHt5fQvFpcS9YErW2jSv0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658400689102357.1271223745265; Thu, 21 Jul 2022 03:51:29 -0700 (PDT) Received: from localhost ([::1]:49312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oETmC-0005Ig-1s for importer@patchew.org; Thu, 21 Jul 2022 06:51:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oETkv-0004Sm-1Z for qemu-devel@nongnu.org; Thu, 21 Jul 2022 06:50:09 -0400 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]:60654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oETkk-0003Nh-U8 for qemu-devel@nongnu.org; Thu, 21 Jul 2022 06:50:08 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EB907618D9; Thu, 21 Jul 2022 10:49:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AC3DC3411E; Thu, 21 Jul 2022 10:49:56 +0000 (UTC) Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 5ed7f0e8 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Thu, 21 Jul 2022 10:49:54 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="RV2+K687" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1658400594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fN/w6gegnQOs4DOJwfQprTiKG82Jv+JUCJ50zi4y3D8=; b=RV2+K687MDB4jmPatYTU9y8e5ChSsqUktWsSUynaM6PbS1Ziy1sc/KlEInS6f/uEAwH9My +w52xFuQSJG5XBKmIS32lLR7Np3K6hR+yOW7h1871JI7EzPQdaY+bY+VyXGFXNJIRiVDPU yWeXDTOhklOBzvkLXjyvT9ANg4a5wMY= From: "Jason A. Donenfeld" To: mst@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org Cc: "Jason A. Donenfeld" , Marcel Apfelbaum , Richard Henderson , Eduardo Habkost , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier Subject: [PATCH v6] hw/i386: pass RNG seed via setup_data entry Date: Thu, 21 Jul 2022 12:49:50 +0200 Message-Id: <20220721104950.434544-1-Jason@zx2c4.com> In-Reply-To: <20220721104730.434017-1-Jason@zx2c4.com> References: <20220721104730.434017-1-Jason@zx2c4.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2604:1380:4641:c500::1; envelope-from=SRS0=2GtW=X2=zx2c4.com=Jason@kernel.org; helo=dfw.source.kernel.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @zx2c4.com) X-ZM-MESSAGEID: 1658400689457100001 Tiny machines optimized for fast boot time generally don't use EFI, which means a random seed has to be supplied some other way. For this purpose, Linux (=E2=89=A55.20) supports passing a seed in the setup_data ta= ble with SETUP_RNG_SEED, specially intended for hypervisors, kexec, and specialized bootloaders. The linked commit shows the upstream kernel implementation. Link: https://git.kernel.org/tip/tip/c/68b8e9713c8 Cc: Michael S. Tsirkin Cc: Marcel Apfelbaum Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Cc: Peter Maydell Cc: Philippe Mathieu-Daud=C3=A9 Cc: Laurent Vivier Signed-off-by: Jason A. Donenfeld Reviewed-by: Michael S. Tsirkin --- hw/i386/x86.c | 21 +++++++++++++++++--- include/standard-headers/asm-x86/bootparam.h | 1 + 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 6003b4b2df..56896cb4b2 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -26,6 +26,7 @@ #include "qemu/cutils.h" #include "qemu/units.h" #include "qemu/datadir.h" +#include "qemu/guest-random.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qapi-visit-common.h" @@ -774,7 +775,7 @@ void x86_load_linux(X86MachineState *x86ms, int dtb_size, setup_data_offset; uint32_t initrd_max; uint8_t header[8192], *setup, *kernel; - hwaddr real_addr, prot_addr, cmdline_addr, initrd_addr =3D 0; + hwaddr real_addr, prot_addr, cmdline_addr, initrd_addr =3D 0, first_se= tup_data =3D 0; FILE *f; char *vmode; MachineState *machine =3D MACHINE(x86ms); @@ -784,6 +785,7 @@ void x86_load_linux(X86MachineState *x86ms, const char *dtb_filename =3D machine->dtb; const char *kernel_cmdline =3D machine->kernel_cmdline; SevKernelLoaderContext sev_load_ctx =3D {}; + enum { RNG_SEED_LENGTH =3D 32 }; =20 /* Align to 16 bytes as a paranoia measure */ cmdline_size =3D (strlen(kernel_cmdline) + 16) & ~15; @@ -1063,16 +1065,29 @@ void x86_load_linux(X86MachineState *x86ms, kernel_size =3D setup_data_offset + sizeof(struct setup_data) + dt= b_size; kernel =3D g_realloc(kernel, kernel_size); =20 - stq_p(header + 0x250, prot_addr + setup_data_offset); =20 setup_data =3D (struct setup_data *)(kernel + setup_data_offset); - setup_data->next =3D 0; + setup_data->next =3D cpu_to_le64(first_setup_data); + first_setup_data =3D prot_addr + setup_data_offset; setup_data->type =3D cpu_to_le32(SETUP_DTB); setup_data->len =3D cpu_to_le32(dtb_size); =20 load_image_size(dtb_filename, setup_data->data, dtb_size); } =20 + setup_data_offset =3D QEMU_ALIGN_UP(kernel_size, 16); + kernel_size =3D setup_data_offset + sizeof(struct setup_data) + RNG_SE= ED_LENGTH; + kernel =3D g_realloc(kernel, kernel_size); + setup_data =3D (struct setup_data *)(kernel + setup_data_offset); + setup_data->next =3D cpu_to_le64(first_setup_data); + first_setup_data =3D prot_addr + setup_data_offset; + setup_data->type =3D cpu_to_le32(SETUP_RNG_SEED); + setup_data->len =3D cpu_to_le32(RNG_SEED_LENGTH); + qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH); + + /* Offset 0x250 is a pointer to the first setup_data link. */ + stq_p(header + 0x250, first_setup_data); + /* * If we're starting an encrypted VM, it will be OVMF based, which use= s the * efi stub for booting and doesn't require any values to be placed in= the diff --git a/include/standard-headers/asm-x86/bootparam.h b/include/standar= d-headers/asm-x86/bootparam.h index 072e2ed546..b2aaad10e5 100644 --- a/include/standard-headers/asm-x86/bootparam.h +++ b/include/standard-headers/asm-x86/bootparam.h @@ -10,6 +10,7 @@ #define SETUP_EFI 4 #define SETUP_APPLE_PROPERTIES 5 #define SETUP_JAILHOUSE 6 +#define SETUP_RNG_SEED 9 =20 #define SETUP_INDIRECT (1<<31) =20 --=20 2.35.1