From patchwork Wed Aug 3 15:49:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 12935613 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C050DC19F28 for ; Wed, 3 Aug 2022 15:50:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237785AbiHCPuY (ORCPT ); Wed, 3 Aug 2022 11:50:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236130AbiHCPuX (ORCPT ); Wed, 3 Aug 2022 11:50:23 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A460D262B for ; Wed, 3 Aug 2022 08:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659541821; 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; bh=/BrQz+CyfVcc2k2vo2CUTQfHHEz6+03jB7eKZ/pazJY=; b=CCMVAYOScJitjppS0TLVBXpqN25jlY499umtVOWGOb9cw27GB7iTsa9/Wc5KABICw1kw0c KaoWUW+igEjbJ+NirCWHK6DyI7hl/6dfk/ps6Q8AhvYnx+MmBmWAHaVqzVyP/z0q/Gz5+f 0qD1xda3nc3MjgG0uqCEiIXL4xQ2p4g= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-358-3w-6go72NbWtFWzI4ESLZQ-1; Wed, 03 Aug 2022 11:50:17 -0400 X-MC-Unique: 3w-6go72NbWtFWzI4ESLZQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2BDCD2919EAE; Wed, 3 Aug 2022 15:50:17 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.242]) by smtp.corp.redhat.com (Postfix) with ESMTP id 877F01121314; Wed, 3 Aug 2022 15:50:12 +0000 (UTC) From: Maxim Levitsky To: kvm@vger.kernel.org Cc: Borislav Petkov , Dave Hansen , linux-kernel@vger.kernel.org, Wanpeng Li , Maxim Levitsky , Ingo Molnar , Sean Christopherson , x86@kernel.org, Jim Mattson , Kees Cook , Thomas Gleixner , "H. Peter Anvin" , Joerg Roedel , Vitaly Kuznetsov , Paolo Bonzini Subject: [PATCH v3 00/13] SMM emulation and interrupt shadow fixes Date: Wed, 3 Aug 2022 18:49:58 +0300 Message-Id: <20220803155011.43721-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This patch series is a result of long debug work to find out why sometimes guests with win11 secure boot were failing during boot. During writing a unit test I found another bug, turns out that on rsm emulation, if the rsm instruction was done in real or 32 bit mode, KVM would truncate the restored RIP to 32 bit. I also refactored the way we write SMRAM so it is easier now to understand what is going on. The main bug in this series which I fixed is that we allowed #SMI to happen during the STI interrupt shadow, and we did nothing to both reset it on #SMI handler entry and restore it on RSM. V3: addressed most of the review feedback from Sean (thanks!) Best regards, Maxim Levitsky Maxim Levitsky (13): bug: introduce ASSERT_STRUCT_OFFSET KVM: x86: emulator: em_sysexit should update ctxt->mode KVM: x86: emulator: introduce emulator_recalc_and_set_mode KVM: x86: emulator: update the emulation mode after rsm KVM: x86: emulator: update the emulation mode after CR0 write KVM: x86: emulator/smm: number of GPRs in the SMRAM image depends on the image format KVM: x86: emulator/smm: add structs for KVM's smram layout KVM: x86: emulator/smm: use smram structs in the common code KVM: x86: emulator/smm: use smram struct for 32 bit smram load/restore KVM: x86: emulator/smm: use smram struct for 64 bit smram load/restore KVM: x86: SVM: use smram structs KVM: x86: SVM: don't save SVM state to SMRAM when VM is not long mode capable KVM: x86: emulator/smm: preserve interrupt shadow in SMRAM arch/x86/include/asm/kvm_host.h | 11 +- arch/x86/kvm/emulate.c | 305 +++++++++++++++++--------------- arch/x86/kvm/kvm_emulate.h | 223 ++++++++++++++++++++++- arch/x86/kvm/svm/svm.c | 30 ++-- arch/x86/kvm/vmx/vmcs12.h | 5 +- arch/x86/kvm/vmx/vmx.c | 4 +- arch/x86/kvm/x86.c | 175 +++++++++--------- include/linux/build_bug.h | 9 + 8 files changed, 497 insertions(+), 265 deletions(-) Tested-by: Thomas Lamprecht