From nobody Fri May 3 14:16:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526949833437976.7664074840728; Mon, 21 May 2018 17:43:53 -0700 (PDT) Received: from localhost ([::1]:53017 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKvP0-0003W1-KF for importer@patchew.org; Mon, 21 May 2018 20:43:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKvMr-0002NK-72 for qemu-devel@nongnu.org; Mon, 21 May 2018 20:41:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fKvMm-00079I-N3 for qemu-devel@nongnu.org; Mon, 21 May 2018 20:41:33 -0400 Received: from mail-co1nam03on0050.outbound.protection.outlook.com ([104.47.40.50]:16315 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fKvMm-00078T-F6 for qemu-devel@nongnu.org; Mon, 21 May 2018 20:41:28 -0400 Received: from linux-h3ml.amd.com (165.204.77.1) by SN1PR12MB2479.namprd12.prod.outlook.com (2603:10b6:802:29::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.776.11; Tue, 22 May 2018 00:41:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RKrnVwvkBI+E6MHFr8pryB77NX+7WwzHRiOhpGZM3AU=; b=g3d6bHIksxr0lxcTVCYz+baTP3OicMH0lqMTsKJoOlOGq3YUnkCfq0hxCpWGUA3s454wOFl7ITkbqPR898VhfNRWhvggF513aSuvf/iaQe+WL7xN/kjp9KJbXw8ukpRxNtpGh4U+USoLIWsj/ASmMDImOKoH0brGAEo5xGB6OVs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mtosatti@redhat.com Date: Mon, 21 May 2018 20:41:11 -0400 Message-Id: <1526949675-106737-2-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1526949675-106737-1-git-send-email-babu.moger@amd.com> References: <1526949675-106737-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN1PR12CA0071.namprd12.prod.outlook.com (2603:10b6:802:20::42) To SN1PR12MB2479.namprd12.prod.outlook.com (2603:10b6:802:29::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:SN1PR12MB2479; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 3:EfzGr6op1+b1Yk98Z3vxFCYZhm1YASIwjxD7jkIE00EM1C64E223dj4/+D8S2fP7gnWIO8isj/7OrcxtR4NS3/L5FTQEF+Eg9QbNqCkUnY8pDq/rcgd4MXLp9DVVhgYBuOrRb4ROcPvxKsVQdo6I04mWZq2aTi7o5pjjSFgrCmdYRWb3x0gwSUji7UsqH3T1oWlpjUVDf187rs5HkTgjZA4k5QxmxA8hGHXu5LFeJZXqVSLJUn5cDVKnu0i85qR8; 25:FLtc0PGaxJh48zrEhecggBmj6h6lsKT2k7Qp9xNTih5fK+dxXZmCSWX0bbT2z1qJ/tRycaWlJa/MO8nvTlZ9zGGHkB1DysESE0iiDi6G0NouMi0BZJIFKumXJ1NmUIYaNkmFs6KGFWnkhsRq9STnPWsnEspBA50n+IaNxP0KGpkqGhgdg4fSn7EF1wb/nKlK7NN9EQHeyZxlrzAwQqj4/7u/zlYmnskOtBupafAgdtSrg3mx7108htvVo0O6zF9AdUvJOlbTeCyYKBWiSXMrByBRVAJsKjmruly4I0slVQxp4b33vZojwNmoKyI2dymOZp44u9x/Oy8hSDDVXEA/Tw==; 31:KKsfzT/K8QxQRoDqAu9sBS+G0jOYmrV+2RZafxS2FuViDcCJ3TNPALKowEhFzHdFcatq5v/CWKQUtlxARPNRwnwqEOzBvJZnxgSjnMi/9NA1fX+27F9EUjDkJ58AI/NPId7+WnQaDNgGD0BgXAWzhDPjAqUkd84lu87ksoYxmHN/1ql42ihbu8JjITgOGr7+atzQSID0nhZTOKBZuKBjLS9PxGPdQeHDm3dWDtkLOIo= X-MS-TrafficTypeDiagnostic: SN1PR12MB2479: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 20:pu0hmRMR4UOVQjId4TfpbnxIWZ7LAj50QzO5SLaMqq4BQWCho86aQqVJ55+sY6BNoZi8r35jYqUJxrGgiXNyFsCXUMeJEkScjqrRacye0OqlSAdPsgBRAOEtRuLfwyQeXu64wMlekWe+RUekXs+QsIqDZQg/CVFDMl84axX9O31S+rjhjfawNQqw7FIIuZNQvfvIplNXUjORSCQniqbu2XwOZzj9I8WiA3tjMWHkIwsao3Ns0HLb/0ZPqQUAX1udi29t0eOXiH/uN6gGehAr8mYIjzJ+6y3BY/FgcWx29cimvjlZB+k1A8P9Tip0/skUugVEpLKt03GiKr3BoY5qv5aNWBm05uAcpUncI9iErj4UMsP+rZeCfqHgzju2bHl/yonf8caNqDYcMNiSArzLJHFO5zvfVtvuIuPcI2fCZpo0iyRkpIv8Udkw+t9xzjOcu2Sjrn3rpReBbLRAV4ZH6/HIu8AVj9FNh+8q/VwEKs/6WrisMEMPNxPwHf+9fYvb; 4:sTBo+0TDaYcjmnnl33KctGN8iG2FiXsol+umZ0LZKwdcQkgiIPk4k/OZjTAsFrhlqua2DjO4K5DMq2v4O3mr0Mk/luc9xevrNNscKr/wS521NrNsdApq6M2/x2mhJ620r7E1Fm9gp8qqVYvdW2sZHoIwqojXTGqjNCIQr78Unw0YBOHZghsdfjCaOGalFBgzb4UjnLg9IIC6Eh5hnwLG4pGMDVA279K+nK7jyR89wLL7RgJ81Rgie9X/fXH1v0vciilO/Rzn1J17D0P7RYePBpJ1QiS3YJ/vc3JNE6PrEqgDvmYWFkvNhiyHPV1cJYV+GuTXsh5tDVmUfNGHILrduw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(17755550239193); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231254)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:SN1PR12MB2479; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB2479; X-Forefront-PRVS: 0680FADD48 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(366004)(346002)(39860400002)(376002)(39380400002)(199004)(189003)(16586007)(66066001)(25786009)(6666003)(36756003)(316002)(305945005)(48376002)(2616005)(486006)(3846002)(4720700003)(68736007)(956004)(47776003)(7736002)(53936002)(44832011)(50466002)(2906002)(6116002)(446003)(476003)(11346002)(8676002)(26005)(81166006)(8936002)(106356001)(7416002)(81156014)(386003)(105586002)(86362001)(97736004)(72206003)(5660300001)(478600001)(7696005)(186003)(39060400002)(50226002)(51416003)(59450400001)(53416004)(6486002)(16526019)(52116002)(45080400002)(76176011)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB2479; H:linux-h3ml.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR12MB2479; 23:0GzM9XPMros/7GBhsRjwHzI+KoaAwnLAmBU7wn+XF?= =?us-ascii?Q?H4+r4Vf9Bgd1Qz4qN/uJ64fL4Su5RarUuIkmlYl883A438LiRYW3eMJICUEj?= =?us-ascii?Q?fewvg+8Xl4cFklx4kiMjWSi6mH2qRts6ZhANMF8HYR+kXMPBrMx5RohDqmlJ?= =?us-ascii?Q?7F0A4ptnljeAyQ5B8rY/9Ii0HoNAFkyyxtb70ET3UGCElDx6lBqbuus9IfSi?= =?us-ascii?Q?wDCscdM1c11J97xd7l0Rr9y73nDdRWxxIM3ihY63DiDVGqukfbyBQ0YCP+/t?= =?us-ascii?Q?NzLO+3eP/9N8oUQc9Kwuu53PsGG/RUZ3byfZSgu7EXwzl802aAyBZmj2jnoG?= =?us-ascii?Q?MkAZHs+HjspoGLhocGhG1992vbwynRWMmCFXKkmvJcIDOsCY1RK1dBFxsWom?= =?us-ascii?Q?/kAvESW2+a9nFkUOfPMq9woncS0dR48jMV3UPQ55Voxhb0C/bRa08KjmrQv6?= =?us-ascii?Q?WbnzpV1VOJC7LvvvqtNdWjjTUY2ATFhUwkGZ3BEtftFe3Meyk82mVJFM+n8v?= =?us-ascii?Q?uEr68b4LWnCa408TBx0hHMNGrsm+E3UyJuO4va/+VO6ZREjTtVHFL62Ayk6k?= =?us-ascii?Q?OA5z/XVSBzZXqMqaTpN2w9RsKqoczNcuDYq3iB6dV5QJWkNur2F4PpgdwRBA?= =?us-ascii?Q?JZTjf2MWmCiMuMe+iJRT8K7IcUvbRbPLOe4ddMbSkTYhDSVT1ocT/bt3TaQj?= =?us-ascii?Q?0B9T2Xo6ROYjvycQGBiiWskeMh0cuMW40Z8RoPgkcSuW9teP+92qvw36N2rl?= =?us-ascii?Q?CTeIHy9DoG2YRFcRRhUmFdFAh/lOMdKDBuwUi/uClKfjagRPHWcglT0bzpU+?= =?us-ascii?Q?fxlre7eTX5ODqR9eb0ER8OBQBnp8srXNcio+L5NZ02hNkm2ZEYEEez5e3XRZ?= =?us-ascii?Q?tXvKCVBSPW8B1QxavXjYZMrX+KubMBGGU+rLz1W3qMfF0Cem5haX818wEOcT?= =?us-ascii?Q?WXJ84adXqTuVtxXgr1+wxBweU1Ef/ejh+M+RzbvbkMwFZOT3btDNa9bxFDbC?= =?us-ascii?Q?/FXPgO/GbNu3qhrRmME9qO8ksX1dyQmb1kdSx/FQhuSG6sfAZyHFRPNnM9St?= =?us-ascii?Q?aiVGXo+iTo8TJdo/9hSy031R20CPWsSBdIxFmwTIPxK3AsZC9xEP058o1Q60?= =?us-ascii?Q?MLvUxzlSsPrhXsIqxj6ARAQLha6SQ0D9S4GQJOCWq0+gspHNfbjNAz8PV6eZ?= =?us-ascii?Q?fSynGKa3Ggub6VZJAptX1jVb+g2CiXk25WNpBVVeBqobbVuGUNEHRLUjNc2d?= =?us-ascii?Q?4037YowQTLEfXE1elArNlKkIO+O67dt8FUGc1nIXt83/likeHs+QXz0rwAqo?= =?us-ascii?Q?jWppgrKdAtylJHQ7Z5Pgcd7jrTT3Fc+KO6utLOC27/6?= X-Microsoft-Antispam-Message-Info: yKklgrVVSnrtFHGfCNtUjH4sJ/qQjWxAdFSCIm5IQStsF63aKyREDXotL5zriWm/ZmiQBgG2r5kWRjYISX3MSjna2Y445C1Ka+nD6XuVWU6VOFfO9uka7279/lcPlRUv7h09HSkVM29kEnUO4F7dif0b59BxCWJ+xDcfHg4x0jKbkBrp+KwU/o0e9O4Rl8WJ X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 6:KBxWUwLd6b/6cu+AGw5mxhqBdGWoVEq112qQLKGrJRjqb0WpDCuds6bUZd2S7QR/6FTfdcYUQzmf/LWsOK32xiYt0JR7JIdZtlvYMTb3UjY+Yik5mkIUkk+ZdvcNZMzpCoQvoRIeIDkUvbNOv93E2GnEhtJ9ZBLe6Xqvqyea8VR6UTWIu9cHLl57MYE0vSCEDR0NL1AVK2FpqoYsV31WL7kJZ2R7Ia5sIlezujn2puWcFRkaEqgIbVYcRz8FcufuQNGXqMy4K7571sd+RaZay9MDERCqzt/YsSurRLsyvkOg9aCL0L6xzdvjqnjvy5LmcwfowkVDR1nIl0V5/onNE13to69eCfCWQ2kR5H5XGSn4hTib16+l2UQZNC+a3hMIJMeWGBfVHlG0636d54tN6leW0zZDU8NxzTt3XAbXEjMgO3H4+osvoMDlrjvNkodtGxCFuL1N8Sw0A0olJhFV3Q==; 5:365R0hDdXJrhmvr4zbpmgfOLix0H9Fm7onts10Yi2e86GmdKaebq4hdOvLhMwVz5pSl9d27T8UplMaNs089TX1zqqtFp/EsIVZOPX7GJ2veVHH4eAQaHsDm0yFre/5NKDN2bOlRAotg2L8xC3WF4GeKMDIV2wA0neDnShX7AyPg=; 24:A0FbIumagbLN6D8iWyi5ommNwRUNn0nny5pLoFtzlZKPhCFkf+wP/awJb3dX1ssNfIj1oSMi/e581EaVqOKveVMRiPLRf1lDdWrM8LkwZiw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 7:EnJRI4GnVXV0CufS5Zz3LIMPHHk5UtdhkPB+svDHOregk9KUq88EDXTOZ6lh8QrDoJ7h5oGnirHFmLWWgtdbvptDgsx6J+p/cIdx6kVpZRmNC4yvycoFDRf0soS8Fsg3m4Mqy9aMmBlGkkKUbZMG96vVtDpI1r85BiQ8YKIwP8AYsBt2anhX7QLjmeivNmp1sbBUi7RStePrKTOcky+DyMG76+CiLNSsSSGTHIE9bPWSyCLjOCNDv7GbzEqwYN2r; 20:IoSJiTkWm8VxH8K0FgJ32uUZtAHU0M0hY1oL/L9LIdnecmNB0q1rtXnfKoOZvESJ0ypUD46uAiMwrKXtXinJ5ORb/8h4SEVEB9CcjmTXiNKimK98bTTSH6qqR1oFe4iHRTj5ivfGiHZbbBR4Jec7s3B2s3ZDDKPe8y0VPpPc2shbow19vItPAJmqnNT4M32dWuTV1vCAgcAPnQlhNDq125teSJZjoESEniLz1I7QlzqpGpfHjCn/tjUMiMhRmuxe X-MS-Office365-Filtering-Correlation-Id: 03a4b1d6-3243-4a12-cc72-08d5bf7cbef7 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2018 00:41:24.0272 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 03a4b1d6-3243-4a12-cc72-08d5bf7cbef7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2479 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.50 Subject: [Qemu-devel] [PATCH v10 1/5] i386: Clean up cache CPUID code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: geoff@hostfission.com, babu.moger@amd.com, kash@tripleback.net, qemu-devel@nongnu.org, kvm@vger.kernel.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Eduardo Habkost Always initialize CPUCaches structs with cache information, even if legacy_cache=3Dtrue. Use different CPUCaches struct for CPUID[2], CPUID[4], and the AMD CPUID leaves. This will simplify a lot the logic inside cpu_x86_cpuid(). Signed-off-by: Eduardo Habkost Signed-off-by: Babu Moger --- target/i386/cpu.c | 117 +++++++++++++++++++++++++++-----------------------= ---- target/i386/cpu.h | 14 ++++--- 2 files changed, 67 insertions(+), 64 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index e5e66a7..d9773b6 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1114,7 +1114,7 @@ struct X86CPUDefinition { }; =20 static CPUCaches epyc_cache_info =3D { - .l1d_cache =3D { + .l1d_cache =3D &(CPUCacheInfo) { .type =3D DCACHE, .level =3D 1, .size =3D 32 * KiB, @@ -1126,7 +1126,7 @@ static CPUCaches epyc_cache_info =3D { .self_init =3D 1, .no_invd_sharing =3D true, }, - .l1i_cache =3D { + .l1i_cache =3D &(CPUCacheInfo) { .type =3D ICACHE, .level =3D 1, .size =3D 64 * KiB, @@ -1138,7 +1138,7 @@ static CPUCaches epyc_cache_info =3D { .self_init =3D 1, .no_invd_sharing =3D true, }, - .l2_cache =3D { + .l2_cache =3D &(CPUCacheInfo) { .type =3D UNIFIED_CACHE, .level =3D 2, .size =3D 512 * KiB, @@ -1148,7 +1148,7 @@ static CPUCaches epyc_cache_info =3D { .sets =3D 1024, .lines_per_tag =3D 1, }, - .l3_cache =3D { + .l3_cache =3D &(CPUCacheInfo) { .type =3D UNIFIED_CACHE, .level =3D 3, .size =3D 8 * MiB, @@ -3342,9 +3342,8 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefin= ition *def, Error **errp) env->features[w] =3D def->features[w]; } =20 - /* Store Cache information from the X86CPUDefinition if available */ - env->cache_info =3D def->cache_info; - cpu->legacy_cache =3D def->cache_info ? 0 : 1; + /* legacy-cache defaults to 'off' if CPU model provides cache info */ + cpu->legacy_cache =3D !def->cache_info; =20 /* Special cases not set in the X86CPUDefinition structs: */ /* TODO: in-kernel irqchip for hvf */ @@ -3695,21 +3694,11 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index= , uint32_t count, if (!cpu->enable_l3_cache) { *ecx =3D 0; } else { - if (env->cache_info && !cpu->legacy_cache) { - *ecx =3D cpuid2_cache_descriptor(&env->cache_info->l3_cach= e); - } else { - *ecx =3D cpuid2_cache_descriptor(&legacy_l3_cache); - } - } - if (env->cache_info && !cpu->legacy_cache) { - *edx =3D (cpuid2_cache_descriptor(&env->cache_info->l1d_cache)= << 16) | - (cpuid2_cache_descriptor(&env->cache_info->l1i_cache) <= < 8) | - (cpuid2_cache_descriptor(&env->cache_info->l2_cache)); - } else { - *edx =3D (cpuid2_cache_descriptor(&legacy_l1d_cache) << 16) | - (cpuid2_cache_descriptor(&legacy_l1i_cache) << 8) | - (cpuid2_cache_descriptor(&legacy_l2_cache_cpuid2)); + *ecx =3D cpuid2_cache_descriptor(env->cache_info_cpuid2.l3_cac= he); } + *edx =3D (cpuid2_cache_descriptor(env->cache_info_cpuid2.l1d_cache= ) << 16) | + (cpuid2_cache_descriptor(env->cache_info_cpuid2.l1i_cache) = << 8) | + (cpuid2_cache_descriptor(env->cache_info_cpuid2.l2_cache)); break; case 4: /* cache info: needed for Core compatibility */ @@ -3722,35 +3711,27 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index= , uint32_t count, } } else { *eax =3D 0; - CPUCacheInfo *l1d, *l1i, *l2, *l3; - if (env->cache_info && !cpu->legacy_cache) { - l1d =3D &env->cache_info->l1d_cache; - l1i =3D &env->cache_info->l1i_cache; - l2 =3D &env->cache_info->l2_cache; - l3 =3D &env->cache_info->l3_cache; - } else { - l1d =3D &legacy_l1d_cache; - l1i =3D &legacy_l1i_cache; - l2 =3D &legacy_l2_cache; - l3 =3D &legacy_l3_cache; - } switch (count) { case 0: /* L1 dcache info */ - encode_cache_cpuid4(l1d, 1, cs->nr_cores, + encode_cache_cpuid4(env->cache_info_cpuid4.l1d_cache, + 1, cs->nr_cores, eax, ebx, ecx, edx); break; case 1: /* L1 icache info */ - encode_cache_cpuid4(l1i, 1, cs->nr_cores, + encode_cache_cpuid4(env->cache_info_cpuid4.l1i_cache, + 1, cs->nr_cores, eax, ebx, ecx, edx); break; case 2: /* L2 cache info */ - encode_cache_cpuid4(l2, cs->nr_threads, cs->nr_cores, + encode_cache_cpuid4(env->cache_info_cpuid4.l2_cache, + cs->nr_threads, cs->nr_cores, eax, ebx, ecx, edx); break; case 3: /* L3 cache info */ pkg_offset =3D apicid_pkg_offset(cs->nr_cores, cs->nr_thre= ads); if (cpu->enable_l3_cache) { - encode_cache_cpuid4(l3, (1 << pkg_offset), cs->nr_core= s, + encode_cache_cpuid4(env->cache_info_cpuid4.l3_cache, + (1 << pkg_offset), cs->nr_cores, eax, ebx, ecx, edx); break; } @@ -3963,13 +3944,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, (L1_ITLB_2M_ASSOC << 8) | (L1_ITLB_2M_ENTRIES); *ebx =3D (L1_DTLB_4K_ASSOC << 24) | (L1_DTLB_4K_ENTRIES << 16) | \ (L1_ITLB_4K_ASSOC << 8) | (L1_ITLB_4K_ENTRIES); - if (env->cache_info && !cpu->legacy_cache) { - *ecx =3D encode_cache_cpuid80000005(&env->cache_info->l1d_cach= e); - *edx =3D encode_cache_cpuid80000005(&env->cache_info->l1i_cach= e); - } else { - *ecx =3D encode_cache_cpuid80000005(&legacy_l1d_cache_amd); - *edx =3D encode_cache_cpuid80000005(&legacy_l1i_cache_amd); - } + *ecx =3D encode_cache_cpuid80000005(env->cache_info_amd.l1d_cache); + *edx =3D encode_cache_cpuid80000005(env->cache_info_amd.l1i_cache); break; case 0x80000006: /* cache info (L2 cache) */ @@ -3985,17 +3961,10 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index= , uint32_t count, (L2_DTLB_4K_ENTRIES << 16) | \ (AMD_ENC_ASSOC(L2_ITLB_4K_ASSOC) << 12) | \ (L2_ITLB_4K_ENTRIES); - if (env->cache_info && !cpu->legacy_cache) { - encode_cache_cpuid80000006(&env->cache_info->l2_cache, - cpu->enable_l3_cache ? - &env->cache_info->l3_cache : NULL, - ecx, edx); - } else { - encode_cache_cpuid80000006(&legacy_l2_cache_amd, - cpu->enable_l3_cache ? - &legacy_l3_cache : NULL, - ecx, edx); - } + encode_cache_cpuid80000006(env->cache_info_amd.l2_cache, + cpu->enable_l3_cache ? + env->cache_info_amd.l3_cache : NULL, + ecx, edx); break; case 0x80000007: *eax =3D 0; @@ -4692,6 +4661,37 @@ static void x86_cpu_realizefn(DeviceState *dev, Erro= r **errp) cpu->phys_bits =3D 32; } } + + /* Cache information initialization */ + if (!cpu->legacy_cache) { + if (!xcc->cpu_def || !xcc->cpu_def->cache_info) { + char *name =3D x86_cpu_class_get_model_name(xcc); + error_setg(errp, + "CPU model '%s' doesn't support legacy-cache=3Doff"= , name); + g_free(name); + return; + } + env->cache_info_cpuid2 =3D env->cache_info_cpuid4 =3D env->cache_i= nfo_amd =3D + *xcc->cpu_def->cache_info; + } else { + /* Build legacy cache information */ + env->cache_info_cpuid2.l1d_cache =3D &legacy_l1d_cache; + env->cache_info_cpuid2.l1i_cache =3D &legacy_l1i_cache; + env->cache_info_cpuid2.l2_cache =3D &legacy_l2_cache_cpuid2; + env->cache_info_cpuid2.l3_cache =3D &legacy_l3_cache; + + env->cache_info_cpuid4.l1d_cache =3D &legacy_l1d_cache; + env->cache_info_cpuid4.l1i_cache =3D &legacy_l1i_cache; + env->cache_info_cpuid4.l2_cache =3D &legacy_l2_cache; + env->cache_info_cpuid4.l3_cache =3D &legacy_l3_cache; + + env->cache_info_amd.l1d_cache =3D &legacy_l1d_cache_amd; + env->cache_info_amd.l1i_cache =3D &legacy_l1i_cache_amd; + env->cache_info_amd.l2_cache =3D &legacy_l2_cache_amd; + env->cache_info_amd.l3_cache =3D &legacy_l3_cache; + } + + cpu_exec_realizefn(cs, &local_err); if (local_err !=3D NULL) { error_propagate(errp, local_err); @@ -5175,11 +5175,10 @@ static Property x86_cpu_properties[] =3D { DEFINE_PROP_BOOL("vmware-cpuid-freq", X86CPU, vmware_cpuid_freq, true), DEFINE_PROP_BOOL("tcg-cpuid", X86CPU, expose_tcg, true), /* - * lecacy_cache defaults to CPU model being chosen. This is set in - * x86_cpu_load_def based on cache_info which is initialized in - * builtin_x86_defs + * lecacy_cache defaults to true unless the CPU model provides its + * own cache information (see x86_cpu_load_def()). */ - DEFINE_PROP_BOOL("legacy-cache", X86CPU, legacy_cache, false), + DEFINE_PROP_BOOL("legacy-cache", X86CPU, legacy_cache, true), =20 /* * From "Requirements for Implementing the Microsoft diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 8bc54d7..5098a12 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1098,10 +1098,10 @@ typedef struct CPUCacheInfo { =20 =20 typedef struct CPUCaches { - CPUCacheInfo l1d_cache; - CPUCacheInfo l1i_cache; - CPUCacheInfo l2_cache; - CPUCacheInfo l3_cache; + CPUCacheInfo *l1d_cache; + CPUCacheInfo *l1i_cache; + CPUCacheInfo *l2_cache; + CPUCacheInfo *l3_cache; } CPUCaches; =20 typedef struct CPUX86State { @@ -1292,7 +1292,11 @@ typedef struct CPUX86State { /* Features that were explicitly enabled/disabled */ FeatureWordArray user_features; uint32_t cpuid_model[12]; - CPUCaches *cache_info; + /* Cache information for CPUID. When legacy-cache=3Don, the cache data + * on each CPUID leaf will be different, because we keep compatibility + * with old QEMU versions. + */ + CPUCaches cache_info_cpuid2, cache_info_cpuid4, cache_info_amd; =20 /* MTRRs */ uint64_t mtrr_fixed[11]; --=20 1.8.3.1 From nobody Fri May 3 14:16:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526949975137335.9586910042864; Mon, 21 May 2018 17:46:15 -0700 (PDT) Received: from localhost ([::1]:53033 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKvRO-0005Rl-8g for importer@patchew.org; Mon, 21 May 2018 20:46:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKvMr-0002NO-7i for qemu-devel@nongnu.org; Mon, 21 May 2018 20:41:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fKvMn-00079Z-6s for qemu-devel@nongnu.org; Mon, 21 May 2018 20:41:33 -0400 Received: from mail-co1nam03on0050.outbound.protection.outlook.com ([104.47.40.50]:16315 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fKvMm-00078T-Ui for qemu-devel@nongnu.org; Mon, 21 May 2018 20:41:29 -0400 Received: from linux-h3ml.amd.com (165.204.77.1) by SN1PR12MB2479.namprd12.prod.outlook.com (2603:10b6:802:29::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.776.11; Tue, 22 May 2018 00:41:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ytmnL1GxcRFT0Uf9aNyQ539CGs50H8hSS2TKZouQsf0=; b=BKMxmQfYg2gqPwCkAdGEzQU9ktHhLcdCGCQ+DGE63Wo4ezNeuuyFw4dOo2ciPdg/b+5jM9jmGqC08AxV7Yo/8DGugWYjHfdSjWWo9o+aUHGGj/ZMnTPA8Tmn1RbaveR3XtXci6GzwmjrqG6Py0KUAq8btdM40cdwkvhSfw08Iwk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mtosatti@redhat.com Date: Mon, 21 May 2018 20:41:12 -0400 Message-ID: <1526949675-106737-3-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1526949675-106737-1-git-send-email-babu.moger@amd.com> References: <1526949675-106737-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN1PR12CA0071.namprd12.prod.outlook.com (2603:10b6:802:20::42) To SN1PR12MB2479.namprd12.prod.outlook.com (2603:10b6:802:29::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:SN1PR12MB2479; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 3:xxY9Ju8FwkXWA47WIuBDLepBO9QfWdXHpl/bDSs9BDgtCF6EpWx1LxJEHHtywCsEkc96hVIFiPWZAYjGpzlHe0OBgn/ui17HREs+/xYUJrTr7k+PSSTPD0WeY2FjETmAmQ5S4UL78RCF0r2EBZ7NcHWyQQkQuXtWJTXEO2pe3yhc7yNzNJlIIb4RAyZLHOg3r+0Isdskzlbe81MestFs3iPD4gJ8t4bdAkwPUZmox1ugrWP8M6Rub5oByPxqjMTz; 25:SYDgco7EaHlN/ShbBauO8noHxcriXRDPTrsd8vctYyAibVgGGJKdapnl2DQ/5NrzeqkkcI4E0aJ5AE2RzC6NaD4KOsYTdKdIYoQxIuuKUTVUfFeRs0GQFyYhlFZX6/hKlq7XvANzCPyovrdrnDeLu9NBgO4f4ukC3fVG2S7viXH+RRyCDBsPlSMVTDo3MGtHIzcxw+BIkU5/tX411VZpYTc3ssw7qESkLKOS4NyCAUesgZk4h8FksG0Fm5HyaDwiutUHin3z4yZA7zDxrLbHsMAwm39czyAjfvGzSE75Mc42zAGSEQrnuHKtGy+/N2yOWWzsIVjPLCDLqsI+eObt4Q==; 31:5LZ5ZEE4tcKVeRrkN3kN5jrCHZn7OMnf4vKVkbmEKdQZIxROM0G0Miu96nJZMCW9n6cyOCt1hLtjkzba4Ltg6hX6TGu5ty6UEEwEp2d7UP6FF76WD0mdVXSngC0TQ22Z6E01vU18GsWGqStk+79TuJp9rZIEdOInV88u9vJCGm2I1g2Et+s4mil7zsBOD/g5D7HBcQwSrmDhbK7LCGwrjwJKi+WwDjtpuRG+pHxUmd0= X-MS-TrafficTypeDiagnostic: SN1PR12MB2479: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 20:5qAmC4Rftuno3kfbFKCv1OumurJxUqtmsj2UQXpMQ2ZnGbgyFU1fKF7K8evBurHJmfXw2CsH9lJ0oX8BAjNhqnusa5LaHuCjW7w7Ct62p0hidFgMNTx65yaQAXtNTf2hB8LldiRGYQBmK/3VjJgTFSKGJxUvu23zSJId55DSSAc87kw74VQWkx+GQZc+oD7gLgAQV2YeoMXEZgJcvGOWsekOzFKCAsN8G1yfl4okZCuMneu+iwdjiYTjw4AYhsKMcDgSm4s2QM4YtLaQlqwQ3+yQc14OZj+WAToCmO8UZYh5/WqVJBooU3qNnuxI2cu++2Ks3iEhjZQCx73O4takxtdO+e2Pi7F30opJ9CxgBU9H/+TxH5Pm12ZK8Cg0SOjiMkYGzN7LsFyO9NspMu1Dmp+2BCxdTgIegbTAezJWbnbWH+UMjzj4TYWq69t8qnm1KdrfZj48A6AK1L+SP/k/sSFLTnxTFZixmxHUdP3OHGY98dcS/K/SbuNNgYdJLNkq; 4:7u8pvgwo+AM4prwtkWF3PMPn805XSKOxRTciD56M21A6dt2bHRAQVoBtRTJwwmnJZPRMKu7ArB51UQWVvdf95I9ejiMXNb8nIBK2Jv6V/VyrJYAhqQXQSKelOkDjG0xYv4DIZfN5v0qif+KNS8shDxxh6o0dknKiJwNWnBKLLa72OzP4Z8U2ArKWeVt5EpW/DMfrUWnrq2e3Q+eoW8amiz851TziWQqTTXbAc5uscjlOE5X7oqZVtwzqwxVpMVFo/n4q4ewXiliDRzlI38tCsZenUcfM1luDYrgg86C/sqa+Lu50bjAfktMMfUB1VyQ1 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231254)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:SN1PR12MB2479; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB2479; X-Forefront-PRVS: 0680FADD48 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(366004)(346002)(39860400002)(376002)(39380400002)(199004)(189003)(66066001)(25786009)(6666003)(36756003)(316002)(305945005)(2616005)(486006)(3846002)(4720700003)(68736007)(956004)(47776003)(7736002)(53936002)(44832011)(50466002)(2906002)(6116002)(446003)(476003)(11346002)(8676002)(26005)(81166006)(8936002)(106356001)(7416002)(81156014)(386003)(105586002)(86362001)(97736004)(72206003)(5660300001)(478600001)(7696005)(186003)(23676004)(39060400002)(50226002)(53416004)(6486002)(16526019)(52116002)(76176011)(4326008)(2870700001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB2479; H:linux-h3ml.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR12MB2479; 23:+DRvpdjKwPHHyjmihQM8kNpBZ/ioODYnbaf9V7dKV?= =?us-ascii?Q?dFKAv0HRc9Ex7YuqejD8je67oH1+nkYDPK6/93y6pqj5H2TBFzOwjsT5izM9?= =?us-ascii?Q?yRnGI8fM6557/zTs0lRjNmit/mZWfl6BkaH6IlJbmWkcDaiZqhFCgiQMtdU4?= =?us-ascii?Q?k7z/mN9Y2uR/lrRReV0U+W2zQNtK+NfoF4nPZ6ZeEGpqcyNdnnkgN3bnwXFY?= =?us-ascii?Q?lYJ73+Il7wpA3UAe+lOnloh2C49+Hd8FO8l5Reddu5oLdhQQI17l0+SWEPSz?= =?us-ascii?Q?V5e59rYkn2Jl9CQRkdn7erCV90U5GkHdY512zMCnawI6oE493ZjTrZdZDYK4?= =?us-ascii?Q?h9uUcRs/h/1XrhtYraaCZtxJxTCL70n53MRCN9wree24n4ey0Zjwre7OTSEj?= =?us-ascii?Q?8Z2mgTX+qM7AWCQeKWg2zfw3ES7yklu+xq7b9Ftng4Tv/coEtl7kRM7Jibo8?= =?us-ascii?Q?erQU5427b6btgyK4eMIyuKYRphQC5wpbTNgPGhoPVOHCo3T8VEeuOQucXYuK?= =?us-ascii?Q?yPbeEGtHwtAJ9JTf80Rpe71PckPxcYJfyxDMlZr273Qk1YZ5Tofaf6LDDuV0?= =?us-ascii?Q?nHQ5a4VhQPXM8RjsMPM8eN1D5I6iUnJTI7M1IEShqGGy+LSEvbK5RKSmPEQQ?= =?us-ascii?Q?sXMcYkuilN1j60MHa2Pmm/DQEolqIMIRuhZV+nWOeX1nehksm9k0CggzmPUM?= =?us-ascii?Q?DWmTaVkNmCa+gyI9PnJsyPGaLQC6h3jEXU2uVwpC/lMS2g0LQTXamHbu7VKw?= =?us-ascii?Q?XxnxLGHK5VgTmKayfBafvnM0eZSkHmNsLTVIpJuMJZmuHt+t1lPLwb46o0Az?= =?us-ascii?Q?AVsUa3+8qc+vdJ8bNG1oW8BvSuYL+lc6M+4MLkngWr+7iGgVbFkbHxjDM90j?= =?us-ascii?Q?g6qvOLgEEI9c681wQ+1VolNNLmRbsJYs/MoDI7tZbXQHa69W1dIE5aEUFmFe?= =?us-ascii?Q?1TL/eOpdvvoQjnXrMg9Zl6YBvHHm7alqwwRwmmERKOaGZVIJmSpMAOoT9k8h?= =?us-ascii?Q?RwZriWiU3STHSuthwLR/JMKczSvgaCKXZivWc6kWwcgVnikoSuJU+wSgDm5s?= =?us-ascii?Q?AhgTBUnfSVqQB5exrEk4sZ4GV51jgJMQq9+tcYa1QW4oS5S83OlkH0FUzR2+?= =?us-ascii?Q?9BbKnIw0phfeyYKyZVgNhimRFfJ6VFMR0cBVHXipycfbrCqPBk1Vkf4+zd/n?= =?us-ascii?Q?beiLMh5ZBY4NakOd/+hznl0lRJ+jglSu6CgKzVswdCBO1zd1SmZc1QBOtcU1?= =?us-ascii?Q?wu3cW6+tKXnQa1Fst3EQSLSXL2rXnZjk+Ariwxv?= X-Microsoft-Antispam-Message-Info: joxisqHKGu3sxnETLKOgOtP7AqSTwaa9u3gq1soC3tZykojfOTNXdW4PKjicE4LJMM2IfDcHpycrSsJ8NfzZAwn9eRl+vvVbmh/qdjb9xw16dwZl0V+YxtcfHJ4TyGeW9Ei1ESzxrvAj+yjTr3Ngy+ZcQ2J51Dz+IJLG2o8d7UwL3V9kLtDYnJ6u/xFAjRys X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 6:w+bGNh5INT3PfRTrxwlUG+T9cxABtb6MDZvMAJuqmwAod6vVuL9U5MNGJHTnIalMG3IECsD7z3fBTNv1Ptyxtc+gdHGD0nJlXXmqkKBDHxbu8YFgyHf8dq6yy44GqJRu4fpgsBAspKZsvl/sFS1//NiwIllb/7yjJEcStqQeBCSLiDyw8YJ+Cv2/Xc6NgnzofDydh3yCLPYot8ZTy8HNvMWHisRcNCdX+UDUhYAqSVvzGIxNWMxUNubNhufFYF5qboBo4v1LMVzcP0oH5stNPH0WZC6+5nfqdHVKD4aXs8iuNN4LUyob0KZPEnrbrvlqrVG7pkSYPwq3d3d45DJPLT3n7EqDs8kg8AFnuVO5JTM7Ja7MtcFSfT+6VoMmHstiL7hMA5mQzX56/geP/F3og5GOLHnvmeoKRNWTRybMIFFwbwWppumVJL2Bsx5yZL99+Pu60SQwTMR8usS2oq3YFw==; 5:HGMS+pSrCqOP44oIwRaP9aZVteR2bn65C3LSDfuM3U14ZGV2ns4Dz2Zjrrrvpsc/ppgI4Cjc+ry3XqfLLCH+eZx/1KliId1aX//3LrVobDkt1uXBGdR17e4jR8Y8XaRtjyBt7Hzqqv895HvO5x65m9alk5N0kqx7CUDILIltELg=; 24:ngkHA9O+koi8tp9h+BMyRz4Zx+Cb8IupGxKMTwlpXvAYs8VfmrQ/rcSFv34PfJhCbwG+4aVMv0jJPoqc3lJLUWGmCe9kLj8EWS3Ha1IpP2o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 7:vm9//Z34FeIDkqVADPBb7OQ1tlLUsjDEvRg0XjeGqPOURoPmEbGBsJRfGn5OT9rzpKr8p1KSYGDeCchRVGgEyT0e6JcKuZkb15cIlrz9moWJohDZPkE3cZLB2cF0u+mLnlBjGzXuI/P7Ig2iDis5w1vrgpvlPOorFu/5NlbxRbvpJZyMXxbp4A4Ym3fEdz9ngPiPARZsGiCLo8tE7F/4G25oIrpQl7iy1vLVclr5IiAhpNftG6en6qzeZQqZRz3y; 20:xMCREo81KrUsbc1CrfYX0v8Hr60g097ndhT7TtfwbCiMWCkOVaTtGihXmk24VeOmlWOM9N2GhWnSyvMuu6E+6ukSG1a7hzznZfneDjNT2GAj6su66KIid4PciFtB4Muq2brIqzWyVknUtaWL4xsxIL8h5ieMccaoaZ5GOjvPh09L8M8D1narWvrpTlHTiIKyKY7PHdn2B2eJebTIOZVP7Tzmf/3frfoben/sSyKjxr8dSnlGI2DsKiTtBM+OuJNB X-MS-Office365-Filtering-Correlation-Id: 07647035-9108-4cf4-8bd8-08d5bf7cbf97 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2018 00:41:24.6366 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 07647035-9108-4cf4-8bd8-08d5bf7cbf97 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2479 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.50 Subject: [Qemu-devel] [PATCH v10 2/5] i386: Populate AMD Processor Cache Information for cpuid 0x8000001D X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: geoff@hostfission.com, babu.moger@amd.com, kash@tripleback.net, qemu-devel@nongnu.org, kvm@vger.kernel.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add information for cpuid 0x8000001D leaf. Populate cache topology informat= ion for different cache types(Data Cache, Instruction Cache, L2 and L3) support= ed by 0x8000001D leaf. Please refer Processor Programming Reference (PPR) for = AMD Family 17h Model for more details. Signed-off-by: Babu Moger --- target/i386/cpu.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ target/i386/kvm.c | 29 +++++++++++++-- 2 files changed, 129 insertions(+), 3 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index d9773b6..1dd060a 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -336,6 +336,85 @@ static void encode_cache_cpuid80000006(CPUCacheInfo *l= 2, } } =20 +/* Definitions used for building CPUID Leaf 0x8000001D and 0x8000001E */ +/* Please refer AMD64 Architecture Programmer=E2=80=99s Manual Volume 3 */ +#define MAX_CCX 2 +#define MAX_CORES_IN_CCX 4 +#define MAX_NODES_EPYC 4 +#define MAX_CORES_IN_NODE 8 + +/* Number of logical processors sharing L3 cache */ +#define NUM_SHARING_CACHE(threads, num_sharing) ((threads > 1) ? \ + (((num_sharing - 1) * threads) + 1) : \ + (num_sharing - 1)) +/* + * L3 Cache is shared between all the cores in a core complex. + * Maximum cores that can share L3 is 4. + */ +static int num_sharing_l3_cache(int nr_cores) +{ + int i, nodes =3D 1; + + /* Check if we can fit all the cores in one CCX */ + if (nr_cores <=3D MAX_CORES_IN_CCX) { + return nr_cores; + } + /* + * Figure out the number of nodes(or dies) required to build + * this config. Max cores in a node is 8 + */ + for (i =3D nodes; i <=3D MAX_NODES_EPYC; i++) { + if (nr_cores <=3D (i * MAX_CORES_IN_NODE)) { + nodes =3D i; + break; + } + /* We support nodes 1, 2, 4 */ + if (i =3D=3D 3) { + continue; + } + } + /* Spread the cores accros all the CCXs and return max cores in a ccx = */ + return (nr_cores / (nodes * MAX_CCX)) + + ((nr_cores % (nodes * MAX_CCX)) ? 1 : 0); +} + +/* Encode cache info for CPUID[8000001D] */ +static void encode_cache_cpuid8000001d(CPUCacheInfo *cache, CPUState *cs, + uint32_t *eax, uint32_t *ebx, + uint32_t *ecx, uint32_t *edx) +{ + uint32_t num_share_l3; + assert(cache->size =3D=3D cache->line_size * cache->associativity * + cache->partitions * cache->sets); + + *eax =3D CACHE_TYPE(cache->type) | CACHE_LEVEL(cache->level) | + (cache->self_init ? CACHE_SELF_INIT_LEVEL : 0); + + /* L3 is shared among multiple cores */ + if (cache->level =3D=3D 3) { + num_share_l3 =3D num_sharing_l3_cache(cs->nr_cores); + *eax |=3D (NUM_SHARING_CACHE(cs->nr_threads, num_share_l3) << 14); + } else { + *eax |=3D ((cs->nr_threads - 1) << 14); + } + + assert(cache->line_size > 0); + assert(cache->partitions > 0); + assert(cache->associativity > 0); + /* We don't implement fully-associative caches */ + assert(cache->associativity < cache->sets); + *ebx =3D (cache->line_size - 1) | + ((cache->partitions - 1) << 12) | + ((cache->associativity - 1) << 22); + + assert(cache->sets > 0); + *ecx =3D cache->sets - 1; + + *edx =3D (cache->no_invd_sharing ? CACHE_NO_INVD_SHARING : 0) | + (cache->inclusive ? CACHE_INCLUSIVE : 0) | + (cache->complex_indexing ? CACHE_COMPLEX_IDX : 0); +} + /* * Definitions of the hardcoded cache entries we expose: * These are legacy cache values. If there is a need to change any @@ -4005,6 +4084,30 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, *edx =3D 0; } break; + case 0x8000001D: + *eax =3D 0; + switch (count) { + case 0: /* L1 dcache info */ + encode_cache_cpuid8000001d(env->cache_info_amd.l1d_cache, cs, + eax, ebx, ecx, edx); + break; + case 1: /* L1 icache info */ + encode_cache_cpuid8000001d(env->cache_info_amd.l1i_cache, cs, + eax, ebx, ecx, edx); + break; + case 2: /* L2 cache info */ + encode_cache_cpuid8000001d(env->cache_info_amd.l2_cache, cs, + eax, ebx, ecx, edx); + break; + case 3: /* L3 cache info */ + encode_cache_cpuid8000001d(env->cache_info_amd.l3_cache, cs, + eax, ebx, ecx, edx); + break; + default: /* end of info */ + *eax =3D *ebx =3D *ecx =3D *edx =3D 0; + break; + } + break; case 0xC0000000: *eax =3D env->cpuid_xlevel2; *ebx =3D 0; diff --git a/target/i386/kvm.c b/target/i386/kvm.c index d6666a4..a8bf7eb 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -979,9 +979,32 @@ int kvm_arch_init_vcpu(CPUState *cs) } c =3D &cpuid_data.entries[cpuid_i++]; =20 - c->function =3D i; - c->flags =3D 0; - cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx, &c->edx); + switch (i) { + case 0x8000001d: + /* Query for all AMD cache information leaves */ + for (j =3D 0; ; j++) { + c->function =3D i; + c->flags =3D KVM_CPUID_FLAG_SIGNIFCANT_INDEX; + c->index =3D j; + cpu_x86_cpuid(env, i, j, &c->eax, &c->ebx, &c->ecx, &c->ed= x); + + if (c->eax =3D=3D 0) { + break; + } + if (cpuid_i =3D=3D KVM_MAX_CPUID_ENTRIES) { + fprintf(stderr, "cpuid_data is full, no space for " + "cpuid(eax:0x%x,ecx:0x%x)\n", i, j); + abort(); + } + c =3D &cpuid_data.entries[cpuid_i++]; + } + break; + default: + c->function =3D i; + c->flags =3D 0; + cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx, &c->edx); + break; + } } =20 /* Call Centaur's CPUID instructions they are supported. */ --=20 1.8.3.1 From nobody Fri May 3 14:16:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526949832006650.8397197110908; Mon, 21 May 2018 17:43:52 -0700 (PDT) Received: from localhost ([::1]:53018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKvP0-0003X7-TW for importer@patchew.org; Mon, 21 May 2018 20:43:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKvMr-0002NN-7d for qemu-devel@nongnu.org; Mon, 21 May 2018 20:41:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fKvMn-00079v-Nj for qemu-devel@nongnu.org; Mon, 21 May 2018 20:41:33 -0400 Received: from mail-co1nam03on0050.outbound.protection.outlook.com ([104.47.40.50]:16315 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fKvMn-00078T-E8 for qemu-devel@nongnu.org; Mon, 21 May 2018 20:41:29 -0400 Received: from linux-h3ml.amd.com (165.204.77.1) by SN1PR12MB2479.namprd12.prod.outlook.com (2603:10b6:802:29::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.776.11; Tue, 22 May 2018 00:41:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4Gd3OTOZAkAp/S6xMGYHXCU7jGml9KTI7h1Ok6uKXfs=; b=d+4VJGg8aP4QaAqaEuSKtoB0Yi5MbkY4frSQd8xponbfm++S9+vIY4cqJKlB0Ql0OS7hCKbDXYREOJumfOj9D323GOgsF6llzum8MW9nzpnqbs3LipLyESzspX8u2WJ2WMPCafE11fxm60HHIHPmyCQ/RM3V/2xaFMQSd2NABIk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mtosatti@redhat.com Date: Mon, 21 May 2018 20:41:13 -0400 Message-Id: <1526949675-106737-4-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1526949675-106737-1-git-send-email-babu.moger@amd.com> References: <1526949675-106737-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN1PR12CA0071.namprd12.prod.outlook.com (2603:10b6:802:20::42) To SN1PR12MB2479.namprd12.prod.outlook.com (2603:10b6:802:29::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:SN1PR12MB2479; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 3:tXtxvEARDLieOBA7OnDPV13Csxn7Nmo5PdJ1dkkO/v90bN7CAG3fFb1IpUlxLOksmH3YgWGj2LMWENLMT4euqarBN5hCy2YR9V6zFkCKQniYzJg7FbQqWhvNWmiZ9IelDwxZk2+gqI6NxAk04xMz0tl9kYAfKKykUc2gyEZZkbhYJzQhQIp4yBkGK0bHhC6MHiriuT9n2Sm7f8jm1IKfq9LdLQ71Y7jy0QtbIN0MKxSKnPLX+TF2Mp0cX5ShjHq/; 25:2ZlAiIv/HP+4VIAOi7f9pRuNe6W/OIMEOvMD8ODP0gMmYmk+RZlchGuYh+XcJ1KFR58KfoDDon/RKns94wDNis34RkvlxSYuEPuhzfcp8DglIXbpS+w7GuQn5TDJH44xy6YVPNMdjw38FVE6PyFwEwQuGqFV2ZLFMWbslQAqJEfwcIX5xRDvuMeiMiYmjgdN3fj8fNnQV61jDysQs4qO0yN3Xwdxmig5wOcSmCu1B7q8H2IfnwAoZ2i4N7duJo39DX4FKFJsaQuVaV5EA9P3S5/mbF0YtM/9pAkt1qkEtyuI3qErqzZKp8e50m4Ngyxh8hXODa3g6f+5Y+mseUVA6A==; 31:Dfv0GlKAkzC0akp4otngz8RQu2XlG9g0qLt7b5iksgmt9yshcq1CvHaqTNKLsjdkFiK+A8CS4gb8gh/vIjuV9vMO5ZUJqdvne0KJI+SSd27+hUlw+/APFv208OZdGFeEEeBbrcqC0VjqAZJ33Qb9Doa8bX+hmT3nXqrEVuICurY3g8zs+bjZ7hnCuQBa3Ji33mSERr6EtzGqg3R6k6kBD4yPL+hgEmd/Amg5/f40XuI= X-MS-TrafficTypeDiagnostic: SN1PR12MB2479: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 20:6rKNgMQOTx2JODKn+o2kEQEb7zznneulfg+cqxdkxispCG3WKGPqcqah4UtrGyGgd4+gOMHLTcIlTQPo43m8j4M0OrCIUJO7eNL2v+ellW5H8tBfi9IFEb4E/cHOPiWJ6hGueKiE90OrbRmRHsN8W9CODOasYWC9tA7sXnTmqHmeM95KQJdNw4vooylhqNhBUxiHQCyoS8ll3pW90Pu+Me/eLlPUvVz1gadtHwkFpILpEx99HgruiksoqK9wVJ9f4fL79YgwgCzh/WSqFdoJ/PiBPcS0S65wmq9ftp2KqncwyUkIRQ1q1MAoyhPzjBtQpSvcX1SLJgV88kwt0CxyrP39eJvMUtpbpVFWWjR2+JNdoDP9JUpLZIIVlUTkTE0E6I1VkA760JJYm+GetE53/ZOO7LzL+M4IF0a73iMZ4b75Ox6n/5h+aw3qwnK4320WLa1AWnjg3PZpzF3ublSsNE33o09sKVOKj/cemb7u4eXHXkUZfuRqd0EvVzHV97nt; 4:lCe8RTusdVM+PEbXpEBWB1oHvdfkXHd5PO4dXF5dHe++D/lrmgDwe77Gimm1pvgeFBILR5cCr+hJkuvyPOyWRIdd4QR8/N3gzJ2hP2Huu5p9RRTaz23WzlLbhLRAvLFUaTlwHjGmWP3OMyp385Jneo0fWhopjsIrej/lPXHz2U2wgdf/KkkkgDz1yzCx6he7jHQq/ztm0+sR0GipkT8WiNYvirrPy8kez8THpJjOtVApsfvGTb95Iy8MXC5trzEwA8wMEJU9aZeytRhz5eWkyr7bFesOznM4oRDoKna9jpGMYvuNf07ye2zR8suj9bjS X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231254)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:SN1PR12MB2479; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB2479; X-Forefront-PRVS: 0680FADD48 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(366004)(346002)(39860400002)(376002)(39380400002)(199004)(189003)(16586007)(66066001)(25786009)(6666003)(36756003)(316002)(305945005)(48376002)(2616005)(486006)(3846002)(4720700003)(68736007)(956004)(47776003)(7736002)(53936002)(44832011)(50466002)(2906002)(6116002)(446003)(476003)(11346002)(8676002)(26005)(81166006)(8936002)(106356001)(7416002)(81156014)(386003)(105586002)(86362001)(97736004)(72206003)(5660300001)(478600001)(7696005)(186003)(39060400002)(50226002)(51416003)(53416004)(6486002)(16526019)(52116002)(76176011)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB2479; H:linux-h3ml.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR12MB2479; 23:DdgdnSqSmWzsi7syzddSUEGZ1nVnegyLU+7PrfNb9?= =?us-ascii?Q?Z6I10jsHEjR4tiNB0seoQ32VuLTiYkkYwJgIJyZt/gw5Y+LiffpvciQaTaMh?= =?us-ascii?Q?YEzvBEU6/ojebwz11JvBnPfV1YEl+CeZPiV6JUFvF/id/d8PclRjS7+ggU9y?= =?us-ascii?Q?6L7kVpBjm70vQgFNe1SVjNmFIc5PUOgwx6mC+Czw6mTKI+wPlIvWNlMTu/wK?= =?us-ascii?Q?sq4sswyysiQYizjr93wTeqiZaoMWcA7wwZvH6lT3xgAblpSDCMIFnOdKeNRs?= =?us-ascii?Q?t948DtEkwPaB5ssVptakj9Yo7j7RbjWeH1NdcTaSJfaFNX2B97rda7MWILYS?= =?us-ascii?Q?GShBPCvcG7gZFbdBOxKgRkbfiN7/A59Alk3sg4Q9hpcHQG7VVLchJg4U/eCI?= =?us-ascii?Q?BkG80camx2gqMRRmLsg9vXl6XnsCaShcdZ/z5R2wDukt93aX9TB1OsHqSddl?= =?us-ascii?Q?oRdJYR2ansDKZuLvpJ1dTtQbTxa3uphvtjvNy7wZgBKx9yXj0HlwcXf/ztTc?= =?us-ascii?Q?WyjcDoLUUsZv6XEHZxI+JqZbTrDH/cjY0S7JnkSQh2dhr2Gh2jEjxc5TG2M1?= =?us-ascii?Q?nehRYUa+D8c9ehXWb3xgc7UJ9MYstGcX19SvzPVgWhEcIFOiu2GcFE4C/SvM?= =?us-ascii?Q?EsjTyFsPdGTClp2wVPGf04X/K77HDlrifUMXaL8/91qK22CQ4p1jcAqd1OvT?= =?us-ascii?Q?aAFnOQuY1b3jADT+S2qEi0/Bz+T5jjmSZnSDpAML6oZkG9Qn+L7fqj+kqN2R?= =?us-ascii?Q?1qP5se/948ja2Xl63yTTuITcKUzLaqUe5YsULqg03v661LEp0uLvznSAKcgP?= =?us-ascii?Q?g4toyfBKlDiPDrmOTjCeMxJmzgtZoWuwwTMOL8DnUXNcgTi/SbbNrszZWkxk?= =?us-ascii?Q?kM7X1AKiEHBm7Dk6Ziwg88njI6WWciNjOJguq57KblCISiggr/tkou26SKfp?= =?us-ascii?Q?NKUMcaLFhFxIUkXf/Ec+f94I41fpUoUhY9mTNKdm7STgo/jGFscWUNHNy9ct?= =?us-ascii?Q?Qd+tpjMmU0QoV4NOmZ7cz2c4n0u+ra7isWMvAJyyMhfo4MzTQ55PK0wtQ4qp?= =?us-ascii?Q?RsEQ51oC+4yEC9A/uwHoOolGIsR/oc/TXOuZL3XKfiRadB0R5Pr5Z5G6x9da?= =?us-ascii?Q?b43qsQ9qMitZLPg/G9Wj0GP3dCA8zPg90KiqVcjEq5v0H9bUX7V0nx3Zl+uy?= =?us-ascii?Q?ceT/TTu7vsEVWlPHTUolkI5caBzYYlJgwc8Rp4GSwumcQYxw7gUCGeUEUY3/?= =?us-ascii?Q?SQ9+WXj9+3WOUvk4ZZQx55Zp9oKhxdRFMvx41OL?= X-Microsoft-Antispam-Message-Info: eZAHWKXO/gHKtUCYYfzrWPFwz9tyYDzW7ycdONVg17pi5bUL0pH8wYtCCHqaT7nRdx4kvWoLONjX1EYvkwbgpD1xGL9n1VhO8FUoVaQwDFf+ZOniZIRvxb9CqeUb5ze2+48ZyW5pb50Y6BLA8mYTHzwXorj+pP/9QUdp0/9fBwG2Mkd7uuFNEDe99N/KmeSj X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 6:/p4dSczfr7o7UGTvX9pFyC/xYkOAzBz3IkH20bZn+OZHx+x7tcksr4L2DYIZeOHydxUVp0gGvonA9gssL8d3eenfgAWytZbfkebm+oiKu5ELLuSmjtB3up/AzI1UdLxgL5I6gwX0xv8yn7CVwaqdn34+Guh2WGZ3keY6ERDJ/Wm6jVp1KHHHRT3lDoq7E6UAT1gwsgCfr75Usln/WBMET+Hkmm0FGsyD64Zw0ukYdsQ3Gwv0lZwJL0iBwR8QJB8fgr/suEv+3lalK3a4Dgs5l2OVMHE040Td/wIOH0osUwm71VIYZ3S67icvLcY3dSrgCH+hOCffHgM/bdCBMprI0nJIGxrFb1TFIJvcvqDbrOLQR9Bd6EUlIHkMnRAoqxGmF2/hmNZQGc3Drz/G5GzbXG/wUv0Z/6AuKbj0X05e5hG1iVchTmRcXjx4e0juu+tM7tJuOnxqpIPfiPRQ0p8MGw==; 5:oJ5GaMxlm4SQSVv6qvf8tpNzvCi1GZtZOYVjQvtBon6diFasDgrdyz+EZUsAJlH42meekMw/itxx5SQJKQUPkccXow18LHvIxOoW43O26buu4SDossFGlsLBxuHxg3WMdPhwwClf8vYunuHLxdl/YGKmDf6m+BMo/OePWnx4Dh0=; 24:GlS4xMewZg9QTw9iJ6cJt4vfkhR1VuWmGugxfDnnn+GvYg5C4Gzj9aXeajNvHJ+mcgRszJ4M/7AqTvCHUdr7eq0qoiAnSsCFeGCxvCsRxjM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 7:ltsEpl7ebxZKgBDQEXoo7N71LfnVpGzknGpv/ta5miiVbYtuL+VqfqxpnTgmikT6FcHLbwu6PCVRXqD+jVkmX/Xptt+djMkGNPglwdp614ftTDhoNn/wLHpNKxbmNLz15U4F3Sx6fveInbcxubNIc3KTyIKq/8ld1xQUy97t7co12TDKqQi8NZKaVsfsqFRq3vq3M5Ha+nVNlpB2yvPgby5oeRld7vUVcwQ7Rll4+bO+EYmYJmA1V6r8+/w0y1BH; 20:uJGLXAAOmkzrjhedI3nTm3jkGpZyboqzxW0DldWGBqMQVfO3UvWjrkyqUkWnQrLU5L47Uf3W4/+6vG7BC2jKud0uxbEwDWyxt5ajsCpq0E7n7LL49WmPeawlX+2/YOSeYtadK6TgFIaOVbfOky8kVVgDIAmfIFMgEmWL0nTYhFytQXn4bJIw+51Onaa1kiEXmPcTiOVplNNHNQ1ARGe2HcSmgPvlq2geQIRnw0Z88XUJdOl6bLf+Lc6szDoDa1A6 X-MS-Office365-Filtering-Correlation-Id: 07712dd6-f0d3-42fa-6076-08d5bf7cc00c X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2018 00:41:25.8242 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 07712dd6-f0d3-42fa-6076-08d5bf7cc00c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2479 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.50 Subject: [Qemu-devel] [PATCH v10 3/5] i386: Add support for CPUID_8000_001E for AMD X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: geoff@hostfission.com, babu.moger@amd.com, kash@tripleback.net, qemu-devel@nongnu.org, kvm@vger.kernel.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add support for cpuid leaf CPUID_8000_001E. Build the config that closely match the underlying hardware. Please refer Processor Programming Reference (PPR) for AMD Family 17h Model for more details. Signed-off-by: Babu Moger --- target/i386/cpu.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 85 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 1dd060a..d9ccaad 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -415,6 +415,86 @@ static void encode_cache_cpuid8000001d(CPUCacheInfo *c= ache, CPUState *cs, (cache->complex_indexing ? CACHE_COMPLEX_IDX : 0); } =20 +/* Data structure to hold the configuration info for a given core index */ +struct epyc_topo { + /* core complex id of the current core index */ + int ccx_id; + /* new core id for this core index in the topology */ + int core_id; + /* Node(or Die) id this core index */ + int node_id; + /* Number of nodes(or dies) in this config, 0 based */ + int num_nodes; +}; + +/* + * Build the configuration closely match the EPYC hardware + * nr_cores : Total number of cores in the config + * core_id : Core index of the current CPU + * topo : Data structure to hold all the config info for this core ind= ex + * Rules + * Max ccx in a node(die) =3D 2 + * Max cores in a ccx =3D 4 + * Max nodes(dies) =3D 4 (1, 2, 4) + * Max sockets =3D 2 + * Maintain symmetry as much as possible + */ +static void epyc_build_topology(int nr_cores, int core_id, + struct epyc_topo *topo) +{ + int nodes =3D 1, cores_in_ccx; + int i; + + /* Lets see if we can fit all the cores in one ccx */ + if (nr_cores <=3D MAX_CORES_IN_CCX) { + cores_in_ccx =3D nr_cores; + goto topo; + } + /* + * Figure out the number of nodes(or dies) required to build + * this config. Max cores in a node is 8 + */ + for (i =3D nodes; i <=3D MAX_NODES_EPYC; i++) { + if (nr_cores <=3D (i * MAX_CORES_IN_NODE)) { + nodes =3D i; + break; + } + /* We support nodes 1, 2, 4 */ + if (i =3D=3D 3) { + continue; + } + } + /* Spread the cores accros all the CCXs and return max cores in a ccx = */ + cores_in_ccx =3D (nr_cores / (nodes * MAX_CCX)) + + ((nr_cores % (nodes * MAX_CCX)) ? 1 : 0); + +topo: + topo->node_id =3D core_id / (cores_in_ccx * MAX_CCX); + topo->ccx_id =3D (core_id % (cores_in_ccx * MAX_CCX)) / cores_in_ccx; + topo->core_id =3D core_id % cores_in_ccx; + /* num_nodes is 0 based, return n - 1 */ + topo->num_nodes =3D nodes - 1; +} + +/* Encode cache info for CPUID[8000001E] */ +static void encode_topo_cpuid8000001e(CPUState *cs, X86CPU *cpu, + uint32_t *eax, uint32_t *ebx, + uint32_t *ecx, uint32_t *edx) +{ + struct epyc_topo topo =3D {0}; + + *eax =3D cpu->apic_id; + epyc_build_topology(cs->nr_cores, cpu->core_id, &topo); + if (cs->nr_threads - 1) { + *ebx =3D ((cs->nr_threads - 1) << 8) | (topo.node_id << 3) | + (topo.ccx_id << 2) | topo.core_id; + } else { + *ebx =3D (topo.node_id << 4) | (topo.ccx_id << 3) | topo.core_id; + } + *ecx =3D (topo.num_nodes << 8) | (cpu->socket_id << 2) | topo.node_id; + *edx =3D 0; +} + /* * Definitions of the hardcoded cache entries we expose: * These are legacy cache values. If there is a need to change any @@ -4108,6 +4188,11 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, break; } break; + case 0x8000001E: + assert(cpu->core_id <=3D 255); + encode_topo_cpuid8000001e(cs, cpu, + eax, ebx, ecx, edx); + break; case 0xC0000000: *eax =3D env->cpuid_xlevel2; *ebx =3D 0; --=20 1.8.3.1 From nobody Fri May 3 14:16:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526949833412396.350847276085; Mon, 21 May 2018 17:43:53 -0700 (PDT) Received: from localhost ([::1]:53016 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKvP0-0003VH-Cj for importer@patchew.org; Mon, 21 May 2018 20:43:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKvMr-0002NM-7X for qemu-devel@nongnu.org; Mon, 21 May 2018 20:41:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fKvMo-0007A8-7c for qemu-devel@nongnu.org; Mon, 21 May 2018 20:41:33 -0400 Received: from mail-co1nam03on0050.outbound.protection.outlook.com ([104.47.40.50]:16315 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fKvMn-00078T-Vi for qemu-devel@nongnu.org; Mon, 21 May 2018 20:41:30 -0400 Received: from linux-h3ml.amd.com (165.204.77.1) by SN1PR12MB2479.namprd12.prod.outlook.com (2603:10b6:802:29::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.776.11; Tue, 22 May 2018 00:41:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2gTSEwXiZQon1+GG0wFBaG+W6CwsQWMHu51XtfgnqIE=; b=WA0hVk+MayPIMSDBRThFMg5H3oTjqGBSOn86s38vI06ZIGbyUJ7s8hvLvlm/TYZJXnA4uxhwda4d/e4Ai4XsdLKrLnACt0wQJLUfFoPUzW5SObg9fi/jLrcc/IgKmyuwTG0qiR/tO/97kJlA7uqFQ/oKt8RlnRJysPA/NsnH8e8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mtosatti@redhat.com Date: Mon, 21 May 2018 20:41:14 -0400 Message-Id: <1526949675-106737-5-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1526949675-106737-1-git-send-email-babu.moger@amd.com> References: <1526949675-106737-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN1PR12CA0071.namprd12.prod.outlook.com (2603:10b6:802:20::42) To SN1PR12MB2479.namprd12.prod.outlook.com (2603:10b6:802:29::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:SN1PR12MB2479; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 3:E5G9uFO8NFWv7UCvjpnecLzWuS0sSYtgj5p0zoFdoA67rU8VSE3SVwcdmpcy5aHvYVasdYXWEWp0FEkXjB8YLXmmmlAS9NqHnZgCSnHzz6nFMy7UJh2b4vRTn2VS1J2Y78At4cCAv5/PenjD8LXCm3FoAOSoOhRdrQVkoY59sF++197/Jwen3scRD5LLk6HQCLU7YsynZrGVdJTLJ582rfviFbQIPkmXVB+xZ8MRhaqxOJh6LMK/leZZU+TY4WHr; 25:Rutplw/Kr6nxBhCEaQI6N1b59SFtMLW0NZXwkzjScF8ooiA5yhwZIcNQaN6wPNYVZ3ERVZU6pHtFZL31ieZ+zfln80pAv07N5BmZYPZHA4pVcEymMM2XLjj8/gGpmEP9HH80T/WcWh5ppXLyqA5PyEqLvTkcNrGhQdsqMxPEgJAf4a8ylbBlIaHyaBBxUZMD5AytOsIfSGhAy+DidvdJqiOfAx8OEzTqYU8AMKwIISLJ+BKVbotIqwuar7iCPZ22gmZetA2Q/xWw+mYrolCv9KT032FbcZZOnwyWaGpeSMnBD9c5/0CCKW8y76jBKTh/Yu+pkJ1Gy1ZZ5DuHWVI7CA==; 31:mpmWKD+Z+OJyCoiJlmJnm0BDLA43qNZju3v37IiF3B7OXlVhAIfhL8DSMzfgafi/eX8zossvlRI5wvOtrwB1L3mfTq5a8ygT5jjS21GICUE8FfHwOVftzcX3OgVk5BjMy13Kek1v3bYRFnfESQlRGH4S3xCUnrgMqwcvVy+BMKOrm+jVTrEfeyX32UlYk+oRJKLOFIITaMsqL6VDaQBcIewm9fb2i5ccf3T4JQ29jlM= X-MS-TrafficTypeDiagnostic: SN1PR12MB2479: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 20:VuA52Fp3S3aJ4/7RJ3YdRY5RfOQKQonvM5A5bIWFQ+v1UyXhgqEmQDmoEj2RhinBJHiuEmC+mxv+EODqp/cUYw76eIJo+PrmZ0ivy/joXFrQ3WtETZdJ/f/oizXlCRYEJR9RmgV7ZCrwty6nosbv68YroBzeuhwqWyIvFuW0N5rpsj1/yNV8x53LS00q1nWnXMlDvB9/mPJtXVWkTadsRbeFEgxPk9sXaMRNC7ke62KrFKaMrBxMeKWUsu4E/Oe298t+dO3068qS0Rj0mMjHbnxSsQ8VOBUchtFUUzEIykDUMNRwafgu9Nnppd7f5fSjE64rCVeJxoCzyaRIMcmyuTO0Afbjat8Z7w3kX0EzCm1V71n7Mzvuu7Qh6g4BEBx7VBi1uUdwOoCvY+TzA/7T89C4VwSYUhIKo0BmnFfZ+XUYqbA006W8vUoDH2+PZ3b38D/7yDV0z6q/GoqW0XDH9yfhfFX9qD9sxFAEYXxoDwugoq6saxTsRKn6Du47SKwr; 4:c30HVR3FoSL5uUKZZTZCo1wjBz6n5FU4NpRGey2Bjitlk8A0DHVcaGLmirkHs+gh2xeQaeQtpj5K0EdrkKoYS3GxkiqS4GOwgN6ZtUiZSrQRg9hqJrKVT5JjWWp0buV1UP4WBrr8pU1HIbDyflQygSTXYofmCTwJz2vAljrfWRDIwy5nexbtxZYSx2bQcZ0tdhRL7pj/ZvzsyLYvsGRJ7JubcM9jELApqiH8msUUXEbRAZzug2pLbcEoDcnsdlzi0R7KvhJpiyR/axP/fLBd8cKysQGnVa4EJ07cNgxZA+ZRHmToYFhKoWMGanM0YOjL X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231254)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:SN1PR12MB2479; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB2479; X-Forefront-PRVS: 0680FADD48 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(366004)(346002)(39860400002)(376002)(39380400002)(199004)(189003)(16586007)(66066001)(25786009)(6666003)(36756003)(316002)(305945005)(48376002)(2616005)(486006)(3846002)(4720700003)(68736007)(956004)(47776003)(7736002)(53936002)(44832011)(50466002)(2906002)(6116002)(446003)(476003)(11346002)(8676002)(26005)(81166006)(8936002)(106356001)(7416002)(81156014)(386003)(105586002)(86362001)(97736004)(72206003)(5660300001)(478600001)(7696005)(186003)(39060400002)(50226002)(51416003)(59450400001)(53416004)(6486002)(16526019)(52116002)(76176011)(4326008)(575784001)(217873001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB2479; H:linux-h3ml.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR12MB2479; 23:R5XgvGwKTFXaGfB+PPlTitdG7YZNLqT/cfFikQVBW?= =?us-ascii?Q?d9qE1S+wYiKmahWeNDnl0PFYbafhsJzRAw3yfnyfKLdIQ4WD3jBN+B5IEkJy?= =?us-ascii?Q?LTo/11gIBil4xI2imab8BT3sSjN19S/QZUQ+3s8T6W5RZS49MnunBM7HOAA7?= =?us-ascii?Q?jd3UvkiaiV1SaV6A75O9sDZb3tBdnUopMJfxwg6vawMPExgMCbEw+xw4/8oj?= =?us-ascii?Q?ESYCwfYNmjwcGwY8kBa2YQ4RIJk8Cj6uAFTIjanUK4qhlhFCINxfxMT5yILV?= =?us-ascii?Q?CCx+tRLaGnS3ARXyERG1mQCKd9DlcqBq8NrZI4Q7AfxEtjaL4wQoOHIfwBYo?= =?us-ascii?Q?XsNxKZDiv4n1Uo1GvTqbKxQQP0LhA7Z0YBTDdK7sSnsLLrvkp8V7997jFNMR?= =?us-ascii?Q?k2eKTtOa7jBLkcN+hM9PFELFMrGumqqGn44MMOzwes7vMAQ2WLx3HNUce/oK?= =?us-ascii?Q?xKSMdO6uleFc95k1mV1FgX1LG1y6ADl3GytSCXonVzRnoTbAcKbAoIg99cX/?= =?us-ascii?Q?JG8pfldwp/OQrdxNoYk3sJZNcrqZWv7awKkGGpUuehckcbUpbcuPeYefcIeY?= =?us-ascii?Q?qXx4K3gEbTM7L8nA7AS3GoUqTZuP8pzX3pkTPlWNgwq2C1p/E0L7bAcFwpN9?= =?us-ascii?Q?W7jzrQMi97fY8y+VkDUrwbwjLBPIhCm3s7xbv4MiOuEHbhmyS5ErM4Bhm7Sa?= =?us-ascii?Q?a41+ScPW3DKDVgxBeRVG2VSH3fllgPpoBkJHLJceQ+H4MGrE4WaSz6uSK10k?= =?us-ascii?Q?Kcc4n+8maMMFobIOH4+NI7RYvjtc9f6w+dLeCY3T3t2sug/h36d6JcRADkOv?= =?us-ascii?Q?htpRxnM0EoztolMpeTxmoxOQthSfZuDGudzg4AAPh7nqpXzJLeFJm8VAuyUM?= =?us-ascii?Q?pQaIbsdxeOALM/Hyx+9/m2fYtGcLxdPql4hIDVDtTfDEcNmSFazeaJSR4JIX?= =?us-ascii?Q?vu/qbNNB1VPrKCqVLjhtJD7JJ8Vbo1c40pBmH41n+yyciNDTtxhcbVO9n0c5?= =?us-ascii?Q?8nxaHR3HzZB3Mh0GZEMrUm4eyMqmlWuKCRNtizHmlYh1GTIn4PfkwRTF10RQ?= =?us-ascii?Q?b+8SG1q7CcWuG24A5C94QU/AoKNusSpjQatcyYmAIXbZd5aNdkvpgJNM+NUN?= =?us-ascii?Q?yO+kYViPh9lycKnwBs2XIWh2XJLZWPiR8+WccHO3j100mtIfR9kgs4RIf5r5?= =?us-ascii?Q?Qc/U1kl/XkqjdwgdLzs7CX6kZqPojig3g1ZWF6ZJI5Hu88m0NY8MQLeK+y2H?= =?us-ascii?Q?C6WZVqms/p0pfCuLkJXSli5RtEW6RfX5SYQIvw1nPsIzeTdVhMahnRUvn+c0?= =?us-ascii?Q?VcUhaJ3gBFwh8OgpHwVaHDsCKwIhRuYDOri5jRx74nKJDoonIqWIarv9yZ7e?= =?us-ascii?Q?FUxYQ=3D=3D?= X-Microsoft-Antispam-Message-Info: nEFL2n3JdpIk2BPEx9CBM9ldqIugVOsFxj6R26R+LBRBnTuGMnIUQQZqQ3qO9GgH2WpqUtHEmRTV69g/9NHaS+WhebYi6clpndm2quYdZwnjM11ZJ/eIiddYnnsgEpGB304OoF7nEZU1Vfe74Wtf8gQi6B2pIyLEHyQelgpyyaXTTtfUhlucnpzu3tWiv9u5 X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 6:ywmMghCyy/XuRUlupCFxHafwo/PWh98/MfhZ7jLZTALuNqbUVSUQk6Y0YFwJatwkc9dvAATAB3X0N9JgQpYPL54sPRskWmc1fh8F04FzuTsU2rhkAxvbD7k3Hk/DNvbmrKqkFMLqzCzFrBg+0UhwfyGkdRzMd6GlyfX9YGBJLHrRXZMjq70Ua4m6kOfhiLQahg7tgZkuwd/FfCy7EqZ2IKJrdNR2BV4vMGO83z0igZon4w8hLH/IQii4E8vt7b6pHV41LdnGutf22/78h7SmtWUTSZ11re4GfKla/DXNxGxOwdhcB+F4yVJoUlvjoA4fuRZIKgP3VXjCwMEA5G/f5eX6QYaIAyLocfAAl/4MTtUYHFHQbAWg2A1sroFqHD3syRoUFEy1CdrK/fGmxHpv6Y0+3fzPKt1E4BMwKxdxqYqzu/o6S2c2k/eXdrBT8azFWd/nXOl/Swfqr3S+lxk+mQ==; 5:zDUSTpfayMDpCW1zzJ37lehetpetO9+8jiA4a02sTEgkY76AM5fqKAJEkfxl3Q5nOO6eSH/vKJaQRLPgusEM7v1vt6P10SRoHRFPoVbLxZ8sh1mniU3epfZWTZsTLz4n3eQypdPzB9g6eXTngKC+332884Yu1gXge/FcOUA1/O4=; 24:IWRRpjXopdGxV0aSX6AqL/G3h5AfoIOYV5r2RFvn7hpc5Ym3vyD8RR+k/9QxghokqiprZNxN1RQ2R3J8WRsGppSU8RrrVZTIfUTpAk6uVzg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 7:QcY4wre5YBcSJg7dQV8EcSF5LI4fXPfntxcpBJ9P1WTz7l/6fiiVODXIONJ92XzfWpeIbRgrLXcKTygt8obLe4iXIVnCXN7nzsZ+abYKyPvblgtj4/KA8vD7aUeJMStcu30syWjNNcEyekTWlCxB/tLPmA06srpn9eFQEeA1orlRELh9MwzO5G6+L05gACC6Cot4rHj25Qdzco+MGDZ4eRbtnQ17AEW7Ma/IgQUf444oMxrdHyVQdxBR0W/KlUYT; 20:XUUzkk6wydGl8ySVd4m+8OOJ2zxvYOFGqavtdKwGYhVknrWB2QLDb8wGhWEh56bwH3AblS8hwj8gL2MUo1R1SjHMomB/Zv/ipi8EKeW3cXaJkdEYlm5c//ykiljCy3CiubHOZTA5WlJM6RBIXc0DHNaWHfuG2jBAlMqrfDclh5e5n+3tp4UTQqgYHOACoqmi+jGj96DGUYJO5x2Gc106g3nCuvOScYD4itRZriT55IOf701cRg4ZHag1yizTj9cY X-MS-Office365-Filtering-Correlation-Id: 0b90e968-85e9-43eb-4918-08d5bf7cc075 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2018 00:41:26.5273 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b90e968-85e9-43eb-4918-08d5bf7cc075 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2479 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.50 Subject: [Qemu-devel] [PATCH v10 4/5] i386: Enable TOPOEXT feature on AMD EPYC CPU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: geoff@hostfission.com, babu.moger@amd.com, kash@tripleback.net, qemu-devel@nongnu.org, kvm@vger.kernel.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Enable TOPOEXT feature on EPYC CPU. This is required to support hyperthreading on VM guests. Also extend xlevel to 0x8000001E. Disable TOPOEXT feature for legacy machines and also disable TOPOEXT feature if the config cannot be supported. Signed-off-by: Babu Moger --- include/hw/i386/pc.h | 4 ++++ target/i386/cpu.c | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index a0c269f..9c8db3d 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -302,6 +302,10 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_= t *); .driver =3D TYPE_X86_CPU,\ .property =3D "legacy-cache",\ .value =3D "on",\ + },{\ + .driver =3D "EPYC-" TYPE_X86_CPU,\ + .property =3D "topoext",\ + .value =3D "off",\ }, =20 #define PC_COMPAT_2_11 \ diff --git a/target/i386/cpu.c b/target/i386/cpu.c index d9ccaad..d20b305 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -496,6 +496,20 @@ static void encode_topo_cpuid8000001e(CPUState *cs, X8= 6CPU *cpu, } =20 /* + * Check if we can support this topology + * Fail if number of cores are beyond the supported config + * or nr_threads is more than 2 + */ +static int verify_topology(int nr_cores, int nr_threads) +{ + if ((nr_cores > (MAX_CORES_IN_NODE * MAX_NODES_EPYC)) || + (nr_threads > 2)) { + return 0; + } + return 1; +} + +/* * Definitions of the hardcoded cache entries we expose: * These are legacy cache values. If there is a need to change any * of these values please use builtin_x86_defs @@ -2541,7 +2555,8 @@ static X86CPUDefinition builtin_x86_defs[] =3D { .features[FEAT_8000_0001_ECX] =3D CPUID_EXT3_OSVW | CPUID_EXT3_3DNOWPREFETCH | CPUID_EXT3_MISALIGNSSE | CPUID_EXT3_SSE4A | CPUID_EXT3_ABM | - CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM, + CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM | + CPUID_EXT3_TOPOEXT, .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_RDSEED= | @@ -2586,7 +2601,8 @@ static X86CPUDefinition builtin_x86_defs[] =3D { .features[FEAT_8000_0001_ECX] =3D CPUID_EXT3_OSVW | CPUID_EXT3_3DNOWPREFETCH | CPUID_EXT3_MISALIGNSSE | CPUID_EXT3_SSE4A | CPUID_EXT3_ABM | - CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM, + CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM | + CPUID_EXT3_TOPOEXT, .features[FEAT_8000_0008_EBX] =3D CPUID_8000_0008_EBX_IBPB, .features[FEAT_7_0_EBX] =3D @@ -4166,6 +4182,12 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, break; case 0x8000001D: *eax =3D 0; + /* Check if we can support this topology */ + if (!verify_topology(cs->nr_cores, cs->nr_threads)) { + /* Disable topology extention */ + env->features[FEAT_8000_0001_ECX] &=3D !CPUID_EXT3_TOPOEXT; + break; + } switch (count) { case 0: /* L1 dcache info */ encode_cache_cpuid8000001d(env->cache_info_amd.l1d_cache, cs, @@ -4190,6 +4212,12 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, break; case 0x8000001E: assert(cpu->core_id <=3D 255); + /* Check if we can support this topology */ + if (!verify_topology(cs->nr_cores, cs->nr_threads)) { + /* Disable topology extention */ + env->features[FEAT_8000_0001_ECX] &=3D !CPUID_EXT3_TOPOEXT; + break; + } encode_topo_cpuid8000001e(cs, cpu, eax, ebx, ecx, edx); break; @@ -4654,6 +4682,11 @@ static void x86_cpu_expand_features(X86CPU *cpu, Err= or **errp) x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000000A); } =20 + /* TOPOEXT feature requires 0x8000001E */ + if (env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_TOPOEXT) { + x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000001E); + } + /* SEV requires CPUID[0x8000001F] */ if (sev_enabled()) { x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000001F); --=20 1.8.3.1 From nobody Fri May 3 14:16:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526949831993838.5767639536037; Mon, 21 May 2018 17:43:51 -0700 (PDT) Received: from localhost ([::1]:53015 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKvOw-0003Sz-9J for importer@patchew.org; Mon, 21 May 2018 20:43:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKvMr-0002NL-79 for qemu-devel@nongnu.org; Mon, 21 May 2018 20:41:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fKvMo-0007AL-NA for qemu-devel@nongnu.org; Mon, 21 May 2018 20:41:33 -0400 Received: from mail-co1nam03on0050.outbound.protection.outlook.com ([104.47.40.50]:16315 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fKvMo-00078T-F6 for qemu-devel@nongnu.org; Mon, 21 May 2018 20:41:30 -0400 Received: from linux-h3ml.amd.com (165.204.77.1) by SN1PR12MB2479.namprd12.prod.outlook.com (2603:10b6:802:29::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.776.11; Tue, 22 May 2018 00:41:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mZoedMjZp2bhamGsgLzHW7yfB5uXTu8avv5PJN8fxzo=; b=FCr/9kYKtnxQQiA7BDeXkCWY87Gf1dPS6BLlMBRFtnrUNGCe0jqu4NjOHQS8+kwjVw7kKIF5p2zJm0vf8uBmrzQbaEppNw/G4/ZpevhH1rzHiXkg3ouyQuOJMR/aaWb02nFF2+E39QOppM/Lz1v05QFCKhNLwBrxpa4PZETHSMY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mtosatti@redhat.com Date: Mon, 21 May 2018 20:41:15 -0400 Message-Id: <1526949675-106737-6-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1526949675-106737-1-git-send-email-babu.moger@amd.com> References: <1526949675-106737-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN1PR12CA0071.namprd12.prod.outlook.com (2603:10b6:802:20::42) To SN1PR12MB2479.namprd12.prod.outlook.com (2603:10b6:802:29::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:SN1PR12MB2479; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 3:CdHqRabzG+EK/xyKOSSoCyFtt/7V7OZxVCD7hsg5ou65SFmRRLNt5tet9ox90yUcIDmOoPcIhJAyVWYKTSB79NGbZG9dX6huNTmQZ1wFWTsk2bZPc5inU/Xj/fgLMRvtNGKKLYH0nUA0hJ33fQvWjMAxqmCAd6jdTT9Nym6bE6c2tHB9uCszHbwuYi0hHjywEGg7FEZGg1M0DzGCKU2DXH3y/vl6gVWPxmRmbn6egZDx3kR9P7xccKVoh0trsR9y; 25:Rjv+2Zdovb21AqS2jmzvglLdO3r53wMupbu7PrXbuFMAjSoFO9eGB0a5VZe1Idku2fhFT1XpsAQlXTZO22Oz3YMDJVd8uDj6t+Zv3lwNxMGlM5kpswDTk5wGDVBryAvGS21KU+QwcrSX1ywKhYjw6wCrJyN8W96HU+7p2/TkKpOsTl8BKfdJ1OdOQ0nZldhXpzUNYgXtPoceb+FUL+NPwxcagYflmQH0ODyCftY8yfbbrpRaCzRe36mJ6gwyKmyZoZZRRV0wNkaNBTiul82rh1eXMW1rtYkFA8dueiiPBu2cmkrx7VrPgtIsvnyHUI9HylHrwfwcoJfe5yN2CZhZew==; 31:bHGM7Jp0dyu3KO3ciYJop0GZxAOAZsitjtUnBkS+Z+SxeDODLDVMJe4MdxokV1158i3FBVqm/QK8do7dm3cn/ovoaVW0Fp05eQTvvco4HMT/npwfvh5XxRdftZFbkx1yikCaLtO7BNM7bH2cFATpz9/ml5V6GDAo92SxVe3PSmHzbmAMBf/YkDV9AdK5twDVh2Ib1VINDhQRBgXWlsLc69t2WLiAgx31pj6YYEZ6utk= X-MS-TrafficTypeDiagnostic: SN1PR12MB2479: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 20:3dgatQoWXR6W9bb9hcmzQ2ZLmSWc8lYp4pAYXJs2iynKRtbDl6rAUjWRRDeKv88IZlzvWy8oADQrOtC9PlDEDKHkCbYsd3I5CdKy7pLveVZFLdZJf+nxE27xL3u+sb6lnqMwtglGW/FGK0sPcKBi94PRO3G7/YbWYT4LWsl+walCYc2fNs0HePVxVZ+K4UGDbQid8/UfocGHPJo7H9+M3i/FCsdJCnfQBi1jZtTTwi0ycE8HbY49hiXjtohW0zOObRTzweCvC1lXHVX1PIol33DdsKnJqt/eAgraCxshHFWGWKiNM9emO257i+KeGxMRcqWRJutzX2LNCElyv99OkwZHN8nTtd5dwC32LEqioXK/DWwn6q9b/lBwyE0iLpPu0r5VNRxnethBU1j2AqpAaYnesNMXknjss+A7DL5zwiZ+L+FJcQzcWMcqE8SR1P5/kqwbdBT4jgYrI5YHUmEil2c1zczDtYRZ8zeKZQIPv2XUueXNzdpoyEmVXizX62lY; 4:ib/8J05NkYyTvO/Ceg8gn3kZpkK9YAZeK+u6ezWpbqKiGijp7N1PowBytsm8rWlJPXRzvcTmlbmAoqE6HEU9pQSIJtwjcDw55G6Cnl8F7zdwJ5xk5UHtnbuVR9artaNHtp9GYMvuFnH/nvGj59aGELOR3O9B+rqTfwMZebwK3145LMPZiJnb2Tl7GBMIWxKe7ECdPE8w7tr1T2zDpVwlLWIb5UwG/Du/faNrBNQ4hIAmeh5HrHqgHMOGhRhLHSsUWJQwrXkZh3v2/qcc/7VC71GRjYagVdGeLd1je3jonk2UZ1/f2e4PpQcLuwzlNZOb X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231254)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:SN1PR12MB2479; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB2479; X-Forefront-PRVS: 0680FADD48 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(366004)(346002)(39860400002)(376002)(39380400002)(199004)(189003)(16586007)(66066001)(25786009)(6666003)(36756003)(316002)(305945005)(48376002)(2616005)(486006)(3846002)(4720700003)(68736007)(956004)(47776003)(7736002)(53936002)(44832011)(50466002)(2906002)(6116002)(446003)(476003)(11346002)(8676002)(26005)(81166006)(8936002)(106356001)(7416002)(81156014)(386003)(105586002)(86362001)(97736004)(72206003)(5660300001)(478600001)(7696005)(186003)(39060400002)(50226002)(51416003)(59450400001)(53416004)(6486002)(16526019)(52116002)(76176011)(4326008)(41533002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB2479; H:linux-h3ml.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR12MB2479; 23:w8cnJVM3ItKJEO+ohCDgyDK7a6b+aQSsH2zV1fZDv?= =?us-ascii?Q?qJwWhaA3PQCSzYVc/684mUz4TMvSJcDsm9JdCiG0RLG9S/416+HktbMt4xcO?= =?us-ascii?Q?0fP3tmIGjEmK+WlXMx0LdfH/vsdzRtdsPcUfRS5bA9tbQ1CNZ38w6d2LtUE7?= =?us-ascii?Q?4xuHGDACOr+snXXH9zCR1O3TqolE8yQnXcy1tI5EOoTw7T0i1bJQt0P5aRWZ?= =?us-ascii?Q?MduVERzXo7GGvVbztHx8LOlXUOay2qOFltbSWqJsIC1w8zo+Ewv+Kwtt57jF?= =?us-ascii?Q?1g+y2q5nBThNYw2CksPaEzhqnVgDNiwGpTAyazj0owBOjZzSsqhY9JlHbXsR?= =?us-ascii?Q?aJnV1pxk+MJWAVs2FuphQ1wWXp2E8krhGnQkbXUHMfpjTFCDaCdb7zmx3ej6?= =?us-ascii?Q?ChFDQsxKcBgOiSqLdiTvt1q+vU8LAqgy+xsn7/PcKGP4l3IIfUf0iJNaNNAp?= =?us-ascii?Q?yN0U/QrZhxHF5NniGco8p1FHadDS3B3t5QvMVvlVSTx5nFN7pUe0IaZX2D+8?= =?us-ascii?Q?JsTlfMJ7E2/zRJm49CFqccNPNJuFYbmmb4FE9fUzqkrRx2SbQSAWDlb8i6bb?= =?us-ascii?Q?P9aAc7X1TQp3YPZIxgJwQutYNePFlqfPKrkzXg0Rx7a1wAnroK5BbIsQ7Z8b?= =?us-ascii?Q?i1ZATF8zA+Ty2FPj0CXka8G8P13K0U8PT4l7UutCV90+DjCvIb6GLviRwLlV?= =?us-ascii?Q?TvnJFcFRLu7qE7yEHJ3tEZwS2QLeUaBplgyHYHDezFoQFiWYHkNC2eViZCl8?= =?us-ascii?Q?ZbyI7XE0zpS4xbzFfeE1XRjrLyzwf2lmKdrEjEztDVlPWPa+q3VftcS+0CAl?= =?us-ascii?Q?ek4AD3yBxY4sIf4ytNXwd1CRcGJsGvjsJMLSKor0IRn4F+HZZ+8l38w2GG+G?= =?us-ascii?Q?dTNiJ9/mp8Eh3YH6/sU3UNmvJBZsL4iMS0Bl4cNtGfqpuBmYQyerLoKIFA+T?= =?us-ascii?Q?N8wUFES8xBaKD9IDctsVHrvgGexOcGc4g6uj30lh8qu1xT21ZRsjggmayUDo?= =?us-ascii?Q?aNKnJ5T5IW27nQQBX+HvyPm4W/wmaZiHgWw+ZRdeaQMnvr8vYeAabhWGMRBm?= =?us-ascii?Q?a/hpvajSD/ZpMkpnhDP0drWayEj+9uYWLov9O580oCbHKvpPeCm+cccRJcqf?= =?us-ascii?Q?0G7+wfUSSzO4hPJRrOx7SX1ORqR0f1DHbzQd73qxDNLRzxufULeUbq7Sx/3o?= =?us-ascii?Q?1CZ3iLyVtpRTOHfDGTbOZgyqx3RF7CloTwqhKIRhJZ7r5xWqnpSB/d2wt4pm?= =?us-ascii?Q?yd7gMh36hG/wMYXdJi1i26JBMFKFz0eBWgbGz9IG7PWKzwEprTRnIQ97Xezo?= =?us-ascii?Q?uHptB1YdTUgVc2ywfKgZDdby4EqzmfQqaagyGf2UQZU?= X-Microsoft-Antispam-Message-Info: 9YjG31d+K4WdYzI2a0vwIWMdbc7eUvh4WzrWGdZFF1AgkRk9ZKlEeQyrsYrNCmO1g+9UB5KZKJNCwVG0MTI0zHffj9vAPiJBenAJFsKvJ6DIMFjx61SWOW1Z5rs92AAFr/aPRJXjjVtLYBjvk+dZf/OyXhudR1h2CNWu/po84FqjjhGjZkZLg3HPmWUESAzu X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 6:ziyc6ZHxlmyVD85hJgJ6g1l2HRIQcWhqeDdUIf0c6yZ1+hyvIsPif+PYpwb+BT7qFQ0gtYXtafpiXN1qikhiQb+hDaVp+hAZRo0WMrb4TAh3TcU8UpOS33YDrmnrMEPHoiCQeehUU4siD5CHcNuOfGhK5fHX08aVEGXAk8L4dy4h56v20NoiUGAngM9cpopTERfWYtNEzbfrlK/T3kSM3U3OZbziAN0LvNsAF+Eka+TEzkek/jqOPMtmUWL46Vrxm0o+9oH4PGesQwNHt2fF7EFuU7VaAf5OY260Obiwj4glOpvua1Q1iw7YEuuyP0pbCcQGCamKuvwwPL8zYjhparEU1b2irn/ISsMF+x3DnlcQ0oI08PVnTR1EGjeht84WpgG8rcQicVuDdNqJNYeqYK9GfB2XO+wBhJDmDSTJPqJivnvV2SkiuS7yHVS3CwbAXxaUW7DUq0mKE/p+wwxnZA==; 5:QX6EG8huH4hfEgMwiu4rR+7EdBylTWugitYCEqQyWNQZKBgqF/t5Hwpf3qRU9ZA4UTG6ukeI3MYrHJx7C2Bp2UTE7lQoi56meO+ibCriMZC4WWV/XiOTscIkJgpzAAziK+sG0ukwVmGJagPykmsX/tkfNFNb6a6Bae5ZLX2s1Ow=; 24:GuGzRCdIFwXTaimFlD8SMwFaVBPu74tMJtFja+Lt6s5kmVa3FmVNJ1YccubkYHlg8ZuJV7+ywuLhe98xc/W9PmebyyBIsmeVhsomgxpGf9s= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2479; 7:Ks3nbdlJdPcQ/oKrNza9xTy0JbVMGKJXVSxKgjxQir4q1HpqDj4UgeQPY6EIIRmbglC12XB4ZFQUluEqCiOrBcKj2IRuZ+MPtcmz+n6gaKWQaBEHvlwhB10/9WtYmTPh3N6Fcf/6Q+NyWmUVKHVGQN2U34VAjXIYXxqfcdVecxX4damDcytb+t4+rU+hJajlDiie6mXWWneJbCbqt/PQ3DL9sQNRkxaGOSC1FHShwL5y2itZA4MqdSYJaRvb4MvF; 20:Y+x54YRzH20YjwMV0uVW6fpDLL++bQGZ4tX6jZlcuG2fIp4Vdz8M7J5r9A2gWwtMCXA+ReaaN9TKavft2BX6qsg1N0rPfEI1UarpQhmzxqJSbUmxx2WBUroi36u7FW2lceA736D89EYKNHdYwZz4gRE6YXv4NPdLvwZJntGAZp6EnnzQl3ZGivB5TnM5kXhqdjGYnFTmVa1JdWiz+NMwDyatL1y4o413KiTUfv3hrJ5V6+KdmWx+Rt+r6VNLxF/t X-MS-Office365-Filtering-Correlation-Id: 172ff495-d5d2-41c8-58e8-08d5bf7cc0e5 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2018 00:41:27.2617 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 172ff495-d5d2-41c8-58e8-08d5bf7cc0e5 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2479 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.50 Subject: [Qemu-devel] [PATCH v10 5/5] i386: Remove generic SMT thread check X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: geoff@hostfission.com, babu.moger@amd.com, kash@tripleback.net, qemu-devel@nongnu.org, kvm@vger.kernel.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove generic non-intel check while validating hyperthreading support. Certain AMD CPUs can support hyperthreading now. CPU family with TOPOEXT feature can support hyperthreading now. Signed-off-by: Babu Moger Tested-by: Geoffrey McRae Reviewed-by: Eduardo Habkost --- target/i386/cpu.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index d20b305..7eba8cc 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4961,17 +4961,20 @@ static void x86_cpu_realizefn(DeviceState *dev, Err= or **errp) =20 qemu_init_vcpu(cs); =20 - /* Only Intel CPUs support hyperthreading. Even though QEMU fixes this - * issue by adjusting CPUID_0000_0001_EBX and CPUID_8000_0008_ECX - * based on inputs (sockets,cores,threads), it is still better to gives + /* Most Intel and certain AMD CPUs support hyperthreading. Even though= QEMU + * fixes this issue by adjusting CPUID_0000_0001_EBX and CPUID_8000_00= 08_ECX + * based on inputs (sockets,cores,threads), it is still better to give * users a warning. * * NOTE: the following code has to follow qemu_init_vcpu(). Otherwise * cs->nr_threads hasn't be populated yet and the checking is incorrec= t. */ - if (!IS_INTEL_CPU(env) && cs->nr_threads > 1 && !ht_warned) { - error_report("AMD CPU doesn't support hyperthreading. Please confi= gure" - " -smp options properly."); + if (IS_AMD_CPU(env) && + !(env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_TOPOEXT) && + cs->nr_threads > 1 && !ht_warned) { + error_report("This family of AMD CPU doesn't support " + "hyperthreading(%d). Please configure -smp " + "options properly.", cs->nr_threads); ht_warned =3D true; } =20 --=20 1.8.3.1