From nobody Sat Apr 27 06:34:00 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.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=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1578464216; cv=none; d=zohomail.com; s=zohoarc; b=dJivvyxgreJumz/ggvZcQ2a7DLxBFrkO+JxSXFWfzbeCibilJgT7hiqAph+HpksfVZHa4oteGeGZB6fKfurKSrYG+1mkjBFHIsGYhf3PcMTaPC88g1xcQo866rbU3v+G+qEsnuP3KWH7AKwMGvYBWnsZTGewwr5Mh+Nhflb6GBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578464216; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cH7UNYahiM3aDTo3EuDxEV1jhyegLQKLsUjeGwJxrAg=; b=ah5cSO9c0x1lLuGjIZZAsgl7nBLc66UVnVtvZZDV3owB1bKhDCVVVTwXPmNuoh2MTQlaWRSIziChTTYNAxcPfZcpM4f+qqXOZD0ZYXdEBFLOQsT0HBpALjXEYhKteopPJYWjkbCyTfqp6Zm+wjWrKfG1AFWj5yuAYxGUN8iwTaY= ARC-Authentication-Results: i=1; mx.zohomail.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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578464216530855.8262573870394; Tue, 7 Jan 2020 22:16:56 -0800 (PST) Received: from localhost ([::1]:37914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip4eE-0005Ja-8K for importer@patchew.org; Wed, 08 Jan 2020 01:16:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49175) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip4ca-0003jR-6m for qemu-devel@nongnu.org; Wed, 08 Jan 2020 01:15:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip4cY-000691-De for qemu-devel@nongnu.org; Wed, 08 Jan 2020 01:15:11 -0500 Received: from mga17.intel.com ([192.55.52.151]:12859) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ip4cY-000620-5w for qemu-devel@nongnu.org; Wed, 08 Jan 2020 01:15:10 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jan 2020 22:15:02 -0800 Received: from tao-optiplex-7060.sh.intel.com ([10.239.159.36]) by fmsmga002.fm.intel.com with ESMTP; 07 Jan 2020 22:15:01 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,408,1571727600"; d="scan'208";a="254120965" From: Tao Xu To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Subject: [PATCH RESEND v2 1/4] target/i386: Add Denverton-v2 (no MPX) CPU model Date: Wed, 8 Jan 2020 14:14:55 +0800 Message-Id: <20200108061458.8080-2-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108061458.8080-1-tao3.xu@intel.com> References: <20200108061458.8080-1-tao3.xu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.151 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tao3.xu@intel.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Because MPX is being removed from the linux kernel, remove MPX feature from Denverton. Signed-off-by: Tao Xu --- target/i386/cpu.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 31556b7ec4..6981aa2a34 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3539,6 +3539,18 @@ static X86CPUDefinition builtin_x86_defs[] =3D { .features[FEAT_VMX_VMFUNC] =3D MSR_VMX_VMFUNC_EPT_SWITCHING, .xlevel =3D 0x80000008, .model_id =3D "Intel Atom Processor (Denverton)", + .versions =3D (X86CPUVersionDefinition[]) { + { .version =3D 1 }, + { + .version =3D 2, + .props =3D (PropValue[]) { + { "monitor", "off" }, + { "mpx", "off" }, + { /* end of list */ }, + }, + }, + { /* end of list */ }, + }, }, { .name =3D "Snowridge", --=20 2.20.1 From nobody Sat Apr 27 06:34:00 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.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=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1578464220; cv=none; d=zohomail.com; s=zohoarc; b=f3dOSsXysZ+j7+4H8oLnV4gwFEwpPpT1tIwjElAGJVrUgG50djFMlzs4jQ1cTBFdW5GZNewru1f+S1/fRL2Qya+9MhtAPD6PT4mtXlzMYWuzSDLW7sHRDmHVRBNJKl5nQl8mWooAOr8A0JO9xkYt37+wPlF3Q8VewkaAbEsxA+0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578464220; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xtHraG4RpW0AvzM9Tv20VVbxdF7QQLRxhqc6fp0s7R8=; b=jj6RGf0eP2kgDwpMfTJJIGOGDKWl4YccSB+8I47ziQtZl4Nu0A38gtN7F1ePSpiMPHh6/kXJ6JEQd69pBJj27H0mUntUQUw1tcAjKx1SZJawrz9/Q1i0IWWU0w6sFwwLZvY8okgJL2OVvNVqlu96hPZi8rJ253xFolzxPjC5hhg= ARC-Authentication-Results: i=1; mx.zohomail.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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578464220571101.70087631573324; Tue, 7 Jan 2020 22:17:00 -0800 (PST) Received: from localhost ([::1]:37918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip4eJ-0005PJ-4Y for importer@patchew.org; Wed, 08 Jan 2020 01:16:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49188) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip4ca-0003jT-6T for qemu-devel@nongnu.org; Wed, 08 Jan 2020 01:15:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip4cY-00069Q-PV for qemu-devel@nongnu.org; Wed, 08 Jan 2020 01:15:11 -0500 Received: from mga17.intel.com ([192.55.52.151]:12862) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ip4cY-00063A-HG for qemu-devel@nongnu.org; Wed, 08 Jan 2020 01:15:10 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jan 2020 22:15:03 -0800 Received: from tao-optiplex-7060.sh.intel.com ([10.239.159.36]) by fmsmga002.fm.intel.com with ESMTP; 07 Jan 2020 22:15:02 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,408,1571727600"; d="scan'208";a="254120986" From: Tao Xu To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Subject: [PATCH RESEND v2 2/4] target/i386: Remove monitor from some CPU models Date: Wed, 8 Jan 2020 14:14:56 +0800 Message-Id: <20200108061458.8080-3-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108061458.8080-1-tao3.xu@intel.com> References: <20200108061458.8080-1-tao3.xu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.151 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tao3.xu@intel.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add new version of Snowridge, Denverton, Opteron_G3, EPYC, and Dhyana CPU model to remove MONITOR/MWAIT feature. After QEMU/KVM use "-overcommit cpu-pm=3Don" to expose MONITOR/MWAIT (commit id 6f131f13e68d648a8e4f083c667ab1acd88ce4cd), the MONITOR/MWAIT feature in these CPU model is unused. Signed-off-by: Tao Xu --- target/i386/cpu.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6981aa2a34..a6eb1b81fd 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3678,6 +3678,14 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { /* end of list */ }, }, }, + { + .version =3D 3, + .props =3D (PropValue[]) { + /* mpx was already removed by -v2 above */ + { "monitor", "off" }, + { /* end of list */ }, + }, + }, { /* end of list */ }, }, }, @@ -3789,6 +3797,17 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_EXT3_ABM | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM, .xlevel =3D 0x80000008, .model_id =3D "AMD Opteron 23xx (Gen 3 Class Opteron)", + .versions =3D (X86CPUVersionDefinition[]) { + { .version =3D 1 }, + { + .version =3D 2, + .props =3D (PropValue[]) { + { "monitor", "off" }, + { /* end of list */ }, + }, + }, + { /* end of list */ }, + }, }, { .name =3D "Opteron_G4", @@ -3913,6 +3932,14 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { /* end of list */ } } }, + { + .version =3D 3, + .props =3D (PropValue[]) { + /* ibpb was already enabled by -v2 above */ + { "monitor", "off" }, + { /* end of list */ }, + }, + }, { /* end of list */ } } }, @@ -3965,6 +3992,17 @@ static X86CPUDefinition builtin_x86_defs[] =3D { .xlevel =3D 0x8000001E, .model_id =3D "Hygon Dhyana Processor", .cache_info =3D &epyc_cache_info, + .versions =3D (X86CPUVersionDefinition[]) { + { .version =3D 1 }, + { + .version =3D 2, + .props =3D (PropValue[]) { + { "monitor", "off" }, + { /* end of list */ }, + }, + }, + { /* end of list */ }, + }, }, }; =20 --=20 2.20.1 From nobody Sat Apr 27 06:34:00 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.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=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1578464218; cv=none; d=zohomail.com; s=zohoarc; b=QXK3MlGSKu7luh76S0oLUjicnc2Z5+eqHdxTpiNr/WfkRGaATqlnFb3qY3g/2AqsLfoAr/LY7zYxLIJ3IHdJEq/NtTBDbNrjHBzUIag8aoFwlpoeHJUBxle9/e+m9vIsTi2mU3k42vCGNZMU78exAdPnLE1lzxOo0GCm3XW2HOE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578464218; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/ZlZT1ziqCxzPWKY10jhurc2lxonxedqXbZM9W8ok58=; b=XZIIuowWY25YosKYlJt9KOshUei4eZa+OBIeqyOboCx5XlT5QQoxANzxJTvv3VbmCaf7tpfKYvNq8w8dbhKOWW9JomJnfB88RpoJz1s3mhfjfcliiPlnymkTeCjFX2Qfk3YWPoRA/qSRGTTHBBhNqe4oW5hYaK5bmQOksA1knSk= ARC-Authentication-Results: i=1; mx.zohomail.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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578464218847715.1294829291904; Tue, 7 Jan 2020 22:16:58 -0800 (PST) Received: from localhost ([::1]:37916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip4eH-0005Og-9E for importer@patchew.org; Wed, 08 Jan 2020 01:16:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49193) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip4ca-0003jV-7U for qemu-devel@nongnu.org; Wed, 08 Jan 2020 01:15:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip4cY-00069i-V9 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 01:15:12 -0500 Received: from mga17.intel.com ([192.55.52.151]:12859) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ip4cY-000620-Li for qemu-devel@nongnu.org; Wed, 08 Jan 2020 01:15:10 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jan 2020 22:15:04 -0800 Received: from tao-optiplex-7060.sh.intel.com ([10.239.159.36]) by fmsmga002.fm.intel.com with ESMTP; 07 Jan 2020 22:15:03 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,408,1571727600"; d="scan'208";a="254121002" From: Tao Xu To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Subject: [PATCH RESEND v2 3/4] target/i386: Add new property note to versioned CPU models Date: Wed, 8 Jan 2020 14:14:57 +0800 Message-Id: <20200108061458.8080-4-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108061458.8080-1-tao3.xu@intel.com> References: <20200108061458.8080-1-tao3.xu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.151 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tao3.xu@intel.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add additional information for -cpu help to indicate the changes in this version of CPU model. Suggested-by: Eduardo Habkost Signed-off-by: Tao Xu --- target/i386/cpu.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index a6eb1b81fd..736b4c7326 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1690,6 +1690,7 @@ typedef struct PropValue { typedef struct X86CPUVersionDefinition { X86CPUVersion version; const char *alias; + const char *note; PropValue *props; } X86CPUVersionDefinition; =20 @@ -1720,6 +1721,7 @@ struct X86CPUModel { X86CPUDefinition *cpudef; /* CPU model version */ X86CPUVersion version; + const char *note; /* * If true, this is an alias CPU model. * This matters only for "-cpu help" and query-cpu-definitions @@ -4846,6 +4848,7 @@ static void x86_cpu_list_entry(gpointer data, gpointe= r user_data) g_autofree char *name =3D x86_cpu_class_get_model_name(cc); g_autofree char *desc =3D g_strdup(cc->model_description); g_autofree char *alias_of =3D x86_cpu_class_get_alias_of(cc); + g_autofree char *model_id =3D x86_cpu_class_get_model_id(cc); =20 if (!desc && alias_of) { if (cc->model && cc->model->version =3D=3D CPU_VERSION_AUTO) { @@ -4854,11 +4857,14 @@ static void x86_cpu_list_entry(gpointer data, gpoin= ter user_data) desc =3D g_strdup_printf("(alias of %s)", alias_of); } } + if (!desc && cc->model && cc->model->note) { + desc =3D g_strdup_printf("%s [%s]", model_id, cc->model->note); + } if (!desc) { - desc =3D x86_cpu_class_get_model_id(cc); + desc =3D g_strdup_printf("%s", model_id); } =20 - qemu_printf("x86 %-20s %-48s\n", name, desc); + qemu_printf("x86 %-20s %-58s\n", name, desc); } =20 /* list available CPU models and flags */ @@ -5335,6 +5341,7 @@ static void x86_register_cpudef_types(X86CPUDefinitio= n *def) x86_cpu_versioned_model_name(def, vdef->version); m->cpudef =3D def; m->version =3D vdef->version; + m->note =3D vdef->note; x86_register_cpu_model_type(name, m); =20 if (vdef->alias) { --=20 2.20.1 From nobody Sat Apr 27 06:34:00 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.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=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1578464354; cv=none; d=zohomail.com; s=zohoarc; b=U4M9u4zE0U3r+UVmJwxqLRzE0TtC8yR4tMlxub6rNRu4zvFv5bkzn8KVC2yEUYZYpkvOebsin1vjlu4ILI6UGCAdrUzcYR+X/VCT8x75MUgMeEo0PYexRNsa9dUUKpit/24UIFEyJPE2+x8DTW94aySssJGVwyU/uIEeC4bmn0A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578464354; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RLDsa2GWQ+liPwTA4uDxPRfy62sO7VT+zTYTE1c6xTM=; b=NacNS7dIJhojkeybWZBgqKsyfmYJ1Na6ayK4/ZIBL4vlzWGLMqvyKnFJ/ywRsGsuOQzKbtKXwmwB1p7nbiePJMYqLZeJRO5VfxGR7TPrADyH1y3nyG36fUisIrnGlfO1UC5BqJvh/2ZTfX6UnBX8obQtqbrTQtYLqPaLHVauxfs= ARC-Authentication-Results: i=1; mx.zohomail.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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578464354373125.58487575512254; Tue, 7 Jan 2020 22:19:14 -0800 (PST) Received: from localhost ([::1]:37986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip4gT-0000cf-9w for importer@patchew.org; Wed, 08 Jan 2020 01:19:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49212) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip4ca-0003jX-R8 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 01:15:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip4cZ-0006A7-Ao for qemu-devel@nongnu.org; Wed, 08 Jan 2020 01:15:12 -0500 Received: from mga17.intel.com ([192.55.52.151]:12862) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ip4cZ-00063A-2J for qemu-devel@nongnu.org; Wed, 08 Jan 2020 01:15:11 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jan 2020 22:15:05 -0800 Received: from tao-optiplex-7060.sh.intel.com ([10.239.159.36]) by fmsmga002.fm.intel.com with ESMTP; 07 Jan 2020 22:15:04 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,408,1571727600"; d="scan'208";a="254121013" From: Tao Xu To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Subject: [PATCH RESEND v2 4/4] target/i386: Add notes for versioned CPU models Date: Wed, 8 Jan 2020 14:14:58 +0800 Message-Id: <20200108061458.8080-5-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108061458.8080-1-tao3.xu@intel.com> References: <20200108061458.8080-1-tao3.xu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.151 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tao3.xu@intel.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add which features are added or removed in this version. Remove the changed model-id in versioned CPU models. Signed-off-by: Tao Xu --- Changes in v2: - correct the note of Cascadelake v3 (Xiaoyao) --- target/i386/cpu.c | 50 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 736b4c7326..4daa153bfa 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -2278,10 +2278,9 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "Nehalem-IBRS", + .note =3D "IBRS", .props =3D (PropValue[]) { { "spec-ctrl", "on" }, - { "model-id", - "Intel Core i7 9xx (Nehalem Core i7, IBRS update)" }, { /* end of list */ } } }, @@ -2359,10 +2358,9 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "Westmere-IBRS", + .note =3D "IBRS", .props =3D (PropValue[]) { { "spec-ctrl", "on" }, - { "model-id", - "Westmere E56xx/L56xx/X56xx (IBRS update)" }, { /* end of list */ } } }, @@ -2445,10 +2443,9 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "SandyBridge-IBRS", + .note =3D "IBRS", .props =3D (PropValue[]) { { "spec-ctrl", "on" }, - { "model-id", - "Intel Xeon E312xx (Sandy Bridge, IBRS update)" }, { /* end of list */ } } }, @@ -2537,10 +2534,9 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "IvyBridge-IBRS", + .note =3D "IBRS", .props =3D (PropValue[]) { { "spec-ctrl", "on" }, - { "model-id", - "Intel Xeon E3-12xx v2 (Ivy Bridge, IBRS)" }, { /* end of list */ } } }, @@ -2634,17 +2630,18 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "Haswell-noTSX", + .note =3D "no TSX", .props =3D (PropValue[]) { { "hle", "off" }, { "rtm", "off" }, { "stepping", "1" }, - { "model-id", "Intel Core Processor (Haswell, no TSX)"= , }, { /* end of list */ } }, }, { .version =3D 3, .alias =3D "Haswell-IBRS", + .note =3D "IBRS", .props =3D (PropValue[]) { /* Restore TSX features removed by -v2 above */ { "hle", "on" }, @@ -2655,21 +2652,18 @@ static X86CPUDefinition builtin_x86_defs[] =3D { */ { "stepping", "4" }, { "spec-ctrl", "on" }, - { "model-id", - "Intel Core Processor (Haswell, IBRS)" }, { /* end of list */ } } }, { .version =3D 4, .alias =3D "Haswell-noTSX-IBRS", + .note =3D "no TSX, IBRS", .props =3D (PropValue[]) { { "hle", "off" }, { "rtm", "off" }, /* spec-ctrl was already enabled by -v3 above */ { "stepping", "1" }, - { "model-id", - "Intel Core Processor (Haswell, no TSX, IBRS)" }, { /* end of list */ } } }, @@ -2765,35 +2759,33 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "Broadwell-noTSX", + .note =3D "no TSX", .props =3D (PropValue[]) { { "hle", "off" }, { "rtm", "off" }, - { "model-id", "Intel Core Processor (Broadwell, no TSX= )", }, { /* end of list */ } }, }, { .version =3D 3, .alias =3D "Broadwell-IBRS", + .note =3D "IBRS", .props =3D (PropValue[]) { /* Restore TSX features removed by -v2 above */ { "hle", "on" }, { "rtm", "on" }, { "spec-ctrl", "on" }, - { "model-id", - "Intel Core Processor (Broadwell, IBRS)" }, { /* end of list */ } } }, { .version =3D 4, .alias =3D "Broadwell-noTSX-IBRS", + .note =3D "no TSX, IBRS", .props =3D (PropValue[]) { { "hle", "off" }, { "rtm", "off" }, /* spec-ctrl was already enabled by -v3 above */ - { "model-id", - "Intel Core Processor (Broadwell, no TSX, IBRS)" }, { /* end of list */ } } }, @@ -2893,17 +2885,17 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 1 }, { .version =3D 2, + .note =3D "IBRS", .alias =3D "Skylake-Client-IBRS", .props =3D (PropValue[]) { { "spec-ctrl", "on" }, - { "model-id", - "Intel Core Processor (Skylake, IBRS)" }, { /* end of list */ } } }, { .version =3D 3, .alias =3D "Skylake-Client-noTSX-IBRS", + .note =3D "no TSX, IBRS", .props =3D (PropValue[]) { { "hle", "off" }, { "rtm", "off" }, @@ -3014,19 +3006,19 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "Skylake-Server-IBRS", + .note =3D "IBRS", .props =3D (PropValue[]) { /* clflushopt was not added to Skylake-Server-IBRS */ /* TODO: add -v3 including clflushopt */ { "clflushopt", "off" }, { "spec-ctrl", "on" }, - { "model-id", - "Intel Xeon Processor (Skylake, IBRS)" }, { /* end of list */ } } }, { .version =3D 3, .alias =3D "Skylake-Server-noTSX-IBRS", + .note =3D "no TSX, IBRS", .props =3D (PropValue[]) { { "hle", "off" }, { "rtm", "off" }, @@ -3138,6 +3130,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { .versions =3D (X86CPUVersionDefinition[]) { { .version =3D 1 }, { .version =3D 2, + .note =3D "ARCH_CAPABILITIES", .props =3D (PropValue[]) { { "arch-capabilities", "on" }, { "rdctl-no", "on" }, @@ -3149,6 +3142,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { }, { .version =3D 3, .alias =3D "Cascadelake-Server-noTSX", + .note =3D "ARCH_CAPABILITIES, no TSX", .props =3D (PropValue[]) { { "hle", "off" }, { "rtm", "off" }, @@ -3321,6 +3315,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 1 }, { .version =3D 2, + .note =3D "no TSX", .alias =3D "Icelake-Client-noTSX", .props =3D (PropValue[]) { { "hle", "off" }, @@ -3438,6 +3433,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 1 }, { .version =3D 2, + .note =3D "no TSX", .alias =3D "Icelake-Server-noTSX", .props =3D (PropValue[]) { { "hle", "off" }, @@ -3545,6 +3541,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 1 }, { .version =3D 2, + .note =3D "no MPX, no MONITOR", .props =3D (PropValue[]) { { "monitor", "off" }, { "mpx", "off" }, @@ -3674,14 +3671,15 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 1 }, { .version =3D 2, + .note =3D "no MPX", .props =3D (PropValue[]) { { "mpx", "off" }, - { "model-id", "Intel Atom Processor (Snowridge, no MPX= )" }, { /* end of list */ }, }, }, { .version =3D 3, + .note =3D "no MPX, no MONITOR", .props =3D (PropValue[]) { /* mpx was already removed by -v2 above */ { "monitor", "off" }, @@ -3803,6 +3801,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 1 }, { .version =3D 2, + .note =3D "no MONITOR", .props =3D (PropValue[]) { { "monitor", "off" }, { /* end of list */ }, @@ -3927,15 +3926,15 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "EPYC-IBPB", + .note =3D "IBPB", .props =3D (PropValue[]) { { "ibpb", "on" }, - { "model-id", - "AMD EPYC Processor (with IBPB)" }, { /* end of list */ } } }, { .version =3D 3, + .note =3D "IBPB, no MONITOR", .props =3D (PropValue[]) { /* ibpb was already enabled by -v2 above */ { "monitor", "off" }, @@ -3998,6 +3997,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 1 }, { .version =3D 2, + .note =3D "no MONITOR", .props =3D (PropValue[]) { { "monitor", "off" }, { /* end of list */ }, --=20 2.20.1