From mboxrd@z Thu Jan 1 00:00:00 1970 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 A1E9FC433EF for ; Mon, 21 Mar 2022 02:47:11 +0000 (UTC) Received: from localhost ([::1]:36650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nW84c-0000Oj-Hw for qemu-devel@archiver.kernel.org; Sun, 20 Mar 2022 22:47:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nW83z-00088r-9M for qemu-devel@nongnu.org; Sun, 20 Mar 2022 22:46:31 -0400 Received: from mga12.intel.com ([192.55.52.136]:28934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nW83v-0003XF-OH for qemu-devel@nongnu.org; Sun, 20 Mar 2022 22:46:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647830787; x=1679366787; h=message-id:subject:from:to:cc:date:in-reply-to: references:mime-version:content-transfer-encoding; bh=44rjADHhSKNwp/Z8R/GZaiSbZTcY06QXjf33mhufRt0=; b=XmS/j6ReU1+GSQFTh1x59JVWqLAiZ5KKA/1jdqAy8rixLAu1UPX/xVxj lexz9cAcYX66Fs1Lmc7rZgRO2JP2TdkkJ+zhTK9EFHPUlr0XdZVsi6AYS UceBJhZSmnS0JyLK01IA6ZI6ewlXqUKpS1HPq/RSXByWU4QnVS6BKBsmG nXAiGvj1CF2frCuhJHmsavCZnj0cIAvSBKm5enQi0bZthnv8DXYC540mu m5wckWfudW9Zpqj69Y1Ke7OMIjjvYQzHD5nVS8Mhb57DXOnTy3g4hejqZ IUjs0mdDc0CLaHAglPVJLxIDOZ26R3YDwpQAExOs8OfYE+nbS9Z8TfjAL g==; X-IronPort-AV: E=McAfee;i="6200,9189,10292"; a="237398236" X-IronPort-AV: E=Sophos;i="5.90,197,1643702400"; d="scan'208";a="237398236" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2022 19:46:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,197,1643702400"; d="scan'208";a="600333608" Received: from sqa-gate.sh.intel.com (HELO robert-ivt.tsp.org) ([10.239.48.212]) by fmsmga008.fm.intel.com with ESMTP; 20 Mar 2022 19:46:21 -0700 Message-ID: <8bc7ce51ef13e7694bdf2a843e0b32ceb90f6e6b.camel@linux.intel.com> Subject: Re: [PATCH] i386/cpu: Remove the deprecated cpu model 'Icelake-Client' From: Robert Hoo To: imammedo@redhat.com Date: Mon, 21 Mar 2022 10:46:20 +0800 In-Reply-To: <1647247859-4947-1-git-send-email-robert.hu@linux.intel.com> References: <1647247859-4947-1-git-send-email-robert.hu@linux.intel.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5 (3.28.5-10.el7) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Received-SPF: none client-ip=192.55.52.136; envelope-from=robert.hu@linux.intel.com; helo=mga12.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, UPPERCASE_50_75=0.008 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: , Cc: pbonzini@redhat.com, robert.hu@intel.com, richard.henderson@linaro.org, ehabkost@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Igor, Ping... Thanks. On Mon, 2022-03-14 at 16:50 +0800, Robert Hoo wrote: > Icelake, is the codename for Intel 3rd generation Xeon Scalable > server > processors. There isn't ever client variants. This "Icelake-Client" > CPU > model was added wrongly and imaginarily. > > It has been deprecated since v5.2, now it's time to remove it > completely > from code. > > Signed-off-by: Robert Hoo > --- > Note: This patch is a reword, rebase and resend of > https://lore.kernel.org/qemu-devel/1619660147-136679-1-git-send-email-robert.hu@linux.intel.com/ > --- > docs/about/deprecated.rst | 6 -- > docs/about/removed-features.rst | 6 ++ > target/i386/cpu.c | 122 ------------------------------ > -- > 3 files changed, 6 insertions(+), 128 deletions(-) > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index cf02ef6821..1adc762958 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -289,12 +289,6 @@ from Linux upstream kernel, declare it > deprecated. > System emulator CPUS > -------------------- > > -``Icelake-Client`` CPU Model (since 5.2) > -'''''''''''''''''''''''''''''''''''''''' > - > -``Icelake-Client`` CPU Models are deprecated. Use ``Icelake-Server`` > CPU > -Models instead. > - > MIPS ``I7200`` CPU Model (since 5.2) > '''''''''''''''''''''''''''''''''''' > > diff --git a/docs/about/removed-features.rst b/docs/about/removed- > features.rst > index 4b831ea291..3fb5b28518 100644 > --- a/docs/about/removed-features.rst > +++ b/docs/about/removed-features.rst > @@ -538,6 +538,12 @@ Support for this CPU was removed from the > upstream Linux kernel, and > there is no available upstream toolchain to build binaries for it. > Removed without replacement. > > +x86 ``Icelake-Client`` CPU (removed in 7.1) > +''''''''''''''''''''''''''''''''''''''''''' > + > +There isn't ever Icelake Client CPU, it is some wrong and imaginary > one. > +Use ``Icelake-Server`` instead. > + > System emulator machines > ------------------------ > > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > index 6c7ef1099b..82f1cecf76 100644 > --- a/target/i386/cpu.c > +++ b/target/i386/cpu.c > @@ -3238,128 +3238,6 @@ static const X86CPUDefinition > builtin_x86_defs[] = { > { /* end of list */ } > } > }, > - { > - .name = "Icelake-Client", > - .level = 0xd, > - .vendor = CPUID_VENDOR_INTEL, > - .family = 6, > - .model = 126, > - .stepping = 0, > - .features[FEAT_1_EDX] = > - CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | > CPUID_MMX | > - CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | > CPUID_MCA | > - CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | > CPUID_CX8 | > - CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | > CPUID_PSE | > - CPUID_DE | CPUID_FP87, > - .features[FEAT_1_ECX] = > - CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES | > - CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 | > - CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | > - CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 | > - CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | > CPUID_EXT_MOVBE | > - CPUID_EXT_PCID | CPUID_EXT_F16C | CPUID_EXT_RDRAND, > - .features[FEAT_8000_0001_EDX] = > - CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX | > - CPUID_EXT2_SYSCALL, > - .features[FEAT_8000_0001_ECX] = > - CPUID_EXT3_ABM | CPUID_EXT3_LAHF_LM | > CPUID_EXT3_3DNOWPREFETCH, > - .features[FEAT_8000_0008_EBX] = > - CPUID_8000_0008_EBX_WBNOINVD, > - .features[FEAT_7_0_EBX] = > - CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 | > - CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | > CPUID_7_0_EBX_SMEP | > - CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | > CPUID_7_0_EBX_INVPCID | > - CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | > CPUID_7_0_EBX_ADX | > - CPUID_7_0_EBX_SMAP, > - .features[FEAT_7_0_ECX] = > - CPUID_7_0_ECX_AVX512_VBMI | CPUID_7_0_ECX_UMIP | > CPUID_7_0_ECX_PKU | > - CPUID_7_0_ECX_AVX512_VBMI2 | CPUID_7_0_ECX_GFNI | > - CPUID_7_0_ECX_VAES | CPUID_7_0_ECX_VPCLMULQDQ | > - CPUID_7_0_ECX_AVX512VNNI | CPUID_7_0_ECX_AVX512BITALG | > - CPUID_7_0_ECX_AVX512_VPOPCNTDQ, > - .features[FEAT_7_0_EDX] = > - CPUID_7_0_EDX_SPEC_CTRL | CPUID_7_0_EDX_SPEC_CTRL_SSBD, > - /* XSAVES is added in version 3 */ > - .features[FEAT_XSAVE] = > - CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC | > - CPUID_XSAVE_XGETBV1, > - .features[FEAT_6_EAX] = > - CPUID_6_EAX_ARAT, > - /* Missing: Mode-based execute control (XS/XU), processor > tracing, TSC scaling */ > - .features[FEAT_VMX_BASIC] = MSR_VMX_BASIC_INS_OUTS | > - MSR_VMX_BASIC_TRUE_CTLS, > - .features[FEAT_VMX_ENTRY_CTLS] = VMX_VM_ENTRY_IA32E_MODE | > - VMX_VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL | > VMX_VM_ENTRY_LOAD_IA32_PAT | > - VMX_VM_ENTRY_LOAD_DEBUG_CONTROLS | > VMX_VM_ENTRY_LOAD_IA32_EFER, > - .features[FEAT_VMX_EPT_VPID_CAPS] = 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_INVEPT_SINGLE_CONTEXT | > MSR_VMX_EPT_INVEPT_ALL_CONTEXT | > - 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 | > MSR_VMX_EPT_AD_BITS, > - .features[FEAT_VMX_EXIT_CTLS] = > - VMX_VM_EXIT_ACK_INTR_ON_EXIT | > VMX_VM_EXIT_SAVE_DEBUG_CONTROLS | > - VMX_VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL | > - VMX_VM_EXIT_LOAD_IA32_PAT | VMX_VM_EXIT_LOAD_IA32_EFER > | > - VMX_VM_EXIT_SAVE_IA32_PAT | VMX_VM_EXIT_SAVE_IA32_EFER > | > - VMX_VM_EXIT_SAVE_VMX_PREEMPTION_TIMER, > - .features[FEAT_VMX_MISC] = MSR_VMX_MISC_ACTIVITY_HLT | > - MSR_VMX_MISC_STORE_LMA | MSR_VMX_MISC_VMWRITE_VMEXIT, > - .features[FEAT_VMX_PINBASED_CTLS] = > VMX_PIN_BASED_EXT_INTR_MASK | > - VMX_PIN_BASED_NMI_EXITING | VMX_PIN_BASED_VIRTUAL_NMIS > | > - VMX_PIN_BASED_VMX_PREEMPTION_TIMER, > - .features[FEAT_VMX_PROCBASED_CTLS] = > 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_CR8_LOAD_EXITING | > VMX_CPU_BASED_CR8_STORE_EXITING | > - VMX_CPU_BASED_TPR_SHADOW | VMX_CPU_BASED_MOV_DR_EXITING > | > - VMX_CPU_BASED_UNCOND_IO_EXITING | > VMX_CPU_BASED_USE_IO_BITMAPS | > - VMX_CPU_BASED_MONITOR_EXITING | > VMX_CPU_BASED_PAUSE_EXITING | > - VMX_CPU_BASED_VIRTUAL_NMI_PENDING | > VMX_CPU_BASED_USE_MSR_BITMAPS | > - VMX_CPU_BASED_CR3_LOAD_EXITING | > VMX_CPU_BASED_CR3_STORE_EXITING | > - VMX_CPU_BASED_MONITOR_TRAP_FLAG | > - VMX_CPU_BASED_ACTIVATE_SECONDARY_CONTROLS, > - .features[FEAT_VMX_SECONDARY_CTLS] = > - VMX_SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES | > - VMX_SECONDARY_EXEC_WBINVD_EXITING | > VMX_SECONDARY_EXEC_ENABLE_EPT | > - VMX_SECONDARY_EXEC_DESC | VMX_SECONDARY_EXEC_RDTSCP | > - VMX_SECONDARY_EXEC_ENABLE_VPID | > VMX_SECONDARY_EXEC_UNRESTRICTED_GUEST | > - VMX_SECONDARY_EXEC_RDRAND_EXITING | > VMX_SECONDARY_EXEC_ENABLE_INVPCID | > - VMX_SECONDARY_EXEC_ENABLE_VMFUNC | > VMX_SECONDARY_EXEC_SHADOW_VMCS | > - VMX_SECONDARY_EXEC_RDSEED_EXITING | > VMX_SECONDARY_EXEC_ENABLE_PML, > - .features[FEAT_VMX_VMFUNC] = MSR_VMX_VMFUNC_EPT_SWITCHING, > - .xlevel = 0x80000008, > - .model_id = "Intel Core Processor (Icelake)", > - .versions = (X86CPUVersionDefinition[]) { > - { > - .version = 1, > - .note = "deprecated" > - }, > - { > - .version = 2, > - .note = "no TSX, deprecated", > - .alias = "Icelake-Client-noTSX", > - .props = (PropValue[]) { > - { "hle", "off" }, > - { "rtm", "off" }, > - { /* end of list */ } > - }, > - }, > - { > - .version = 3, > - .note = "no TSX, XSAVES, deprecated", > - .props = (PropValue[]) { > - { "xsaves", "on" }, > - { "vmx-xsaves", "on" }, > - { /* end of list */ } > - }, > - }, > - { /* end of list */ } > - }, > - .deprecation_note = "use Icelake-Server instead" > - }, > { > .name = "Icelake-Server", > .level = 0xd, > > base-commit: 1416688c53be6535be755b44c15fb2eb9defd20f