From nobody Tue May 14 16:35:25 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1710900764; cv=none; d=zohomail.com; s=zohoarc; b=PESM9aw64NejhfzGIK7rZSxLkoUGs1ii3SyrIjFIPGtq3pF5jFLMnKqiaX0gx1ah0BkMzxd6RhN0ako3lEkCyB50V3Q9DRNtpXCWXtx/JcXO8Zqt0St8MKc8q5gFc2Cj+c3F/jkMpTGVomfbnwcs7xHsBdurW7U1X5Ja0hXqv2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710900764; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GyMHvTUBwSnfwFHYFz2vSRED5vmYcLflnSpdIADmVHw=; b=ECmFCag860b2tw2+33J+dSM5hsAyfb01sIOwYOm7v571ed82UyCL+ReyPvGrDyiVrW/lNWwjp5fPw67gYaSpzBd5O3R5/ltffSQxbPkh6ifhTqiq0M87gcAbq6Zm4ImDMB6wJMPSRHmsHUMbFwbQJ6CCMBWrxBR/v21VmN260GA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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 1710900764629460.6709280891953; Tue, 19 Mar 2024 19:12:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmlQq-0007WN-Sx; Tue, 19 Mar 2024 22:11:57 -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 1rmlQo-0007VW-CJ for qemu-devel@nongnu.org; Tue, 19 Mar 2024 22:11:54 -0400 Received: from mgamail.intel.com ([192.198.163.9]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmlQl-00007A-QC for qemu-devel@nongnu.org; Tue, 19 Mar 2024 22:11:54 -0400 Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Mar 2024 19:11:47 -0700 Received: from st-server.bj.intel.com ([10.240.193.102]) by orviesa004.jf.intel.com with ESMTP; 19 Mar 2024 19:11:45 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710900712; x=1742436712; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=gqJUXZjlnDWkYvP2GsAVJ0nIzO8BqMLDQs9PnEHvNdo=; b=B2huodz4jjnw8kiIwdf5QqqcFS/3OUidDKWxOf4u2ACGt3gJedbF7iXU vPk59aIGVSaXmWc6fb/qwETAm+U8Hl/od9APmtsThlwrr5ozXv891t25I 2zsS3x6eEG8srbyx0ur4qg/F2x5xj5a/NTtI1LQZhEO8LlSV/CBv95Kv+ KkYl1orrQgOy+j9Z2MMRjvfOOQ/pVc+j2T7erIo/SBRLvUkgyHO60aHcG Z0lejFTRUONPnDVrAcvnN6UK9evv38FWoWCKerFWHz9rSINcPyQZ3ZN5V us861Lr3a6N/kCDrNakdlZBx9suZHnpgaoza8p+N7jMCAUSLYFzu+cZHy g==; X-IronPort-AV: E=McAfee;i="6600,9927,11018"; a="16540098" X-IronPort-AV: E=Sophos;i="6.07,138,1708416000"; d="scan'208";a="16540098" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,138,1708416000"; d="scan'208";a="18660683" From: Tao Su To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, imammedo@redhat.com, xiaoyao.li@intel.com, zhao1.liu@intel.com, tao1.su@linux.intel.com Subject: [PATCH v2] target/i386: Add new CPU model SierraForest Date: Wed, 20 Mar 2024 10:10:44 +0800 Message-Id: <20240320021044.508263-1-tao1.su@linux.intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: none client-ip=192.198.163.9; envelope-from=tao1.su@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.422, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, UPPERCASE_50_75=0.008 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1710900765724100001 According to table 1-2 in Intel Architecture Instruction Set Extensions and Future Features (rev 051) [1], SierraForest has the following new features which have already been virtualized: - CMPCCXADD CPUID.(EAX=3D7,ECX=3D1):EAX[bit 7] - AVX-IFMA CPUID.(EAX=3D7,ECX=3D1):EAX[bit 23] - AVX-VNNI-INT8 CPUID.(EAX=3D7,ECX=3D1):EDX[bit 4] - AVX-NE-CONVERT CPUID.(EAX=3D7,ECX=3D1):EDX[bit 5] Add above features to new CPU model SierraForest. Comparing with GraniteRap= ids CPU model, SierraForest bare-metal removes the following features: - HLE CPUID.(EAX=3D7,ECX=3D0):EBX[bit 4] - RTM CPUID.(EAX=3D7,ECX=3D0):EBX[bit 11] - AVX512F CPUID.(EAX=3D7,ECX=3D0):EBX[bit 16] - AVX512DQ CPUID.(EAX=3D7,ECX=3D0):EBX[bit 17] - AVX512_IFMA CPUID.(EAX=3D7,ECX=3D0):EBX[bit 21] - AVX512CD CPUID.(EAX=3D7,ECX=3D0):EBX[bit 28] - AVX512BW CPUID.(EAX=3D7,ECX=3D0):EBX[bit 30] - AVX512VL CPUID.(EAX=3D7,ECX=3D0):EBX[bit 31] - AVX512_VBMI CPUID.(EAX=3D7,ECX=3D0):ECX[bit 1] - AVX512_VBMI2 CPUID.(EAX=3D7,ECX=3D0):ECX[bit 6] - AVX512_VNNI CPUID.(EAX=3D7,ECX=3D0):ECX[bit 11] - AVX512_BITALG CPUID.(EAX=3D7,ECX=3D0):ECX[bit 12] - AVX512_VPOPCNTDQ CPUID.(EAX=3D7,ECX=3D0):ECX[bit 14] - LA57 CPUID.(EAX=3D7,ECX=3D0):ECX[bit 16] - TSXLDTRK CPUID.(EAX=3D7,ECX=3D0):EDX[bit 16] - AMX-BF16 CPUID.(EAX=3D7,ECX=3D0):EDX[bit 22] - AVX512_FP16 CPUID.(EAX=3D7,ECX=3D0):EDX[bit 23] - AMX-TILE CPUID.(EAX=3D7,ECX=3D0):EDX[bit 24] - AMX-INT8 CPUID.(EAX=3D7,ECX=3D0):EDX[bit 25] - AVX512_BF16 CPUID.(EAX=3D7,ECX=3D1):EAX[bit 5] - fast zero-length MOVSB CPUID.(EAX=3D7,ECX=3D1):EAX[bit 10] - fast short CMPSB, SCASB CPUID.(EAX=3D7,ECX=3D1):EAX[bit 12] - AMX-FP16 CPUID.(EAX=3D7,ECX=3D1):EAX[bit 21] - PREFETCHI CPUID.(EAX=3D7,ECX=3D1):EDX[bit 14] - XFD CPUID.(EAX=3D0xD,ECX=3D1):EAX[bit 4] - EPT_PAGE_WALK_LENGTH_5 VMX_EPT_VPID_CAP(0x48c)[bit 7] Add all features of GraniteRapids CPU model except above features to SierraForest CPU model. SierraForest doesn=E2=80=99t support TSX and RTM but supports TAA_NO. When = RTM is not enabled in host, KVM will not report TAA_NO. So, just don't include TAA_NO in SierraForest CPU model. [1] https://cdrdv2.intel.com/v1/dl/getContent/671368 Reviewed-by: Zhao Liu Reviewed-by: Xiaoyao Li Signed-off-by: Tao Su --- v1 -> v2: - Specify the spec rev and table which says the contained features. - Fix commit message to make it clearer. - Move the spec link above --- line so that it won=E2=80=99t be gone after= commit. - Add Reviewed-by of Zhao and Xiaoyao. v1: - https://lore.kernel.org/all/20231206131923.1192066-1-tao1.su@linux.intel= .com/ --- target/i386/cpu.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 9a210d8d92..8b86698939 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4099,6 +4099,132 @@ static const X86CPUDefinition builtin_x86_defs[] = =3D { { /* end of list */ }, }, }, + { + .name =3D "SierraForest", + .level =3D 0x23, + .vendor =3D CPUID_VENDOR_INTEL, + .family =3D 6, + .model =3D 175, + .stepping =3D 0, + /* + * please keep the ascending order so that we can have a clear vie= w of + * bit position of each feature. + */ + .features[FEAT_1_EDX] =3D + CPUID_FP87 | CPUID_VME | CPUID_DE | CPUID_PSE | CPUID_TSC | + CPUID_MSR | CPUID_PAE | CPUID_MCE | CPUID_CX8 | CPUID_APIC | + CPUID_SEP | CPUID_MTRR | CPUID_PGE | CPUID_MCA | CPUID_CMOV | + CPUID_PAT | CPUID_PSE36 | CPUID_CLFLUSH | CPUID_MMX | CPUID_FX= SR | + CPUID_SSE | CPUID_SSE2, + .features[FEAT_1_ECX] =3D + CPUID_EXT_SSE3 | CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSSE3 | + CPUID_EXT_FMA | CPUID_EXT_CX16 | CPUID_EXT_PCID | CPUID_EXT_SS= E41 | + CPUID_EXT_SSE42 | CPUID_EXT_X2APIC | CPUID_EXT_MOVBE | + CPUID_EXT_POPCNT | CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_AE= S | + CPUID_EXT_XSAVE | CPUID_EXT_AVX | CPUID_EXT_F16C | CPUID_EXT_R= DRAND, + .features[FEAT_8000_0001_EDX] =3D + CPUID_EXT2_SYSCALL | CPUID_EXT2_NX | CPUID_EXT2_PDPE1GB | + CPUID_EXT2_RDTSCP | CPUID_EXT2_LM, + .features[FEAT_8000_0001_ECX] =3D + CPUID_EXT3_LAHF_LM | CPUID_EXT3_ABM | CPUID_EXT3_3DNOWPREFETCH, + .features[FEAT_8000_0008_EBX] =3D + CPUID_8000_0008_EBX_WBNOINVD, + .features[FEAT_7_0_EBX] =3D + CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 | CPUID_7_0_EBX_AV= X2 | + CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | + CPUID_7_0_EBX_INVPCID | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_A= DX | + CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_CLFLUSHOPT | CPUID_7_0_EBX_= CLWB | + CPUID_7_0_EBX_SHA_NI, + .features[FEAT_7_0_ECX] =3D + CPUID_7_0_ECX_UMIP | CPUID_7_0_ECX_PKU | CPUID_7_0_ECX_GFNI | + CPUID_7_0_ECX_VAES | CPUID_7_0_ECX_VPCLMULQDQ | + CPUID_7_0_ECX_RDPID | CPUID_7_0_ECX_BUS_LOCK_DETECT, + .features[FEAT_7_0_EDX] =3D + CPUID_7_0_EDX_FSRM | CPUID_7_0_EDX_SERIALIZE | + CPUID_7_0_EDX_SPEC_CTRL | CPUID_7_0_EDX_ARCH_CAPABILITIES | + CPUID_7_0_EDX_SPEC_CTRL_SSBD, + .features[FEAT_ARCH_CAPABILITIES] =3D + MSR_ARCH_CAP_RDCL_NO | MSR_ARCH_CAP_IBRS_ALL | + MSR_ARCH_CAP_SKIP_L1DFL_VMENTRY | MSR_ARCH_CAP_MDS_NO | + MSR_ARCH_CAP_PSCHANGE_MC_NO | MSR_ARCH_CAP_SBDR_SSDP_NO | + MSR_ARCH_CAP_FBSDP_NO | MSR_ARCH_CAP_PSDP_NO | + MSR_ARCH_CAP_PBRSB_NO, + .features[FEAT_XSAVE] =3D + CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC | + CPUID_XSAVE_XGETBV1 | CPUID_XSAVE_XSAVES, + .features[FEAT_6_EAX] =3D + CPUID_6_EAX_ARAT, + .features[FEAT_7_1_EAX] =3D + CPUID_7_1_EAX_AVX_VNNI | CPUID_7_1_EAX_CMPCCXADD | + CPUID_7_1_EAX_FSRS | CPUID_7_1_EAX_AVX_IFMA, + .features[FEAT_7_1_EDX] =3D + CPUID_7_1_EDX_AVX_VNNI_INT8 | CPUID_7_1_EDX_AVX_NE_CONVERT, + .features[FEAT_7_2_EDX] =3D + CPUID_7_2_EDX_MCDT_NO, + .features[FEAT_VMX_BASIC] =3D + MSR_VMX_BASIC_INS_OUTS | MSR_VMX_BASIC_TRUE_CTLS, + .features[FEAT_VMX_ENTRY_CTLS] =3D + VMX_VM_ENTRY_LOAD_DEBUG_CONTROLS | VMX_VM_ENTRY_IA32E_MODE | + VMX_VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL | + VMX_VM_ENTRY_LOAD_IA32_PAT | VMX_VM_ENTRY_LOAD_IA32_EFER, + .features[FEAT_VMX_EPT_VPID_CAPS] =3D + MSR_VMX_EPT_EXECONLY | MSR_VMX_EPT_PAGE_WALK_LENGTH_4 | + MSR_VMX_EPT_WB | MSR_VMX_EPT_2MB | MSR_VMX_EPT_1GB | + MSR_VMX_EPT_INVEPT | MSR_VMX_EPT_AD_BITS | + MSR_VMX_EPT_INVEPT_SINGLE_CONTEXT | MSR_VMX_EPT_INVEPT_ALL_CON= TEXT | + MSR_VMX_EPT_INVVPID | MSR_VMX_EPT_INVVPID_SINGLE_ADDR | + MSR_VMX_EPT_INVVPID_SINGLE_CONTEXT | + MSR_VMX_EPT_INVVPID_ALL_CONTEXT | + MSR_VMX_EPT_INVVPID_SINGLE_CONTEXT_NOGLOBALS, + .features[FEAT_VMX_EXIT_CTLS] =3D + VMX_VM_EXIT_SAVE_DEBUG_CONTROLS | + VMX_VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL | + VMX_VM_EXIT_ACK_INTR_ON_EXIT | VMX_VM_EXIT_SAVE_IA32_PAT | + VMX_VM_EXIT_LOAD_IA32_PAT | VMX_VM_EXIT_SAVE_IA32_EFER | + VMX_VM_EXIT_LOAD_IA32_EFER | VMX_VM_EXIT_SAVE_VMX_PREEMPTION_T= IMER, + .features[FEAT_VMX_MISC] =3D + MSR_VMX_MISC_STORE_LMA | MSR_VMX_MISC_ACTIVITY_HLT | + MSR_VMX_MISC_VMWRITE_VMEXIT, + .features[FEAT_VMX_PINBASED_CTLS] =3D + VMX_PIN_BASED_EXT_INTR_MASK | VMX_PIN_BASED_NMI_EXITING | + VMX_PIN_BASED_VIRTUAL_NMIS | VMX_PIN_BASED_VMX_PREEMPTION_TIME= R | + VMX_PIN_BASED_POSTED_INTR, + .features[FEAT_VMX_PROCBASED_CTLS] =3D + VMX_CPU_BASED_VIRTUAL_INTR_PENDING | + VMX_CPU_BASED_USE_TSC_OFFSETING | VMX_CPU_BASED_HLT_EXITING | + VMX_CPU_BASED_INVLPG_EXITING | VMX_CPU_BASED_MWAIT_EXITING | + VMX_CPU_BASED_RDPMC_EXITING | VMX_CPU_BASED_RDTSC_EXITING | + VMX_CPU_BASED_CR3_LOAD_EXITING | VMX_CPU_BASED_CR3_STORE_EXITI= NG | + VMX_CPU_BASED_CR8_LOAD_EXITING | VMX_CPU_BASED_CR8_STORE_EXITI= NG | + VMX_CPU_BASED_TPR_SHADOW | VMX_CPU_BASED_VIRTUAL_NMI_PENDING | + VMX_CPU_BASED_MOV_DR_EXITING | VMX_CPU_BASED_UNCOND_IO_EXITING= | + VMX_CPU_BASED_USE_IO_BITMAPS | VMX_CPU_BASED_MONITOR_TRAP_FLAG= | + VMX_CPU_BASED_USE_MSR_BITMAPS | VMX_CPU_BASED_MONITOR_EXITING | + VMX_CPU_BASED_PAUSE_EXITING | + VMX_CPU_BASED_ACTIVATE_SECONDARY_CONTROLS, + .features[FEAT_VMX_SECONDARY_CTLS] =3D + VMX_SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES | + VMX_SECONDARY_EXEC_ENABLE_EPT | VMX_SECONDARY_EXEC_DESC | + VMX_SECONDARY_EXEC_RDTSCP | + VMX_SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE | + VMX_SECONDARY_EXEC_ENABLE_VPID | VMX_SECONDARY_EXEC_WBINVD_EXI= TING | + VMX_SECONDARY_EXEC_UNRESTRICTED_GUEST | + VMX_SECONDARY_EXEC_APIC_REGISTER_VIRT | + VMX_SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY | + VMX_SECONDARY_EXEC_RDRAND_EXITING | + VMX_SECONDARY_EXEC_ENABLE_INVPCID | + VMX_SECONDARY_EXEC_ENABLE_VMFUNC | VMX_SECONDARY_EXEC_SHADOW_V= MCS | + VMX_SECONDARY_EXEC_RDSEED_EXITING | VMX_SECONDARY_EXEC_ENABLE_= PML | + VMX_SECONDARY_EXEC_XSAVES, + .features[FEAT_VMX_VMFUNC] =3D + MSR_VMX_VMFUNC_EPT_SWITCHING, + .xlevel =3D 0x80000008, + .model_id =3D "Intel Xeon Processor (SierraForest)", + .versions =3D (X86CPUVersionDefinition[]) { + { .version =3D 1 }, + { /* end of list */ }, + }, + }, { .name =3D "Denverton", .level =3D 21, base-commit: c62d54d0a8067ffb3d5b909276f7296d7df33fa7 --=20 2.34.1