From patchwork Wed Feb 8 21:12:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 5150 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3692549wrn; Wed, 8 Feb 2023 13:18:40 -0800 (PST) X-Google-Smtp-Source: AK7set8x4EJ28AAfjlfN/0KB6toJUHp770L/55DFyceAds1vUeWGgEdFGLQkry8OTi+5KS3Tjp21 X-Received: by 2002:a05:6402:35cf:b0:4ab:178f:e307 with SMTP id z15-20020a05640235cf00b004ab178fe307mr600501edc.1.1675891120287; Wed, 08 Feb 2023 13:18:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675891120; cv=none; d=google.com; s=arc-20160816; b=nUTm+7qVd0057dBWtGTwqRoBS47AQ/UOFUlzLRZcnvVyLM5EJba9mZylRgj+oPmysE K4nsUdAxVamsv+4iM7DpxfSzM31S5DMOW+quVsLxSK6YjAqjG3nDhr29aVw4voDNTd8c pyeBqa5rwSmOE/MHLTs4jcr0bFAv2MtZiT2ZxOOCvO6oxmQHZX0ZZJYqqE/g4HShV3Yj AxHaqr7UR3UMr3Tmp6iSS55B2EnWrxl+MxttduiNWzVckdGp4ksQrZHcm4ZjrLdosBNI jUoi7Jg/ndjuQodYrh67uRmC9FsDI3gWEZZrsD8qZFAdSW7tjzPGZCGFost9WJ+HzN1K kZdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=urtHEAv6TEXWhqK0ccVUEtbQBcR8E+gJVsq26PRR1Pg=; b=BJeJr75Q9TNMexMt3BXToCW3uZDjyR+4cYZDSqw3SqXEZNvymAPRaAWFMYOxPq3MII 0lNVFB9Vm7I156zhYGtxnGqjTYBht6Q/RNAqE22nEpzdbwer8kbXTrzIIxk+S8oE26er sgfR0k9Go8I+/hMRSPBRMj5d0MoFi1/w3xKna4oEZDu/+dO8wUwS1O53moEPXIA75Y0y zROAQIhyzAnqeJU5jbIyrPBpvNW7iD4vjWdIl/jg0+BIc4POvJfGCvfr+cIoI7SsVb8j U9P47/ZH0mh3n2Sm/DhkrU3FTHoSPr04RAC4keWIcKVTGCdd6EhTYhKSAyj0g0lCr+Qe RtIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TvglznH9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j8-20020aa7ca48000000b004aa96c529f6si16796879edt.371.2023.02.08.13.18.09; Wed, 08 Feb 2023 13:18:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TvglznH9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231690AbjBHVNW (ORCPT + 99 others); Wed, 8 Feb 2023 16:13:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231158AbjBHVNR (ORCPT ); Wed, 8 Feb 2023 16:13:17 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 548602DE62 for ; Wed, 8 Feb 2023 13:12:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675890749; 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; bh=urtHEAv6TEXWhqK0ccVUEtbQBcR8E+gJVsq26PRR1Pg=; b=TvglznH9BEJHpeYBIspKSabpEViNpJ8nM9fVnRoyXyAUq2xoBolRO2z+CIeAshkQY1lM8T oRO9z8ihp8g2jJ0GSwU/8F3W/9WK2xHf7H37M7SF5FuSpPoS3Sz7mDQ82B3Fg0okHQEqpA 7qlN7sv2jlYRc2Ta5HKZRNqp1LTZ5dI= 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-127-DcH1lR_6OmqV11IdXUiuwg-1; Wed, 08 Feb 2023 16:12:28 -0500 X-MC-Unique: DcH1lR_6OmqV11IdXUiuwg-1 Received: by mail-wm1-f72.google.com with SMTP id x10-20020a05600c21ca00b003dc5584b516so1738650wmj.7 for ; Wed, 08 Feb 2023 13:12:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=urtHEAv6TEXWhqK0ccVUEtbQBcR8E+gJVsq26PRR1Pg=; b=tIDG/0jrf4osD7Kk/cpz/MSr4tD2X60+tUJzgaa0i74evpTQ0MfWTAIgmzOdlNu+05 dARYhAayjm3yzguzEvztxDO39ATSEDPGbnmC2JJHHfcSZbsSN+D3dvXbbpiJtIgXvrPi jGKPiJChxHlRCxwgRqU1brU57EdlXfp+cxO0p6sPTPnjUHkHY/+QBMdijcCL6YcMNZbJ 6iYpZU7om6Tw8lyL3WcSxrkGVzeWElNAOnl6b0ruDWeLXELN4Hw0viGBmBCe9Bp3TtlT IBeWb0zuOwHLiVn+KShOX9+SOu/tybCZbdJVa5JmKN9jf71BxWrBpIu/TZ+TPFs4iVKP neKg== X-Gm-Message-State: AO0yUKVKOWRKTxlZHAFzhJVg6n1Mmy2VlH6/izi4tV+Qyz25rKWHd8o3 S08yHL8Mj6FB0s/Y8u4sXZeYyX3I32j8EoR95XtTjRu7LUdWZJ8AzCthXTt0EV8OjJnm4bTUpPh P3SELjai/OHNpIIUgWVBsd27E X-Received: by 2002:a05:600c:4a9c:b0:3dd:1b6f:4f30 with SMTP id b28-20020a05600c4a9c00b003dd1b6f4f30mr10581876wmp.3.1675890747093; Wed, 08 Feb 2023 13:12:27 -0800 (PST) X-Received: by 2002:a05:600c:4a9c:b0:3dd:1b6f:4f30 with SMTP id b28-20020a05600c4a9c00b003dd1b6f4f30mr10581862wmp.3.1675890746822; Wed, 08 Feb 2023 13:12:26 -0800 (PST) Received: from redhat.com ([2.52.132.212]) by smtp.gmail.com with ESMTPSA id ip21-20020a05600ca69500b003dc59081603sm2742148wmb.48.2023.02.08.13.12.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 13:12:26 -0800 (PST) Date: Wed, 8 Feb 2023 16:12:23 -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 Subject: [PATCH RFC 0/7] revert RNG seed mess Message-ID: <20230208211212.41951-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757299207344540336?= X-GMAIL-MSGID: =?utf-8?q?1757299207344540336?= All attempts to fix up passing RNG seed via setup_data entry failed. Let's just rip out all of it. We'll start over. Warning: all I did was git revert the relevant patches and resolve the (trivial) conflicts. Not even compiled - it's almost midnight here. Jason this is the kind of approach I'd like to see, not yet another pointer math rich patch I need to spend time reviewing. Just get us back to where we started. We can redo "x86: use typedef for SetupData struct" later if we want, it's benign. Could you do something like this pls? Or test and ack if this patchset happens to work by luck. Michael S. Tsirkin (7): Revert "x86: don't let decompressed kernel image clobber setup_data" Revert "x86: do not re-randomize RNG seed on snapshot load" Revert "x86: re-initialize RNG seed when selecting kernel" Revert "x86: reinitialize RNG seed on system reboot" Revert "x86: use typedef for SetupData struct" Revert "x86: return modified setup_data only if read as memory, not as file" Revert "hw/i386: pass RNG seed via setup_data entry" include/hw/i386/microvm.h | 5 +- include/hw/i386/pc.h | 3 - include/hw/i386/x86.h | 3 +- include/hw/nvram/fw_cfg.h | 31 ---------- hw/i386/microvm.c | 17 ++---- hw/i386/pc.c | 4 +- hw/i386/pc_piix.c | 2 - hw/i386/pc_q35.c | 2 - hw/i386/x86.c | 122 ++++++++++---------------------------- hw/nvram/fw_cfg.c | 21 ++----- 10 files changed, 49 insertions(+), 161 deletions(-) Tested-by: Dov Murik Tested-by: Nathan Chancellor