From nobody Mon May 20 16:23:50 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675890790; cv=none; d=zohomail.com; s=zohoarc; b=C+NIe5XpqaV6TIZA6Y+fEkUzLBEGyPbDGYg8qBZISTlOZSYGDroawlQpR0mgsA2eR52fsySHKnvQCx3woJJD5Ilcxxfxeth1kQ7vKFuVWqMyzPl9cQJeSQpoQT6fKjW5U50AILhnpH5imle6H0zj3aSGCniqmYGDFcmNDJE8c6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675890790; h=Content-Type: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=KzSKUxDk47sMRBv2cjoG8jtVyH/AAlQtGJYA+OBG4Yw=; b=SL0p1N0rI0NcC2E7jKZ1Ux8rk/5Twdsaer416ClDgFAMidb7AE8CDA3jq31qiSDPiMfcqK/EvZ/1i7+5DHBo8NAJwMcCKTRbWYqIfagP1OcSWKShQJ6aPiiviuAwjQj/CmDigUVdaH2cZjzDeYzVew8M/yrswHDCMWvJnwvrmEQ= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167589079026419.788318911899978; Wed, 8 Feb 2023 13:13:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPrk6-0000Ep-GJ; Wed, 08 Feb 2023 16:12:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPrk5-0000Bc-HC for qemu-devel@nongnu.org; Wed, 08 Feb 2023 16:12:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPrk3-0007oD-Iw for qemu-devel@nongnu.org; Wed, 08 Feb 2023 16:12:37 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-287-i7wkwWBaMtOqMr8IfLphBw-1; Wed, 08 Feb 2023 16:12:33 -0500 Received: by mail-wm1-f71.google.com with SMTP id l38-20020a05600c1d2600b003ddff4b9a40so30533wms.9 for ; Wed, 08 Feb 2023 13:12:33 -0800 (PST) Received: from redhat.com ([2.52.132.212]) by smtp.gmail.com with ESMTPSA id w13-20020a05600c474d00b003e001afa274sm3292429wmo.2.2023.02.08.13.12.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 13:12:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675890754; 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: in-reply-to:in-reply-to:references:references; bh=KzSKUxDk47sMRBv2cjoG8jtVyH/AAlQtGJYA+OBG4Yw=; b=akqta0CK7+coqm4uL+9zhp1alMv/F/BUhHN47jX6hZ5Mt0h1kZY9ZzWmKlEz270zI/fnBv +tD/yhxAcu5gU1Lpvr8PXbh8uq4OUQ3ok980tt8gmoA0/QentU2g4lzigyrMaJNISPHbml gDWAMh7a/qnXGyYBjuoTzxglnGcm4ZA= X-MC-Unique: i7wkwWBaMtOqMr8IfLphBw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=KzSKUxDk47sMRBv2cjoG8jtVyH/AAlQtGJYA+OBG4Yw=; b=uceIyfhysVooZ57dmOMjsDqeW1lXR9KRMBeuavJx94VnGkAkMJur50elLanP0vtrp8 CLcgCxwiDfRfM6GEm1JbpZr2v3wCggHB19PfWvy7MWdX77yH3pJdZ/PRQMiYtqD/yufX 6GMcUEY9Ut4M1leW41dthi9quM3hIw4RuTrJjfqINOt11flqDYKs/WMRFjXjvPj4v04O LbiaocxEQabbJAPO+LAW3A+WtOvMPbDG+FzZCdRnsuJKtE6qfKWVxQmTF2o0pu7vBJau RvaViQQUlJEPFsdmw6Om38t6IBRZGQB5oWb+OsdhMCZ4mwxEq5l5I5szdI72DbJ3YJsP 9nSA== X-Gm-Message-State: AO0yUKXwTEgF5uGMLeOcXLH916nVjnaLtB/qikuxFvl+YSTdgDku7eW6 tTKzOlR26dtZ/3/RDTQ1KzJPNrGL1p39ha2xi7KocWxt9oMsgxWGKyFiaV56Z3J0iYO42RT7l+y MOELGsYt8yj3v1K/Gkz2YFtijO0yuaF2B6WGdaSrrYb/mfswrRA2Cy6Cy3SoDJa7nxkkB X-Received: by 2002:a05:600c:44c9:b0:3df:f9e9:7600 with SMTP id f9-20020a05600c44c900b003dff9e97600mr7887382wmo.25.1675890751747; Wed, 08 Feb 2023 13:12:31 -0800 (PST) X-Google-Smtp-Source: AK7set+JJa7ZzaVQlG40YN/9KE3HEA+hB+TxeuQUH7u7o0taDk52aH0tfqusVydJBEwCDAPaGLz98g== X-Received: by 2002:a05:600c:44c9:b0:3df:f9e9:7600 with SMTP id f9-20020a05600c44c900b003dff9e97600mr7887353wmo.25.1675890751469; Wed, 08 Feb 2023 13:12:31 -0800 (PST) Date: Wed, 8 Feb 2023 16:12:27 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org, "Jason A. Donenfeld" Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Dov Murik , Tom Lendacky , Gerd Hoffmann , Daniel P =?utf-8?B?LiBCZXJyYW5nw6k=?= , Paolo Bonzini , Richard Henderson , "H . Peter Anvin" , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Nathan Chancellor , Borislav Petkov , Eric Biggers , Sergio Lopez , Marcel Apfelbaum , Eduardo Habkost Subject: [PATCH RFC 1/7] Revert "x86: don't let decompressed kernel image clobber setup_data" Message-ID: <20230208211212.41951-2-mst@redhat.com> References: <20230208211212.41951-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230208211212.41951-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675890791157100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This reverts commit eac7a7791bb6d719233deed750034042318ffd56. Fixes: eac7a7791b ("x86: don't let decompressed kernel image clobber setup_= data") Signed-off-by: Michael S. Tsirkin Reviewed-by: Daniel P. Berrang=C3=A9 Tested-by: Dov Murik Tested-by: Nathan Chancellor --- include/hw/i386/microvm.h | 5 ++-- include/hw/nvram/fw_cfg.h | 9 ------- hw/i386/microvm.c | 15 ++++------- hw/i386/x86.c | 52 ++++++++++++++++++--------------------- hw/nvram/fw_cfg.c | 9 ------- 5 files changed, 31 insertions(+), 59 deletions(-) diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h index e8af61f194..fad97a891d 100644 --- a/include/hw/i386/microvm.h +++ b/include/hw/i386/microvm.h @@ -50,9 +50,8 @@ */ =20 /* Platform virtio definitions */ -#define VIRTIO_MMIO_BASE 0xfeb00000 -#define VIRTIO_CMDLINE_MAXLEN 64 -#define VIRTIO_CMDLINE_TOTAL_MAX_LEN ((VIRTIO_CMDLINE_MAXLEN + 1) * 16) +#define VIRTIO_MMIO_BASE 0xfeb00000 +#define VIRTIO_CMDLINE_MAXLEN 64 =20 #define GED_MMIO_BASE 0xfea00000 #define GED_MMIO_BASE_MEMHP (GED_MMIO_BASE + 0x100) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 990dcdbb2e..2e503904dc 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -139,15 +139,6 @@ void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t= key, void *data, size_t len, bool read_only); =20 -/** - * fw_cfg_read_bytes_ptr: - * @s: fw_cfg device being modified - * @key: selector key value for new fw_cfg item - * - * Reads an existing fw_cfg data pointer. - */ -void *fw_cfg_read_bytes_ptr(FWCfgState *s, uint16_t key); - /** * fw_cfg_add_string: * @s: fw_cfg device being modified diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 29f30dd6d3..170a331e3f 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -378,8 +378,7 @@ static void microvm_fix_kernel_cmdline(MachineState *ma= chine) MicrovmMachineState *mms =3D MICROVM_MACHINE(machine); BusState *bus; BusChild *kid; - char *cmdline, *existing_cmdline; - size_t len; + char *cmdline; =20 /* * Find MMIO transports with attached devices, and add them to the ker= nel @@ -388,8 +387,7 @@ static void microvm_fix_kernel_cmdline(MachineState *ma= chine) * Yes, this is a hack, but one that heavily improves the UX without * introducing any significant issues. */ - existing_cmdline =3D fw_cfg_read_bytes_ptr(x86ms->fw_cfg, FW_CFG_CMDLI= NE_DATA); - cmdline =3D g_strdup(existing_cmdline); + cmdline =3D g_strdup(machine->kernel_cmdline); bus =3D sysbus_get_default(); QTAILQ_FOREACH(kid, &bus->children, sibling) { DeviceState *dev =3D kid->child; @@ -413,12 +411,9 @@ static void microvm_fix_kernel_cmdline(MachineState *m= achine) } } =20 - len =3D strlen(cmdline); - if (len > VIRTIO_CMDLINE_TOTAL_MAX_LEN + strlen(existing_cmdline)) { - fprintf(stderr, "qemu: virtio mmio cmdline too large, skipping\n"); - } else { - memcpy(existing_cmdline, cmdline, len + 1); - } + fw_cfg_modify_i32(x86ms->fw_cfg, FW_CFG_CMDLINE_SIZE, strlen(cmdline) = + 1); + fw_cfg_modify_string(x86ms->fw_cfg, FW_CFG_CMDLINE_DATA, cmdline); + g_free(cmdline); } =20 diff --git a/hw/i386/x86.c b/hw/i386/x86.c index eaff4227bd..78cc131926 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -50,7 +50,6 @@ #include "hw/intc/i8259.h" #include "hw/rtc/mc146818rtc.h" #include "target/i386/sev.h" -#include "hw/i386/microvm.h" =20 #include "hw/acpi/cpu_hotplug.h" #include "hw/irq.h" @@ -814,18 +813,12 @@ void x86_load_linux(X86MachineState *x86ms, const char *kernel_filename =3D machine->kernel_filename; const char *initrd_filename =3D machine->initrd_filename; const char *dtb_filename =3D machine->dtb; - char *kernel_cmdline; + const char *kernel_cmdline =3D machine->kernel_cmdline; SevKernelLoaderContext sev_load_ctx =3D {}; enum { RNG_SEED_LENGTH =3D 32 }; =20 - /* - * Add the NUL terminator, some padding for the microvm cmdline fiddli= ng - * hack, and then align to 16 bytes as a paranoia measure - */ - cmdline_size =3D (strlen(machine->kernel_cmdline) + 1 + - VIRTIO_CMDLINE_TOTAL_MAX_LEN + 16) & ~15; - /* Make a copy, since we might append arbitrary bytes to it later. */ - kernel_cmdline =3D g_strndup(machine->kernel_cmdline, cmdline_size); + /* Align to 16 bytes as a paranoia measure */ + cmdline_size =3D (strlen(kernel_cmdline) + 16) & ~15; =20 /* load the kernel header */ f =3D fopen(kernel_filename, "rb"); @@ -966,6 +959,12 @@ void x86_load_linux(X86MachineState *x86ms, initrd_max =3D x86ms->below_4g_mem_size - acpi_data_size - 1; } =20 + fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_ADDR, cmdline_addr); + fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE, strlen(kernel_cmdline) + 1= ); + fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA, kernel_cmdline); + sev_load_ctx.cmdline_data =3D (char *)kernel_cmdline; + sev_load_ctx.cmdline_size =3D strlen(kernel_cmdline) + 1; + if (protocol >=3D 0x202) { stl_p(header + 0x228, cmdline_addr); } else { @@ -1092,24 +1091,27 @@ void x86_load_linux(X86MachineState *x86ms, exit(1); } =20 - setup_data_offset =3D cmdline_size; - cmdline_size +=3D sizeof(SetupData) + dtb_size; - kernel_cmdline =3D g_realloc(kernel_cmdline, cmdline_size); - setup_data =3D (void *)kernel_cmdline + setup_data_offset; + setup_data_offset =3D QEMU_ALIGN_UP(kernel_size, 16); + kernel_size =3D setup_data_offset + sizeof(SetupData) + dtb_size; + kernel =3D g_realloc(kernel, kernel_size); + + + setup_data =3D (SetupData *)(kernel + setup_data_offset); setup_data->next =3D cpu_to_le64(first_setup_data); - first_setup_data =3D cmdline_addr + setup_data_offset; + 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); + load_image_size(dtb_filename, setup_data->data, dtb_size); } =20 - if (!legacy_no_rng_seed && protocol >=3D 0x209) { - setup_data_offset =3D cmdline_size; - cmdline_size +=3D sizeof(SetupData) + RNG_SEED_LENGTH; - kernel_cmdline =3D g_realloc(kernel_cmdline, cmdline_size); - setup_data =3D (void *)kernel_cmdline + setup_data_offset; + if (!legacy_no_rng_seed) { + setup_data_offset =3D QEMU_ALIGN_UP(kernel_size, 16); + kernel_size =3D setup_data_offset + sizeof(SetupData) + RNG_SEED_L= ENGTH; + kernel =3D g_realloc(kernel, kernel_size); + setup_data =3D (SetupData *)(kernel + setup_data_offset); setup_data->next =3D cpu_to_le64(first_setup_data); - first_setup_data =3D cmdline_addr + setup_data_offset; + 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); @@ -1120,12 +1122,6 @@ void x86_load_linux(X86MachineState *x86ms, fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); } =20 - fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_ADDR, cmdline_addr); - fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE, cmdline_size); - fw_cfg_add_bytes(fw_cfg, FW_CFG_CMDLINE_DATA, kernel_cmdline, cmdline_= size); - sev_load_ctx.cmdline_data =3D (char *)kernel_cmdline; - sev_load_ctx.cmdline_size =3D cmdline_size; - fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); sev_load_ctx.kernel_data =3D (char *)kernel; @@ -1138,7 +1134,7 @@ void x86_load_linux(X86MachineState *x86ms, * kernel on the other side of the fw_cfg interface matches the hash o= f the * file the user passed in. */ - if (!sev_enabled() && first_setup_data) { + if (!sev_enabled()) { SetupDataFixup *fixup =3D g_malloc(sizeof(*fixup)); =20 memcpy(setup, header, MIN(sizeof(header), setup_size)); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 432754eda4..a00881bc64 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -741,15 +741,6 @@ void fw_cfg_add_bytes(FWCfgState *s, uint16_t key, voi= d *data, size_t len) fw_cfg_add_bytes_callback(s, key, NULL, NULL, NULL, data, len, true); } =20 -void *fw_cfg_read_bytes_ptr(FWCfgState *s, uint16_t key) -{ - int arch =3D !!(key & FW_CFG_ARCH_LOCAL); - - key &=3D FW_CFG_ENTRY_MASK; - assert(key < fw_cfg_max_entry(s)); - return s->entries[arch][key].data; -} - void fw_cfg_add_string(FWCfgState *s, uint16_t key, const char *value) { size_t sz =3D strlen(value) + 1; --=20 MST From nobody Mon May 20 16:23:50 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675890812; cv=none; d=zohomail.com; s=zohoarc; b=klL+o3erzmtTRdcswZM7XLSdthM2C1wn51rxUoO2Arl56kTQJWjAT8rOzBz7kBamZ5N/8A4OuCwK1Ro/BIku61X/3sWxz+IaEt1HBaZYxV8vTaRE5ga5gZYlatcp+IOH1jTbCJrjlryE88ok6ZezIF5jdnCSA+4tjJxXdEXF5IY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675890812; h=Content-Type: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=pyB2eX4BrxplsV/cU4fgKDTd3hh497IDhiUSXuPJBb8=; b=CCSm1PAlKVP2SKjK620AcBi71C79SWV+nTZThKG0HJfbjBnUVLDdxSEr2wedZcJwP81lPAX78pW9bxDBPX94dgKLQskmq33mFiXyL+PJzsCvrXfI2QmtiGq71aIGWqmvkiX5XEmTVHr8OMpmgP3N5Yg64s3B4a0s2dFm08ZFRqE= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675890812914982.9613859112786; Wed, 8 Feb 2023 13:13:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPrkE-0000aN-HS; Wed, 08 Feb 2023 16:12:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPrkC-0000U8-Qw for qemu-devel@nongnu.org; Wed, 08 Feb 2023 16:12:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPrkB-0007qs-Do for qemu-devel@nongnu.org; Wed, 08 Feb 2023 16:12:44 -0500 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-144-JvqLPPrcNu-qSqY1EDpTWw-1; Wed, 08 Feb 2023 16:12:41 -0500 Received: by mail-wr1-f70.google.com with SMTP id v5-20020adf8b45000000b002bde0366b11so3256105wra.7 for ; Wed, 08 Feb 2023 13:12:41 -0800 (PST) Received: from redhat.com ([2.52.132.212]) by smtp.gmail.com with ESMTPSA id y5-20020adfee05000000b002c3f6d7d5fesm4398119wrn.44.2023.02.08.13.12.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 13:12:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675890762; 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: in-reply-to:in-reply-to:references:references; bh=pyB2eX4BrxplsV/cU4fgKDTd3hh497IDhiUSXuPJBb8=; b=jA/43WkzesejjPQUNHCQXKDpj7rKpHf5aPojT/l4ql/bR0QREWD/KyCB5WBsnS1l3a8q+t ElILnAucgWtrN05HTc9YsXnARQJPuHHlWl7435ZE2hRfAgU8MX5F7FmBzLXjirHr+R3LHU 8J3AQ+GSATpe+lC2BoK+yJhkvACzwb8= X-MC-Unique: JvqLPPrcNu-qSqY1EDpTWw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pyB2eX4BrxplsV/cU4fgKDTd3hh497IDhiUSXuPJBb8=; b=u1k+E6NxiSXs/KF5F6Q4OiUt28aTBU2fG6gwZyoAhkKjRa/OIPMLg4iFQ4uOCaLLhl RQ4odA7jUqrMZgf3+MgSw4XZMQstLO3M3jO/s5fxNJff/2IIvkN8Pn/OkMRR9fD2WSOm d1eYBd7A3zIkeOLnEOqtd1DruJ9KzRD5Wouh4Ei8R55bapDe/+yXbR/SxDy7YKMuDuAZ tBCjZkn6GJXWksQH9PfrXUocNZS0DAzupv4o59IWu9Bq+AbWqq1bVxuUxUUPfxVFDeVI r9KFhbZ2VnjVRYN3Yauyg2M+Ad9slwKiJE3rrVXZqwQCrY1LdnSsiLbji4tN2ZcDHgR0 Fu7A== X-Gm-Message-State: AO0yUKUC+RZfnxbhwJ3VyL3158G2KSXWewmJ2Ua9qmkFeR8hvnfbqlWu eBWNErPnfCLLFCFvRy7OIq8JwErv2e21cJGnUg2FhdzdNXQtDVNMGW/+osVYz9JwnC76wc33LJ5 bKvlDF30/rpGSGhHOEczdyc7Mgoxkbe3mSRrDnlnjP54qAkdCnXhQSsA/esXYNa5lUVNe X-Received: by 2002:adf:e607:0:b0:2c4:5de:2d3e with SMTP id p7-20020adfe607000000b002c405de2d3emr1747045wrm.41.1675890757427; Wed, 08 Feb 2023 13:12:37 -0800 (PST) X-Google-Smtp-Source: AK7set838VaFDlxa9uadyGE5Hk1bmbh3K276tSM5JtsHQY0vUmJXrZ16/41fZCphaQYDSIClM32nOA== X-Received: by 2002:adf:e607:0:b0:2c4:5de:2d3e with SMTP id p7-20020adfe607000000b002c405de2d3emr1747022wrm.41.1675890757189; Wed, 08 Feb 2023 13:12:37 -0800 (PST) Date: Wed, 8 Feb 2023 16:12:31 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org, "Jason A. Donenfeld" Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Dov Murik , Tom Lendacky , Gerd Hoffmann , Daniel P =?utf-8?B?LiBCZXJyYW5nw6k=?= , Paolo Bonzini , Richard Henderson , "H . Peter Anvin" , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Nathan Chancellor , Borislav Petkov , Eric Biggers , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH RFC 2/7] Revert "x86: do not re-randomize RNG seed on snapshot load" Message-ID: <20230208211212.41951-3-mst@redhat.com> References: <20230208211212.41951-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230208211212.41951-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675890815067100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This reverts commit 14b29fea742034186403914b4d013d0e83f19e78. Signed-off-by: Michael S. Tsirkin Fixes: 14b29fea74 ("x86: do not re-randomize RNG seed on snapshot load") Reviewed-by: Daniel P. Berrang=C3=A9 Tested-by: Dov Murik Tested-by: Nathan Chancellor --- hw/i386/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 78cc131926..7984f65352 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -1115,7 +1115,7 @@ void x86_load_linux(X86MachineState *x86ms, 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); - qemu_register_reset_nosnapshotload(reset_rng_seed, setup_data); + qemu_register_reset(reset_rng_seed, setup_data); fw_cfg_add_bytes_callback(fw_cfg, FW_CFG_KERNEL_DATA, reset_rng_se= ed, NULL, setup_data, kernel, kernel_size, true); } else { --=20 MST From nobody Mon May 20 16:23:50 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675890819; cv=none; d=zohomail.com; s=zohoarc; b=iSor4UIyrUL0ZWCrcYYlrxk/6ScoSdekyoOUP96/VXs4yI+2JTOriwWreXYxjm94gh4VO2fVRpJ6ywIrWp1btToraTYNTILYYDSWRCw2mdzLUIsF9NvcFYQVzbussYtQ+YEhnORkqme1zb6AIwsOVaypidX2oBQc4umfiZkN+c0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675890819; h=Content-Type: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=NERecKdHLUqwMZWLwJADWmbTJLbslnFnPSfMbqlvP3U=; b=H8wvIjSCHvz06g4DxCZ9ZUooxP5vJW0rZqTuW+ynUjfx4eCeLm8jAe9uNl2qWTusOKhivTRIu0SEChJfvCWUrvGsyEgxOp/JkGgd4eorrv86SjLUn6atIm/siWEmZL6UFl8qAF3DpqeEF73yTgTkG3hcUPwY2I5w+fCkOJiyPCg= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675890819492203.46319918436654; Wed, 8 Feb 2023 13:13:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPrkH-0000ir-OK; Wed, 08 Feb 2023 16:12:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPrkF-0000dB-Js for qemu-devel@nongnu.org; Wed, 08 Feb 2023 16:12:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPrkE-0007rP-2K for qemu-devel@nongnu.org; Wed, 08 Feb 2023 16:12:47 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-530-HZYRJkQxMuCU0DgI_3dnpQ-1; Wed, 08 Feb 2023 16:12:44 -0500 Received: by mail-wr1-f72.google.com with SMTP id h5-20020adff185000000b002c3e68f9d6fso2194758wro.10 for ; Wed, 08 Feb 2023 13:12:44 -0800 (PST) Received: from redhat.com ([2.52.132.212]) by smtp.gmail.com with ESMTPSA id c12-20020a5d4ccc000000b002bddac15b3dsm14220412wrt.33.2023.02.08.13.12.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 13:12:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675890765; 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: in-reply-to:in-reply-to:references:references; bh=NERecKdHLUqwMZWLwJADWmbTJLbslnFnPSfMbqlvP3U=; b=UePe9jeuleEU13xO8pLyOB0TvKEjaZXL5FcaG2tL0PFzS6rDSowyuwcxnfTa0grFF2XX5A PeckehzsxVQu9DHi3IUdvInkkLC4OJxhrADselCuXc6Ke4YN9OhjCUS7TcdTjaqmalwQcg 3sMPR9LJJfUUpH0XimlQhD/P7IJzt1A= X-MC-Unique: HZYRJkQxMuCU0DgI_3dnpQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=NERecKdHLUqwMZWLwJADWmbTJLbslnFnPSfMbqlvP3U=; b=W4lDKxoq5sK4rp2CgtarhCyZ97oaBiQ/Yh1FNtJehVV04w7C5WgFot/BbJ1IJAXDDn Sv/X8h9hLPRAaSfxd8WboCpFoGaaxZzt3ELSEh2WNQpN5f9HHMFScGpcK7MrkceZGw5X 0T8A0rXVQ9jyhgVxK42+hsJoznU1Dk5/tuYM/oAPCWXMbY3N8wbAQnKgGrYMzCCDqxkT X1ZPs3h3zJiRYjcZhg3Ucru0Y4VNnAjMBoeTwTDxLwi0soVnMwgsaTEg7c4VGScYKwqt Ai/rzVVxE63uYwLiw9BgZbJgusEvvkHA28Iy/3nh57/crOIdBQtaxPTsnICI8rQrkC29 Facg== X-Gm-Message-State: AO0yUKVzWzALik7DCtKT5eQwLNsEJAbesUWqWky3vW0OGpl9Oi5p91UP BSg8gGZw7OCmBJcgC3QnFdyoMQLJNlK0DQ77sbuEguLdSEm/6nMTevw1Gc4QOuVydScUY2a6Qze jsiA/3pcXN3g7/pjhcitY6Xy9/GUBUSC1GI5RlK9I5T4l1R29Fa3rN3/ZfIhJNOiCJGkZ X-Received: by 2002:a05:6000:1d1:b0:2c3:ba99:44bc with SMTP id t17-20020a05600001d100b002c3ba9944bcmr8345856wrx.68.1675890762575; Wed, 08 Feb 2023 13:12:42 -0800 (PST) X-Google-Smtp-Source: AK7set9hJ/RtQuMOQNR+s++VE21Jk7JmDAqkt+dsnQdLd0krrCQM6jyPXo7PC5NSAGcU94PVU+QKKw== X-Received: by 2002:a05:6000:1d1:b0:2c3:ba99:44bc with SMTP id t17-20020a05600001d100b002c3ba9944bcmr8345830wrx.68.1675890762340; Wed, 08 Feb 2023 13:12:42 -0800 (PST) Date: Wed, 8 Feb 2023 16:12:37 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org, "Jason A. Donenfeld" Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Dov Murik , Tom Lendacky , Gerd Hoffmann , Daniel P =?utf-8?B?LiBCZXJyYW5nw6k=?= , Paolo Bonzini , Richard Henderson , "H . Peter Anvin" , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Nathan Chancellor , Borislav Petkov , Eric Biggers , Marcel Apfelbaum , Eduardo Habkost Subject: [PATCH RFC 3/7] Revert "x86: re-initialize RNG seed when selecting kernel" Message-ID: <20230208211212.41951-4-mst@redhat.com> References: <20230208211212.41951-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230208211212.41951-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675890821014100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This reverts commit cc63374a5a7c240b7d3be734ef589dabbefc7527. Fixes: cc63374a5a ("x86: re-initialize RNG seed when selecting kernel") Signed-off-by: Michael S. Tsirkin Reviewed-by: Daniel P. Berrang=C3=A9 Tested-by: Dov Murik Tested-by: Nathan Chancellor --- hw/i386/x86.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 7984f65352..e1a5f244a9 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -1116,14 +1116,11 @@ void x86_load_linux(X86MachineState *x86ms, setup_data->len =3D cpu_to_le32(RNG_SEED_LENGTH); qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH); qemu_register_reset(reset_rng_seed, setup_data); - fw_cfg_add_bytes_callback(fw_cfg, FW_CFG_KERNEL_DATA, reset_rng_se= ed, NULL, - setup_data, kernel, kernel_size, true); - } else { - fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); } =20 fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); + fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); sev_load_ctx.kernel_data =3D (char *)kernel; sev_load_ctx.kernel_size =3D kernel_size; =20 --=20 MST From nobody Mon May 20 16:23:50 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675890846; cv=none; d=zohomail.com; s=zohoarc; b=BeeaJHudEcxnE6lmc7LQsPeBpalbzP/zwu11LNh8t7JkI5Rfl+RKk9tKn+y8ok2l6Z572N0sp8V5LEgwWxP5ozCAt9sZH9rg81vllJCubtOVwPyeVPeeQGA8rN36a0kliHQQICQ0KgUyJv6rLSVTEPj3UNfBXw46JvwvVMemlf8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675890846; h=Content-Type: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=tkQ9oa8tr+jHC1q9KvAdYJxLnDHRifzn1f10j1QSqk4=; b=ajjezqcJ5fJjQ71NFEOKYZzlzECoJDJx5Xn/T+kxwdvAiroFmRo/8zn9Avx1MzfDLTWWqbFwanVZM/GYVh0S4rDceSq5mEpZ9Q8qm9Q0DslUD9iJerDCmBnAENkHWeYtuXwH4JJn4PiT5sOYndXf1OjPVLHHPw0HPaa/xTPBAww= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675890846774150.11330729632164; Wed, 8 Feb 2023 13:14:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPrkL-0000la-4E; Wed, 08 Feb 2023 16:12:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPrkJ-0000lG-Tt for qemu-devel@nongnu.org; Wed, 08 Feb 2023 16:12:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPrkI-0007t3-DY for qemu-devel@nongnu.org; Wed, 08 Feb 2023 16:12:51 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-465-ioKn2miyOhS3VLCPQ3JoPg-1; Wed, 08 Feb 2023 16:12:48 -0500 Received: by mail-wm1-f70.google.com with SMTP id e38-20020a05600c4ba600b003dc434dabbdso1741701wmp.6 for ; Wed, 08 Feb 2023 13:12:48 -0800 (PST) Received: from redhat.com ([2.52.132.212]) by smtp.gmail.com with ESMTPSA id p24-20020a05600c1d9800b003dd1bd0b915sm2916208wms.22.2023.02.08.13.12.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 13:12:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675890769; 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: in-reply-to:in-reply-to:references:references; bh=tkQ9oa8tr+jHC1q9KvAdYJxLnDHRifzn1f10j1QSqk4=; b=Bug832DrRjZTvP1h7B2hT8f+Lf6NN9OUB+kY9VFeGiDxDwLLPRl4AEt7UOXFObJl76fhL+ Y3km8kjKFbqLFrrQvDIZynN6b6S9H2hN3WKZA5ZlvNsYfA/lzsHfd+bDKOiAikuqJU0F8y k25UEHqVFAry/UHpxG3IeuBnnyj+yhA= X-MC-Unique: ioKn2miyOhS3VLCPQ3JoPg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=tkQ9oa8tr+jHC1q9KvAdYJxLnDHRifzn1f10j1QSqk4=; b=NlFBljjrJa6Qo/WieXCu/S+VbuB6C9I31uVwIJHGlA73cPZ5It54BxOmcu6vsPqxcW s4HqqDUWV2jtS7QLpXt25y+8IPrAZXFI/MtBXWRXrwaqX1z++garC9UyNmNq7M8YUWvi 3Qhg1kmFYcyjvtqjhNo3k8eaAn0Lhdm9cKc467HUSI0r8y1hc4jVmzJR0llOTS3ri5KN ob3s2iN7kb9J/jtz+TLEFbyLHaAh1/UOjLK98lULyj3rw84IPHWvsYD/xmeaUClCS5t8 A4uhsyblYhZjQZCEyAGprBHhoDvsBGHtSb3a4FE2O9YkrvQA9CqPFehqsWPBFxtjZIVg B3LA== X-Gm-Message-State: AO0yUKWtMIspdiX9BjGGPTBOMJji8p0N22hEt4z9NWp0ii13jbB6EjBA urOw63biKZxHYKF0dK6a7StYYBJs7V5mCoTIpHTL+qGl5/OpYW4JrWDqsQ5wpUuvuLg/JJC5sfc 9uYIIYsNesAqTyXU3cso+G0hFcUcovSdavwOXMIem0lbceMKCF+KxbSoLYoZql+Dtclwc X-Received: by 2002:a05:600c:3596:b0:3df:d431:cf64 with SMTP id p22-20020a05600c359600b003dfd431cf64mr7731435wmq.39.1675890766806; Wed, 08 Feb 2023 13:12:46 -0800 (PST) X-Google-Smtp-Source: AK7set8kNfnMKSwUT4zsOirgkb5KdNoSpzPeol3XSoJfqBxaPj4EX7PG3krQuGAKichXMOAacj8Caw== X-Received: by 2002:a05:600c:3596:b0:3df:d431:cf64 with SMTP id p22-20020a05600c359600b003dfd431cf64mr7731407wmq.39.1675890766594; Wed, 08 Feb 2023 13:12:46 -0800 (PST) Date: Wed, 8 Feb 2023 16:12:42 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org, "Jason A. Donenfeld" Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Dov Murik , Tom Lendacky , Gerd Hoffmann , Daniel P =?utf-8?B?LiBCZXJyYW5nw6k=?= , Paolo Bonzini , Richard Henderson , "H . Peter Anvin" , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Nathan Chancellor , Borislav Petkov , Eric Biggers , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH RFC 4/7] Revert "x86: reinitialize RNG seed on system reboot" Message-ID: <20230208211212.41951-5-mst@redhat.com> References: <20230208211212.41951-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230208211212.41951-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675890847149100002 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This reverts commit 763a2828bf313ed55878b09759dc435355035f2e. Fixes: 763a2828bf ("x86: reinitialize RNG seed on system reboot") Signed-off-by: Michael S. Tsirkin Reviewed-by: Daniel P. Berrang=C3=A9 Tested-by: Dov Murik Tested-by: Nathan Chancellor --- hw/i386/x86.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index e1a5f244a9..32f37ab7c2 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -787,12 +787,6 @@ static void reset_setup_data(void *opaque) stq_p(fixup->pos, fixup->orig_val); } =20 -static void reset_rng_seed(void *opaque) -{ - SetupData *setup_data =3D opaque; - qemu_guest_getrandom_nofail(setup_data->data, le32_to_cpu(setup_data->= len)); -} - void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, int acpi_data_size, @@ -1115,7 +1109,6 @@ void x86_load_linux(X86MachineState *x86ms, 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); - qemu_register_reset(reset_rng_seed, setup_data); } =20 fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); --=20 MST From nobody Mon May 20 16:23:50 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675890846; cv=none; d=zohomail.com; s=zohoarc; b=BrJ2/W2Ir5IYXfixs4xli47PpOSABsI2hzAjW11PG3K/xGA/KMPTeAc1SBOob9sY1HlpypB8IjPoIzuhw3L7+U6lrHtl1UyzP+cybgitJTGcycA11lrtNAApwOVXJEjLvRv1u99JbyaQCb4XhkJpCDeLRzmMIlHKvrF/HVmPhrY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675890846; h=Content-Type: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=tS9+7/8O/6fAFa8QO010Xn8p8THh7DB9ISxGEslYQs4=; b=NzL5rDH8R/d+r9k3msj0zDFfb0kudH9x6F6ZX/8dp6c9C7w8lIKlIT81FWokGcfL1sJ1M0je8ph+HaFU5tJBw9+0GJMZXY1DtrWLQhOEuiIYYFBLC3X5BNREsshUw4DXv3sWXv1h0uGIyTjvXiFcC+Zh/nBp58VXbnigQC2Xz3Y= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675890846942673.4050585538956; Wed, 8 Feb 2023 13:14:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPrkV-0000my-O1; Wed, 08 Feb 2023 16:13:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPrkU-0000mR-5M for qemu-devel@nongnu.org; Wed, 08 Feb 2023 16:13:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPrkS-0007xG-8d for qemu-devel@nongnu.org; Wed, 08 Feb 2023 16:13:01 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-517-tlwhjAENOAO5t1E-Dya5vQ-1; Wed, 08 Feb 2023 16:12:52 -0500 Received: by mail-wm1-f72.google.com with SMTP id k17-20020a05600c1c9100b003dd41ad974bso38019wms.3 for ; Wed, 08 Feb 2023 13:12:52 -0800 (PST) Received: from redhat.com ([2.52.132.212]) by smtp.gmail.com with ESMTPSA id j37-20020a05600c1c2500b003daf6e3bc2fsm7197641wms.1.2023.02.08.13.12.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 13:12:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675890779; 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: in-reply-to:in-reply-to:references:references; bh=tS9+7/8O/6fAFa8QO010Xn8p8THh7DB9ISxGEslYQs4=; b=JoojK9sy4aSTRHklrRWHQIFn90e77dC4r7XxzyAm/1hTJqOFTOY32Hdbc2d6EQY4T3ZubO 0jzfwk1B+dwqbalV00ewF0aLol6qzi3SL+H2kYbACYZ7qKjS14aRh1/xGfCrGlYY4mWskI h6cCprvxzTQsxOVrejNakQEHdxtXD9Y= X-MC-Unique: tlwhjAENOAO5t1E-Dya5vQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=tS9+7/8O/6fAFa8QO010Xn8p8THh7DB9ISxGEslYQs4=; b=Awri4bPm48XYGnicsTJQfrii7SwcPaE/outl1FfLWI6xfbl0DnM1i2Kpt76urlaOg/ FNrgfz97VSLovn4FuzgswX5DZbxe3sRBzWNpmfFkvHchgCKnb5glYmbYdievsPHIQ8nV jQqLga4GPkjQJLngNv+GcXIzk0xtImCHWJVaR8oaIcy8dmynqcPf7fXtjIaCZm/UG+Zc lngeZhPce0aRBW1K3dB9QGebM4veHdn12zx6i6v3ai/u7n8wfRzwNI0efMF0aOdqbSLM eI2Bv1WT6eNEoZunGJY+cvgQ+NsiAEnf8j+tAMf3LJQ6pocXVDKRqmCeb9weFqkXlZC3 oCKw== X-Gm-Message-State: AO0yUKVD+WEHo/l58wovJhTDEzoLY6N9l/agIuWYz9U05CaDFFupwtdo LeI4gj1RDZyjYP16wS+/jQL58ZNFTgoYAoaP5eVSw7ZuS83l6oDMcloHgYmZ4HwkpYBM7X+lyuO CNl7SM8QKgAdTExU/MBRewWZ5AYlzPsh0Pe5ck3GEQTkwYRftoCRRJuWH1K8cyMTTIjEk X-Received: by 2002:a05:600c:747:b0:3dc:438a:c381 with SMTP id j7-20020a05600c074700b003dc438ac381mr7510807wmn.28.1675890770931; Wed, 08 Feb 2023 13:12:50 -0800 (PST) X-Google-Smtp-Source: AK7set9iMoFTHiyVDA/tXK+cM7w+o64RXFY6qMkpfJBFLnhKSPwfd/l/vFf31/EdopCJ5I2wdU0tew== X-Received: by 2002:a05:600c:747:b0:3dc:438a:c381 with SMTP id j7-20020a05600c074700b003dc438ac381mr7510779wmn.28.1675890770641; Wed, 08 Feb 2023 13:12:50 -0800 (PST) Date: Wed, 8 Feb 2023 16:12:46 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org, "Jason A. Donenfeld" Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Dov Murik , Tom Lendacky , Gerd Hoffmann , Daniel P =?utf-8?B?LiBCZXJyYW5nw6k=?= , Paolo Bonzini , Richard Henderson , "H . Peter Anvin" , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Nathan Chancellor , Borislav Petkov , Eric Biggers , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH RFC 5/7] Revert "x86: use typedef for SetupData struct" Message-ID: <20230208211212.41951-6-mst@redhat.com> References: <20230208211212.41951-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230208211212.41951-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675890847148100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This reverts commit eebb38a5633a77f5fa79d6486d5b2fcf8fbe3c07. Fixes: eebb38a563 ("x86: use typedef for SetupData struct") Signed-off-by: Michael S. Tsirkin Reviewed-by: Daniel P. Berrang=C3=A9 Tested-by: Dov Murik Tested-by: Nathan Chancellor --- hw/i386/x86.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 32f37ab7c2..76b12108b4 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -657,12 +657,12 @@ DeviceState *ioapic_init_secondary(GSIState *gsi_stat= e) return dev; } =20 -typedef struct SetupData { +struct setup_data { uint64_t next; uint32_t type; uint32_t len; uint8_t data[]; -} __attribute__((packed)) SetupData; +} __attribute__((packed)); =20 =20 /* @@ -803,7 +803,7 @@ void x86_load_linux(X86MachineState *x86ms, FILE *f; char *vmode; MachineState *machine =3D MACHINE(x86ms); - SetupData *setup_data; + struct setup_data *setup_data; const char *kernel_filename =3D machine->kernel_filename; const char *initrd_filename =3D machine->initrd_filename; const char *dtb_filename =3D machine->dtb; @@ -1086,11 +1086,11 @@ void x86_load_linux(X86MachineState *x86ms, } =20 setup_data_offset =3D QEMU_ALIGN_UP(kernel_size, 16); - kernel_size =3D setup_data_offset + sizeof(SetupData) + dtb_size; + kernel_size =3D setup_data_offset + sizeof(struct setup_data) + dt= b_size; kernel =3D g_realloc(kernel, kernel_size); =20 =20 - setup_data =3D (SetupData *)(kernel + setup_data_offset); + 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_DTB); @@ -1101,9 +1101,9 @@ void x86_load_linux(X86MachineState *x86ms, =20 if (!legacy_no_rng_seed) { setup_data_offset =3D QEMU_ALIGN_UP(kernel_size, 16); - kernel_size =3D setup_data_offset + sizeof(SetupData) + RNG_SEED_L= ENGTH; + kernel_size =3D setup_data_offset + sizeof(struct setup_data) + RN= G_SEED_LENGTH; kernel =3D g_realloc(kernel, kernel_size); - setup_data =3D (SetupData *)(kernel + setup_data_offset); + 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); --=20 MST From nobody Mon May 20 16:23:50 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675890821; cv=none; d=zohomail.com; s=zohoarc; b=kPDFznIT/cginjE1QfQvvYUxw8AJ6TAwLqjXiiaZhIsv7lAmAZTYkVXXygrIMb8SQ0x/uAqmsaXpSiJL9MMPUK6xmRxA2QkrZOYlAcTrlEAaCHt3/NDkrmbdPBAEeJEAPMEdTqNBGstXoWulYDO5mmtpxd6w6ff4mZT8bIX6aiY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675890821; h=Content-Type: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=d88wFZ2mo/0imCYZRYbYiUssCRrNIVVmiSofCMtgJ24=; b=Rr/zhYx6ubkVaaKAagVCvQisApUVTvkkyaQCgj1cd1Yimk91XqbzlkgahRlFtTSa4vpjw7saBDZxV99OcuG2iJz/Tz9FSCqoZ8jZsc4nmddQyTvmcbhQutaiXPrZpE9At/vLd6fu0UoEjzrma2DEHZHJVBT2sd+Vo9ueU2I23ZU= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675890821721537.701664747225; Wed, 8 Feb 2023 13:13:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPrkU-0000mb-Cj; Wed, 08 Feb 2023 16:13:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPrkT-0000mG-6c for qemu-devel@nongnu.org; Wed, 08 Feb 2023 16:13:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPrkR-0007xA-Es for qemu-devel@nongnu.org; Wed, 08 Feb 2023 16:13:00 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-638-dR2kufrdPsypl1v658DwtQ-1; Wed, 08 Feb 2023 16:12:57 -0500 Received: by mail-wm1-f72.google.com with SMTP id fl9-20020a05600c0b8900b003dfe4bae099so51091wmb.0 for ; Wed, 08 Feb 2023 13:12:57 -0800 (PST) Received: from redhat.com ([2.52.132.212]) by smtp.gmail.com with ESMTPSA id c12-20020adffb4c000000b002b6bcc0b64dsm14397944wrs.4.2023.02.08.13.12.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 13:12:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675890778; 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: in-reply-to:in-reply-to:references:references; bh=d88wFZ2mo/0imCYZRYbYiUssCRrNIVVmiSofCMtgJ24=; b=i+Dte1+KTwDdiVjZh9bsFTzyMcF6DSJO94CUvdhx8Rtf4u8b4UIut0kONJO0OCIMD6yB7T OVsMRnO0GpQugbJlFD/rkg64wTDEwjvH5dVFsq+QiEO/dNiCbkbIbucR8OH+L7P519ZM1I EcOkMfT0qdFeXMSBaVYCkV2ebsQ5lcs= X-MC-Unique: dR2kufrdPsypl1v658DwtQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=d88wFZ2mo/0imCYZRYbYiUssCRrNIVVmiSofCMtgJ24=; b=nfzWUeuZNzqKXb46w4WW5wSZ1zEMDBVDUZRgWXWjGCyu0A1nMeeaZW9WC5aCO2wxGF g7qbXY11NlpFDAg2ZfwpYTopBrEBYmJXqzvbUaudUVkKXaxuqkhgZNA0c4xtVyZJTZA9 ygvkV168IdrwXqDvMjOoPrbRto1s+FqONOxThq1t1xh0dLIx6WyoV6Hq9SrSqx9Op3no dkyw6y+Y0f04fZ3sugx2l1Ilne+P1vRZtNR/NutjlK/E/uc48j/PfjCVSWvqu1Jx8p39 0bIRifAukBYuxFyxp26o7dbt5xPomNSLWJo3vyxXh8dXTBMUSgKN+/8FE9bdcErUMaCH 1UFA== X-Gm-Message-State: AO0yUKV43V1HvGQK0XDy9Vi6lzPlFOXftyQG/cYLFxwwSGvoPg3jxJYY UD6zinDsuvuSUWkqaSACVdiv2rhOwSpZNdLqHLn9P8nksJ8b/iRB92aaG456ved/kH7hXYvURRl KNrnwppwpWuT2yaoszcOoUIx/pqiUykNAFl5GeRl6f/eZntUdU0VUyND2Zgm1j2LA38Gw X-Received: by 2002:a5d:488b:0:b0:2c3:daf1:ec3 with SMTP id g11-20020a5d488b000000b002c3daf10ec3mr8376256wrq.61.1675890775939; Wed, 08 Feb 2023 13:12:55 -0800 (PST) X-Google-Smtp-Source: AK7set+igEz+8dGMfAGcBhjW48G3LU/ELPOe8gmvLXjBts0ZxATjRj3035BnQWK5uF+zCZ7Igv1FLA== X-Received: by 2002:a5d:488b:0:b0:2c3:daf1:ec3 with SMTP id g11-20020a5d488b000000b002c3daf10ec3mr8376226wrq.61.1675890775626; Wed, 08 Feb 2023 13:12:55 -0800 (PST) Date: Wed, 8 Feb 2023 16:12:51 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org, "Jason A. Donenfeld" Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Dov Murik , Tom Lendacky , Gerd Hoffmann , Daniel P =?utf-8?B?LiBCZXJyYW5nw6k=?= , Paolo Bonzini , Richard Henderson , "H . Peter Anvin" , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Nathan Chancellor , Borislav Petkov , Eric Biggers , Marcel Apfelbaum , Eduardo Habkost Subject: [PATCH RFC 6/7] Revert "x86: return modified setup_data only if read as memory, not as file" Message-ID: <20230208211212.41951-7-mst@redhat.com> References: <20230208211212.41951-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230208211212.41951-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675890823024100007 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This reverts commit e935b735085dfa61d8e6d276b6f9e7687796a3c7. Fixes: e935b73508 ("x86: return modified setup_data only if read as memory,= not as file") Signed-off-by: Michael S. Tsirkin Reviewed-by: Daniel P. Berrang=C3=A9 Tested-by: Dov Murik Tested-by: Nathan Chancellor --- include/hw/nvram/fw_cfg.h | 22 ------------------- hw/i386/x86.c | 46 +++++++++------------------------------ hw/nvram/fw_cfg.c | 12 +++++----- 3 files changed, 16 insertions(+), 64 deletions(-) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 2e503904dc..c1f81a5f13 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -117,28 +117,6 @@ struct FWCfgMemState { */ void fw_cfg_add_bytes(FWCfgState *s, uint16_t key, void *data, size_t len); =20 -/** - * fw_cfg_add_bytes_callback: - * @s: fw_cfg device being modified - * @key: selector key value for new fw_cfg item - * @select_cb: callback function when selecting - * @write_cb: callback function after a write - * @callback_opaque: argument to be passed into callback function - * @data: pointer to start of item data - * @len: size of item data - * @read_only: is file read only - * - * Add a new fw_cfg item, available by selecting the given key, as a raw - * "blob" of the given size. The data referenced by the starting pointer - * is only linked, NOT copied, into the data structure of the fw_cfg devic= e. - */ -void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key, - FWCfgCallback select_cb, - FWCfgWriteCallback write_cb, - void *callback_opaque, - void *data, size_t len, - bool read_only); - /** * fw_cfg_add_string: * @s: fw_cfg device being modified diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 76b12108b4..4831193c86 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -37,7 +37,6 @@ #include "sysemu/whpx.h" #include "sysemu/numa.h" #include "sysemu/replay.h" -#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "sysemu/cpu-timers.h" #include "sysemu/xen.h" @@ -769,24 +768,6 @@ static bool load_elfboot(const char *kernel_filename, return true; } =20 -typedef struct SetupDataFixup { - void *pos; - hwaddr orig_val, new_val; - uint32_t addr; -} SetupDataFixup; - -static void fixup_setup_data(void *opaque) -{ - SetupDataFixup *fixup =3D opaque; - stq_p(fixup->pos, fixup->new_val); -} - -static void reset_setup_data(void *opaque) -{ - SetupDataFixup *fixup =3D opaque; - stq_p(fixup->pos, fixup->orig_val); -} - void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, int acpi_data_size, @@ -1111,11 +1092,8 @@ void x86_load_linux(X86MachineState *x86ms, qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH); } =20 - fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); - fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); - fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); - sev_load_ctx.kernel_data =3D (char *)kernel; - sev_load_ctx.kernel_size =3D kernel_size; + /* Offset 0x250 is a pointer to the first setup_data link. */ + stq_p(header + 0x250, first_setup_data); =20 /* * If we're starting an encrypted VM, it will be OVMF based, which use= s the @@ -1125,20 +1103,16 @@ void x86_load_linux(X86MachineState *x86ms, * file the user passed in. */ if (!sev_enabled()) { - SetupDataFixup *fixup =3D g_malloc(sizeof(*fixup)); - memcpy(setup, header, MIN(sizeof(header), setup_size)); - /* Offset 0x250 is a pointer to the first setup_data link. */ - fixup->pos =3D setup + 0x250; - fixup->orig_val =3D ldq_p(fixup->pos); - fixup->new_val =3D first_setup_data; - fixup->addr =3D cpu_to_le32(real_addr); - fw_cfg_add_bytes_callback(fw_cfg, FW_CFG_SETUP_ADDR, fixup_setup_d= ata, NULL, - fixup, &fixup->addr, sizeof(fixup->addr)= , true); - qemu_register_reset(reset_setup_data, fixup); - } else { - fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_ADDR, real_addr); } + + fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); + fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); + fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); + sev_load_ctx.kernel_data =3D (char *)kernel; + sev_load_ctx.kernel_size =3D kernel_size; + + fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_ADDR, real_addr); fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_SIZE, setup_size); fw_cfg_add_bytes(fw_cfg, FW_CFG_SETUP_DATA, setup, setup_size); sev_load_ctx.setup_data =3D (char *)setup; diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index a00881bc64..29a5bef1d5 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -693,12 +693,12 @@ static const VMStateDescription vmstate_fw_cfg =3D { } }; =20 -void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key, - FWCfgCallback select_cb, - FWCfgWriteCallback write_cb, - void *callback_opaque, - void *data, size_t len, - bool read_only) +static void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key, + FWCfgCallback select_cb, + FWCfgWriteCallback write_cb, + void *callback_opaque, + void *data, size_t len, + bool read_only) { int arch =3D !!(key & FW_CFG_ARCH_LOCAL); =20 --=20 MST From nobody Mon May 20 16:23:50 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675890865; cv=none; d=zohomail.com; s=zohoarc; b=Fp7CtJT8w0FeY1oiYe5u8nfJdqHOjE1O6aTjWv4vXC/yPfj1w/6LovZft/6Jjr4GZ6njuCUEcHUW69lqg/mxyguLud5H3hJOx6QmDuD1fmLVrKCLoGVQXMFOPaA2jTPhNy9OSMnAO9xQfsV3YdNBFfhvvNsCdUQgOgDVNNvRXEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675890865; h=Content-Type: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=PNuoFqEU8CsrXUJPO1lJsWHLekxhHoR3bU0ec0vwJOA=; b=iuXL2fWAvPjRJesKnS6DHWdouBvVwnP0p6587MwTElIQtJOzBb9xOMiawCihjBBhCCARlUBcsQI1qN3W3s638mleBrGXlluvXqkToCl58efpEW1HBpHygdtMmBTgot1KN707PIP8Jo5nK/x5TLlo78J+xlXlkpgQ+l+KEgRfpAA= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16758908653341015.1281901725616; Wed, 8 Feb 2023 13:14:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPrkZ-0000sN-0W; Wed, 08 Feb 2023 16:13:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPrkX-0000nF-Sf for qemu-devel@nongnu.org; Wed, 08 Feb 2023 16:13:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPrkW-0007zH-2g for qemu-devel@nongnu.org; Wed, 08 Feb 2023 16:13:05 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-595-vkoXdc_4PAutrKwD1T8oPA-1; Wed, 08 Feb 2023 16:13:02 -0500 Received: by mail-wm1-f71.google.com with SMTP id x10-20020a05600c21ca00b003dc5584b516so1739130wmj.7 for ; Wed, 08 Feb 2023 13:13:02 -0800 (PST) Received: from redhat.com ([2.52.132.212]) by smtp.gmail.com with ESMTPSA id b18-20020a05600c4e1200b003e00c453447sm3072740wmq.48.2023.02.08.13.12.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 13:12:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675890783; 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: in-reply-to:in-reply-to:references:references; bh=PNuoFqEU8CsrXUJPO1lJsWHLekxhHoR3bU0ec0vwJOA=; b=SXanntGGZ0jZME/kLq03huzUuP1xohB3K2tT6BUhhs1Th4uMARLLwJ0WyDs0lq5QDpdoL4 yWTZlErp5qpDrV2nfjQyDZFi4Av5Mgqet2rVqNpP2YcB2IiNW+lSG9SrV8wk6HMeytssMN UoDtLpGfg6uHrtEPT576mwB+a9Q+gCs= X-MC-Unique: vkoXdc_4PAutrKwD1T8oPA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=PNuoFqEU8CsrXUJPO1lJsWHLekxhHoR3bU0ec0vwJOA=; b=B1vV4l6z4lGESf6r2Q7XKHdkHFkH4y3gyCZ8ChZ9ATZ+djLg4g3uq8yTqCPzZrf3VV QVNioty240uSfv/HUV9Pp+2HGwVy2+DKnPW36BCJx6t/Etm4iV3xyTkaOC1rGTWjy24p ODBODfbLsYnk13Sc0Gw9Itdn+zxXAZpPYC9YlKxse3uBeePiQTMOlgl3vQ0gG4iSnpNM FJzWOIpl2H9y+FzQ34eP7lnf2utGtcNJ4eY1/wAiaLfymYGu/uITgFyi/rS0UDDWKk4B Pc+M8fV5TBnGPj/VUtEfDzGKHyLyoJ93S/PbAcETYgrFpF1RBfF49N2DxB+ykZPMtZrd R5uQ== X-Gm-Message-State: AO0yUKV3DYHj3CyUA4QSrPeRLWqkbU4Q4Z99p4h2e0ZX2pb9TysX4ZDt W6hEOULgNybT587cAk41997huMTUsuIYDhOOKPJ0FASLUwHtU6TLs0N9Sb+Tj/9BRbdKEVFaRDU w/HqNUr2yKdQ2AZjY3+lATdvko25xRAt0cGfsIfYZCQNDuVrmleZJmSJB5RhpVbK6lvJt X-Received: by 2002:a05:600c:30d3:b0:3dc:2137:d67d with SMTP id h19-20020a05600c30d300b003dc2137d67dmr7657613wmn.16.1675890780447; Wed, 08 Feb 2023 13:13:00 -0800 (PST) X-Google-Smtp-Source: AK7set842OGxgCHy+8W5UKxuQ/uJNAUoHGDsQvC9KJfbE0m3LPhdjFCoAA9uMq497flMXehtTQwPvw== X-Received: by 2002:a05:600c:30d3:b0:3dc:2137:d67d with SMTP id h19-20020a05600c30d300b003dc2137d67dmr7657585wmn.16.1675890780166; Wed, 08 Feb 2023 13:13:00 -0800 (PST) Date: Wed, 8 Feb 2023 16:12:56 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org, "Jason A. Donenfeld" Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Dov Murik , Tom Lendacky , Gerd Hoffmann , Daniel P =?utf-8?B?LiBCZXJyYW5nw6k=?= , Paolo Bonzini , Richard Henderson , "H . Peter Anvin" , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Nathan Chancellor , Borislav Petkov , Eric Biggers , Sergio Lopez , Marcel Apfelbaum , Eduardo Habkost Subject: [PATCH RFC 7/7] Revert "hw/i386: pass RNG seed via setup_data entry" Message-ID: <20230208211212.41951-8-mst@redhat.com> References: <20230208211212.41951-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230208211212.41951-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675890866098100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This reverts commit 67f7e426e53833a5db75b0d813e8d537b8a75bd2. Fixes: 67f7e426e5 ("hw/i386: pass RNG seed via setup_data entry") Signed-off-by: Michael S. Tsirkin Tested-by: Dov Murik Tested-by: Nathan Chancellor --- include/hw/i386/pc.h | 3 --- include/hw/i386/x86.h | 3 +-- hw/i386/microvm.c | 2 +- hw/i386/pc.c | 4 ++-- hw/i386/pc_piix.c | 2 -- hw/i386/pc_q35.c | 2 -- hw/i386/x86.c | 26 ++++---------------------- 7 files changed, 8 insertions(+), 34 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 66e3d059ef..44b08554fa 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -127,9 +127,6 @@ struct PCMachineClass { =20 /* create kvmclock device even when KVM PV features are not exposed */ bool kvmclock_create_always; - - /* skip passing an rng seed for legacy machines */ - bool legacy_no_rng_seed; }; =20 #define TYPE_PC_MACHINE "generic-pc-machine" diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index 62fa5774f8..df82c5fd42 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -126,8 +126,7 @@ void x86_bios_rom_init(MachineState *ms, const char *de= fault_firmware, void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, int acpi_data_size, - bool pvh_enabled, - bool legacy_no_rng_seed); + bool pvh_enabled); =20 bool x86_machine_is_smm_enabled(const X86MachineState *x86ms); bool x86_machine_is_acpi_enabled(const X86MachineState *x86ms); diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 170a331e3f..b231ceda9a 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -330,7 +330,7 @@ static void microvm_memory_init(MicrovmMachineState *mm= s) rom_set_fw(fw_cfg); =20 if (machine->kernel_filename !=3D NULL) { - x86_load_linux(x86ms, fw_cfg, 0, true, false); + x86_load_linux(x86ms, fw_cfg, 0, true); } =20 if (mms->option_roms) { diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 6e592bd969..2c5f675ba4 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -804,7 +804,7 @@ void xen_load_linux(PCMachineState *pcms) rom_set_fw(fw_cfg); =20 x86_load_linux(x86ms, fw_cfg, pcmc->acpi_data_size, - pcmc->pvh_enabled, pcmc->legacy_no_rng_seed); + pcmc->pvh_enabled); for (i =3D 0; i < nb_option_roms; i++) { assert(!strcmp(option_rom[i].name, "linuxboot.bin") || !strcmp(option_rom[i].name, "linuxboot_dma.bin") || @@ -1124,7 +1124,7 @@ void pc_memory_init(PCMachineState *pcms, =20 if (linux_boot) { x86_load_linux(x86ms, fw_cfg, pcmc->acpi_data_size, - pcmc->pvh_enabled, pcmc->legacy_no_rng_seed); + pcmc->pvh_enabled); } =20 for (i =3D 0; i < nb_option_roms; i++) { diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index df64dd8dcc..839bd65df5 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -476,9 +476,7 @@ DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL, =20 static void pc_i440fx_7_1_machine_options(MachineClass *m) { - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); pc_i440fx_7_2_machine_options(m); - pcmc->legacy_no_rng_seed =3D true; compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len); compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 66cd718b70..e6e3966262 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -395,9 +395,7 @@ DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL, =20 static void pc_q35_7_1_machine_options(MachineClass *m) { - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); pc_q35_7_2_machine_options(m); - pcmc->legacy_no_rng_seed =3D true; compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len); compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len); } diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 4831193c86..80be3032cc 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -26,7 +26,6 @@ #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" @@ -771,8 +770,7 @@ static bool load_elfboot(const char *kernel_filename, void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, int acpi_data_size, - bool pvh_enabled, - bool legacy_no_rng_seed) + bool pvh_enabled) { bool linuxboot_dma_enabled =3D X86_MACHINE_GET_CLASS(x86ms)->fwcfg_dma= _enabled; uint16_t protocol; @@ -780,7 +778,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, first_se= tup_data =3D 0; + hwaddr real_addr, prot_addr, cmdline_addr, initrd_addr =3D 0; FILE *f; char *vmode; MachineState *machine =3D MACHINE(x86ms); @@ -790,7 +788,6 @@ 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; @@ -1070,31 +1067,16 @@ 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 cpu_to_le64(first_setup_data); - first_setup_data =3D prot_addr + setup_data_offset; + setup_data->next =3D 0; 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 - if (!legacy_no_rng_seed) { - setup_data_offset =3D QEMU_ALIGN_UP(kernel_size, 16); - kernel_size =3D setup_data_offset + sizeof(struct setup_data) + RN= G_SEED_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 --=20 MST