From patchwork Mon Jul 31 16:22:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaoyao Li X-Patchwork-Id: 13335000 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ED601C001DC for ; Mon, 31 Jul 2023 16:30:12 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qQVmT-0007N6-8H; Mon, 31 Jul 2023 12:30:01 -0400 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 1qQVmP-0007MT-Rf for qemu-devel@nongnu.org; Mon, 31 Jul 2023 12:29:57 -0400 Received: from [134.134.136.126] (helo=mgamail.intel.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qQVmO-00008I-8p for qemu-devel@nongnu.org; Mon, 31 Jul 2023 12:29:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690820996; x=1722356996; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OqbwFxE5zjsZMZns5dcqTBrG/GaaJmBZ5rVzXVb5HAQ=; b=UXASUbPXsazrkQS9Srv4BUMsUVrfAn+1y/GulWeg0fV2qaMXyhW5rGc9 AVwyjr8zILrgIP9TqWCitSGxTroB35tATmi3WSsI62De+LTrMuLQ+Hzn4 OrBarjPtzV8ocHmG+1TFmRvmG4v3xx+n9fIIUTelqe7hY47Dtz29eIVPE DMdsYHa1FL+7fXP0W7hzQ6aOuuAwSMD1mhfZSTrnhuYD+9IiSwplracJf K9cNoXnNqPY1766YgCGzqSVIavq0OboAc3XDr7mS7OcCh9jXm9yDvGasE AdPHSL1WHOiqQTNHhYR36WDLDB2+yL0x8T9xufAFm6nyYw9orR3nDTXFI A==; X-IronPort-AV: E=McAfee;i="6600,9927,10788"; a="353993657" X-IronPort-AV: E=Sophos;i="6.01,244,1684825200"; d="scan'208";a="353993657" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jul 2023 09:26:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10788"; a="757984483" X-IronPort-AV: E=Sophos;i="6.01,244,1684825200"; d="scan'208";a="757984483" Received: from lxy-clx-4s.sh.intel.com ([10.239.48.46]) by orsmga008.jf.intel.com with ESMTP; 31 Jul 2023 09:26:15 -0700 From: Xiaoyao Li To: Paolo Bonzini , Sean Christopherson , David Hildenbrand , Igor Mammedov , "Michael S. Tsirkin" , Marcel Apfelbaum , Richard Henderson , Marcelo Tosatti Cc: Markus Armbruster , Eric Blake , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Peter Xu , Chao Peng , Michael Roth , isaku.yamahata@gmail.com, xiaoyao.li@intel.com, qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [RFC PATCH 19/19] i386: Disable SMM mode for X86_SW_PROTECTED_VM Date: Mon, 31 Jul 2023 12:22:01 -0400 Message-Id: <20230731162201.271114-20-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230731162201.271114-1-xiaoyao.li@intel.com> References: <20230731162201.271114-1-xiaoyao.li@intel.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 134.134.136.126 (failed) Received-SPF: pass client-ip=134.134.136.126; envelope-from=xiaoyao.li@intel.com; helo=mgamail.intel.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=0.001, RDNS_NONE=0.793, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Xiaoyao Li --- target/i386/kvm/kvm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index a96640512dbc..62f237068a3a 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -2654,6 +2654,13 @@ int kvm_arch_init(MachineState *ms, KVMState *s) if (x86ms->vm_type == KVM_X86_SW_PROTECTED_VM) { memory_listener_register(&kvm_x86_sw_protected_vm_memory_listener, &address_space_memory); + + if (x86ms->smm == ON_OFF_AUTO_AUTO) { + x86ms->smm = ON_OFF_AUTO_OFF; + } else if (x86ms->smm == ON_OFF_AUTO_ON) { + error_report("X86_SW_PROTECTED_VM doesn't support SMM"); + return -EINVAL; + } } if (!kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) {