From nobody Sun Nov 24 11:57:39 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=zytor.com ARC-Seal: i=1; a=rsa-sha256; t=1723018757; cv=none; d=zohomail.com; s=zohoarc; b=IkWv6gE4AITUeqU09tgQN7TVZIS76EpwZm6B3UM3Rac9eBMPZ7AawxgakOHtcJm9T8HjABFVzH9qC4OYfMrpenD1/me8q2sVQZdg2sASMCJiGExY+64NgrrAOnV1g9fMJzipOxTMwgE7VpitgePS1yYbOmtAm0VQ6a41DPaC3Yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723018757; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=cLhnhzRXZr2FwWzd1KskHfPSIS/PzC+PgX/l/u713kQ=; b=ExbAv+5tvqWZP2flyfUk5uc0f9fnRHGBeCcc0Rovvz/uX0h2TQk0yyJDf33Lqw6nGWW6On4ODVmPKyLIWTa656PX7lWz3N4E34PzwEAuMzYuMX5vFPc/uT7kzlHkhCJL3AQ93/mpK8Ern0JEBBPB5P/cS5QA6C6TBpIKL0bH9R0= 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 1723018757326820.8675559208974; Wed, 7 Aug 2024 01:19:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbbsf-0000aR-32; Wed, 07 Aug 2024 04:18:49 -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 1sbbsO-0000Hf-HC for qemu-devel@nongnu.org; Wed, 07 Aug 2024 04:18:32 -0400 Received: from torg.zytor.com ([2607:7c80:54:3::138] helo=mail.zytor.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sbbsM-0006ui-Hd for qemu-devel@nongnu.org; Wed, 07 Aug 2024 04:18:32 -0400 Received: from terminus.zytor.com (terminus.zytor.com [IPv6:2607:7c80:54:3:0:0:0:136]) (authenticated bits=0) by mail.zytor.com (8.17.2/8.17.1) with ESMTPSA id 4778IDpf735187 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 7 Aug 2024 01:18:17 -0700 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.zytor.com 4778IDpf735187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zytor.com; s=2024071601; t=1723018698; bh=cLhnhzRXZr2FwWzd1KskHfPSIS/PzC+PgX/l/u713kQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gep/dezni3c9dR93wP+dHZQLqT7/iiAfYrsPWP0XIPXKjUCApLLbKv4Ub3vji4RhG 33G8hWTvIclV4SyF7d4BjVsBXlcnzov6hXRenxF5BWAq3WuPAJoOl0t9gHNCCGCRCi 5J4P2d5oET4Plkep/VsQLAuwF2EXHKm6izGni4I7Vfb6OKWNwiM+UHEHT6h8WS5ZVv QPkp31Qq5uXz2C5x1ZTmarCEQjRwYRKQag2+xLxQy7hmMQDJ73e2FnP9F1J7Sdo9TD ynUyBxto59MRp7eeSyE7SW9pz231WUj2ps11Vo/QB+lytD8rgHaWlx6iaMXgWpwZFt a2skGF4qaFRSA== From: "Xin Li (Intel)" To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mtosatti@redhat.com, lei4.wang@intel.com, zhao1.liu@intel.com, xin3.li@intel.com Subject: [PATCH v1 1/3] target/i386: Delete duplicated macro definition CR4_FRED_MASK Date: Wed, 7 Aug 2024 01:18:10 -0700 Message-ID: <20240807081813.735158-2-xin@zytor.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240807081813.735158-1-xin@zytor.com> References: <20240807081813.735158-1-xin@zytor.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:7c80:54:3::138; envelope-from=xin@zytor.com; helo=mail.zytor.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-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 @zytor.com) X-ZM-MESSAGEID: 1723018757762116600 Content-Type: text/plain; charset="utf-8" Macro CR4_FRED_MASK is defined twice, delete one. Signed-off-by: Xin Li (Intel) Reviewed-by: Zhao Liu --- target/i386/cpu.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index c6cc035df3..118ef9cb68 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -267,12 +267,6 @@ typedef enum X86Seg { #define CR4_FRED_MASK 0 #endif =20 -#ifdef TARGET_X86_64 -#define CR4_FRED_MASK (1ULL << 32) -#else -#define CR4_FRED_MASK 0 -#endif - #define CR4_RESERVED_MASK \ (~(target_ulong)(CR4_VME_MASK | CR4_PVI_MASK | CR4_TSD_MASK \ | CR4_DE_MASK | CR4_PSE_MASK | CR4_PAE_MASK \ --=20 2.45.2 From nobody Sun Nov 24 11:57:39 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=zytor.com ARC-Seal: i=1; a=rsa-sha256; t=1723018738; cv=none; d=zohomail.com; s=zohoarc; b=UtIy76ZJbhcIRqEvHuWA02INpeBSxsmK7aTGRbPd/tPHYGxtaQPDA5MpoZu1wFs1pwr1MT6v8UqZb8GQvmIjex+Ycwd6pTfkOxRotyGeIF5abbEqshRqe/L7sx8T8s2xnq5xSQ05jb0BBnSsZpNIDzEQm1oBF44HbzvJQxYe8zM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723018738; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=EOqBLubJw/7uH1jzE2oM60mOC+Vpg7yytT9MIukUwio=; b=i3BUH+72yo1OEjZSCoUO+2tnO6gv/eYENCuMegRBv6R3tE4XVKPmpnQSZRcvKCAQiIvGXZRTU2zHmekA5jbAlDRtiO0E8UqSvAMUL2O1TypKxdtIoDZYWXFCQfhg58glMA58UyQqcXcFpH6Fu0oqiqzmzF6WEmJhHHTpiZD7QWc= 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 1723018738178316.47968511733177; Wed, 7 Aug 2024 01:18:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbbsU-0000JT-1n; Wed, 07 Aug 2024 04:18:39 -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 1sbbsO-0000Hg-Js for qemu-devel@nongnu.org; Wed, 07 Aug 2024 04:18:32 -0400 Received: from torg.zytor.com ([2607:7c80:54:3::138] helo=mail.zytor.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sbbsM-0006ug-HZ for qemu-devel@nongnu.org; Wed, 07 Aug 2024 04:18:32 -0400 Received: from terminus.zytor.com (terminus.zytor.com [IPv6:2607:7c80:54:3:0:0:0:136]) (authenticated bits=0) by mail.zytor.com (8.17.2/8.17.1) with ESMTPSA id 4778IDpg735187 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 7 Aug 2024 01:18:18 -0700 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.zytor.com 4778IDpg735187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zytor.com; s=2024071601; t=1723018698; bh=EOqBLubJw/7uH1jzE2oM60mOC+Vpg7yytT9MIukUwio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FGgfm22Zyqc7Xt/cCdycWRchwzr+/6Pb2R1bnyWAlzygeorN7rDYVwPYKeb9NmV5k RrP9szGswvjaWAYAolNdkKs4odIqMCn2m4Vae9vfKUfUOhO8hnmdd9OeCAiMVP8uG8 vmb4A8F8HlKomKPXcPrtzJUNvVJplUZxf0bWloaVstCuQXA7rGCNLfffuUR0r5BNLu jOFKPVNTbJZ/Dh9DEmNKGSoMvVmyC12tegVnv6Sukn588R1AuQFgXBh2rkASEvGXt0 PXX5suiINPt3xcNWxZOS6PMtmGqUUamxjSUydcOB8IUKtU+5dKOBYwhFtT5BLBYS9+ glGw8sV/2bmfg== From: "Xin Li (Intel)" To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mtosatti@redhat.com, lei4.wang@intel.com, zhao1.liu@intel.com, xin3.li@intel.com Subject: [PATCH v1 2/3] target/i386: Add VMX control bits for nested FRED support Date: Wed, 7 Aug 2024 01:18:11 -0700 Message-ID: <20240807081813.735158-3-xin@zytor.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240807081813.735158-1-xin@zytor.com> References: <20240807081813.735158-1-xin@zytor.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:7c80:54:3::138; envelope-from=xin@zytor.com; helo=mail.zytor.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-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 @zytor.com) X-ZM-MESSAGEID: 1723018739626116600 Content-Type: text/plain; charset="utf-8" Add definitions of 1) VM-exit activate secondary controls bit 2) VM-entry load FRED bit which are required to enable nested FRED. Reviewed-by: Zhao Liu Signed-off-by: Xin Li (Intel) --- target/i386/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 85ef7452c0..31f287cae0 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1435,7 +1435,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] =3D { "vmx-exit-save-efer", "vmx-exit-load-efer", "vmx-exit-save-preemption-timer", "vmx-exit-clear-bndcfgs", NULL, "vmx-exit-clear-rtit-ctl", NULL, NULL, - NULL, "vmx-exit-load-pkrs", NULL, NULL, + NULL, "vmx-exit-load-pkrs", NULL, "vmx-exit-secondary-ctls", }, .msr =3D { .index =3D MSR_IA32_VMX_TRUE_EXIT_CTLS, @@ -1450,7 +1450,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] =3D { NULL, "vmx-entry-ia32e-mode", NULL, NULL, NULL, "vmx-entry-load-perf-global-ctrl", "vmx-entry-load-pat",= "vmx-entry-load-efer", "vmx-entry-load-bndcfgs", NULL, "vmx-entry-load-rtit-ctl", NUL= L, - NULL, NULL, "vmx-entry-load-pkrs", NULL, + NULL, NULL, "vmx-entry-load-pkrs", "vmx-entry-load-fred", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, }, --=20 2.45.2 From nobody Sun Nov 24 11:57:39 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=zytor.com ARC-Seal: i=1; a=rsa-sha256; t=1723018877; cv=none; d=zohomail.com; s=zohoarc; b=FKjHfBLg0YJn33mdpfBXnMYqM2HTmZIXooMqk11P9zRqjiyQbO0oIQBLbhD7P5GSTfUF0TnSL3C0e0i3rjSmNAuw5BEoVzI25jcRsbDsWZYsMtcl9xZ0MUqz4PDroJOgzeKJy4kmisTWbz0o6HEYJ8MO5yPNEinbU7z5uCEWxOY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723018877; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0zoLZBu6i+pYaksTM9d8A0bq3H7+OisO3/x/5JiQ+a4=; b=Fb87Y/GjA9eOF1WPE9838L53ojt2ua1w8CC3cp7ARoilM/S3+gEcne6KHbchcrBi4wm5ajm/GPvm411H5t3qJJEtcAPIrkWSiWvxgxZPIA3p5IHboeMrGwJieQNp0zYg5ZMiNKgKkaLZlinkFfDuy4qqrimbpBphyuH8zUyyqtE= 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 1723018877694433.2791498204904; Wed, 7 Aug 2024 01:21:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbbua-0001Bf-AT; Wed, 07 Aug 2024 04:20:48 -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 1sbbuY-00015N-FM for qemu-devel@nongnu.org; Wed, 07 Aug 2024 04:20:46 -0400 Received: from torg.zytor.com ([2607:7c80:54:3::138] helo=mail.zytor.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sbbuW-0007G4-5b for qemu-devel@nongnu.org; Wed, 07 Aug 2024 04:20:46 -0400 Received: from terminus.zytor.com (terminus.zytor.com [IPv6:2607:7c80:54:3:0:0:0:136]) (authenticated bits=0) by mail.zytor.com (8.17.2/8.17.1) with ESMTPSA id 4778IDph735187 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 7 Aug 2024 01:18:19 -0700 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.zytor.com 4778IDph735187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zytor.com; s=2024071601; t=1723018699; bh=0zoLZBu6i+pYaksTM9d8A0bq3H7+OisO3/x/5JiQ+a4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cd6jmI6jkkbczXYlJZfYrW4d/1FOSL7BVPwDsAPiM4xkgGx04hou99Sw8KMcyJPLL OA9EwbwD1lFNOJst6T9Vn37YrEjIiw5hEBl5SZfU5JpHu0YpnlUsI7CEMHYiMV5DSJ zsntBo3SQU/fZOkiK7qnRdpoBvibSxAXSTjbmY05W4MRQLOyCkm44Ob8ftUZ4+zMW5 hUCIWS5+4X6j7PziOhkv31zrHggoi4/ur3oi0JfCPpRUvr3rkS13pDm3GG53WB4EVS 5fPhAJJxc7QJWf2u+m4b8A4jYbVMfcJbAojvTm7OMI6XKWlkzrrVGl9XMOJTlNwZHX 1Cj7vk/cuDvNg== From: "Xin Li (Intel)" To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mtosatti@redhat.com, lei4.wang@intel.com, zhao1.liu@intel.com, xin3.li@intel.com Subject: [PATCH v1 3/3] target/i386: Raise the highest index value used for any VMCS encoding Date: Wed, 7 Aug 2024 01:18:12 -0700 Message-ID: <20240807081813.735158-4-xin@zytor.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240807081813.735158-1-xin@zytor.com> References: <20240807081813.735158-1-xin@zytor.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:7c80:54:3::138; envelope-from=xin@zytor.com; helo=mail.zytor.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-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 @zytor.com) X-ZM-MESSAGEID: 1723018878236116600 Content-Type: text/plain; charset="utf-8" From: Lei Wang Because the index value of the VMCS field encoding of FRED injected-event data (one of the newly added VMCS fields for FRED transitions), 0x52, is larger than any existing index value, raise the highest index value used for any VMCS encoding to 0x52. Because the index value of the VMCS field encoding of Secondary VM-exit controls, 0x44, is larger than any existing index value, raise the highest index value used for any VMCS encoding to 0x44. Co-developed-by: Xin Li Signed-off-by: Xin Li Signed-off-by: Lei Wang Signed-off-by: Xin Li (Intel) --- target/i386/cpu.h | 1 + target/i386/kvm/kvm.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 118ef9cb68..62324c3dcd 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1186,6 +1186,7 @@ uint64_t x86_cpu_get_supported_feature_word(X86CPU *c= pu, FeatureWord w); #define VMX_VM_EXIT_PT_CONCEAL_PIP 0x01000000 #define VMX_VM_EXIT_CLEAR_IA32_RTIT_CTL 0x02000000 #define VMX_VM_EXIT_LOAD_IA32_PKRS 0x20000000 +#define VMX_VM_EXIT_ACTIVATE_SECONDARY_CONTROLS 0x80000000 =20 #define VMX_VM_ENTRY_LOAD_DEBUG_CONTROLS 0x00000004 #define VMX_VM_ENTRY_IA32E_MODE 0x00000200 diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 31f149c990..fac5990274 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -3694,7 +3694,14 @@ static void kvm_msr_entry_add_vmx(X86CPU *cpu, Featu= reWordArray f) kvm_msr_entry_add(cpu, MSR_IA32_VMX_CR4_FIXED0, CR4_VMXE_MASK); =20 - if (f[FEAT_VMX_SECONDARY_CTLS] & VMX_SECONDARY_EXEC_TSC_SCALING) { + if (f[FEAT_7_1_EAX] & CPUID_7_1_EAX_FRED) { + /* FRED injected-event data (0x2052). */ + kvm_msr_entry_add(cpu, MSR_IA32_VMX_VMCS_ENUM, 0x52); + } else if (f[FEAT_VMX_EXIT_CTLS] & + VMX_VM_EXIT_ACTIVATE_SECONDARY_CONTROLS) { + /* Secondary VM-exit controls (0x2044). */ + kvm_msr_entry_add(cpu, MSR_IA32_VMX_VMCS_ENUM, 0x44); + } else if (f[FEAT_VMX_SECONDARY_CTLS] & VMX_SECONDARY_EXEC_TSC_SCALING= ) { /* TSC multiplier (0x2032). */ kvm_msr_entry_add(cpu, MSR_IA32_VMX_VMCS_ENUM, 0x32); } else { --=20 2.45.2