From patchwork Thu Jul 6 05:49:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Su X-Patchwork-Id: 13303201 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 5DDFBEB64DD for ; Thu, 6 Jul 2023 05:51:32 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHHsl-0006xR-5E; Thu, 06 Jul 2023 01:50:23 -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 1qHHsg-0006wF-22 for qemu-devel@nongnu.org; Thu, 06 Jul 2023 01:50:18 -0400 Received: from mga14.intel.com ([192.55.52.115]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qHHse-0006J9-F1 for qemu-devel@nongnu.org; Thu, 06 Jul 2023 01:50:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688622616; x=1720158616; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0HDgOwZ004g8YaWhUnaVz6SsULReK4Dss6JB40fvo+0=; b=USd7vYP6J4uF+v3tOZhNqDhd1U0hAPU/C/tyE7/7o3azsUj3OxBdrU6p o99aRz0UtFNltH8/ZGRfTnY1LTWc4gB0u1EuegDsLtPIRtVafmDBX1BI1 oN+wecfVB79ybe2tlIeXPnUnpzDavIUJP9CHfoLgC0ms5T7LCzI7T98mg s07B2b3EH0zWDIH88wRV8WlwBX7p1Py2DfVoxKhcRzx0tR81NpruapsWm 6LZbxb1OG+glN8RhvuZQ32oTTSqDTQG+7knNN0udo3zesdpBiG5jh2C+n xPFVX/khj0Vg8aOYFQXcH/w170DzrEdOv4pqv9fwWuZQVHtbKew8hXHWz w==; X-IronPort-AV: E=McAfee;i="6600,9927,10762"; a="363540155" X-IronPort-AV: E=Sophos;i="6.01,184,1684825200"; d="scan'208";a="363540155" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2023 22:50:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10762"; a="863975936" X-IronPort-AV: E=Sophos;i="6.01,185,1684825200"; d="scan'208";a="863975936" Received: from st-server.bj.intel.com ([10.240.193.102]) by fmsmga001.fm.intel.com with ESMTP; 05 Jul 2023 22:49:59 -0700 From: Tao Su To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, imammedo@redhat.com, xiaoyao.li@intel.com, lei4.wang@intel.com, qian.wen@intel.com, tao1.su@linux.intel.com Subject: [PATCH v2 3/6] target/i386: Allow MCDT_NO if host supports Date: Thu, 6 Jul 2023 13:49:46 +0800 Message-Id: <20230706054949.66556-4-tao1.su@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230706054949.66556-1-tao1.su@linux.intel.com> References: <20230706054949.66556-1-tao1.su@linux.intel.com> MIME-Version: 1.0 Received-SPF: none client-ip=192.55.52.115; envelope-from=tao1.su@linux.intel.com; helo=mga14.intel.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org MCDT_NO bit indicates HW contains the security fix and doesn't need to be mitigated to avoid data-dependent behaviour for certain instructions. It needs no hypervisor support. Treat it as supported regardless of what KVM reports. Signed-off-by: Tao Su Reviewed-by: Xiaoyao Li --- target/i386/kvm/kvm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index de531842f6..ebfaf3d24c 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -432,6 +432,10 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function, uint32_t eax; host_cpuid(7, 1, &eax, &unused, &unused, &unused); ret |= eax & (CPUID_7_1_EAX_FZRM | CPUID_7_1_EAX_FSRS | CPUID_7_1_EAX_FSRC); + } else if (function == 7 && index == 2 && reg == R_EDX) { + uint32_t edx; + host_cpuid(7, 2, &unused, &unused, &unused, &edx); + ret |= edx & CPUID_7_2_EDX_MCDT_NO; } else if (function == 0xd && index == 0 && (reg == R_EAX || reg == R_EDX)) { /*