From patchwork Thu May 24 15:43:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Moger, Babu" X-Patchwork-Id: 919958 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="OjXIs0uV"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40sDMt1hslz9s0q for ; Fri, 25 May 2018 01:49:28 +1000 (AEST) Received: from localhost ([::1]:39325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLsUW-0002r8-TW for incoming@patchwork.ozlabs.org; Thu, 24 May 2018 11:49:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLsPC-00070Y-GF for qemu-devel@nongnu.org; Thu, 24 May 2018 11:43:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLsP8-00024y-Jt for qemu-devel@nongnu.org; Thu, 24 May 2018 11:43:54 -0400 Received: from mail-bl2nam02on0079.outbound.protection.outlook.com ([104.47.38.79]:5536 helo=NAM02-BL2-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 1fLsP8-00024u-Do for qemu-devel@nongnu.org; Thu, 24 May 2018 11:43:50 -0400 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=YOnBjpYfUSZRhkEOawGJQ2Oxwo6ibgMf+3h7+ej8gTE=; b=OjXIs0uVNyIxv2DCaABD0RmoVrMCDSGopDagEQZnSFfzkQH00XTd5/V4+6VXoaF0OLbauGhPxgcnymf7T1GxS3v8d4U1HJHMN1zU/pT6AqbqAfixop+QdKiSMl2yWuC5kTic4ht1DpeOqATan5/istJYMqGbWtZTA+kCnEMUQbo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; Received: from linux-h3ml.amd.com (165.204.77.1) by DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Thu, 24 May 2018 15:43:46 +0000 From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mtosatti@redhat.com Date: Thu, 24 May 2018 11:43:30 -0400 Message-Id: <1527176614-26271-2-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1527176614-26271-1-git-send-email-babu.moger@amd.com> References: <1527176614-26271-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0501CA0024.namprd05.prod.outlook.com (2603:10b6:803:40::37) To DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DM5PR12MB2471; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 3:Ad04UatlG+WdQm53xRA47iMJf9gAjY669brCkHss8+3MnwBWt8G8PpDnmdekO1MQPmoeTTYbhzmLF55cnAWy85stT7g/6UC6r1loJpIgT3g5hCtIUxdiW5wHNerOQvKUp2W9Wj8DOQPNnS/7665+cIU2rF/ABWV95O/XwIWFLH6OaYqjbQ71J4+R+Sz2hZDWkNnSz+u7mpYWhjIzWY7VqXDd40uIObYdX3OqkuNZiJgprviK8RtCEQ3A2jOA0bDe; 25:7K2rWjbb9XOzNipdE926uC6/+8pHZ3KXYJ5Z5bYdrJcISFAaojzCmfK1Q+NFyeBldqMbcsVMSnY453QNRpX/xvTKtBm6lP1MUerF99WAAxua5HAbQEG6fNDayMtdsLh4TV0ikgi85gRNlaP6DH34yaW/Px/rZ74tIgPgi28MbufFUMEzTFt+ey0yFKNIyPyHmuKCOLVN4xc8CLZ5msL7k2tczx6vm/jrdXJp19kRKFnD14p5lCo7y3oHdbPQyF4u0zJJmaoUyO3JZIXREEVaD2znJDLKabbA7yY/5JarGkeWADVeRYPvWNk/VuAKPFjb54s/ftaVYQ2eWf8exPiEyA==; 31:0A6snO9XALjLJ7Z4gx1gO2hfxQv7Tz6ZZide8p+qeXxmqnl8dBCqSyPqB5x2ZCgkub8bXyCRHSwHOuVBNhPcrTQUrrPNHAmaTLD8GOvftyZ5P0eo9jTXOpQIy72kod0GwOQrcK68tek5LkkgEm+yST1f7+IG/dmgXk1x8I7U1urupA+fvp1Nc4ZFHAeR7MWGIHg5hBhy9VuQwKiB1b/1d/TS/OGP/FWU2EEB3cw0Fs0= X-MS-TrafficTypeDiagnostic: DM5PR12MB2471: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 20:vXcOcq7PluSDxLxYXX6jA2RjUgOreQ5IH65FlWRmkg2Oh/OT0MtQ8ZBU6Zk92QvZ5zGQRdDZArXEOcdTy8ezw10tO1xcxVw8IMfjE1zdr0sRfixVXLxGroJPpPDv73/WeBcUPIzkwMTYTQIaZoQQxLIDP3HiicX57FYvkI2S2CvHSSoSrA9K90+PGx3wqSfPoD3HfMN//gBQBrwP0UpDQnw5n8hMIxJebHlAypq+5xUpvA1GyoMsjcTj6ZNwnFGcaITC/sBEyrpB8DOxyGIjcdaAEzNglEqJwyAQP5Y5uT8+VsVW4zVgPz5fQBtZpNM7AKjB3HHXDEugSmVv98EthInQgAnsZk/4DniNh7NAlI1BzZIB4WJ3hGoiBHKt4+5aPOkpBVcopf3RIutTMR3DIHhHKWUAI9Hrw153m2O8i5fsG/v918LHzSReVKVyUBsiLJ8iOkJCmsKWUSlCNpLskjJB/4AoKoYh45M+BqgTVAWMu7IRJoJVA9oPU8PlKuU9; 4:HwKAha3E1N70gF6ehVWSSOM3gpUtztkAMcWDDIsLKgCBYjpfUY37BvSkao8HPK3LuzwrfpGlnpJprHhninu0xk25M0hSxlSe38r9vsZqNAwI0rkfYXfBG1tQ7UEkDggxUos9PMSMnaAsAqr3DZNpZ/za8/tnvNtcUE45HJSeZ3YR7oL7zjrhfauDVx+uSTc2eAfpq951YJdLOtfgGR3cpFVepS9hrhV9t+bL+m5aEf2oiBrfx5DZxfg9s5l2FRJBtOfc+lVkH3Q3y0uRW4kdwQXDM94YJU8h9EFmBmJjyKccSiRlth2Jxn1z2lM7m0e0xDmSNkPxaegpROltXgem1g== 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)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DM5PR12MB2471; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB2471; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(39380400002)(366004)(39860400002)(396003)(376002)(189003)(199004)(5660300001)(53416004)(6666003)(2616005)(446003)(11346002)(956004)(476003)(59450400001)(486006)(44832011)(16586007)(7416002)(4326008)(25786009)(478600001)(45080400002)(53936002)(39060400002)(26005)(47776003)(316002)(186003)(16526019)(386003)(575784001)(86362001)(7696005)(51416003)(52116002)(66066001)(68736007)(76176011)(97736004)(2906002)(50466002)(3846002)(6116002)(72206003)(4720700003)(7736002)(6486002)(305945005)(36756003)(48376002)(50226002)(8676002)(8936002)(81166006)(81156014)(105586002)(106356001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB2471; H:linux-h3ml.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR12MB2471; 23:Hb5Fef7BLi6/IWK8iyPcwYCV5eKrQg9wJE3pTjkVt?= 6MrCdEOtr8bCtRGmjqJ1sfpd/6SILd9ba2GXcro/afQ/CRd6qcjqtUEuCv23D8EN70z5YLBoZ2vpU8q88T7thyqiG9zkW6F8FtQkBdEI4GAPXPGlmgKEJbDm1Za/MfoDg3iBv45fS1CiLMoIs33kDJM9az3T4a3XCG/Gbcp+Y85YR/BSQtjzoqm93NVNLAtB2rBmnL55FfGnmlLGi/OdCfv/vJYbh/ENzzPRm8cHTaqWa3rHS3cpcdVQeJxs7wHVK5FG7BmkNTF5evHHtwNp6b7mZdggBNAbnNeZIWlHzd7K+rm8+SSx4X0hfIOKsNO5blApYNx4Krv2ns7P3eYBj3wJfHnAHxCuBSwHL+yJQHIIhJUQ0+DNt/Zq9GRtFE9ZJGBg3KHm+AfF0RWAAPSKZVt2TuzT8Ci2jSRquffxq5GM0YhYGR+7vwqlYMV0MRcYFuW0Ajd3TPpos9TaqfDa9q1HvR4alWEl1nNP+i2f6rACjrRe+9gLLSPMNItzRyhC3C9STsRtvoXHNYeSvoYJ4i1yS9aPx+MVJO0+usOFtdKVO1YhEY1l26s8jbAB3r9bFCWO6DbVgBKg0xXETbIu0wHs8Nndg7n+ELgM/eX1CO+yXKF8X4jT3E+Vl85V2qPSpapw8B1xePT1+37svZLwx6GdHD5adOdA9mYbyeh764aBnDJaZnC3+eWS1Tq/gXf931t6op/NA8FNb8bHXldw0ah21nIXBFKQMOBqDrndlaeb8I3uVIBcBFurWnV4PZblWjawwPwDq0v1gEwGVd8rOSNVMPesvxRZqskweQAUCMAiXVMJSdGxoUSaeoosHLI4IHstPFkpsruV9krNPstsd1bdbNiKTNEKMY8nfQAqsjU9xDrR6C3bnumgr9kOMH6Oy8x9RyWI77xdTMN1JU7tJYgImrpwMyl/SdxKhshPZF0G9DifGaIrKYXQfrQAAh1D1Ewl32JKe+l7an97chRT2Dem8fqYWyT9LiUl8SxYBhpfwTWfWqXmtL/h4RdFQHWD6T05ZX3zmKxHJY1odP/6ZIeqWl/jIIfld+EC7Ug54IyKEnApj9PxtGeoUridKWz8/G7W1cwO74WCserji+OLAtkobdTGBR0cdE8sWi2EKFdVmkUoLq+tZSVht/en9sXy7hwrvqYpZ1J7U5dY4gJc3zLyn7tXy2lgJ2QiuCklwcPhj1CFgMV1cCcuG0cxFAPBPAu/na1NLqReumIVKxzcCVwJ8Oz33POjx7PHRVtZtdnqFCjAUgt7sLR2SLhmcbW+rRG5xTtpa2lS8W2gJbSwt7jKCQ0NQ/M9FNchQluDTJCxQ== X-Microsoft-Antispam-Message-Info: xLIlh8bw7j7bE7Opi/w6vtiNbiLWyWisE1xG4vdT/5B4ybrlbiLd2Lp/EubQ72QSoXIHu9jpe8ZV4gxLURST9BEskgbZLytfFlt+/ya6uWL6IE+l3L+QbpTITC0uBGY4XWV3xE6Fki4oV6fr6Pi1FKi+iXLj2QK438cwpmc9haj0Bd6EYMeBhpzY1ZHjJ/5R X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 6:+azAbanafA36ZNxpWzziOZqM6C4nebL66BYXt9w7QncCYliNDd82zYNg/HE7bpBcAxeEwpbZBwMJZY6iOU83J69Hm3lXtgp4QnIir4ROtn/APXuS765/drEByyITSQxC/yFp69OipLX63uH+0QImldD4fAfCogf/Md29hCTdJral2WDpRGcVOIjWU+e2P/+Y6xdogaOGbgjrJtTphiTPHiJiWQPIefyrHv7cNS24eTjurX3Z/M3FAxlI/pwKiKs4FtWNwb5pBQfQSDZqAi7z2YYcOiOJ1MaPIYGKxMsLALR8qn0Da3YNB1+hO0vi3ZkzPTDWzUFAg/gJm/L14lOXQoRHh+qnkIWF1GxrqhRWdBrkdgGqxUEM5La6CnkDkuJygYaqBdVvh4ehtYwrknJteUnFZLHtLAGlRRcGpNIYdPcFlWOleVSFrQoMEu3UG49L/VEXfmpZi2ViR61tuViDfg==; 5:MOt+CfTJogqq5Ca+CbRGMFrolGNkVOfuL1OihvGxbQl7nLAW5IJ43TzBeMLQAsychrjidionLfRGW15nwSd5XgzNDPz/wyir/Falx//JZ+AqEqDoi8sYV2CDiI91Ut3HJoMiMqLuJc0aJqoOI4JdmhXmEytzGAg168YQIddfGDA=; 24:s9t5gQXAYR0N/imjD4RTrlshiGs3NGjKWkslbNeilmu8YlrC0g/RMUe1MQFKBoM6I7yYI5sYdYodKD/VhrUIA1ZA55dHh6H7wRTa0zKrsko= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 7:+00P2kaoOO6rV9FcUWSsEGciFvf4cs7Rw6wHKu8ssclE1yDDQhBab9YgHM+HtJPFLprBn3eQGCYxfKkVOsOCH2OHi6jSzgS1fFxrgTBuZZR1lX4KeepStsAarpL9ov0mFH0dvgfK8L9KLSsWOD7j7D46+zi9J3D+EnHmZ5rgijczr77ZG/tbFN42dgux6sx9bnCsMw0FvUnIYpDGQyjZx0aXQki/bwHjJI8dkBylB/NkmwotHkJGrhcfQA5LJU+r; 20:4lbw3GEi9GSTyTgc7320lwB6ZJpIdXUK4JFRhEIKlVdkjP1XKkmNwwe/BPct6yqRR9HMmaBYkmubwVuQk54ZZEXbPnjghi281Q9f36u6HUOhfBChaw1XMS1ChhFXDfNACz310ybPVrqQDl7MsEglucVzITGNxG+hkDwWyX6p63BqKWPXhfORX4yXU5aZGIqPWeQ1yniA8wk9J8G1Qeel2KPscrrKPN6m0+TLgVuGbjwXTf3mu+oI0X6dFtLJnCzC X-MS-Office365-Filtering-Correlation-Id: bbf2b868-db74-4ec7-5e76-08d5c18d23a3 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 15:43:46.8689 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bbf2b868-db74-4ec7-5e76-08d5c18d23a3 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2471 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.38.79 Subject: [Qemu-devel] [PATCH v11 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Eduardo Habkost Always initialize CPUCaches structs with cache information, even if legacy_cache=true. 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 d95310f..5c9bdc9 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1114,7 +1114,7 @@ struct X86CPUDefinition { }; static CPUCaches epyc_cache_info = { - .l1d_cache = { + .l1d_cache = &(CPUCacheInfo) { .type = DCACHE, .level = 1, .size = 32 * KiB, @@ -1126,7 +1126,7 @@ static CPUCaches epyc_cache_info = { .self_init = 1, .no_invd_sharing = true, }, - .l1i_cache = { + .l1i_cache = &(CPUCacheInfo) { .type = ICACHE, .level = 1, .size = 64 * KiB, @@ -1138,7 +1138,7 @@ static CPUCaches epyc_cache_info = { .self_init = 1, .no_invd_sharing = true, }, - .l2_cache = { + .l2_cache = &(CPUCacheInfo) { .type = UNIFIED_CACHE, .level = 2, .size = 512 * KiB, @@ -1148,7 +1148,7 @@ static CPUCaches epyc_cache_info = { .sets = 1024, .lines_per_tag = 1, }, - .l3_cache = { + .l3_cache = &(CPUCacheInfo) { .type = UNIFIED_CACHE, .level = 3, .size = 8 * MiB, @@ -3342,9 +3342,8 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp) env->features[w] = def->features[w]; } - /* Store Cache information from the X86CPUDefinition if available */ - env->cache_info = def->cache_info; - cpu->legacy_cache = def->cache_info ? 0 : 1; + /* legacy-cache defaults to 'off' if CPU model provides cache info */ + cpu->legacy_cache = !def->cache_info; /* 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 = 0; } else { - if (env->cache_info && !cpu->legacy_cache) { - *ecx = cpuid2_cache_descriptor(&env->cache_info->l3_cache); - } else { - *ecx = cpuid2_cache_descriptor(&legacy_l3_cache); - } - } - if (env->cache_info && !cpu->legacy_cache) { - *edx = (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 = (cpuid2_cache_descriptor(&legacy_l1d_cache) << 16) | - (cpuid2_cache_descriptor(&legacy_l1i_cache) << 8) | - (cpuid2_cache_descriptor(&legacy_l2_cache_cpuid2)); + *ecx = cpuid2_cache_descriptor(env->cache_info_cpuid2.l3_cache); } + *edx = (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 = 0; - CPUCacheInfo *l1d, *l1i, *l2, *l3; - if (env->cache_info && !cpu->legacy_cache) { - l1d = &env->cache_info->l1d_cache; - l1i = &env->cache_info->l1i_cache; - l2 = &env->cache_info->l2_cache; - l3 = &env->cache_info->l3_cache; - } else { - l1d = &legacy_l1d_cache; - l1i = &legacy_l1i_cache; - l2 = &legacy_l2_cache; - l3 = &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 = apicid_pkg_offset(cs->nr_cores, cs->nr_threads); if (cpu->enable_l3_cache) { - encode_cache_cpuid4(l3, (1 << pkg_offset), cs->nr_cores, + 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 = (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 = encode_cache_cpuid80000005(&env->cache_info->l1d_cache); - *edx = encode_cache_cpuid80000005(&env->cache_info->l1i_cache); - } else { - *ecx = encode_cache_cpuid80000005(&legacy_l1d_cache_amd); - *edx = encode_cache_cpuid80000005(&legacy_l1i_cache_amd); - } + *ecx = encode_cache_cpuid80000005(env->cache_info_amd.l1d_cache); + *edx = 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 = 0; @@ -4692,6 +4661,37 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) cpu->phys_bits = 32; } } + + /* Cache information initialization */ + if (!cpu->legacy_cache) { + if (!xcc->cpu_def || !xcc->cpu_def->cache_info) { + char *name = x86_cpu_class_get_model_name(xcc); + error_setg(errp, + "CPU model '%s' doesn't support legacy-cache=off", name); + g_free(name); + return; + } + env->cache_info_cpuid2 = env->cache_info_cpuid4 = env->cache_info_amd = + *xcc->cpu_def->cache_info; + } else { + /* Build legacy cache information */ + env->cache_info_cpuid2.l1d_cache = &legacy_l1d_cache; + env->cache_info_cpuid2.l1i_cache = &legacy_l1i_cache; + env->cache_info_cpuid2.l2_cache = &legacy_l2_cache_cpuid2; + env->cache_info_cpuid2.l3_cache = &legacy_l3_cache; + + env->cache_info_cpuid4.l1d_cache = &legacy_l1d_cache; + env->cache_info_cpuid4.l1i_cache = &legacy_l1i_cache; + env->cache_info_cpuid4.l2_cache = &legacy_l2_cache; + env->cache_info_cpuid4.l3_cache = &legacy_l3_cache; + + env->cache_info_amd.l1d_cache = &legacy_l1d_cache_amd; + env->cache_info_amd.l1i_cache = &legacy_l1i_cache_amd; + env->cache_info_amd.l2_cache = &legacy_l2_cache_amd; + env->cache_info_amd.l3_cache = &legacy_l3_cache; + } + + cpu_exec_realizefn(cs, &local_err); if (local_err != NULL) { error_propagate(errp, local_err); @@ -5175,11 +5175,10 @@ static Property x86_cpu_properties[] = { 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), /* * From "Requirements for Implementing the Microsoft diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 8ac13f6..5ddb0e6 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1100,10 +1100,10 @@ typedef struct CPUCacheInfo { 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; typedef struct CPUX86State { @@ -1295,7 +1295,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=on, 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; /* MTRRs */ uint64_t mtrr_fixed[11]; From patchwork Thu May 24 15:43:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Moger, Babu" X-Patchwork-Id: 919956 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="ycOvKFIg"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40sDK64mm2z9s0q for ; Fri, 25 May 2018 01:47:06 +1000 (AEST) Received: from localhost ([::1]:39317 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLsSG-0000Y8-6v for incoming@patchwork.ozlabs.org; Thu, 24 May 2018 11:47:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLsPD-00071Q-UO for qemu-devel@nongnu.org; Thu, 24 May 2018 11:43:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLsP9-00025h-Vy for qemu-devel@nongnu.org; Thu, 24 May 2018 11:43:56 -0400 Received: from mail-bl2nam02on0040.outbound.protection.outlook.com ([104.47.38.40]:18592 helo=NAM02-BL2-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 1fLsP9-00025U-Pv for qemu-devel@nongnu.org; Thu, 24 May 2018 11:43:51 -0400 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=D0kUTnB3toZSxHqYp3fZn71ixSvGlo2QKKAJHtFlk/c=; b=ycOvKFIgKcVpcSY88TbUHbgXYhbgXTr6zBzu42/NE8D4ajvF8vqk1v7Zx61/kEHohXwg+Nd1NeUcIBb89BiiAbHrr/XaHbgEywo+4yjs8D495R8AfBJCqIdiHGT1w7L1IdXBNvv6hl6KF56KOSD44ybbz3V9RYfIxEJg02awKGQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; Received: from linux-h3ml.amd.com (165.204.77.1) by DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Thu, 24 May 2018 15:43:48 +0000 From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mtosatti@redhat.com Date: Thu, 24 May 2018 11:43:31 -0400 Message-ID: <1527176614-26271-3-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1527176614-26271-1-git-send-email-babu.moger@amd.com> References: <1527176614-26271-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0501CA0024.namprd05.prod.outlook.com (2603:10b6:803:40::37) To DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DM5PR12MB2471; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 3:n9HUGc/ptiDLaB7Q+jqeep3DcLBXhqvuxJt/s8uhDlLabShzQyDPbCtboujQbzwDrbp/VTulh6sOyS9AGxNcA1h3o/aKI2rGMvlXzhgQ76WBiZxoqvoygo274V1xx1ARaPbHHBxYiPKb3jSiIhXa+jnsZg7BpYdXYu9I6rDBZ27Kc9xFvAeirbfmOryWZNEeo3+PhTR6hsHVOedZteCSngykntlU8RF8dH8lwIa+NfWkgkpt1Hh6MjtCWj9u7nhQ; 25:d2ZbWKXsw/IEBPVMjQNIKgfHnbFUFUQuwsXrqtJRfsmm3L2o6QLETdS0tnZYNRARGQZXgcClTsLza8lqcx+DvxjjfbquutI01ziixaFsS/bTzWyajY1EYvR8QzJTL0BGWtmKHkHfmg7jYOLJAV2bsfvGqvLSXbNij0u8BSsaUIyN/lQTbK1GXKaDjBj0T+SNSm2u2j0KCaC+ncG4B7lLxZe5lLvuLbioRnsisoOEzIlhKDMznTGubulAHRbMO86PVdC3Ys6+KbKV380efY2Dch437t9HDxWd5QXhD2bVA1z8UyetN0WgyjKWR62oH6Bivx13wxMRWWuyGvotLIwiBQ==; 31:4Bkcxqmq2Ye9JWxoLbuFP4MugC/bf+IqrzlzGzqCzqZE8iCV3/rkDgRvCmYrFKCknlASvDx9YATLZ1GFlsa2pEREU++c2RAmR/nTZOUn+1ESt0NtqGBxuXFbjeD1A0DddIIH/bqbRo4ns9n5ZK5NgjhvsZKhWvzfD23tMm7lI7H0haH8e3wbnY9KeZxcWZUZ0ZZwv+j4Hg/cbGP8Oj68Nv3EQtJxywtwsEQg6iQ2XqI= X-MS-TrafficTypeDiagnostic: DM5PR12MB2471: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 20:aBEEQoomCpK+4ecU88eH3h4YZw5OMpEF1zHZNigHqCLHEyTaJBrIqJiv4VBBZGBX4O6UHwx3sbxy3elsoFqx9sXCq8WR2XcowyRd93zFF/e5WWnXnD9WZtyOOgn7gsS/zbIVbGl0D/Ossy5elClppBE5QhjxihDgRr5DWzMGhTodh0L1PAKVu43Wjc1dIKp46SKh1Zp9OkNTie4McK7hxYJa/jGa6i7ga4/u+jJgRW9eqWmHdPMq0YacvGF8N7KJTx2VMxGAU7g+0HmInRDOPr9ph8EhY7KtDaGueKghpLC1opZqvr8dMdPE2J6k1TNCAjQ9f7s6j1OERhdw6pDOHxmYKQR+GtXJjaW7A0fl83m892AmkqOpp3jjPvhYpYG7yltHYjImMj0lVR+/NWDrsUn1bUA6QwvUJ9LkFBjE5IhfWAIifeooQXb+M47Pl0Bg6q4a8ngaNZCJ5HQFjq17H6nlEhfDOBUVfNoQY2rLTEDb3PUlYTsdWLM3Jj9jKNR3; 4:oZpgCLL6tpv4CkntlSAZeuQ+br3S690kHpeiRc+Nyx96+c9Pdahsm7GY+k5JlR6GdFLACMS007YZrh62SjC6GYox9DnaZP0nXmdtq+XzCoaU/H1JuLpKxJ+vyfLLuMEK60Ex7v1lKrd0BdDuMJeJDRpo0LpBPLo0mg3WwnX+Nw40g+C/4TBdluTVB4yysdEas2qi+btduM85fZ/ElVgTJMNagmrXAPij8IuEbrgSuKhK7Qar0wYniwHcSW2Zk1kknxpZLTzsIa/I1c1VBePOpwRTYA8qNN+4c2eKseEd946I/LJRKkV3kmtknwHmkmet 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)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DM5PR12MB2471; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB2471; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(346002)(39380400002)(366004)(39860400002)(396003)(376002)(189003)(199004)(5660300001)(53416004)(6666003)(2616005)(446003)(11346002)(956004)(476003)(486006)(44832011)(7416002)(4326008)(25786009)(478600001)(53936002)(39060400002)(26005)(47776003)(316002)(186003)(16526019)(23676004)(386003)(86362001)(7696005)(52116002)(66066001)(68736007)(76176011)(97736004)(2906002)(50466002)(3846002)(2870700001)(6116002)(72206003)(4720700003)(7736002)(6486002)(305945005)(36756003)(50226002)(8676002)(8936002)(81166006)(81156014)(105586002)(106356001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB2471; H:linux-h3ml.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR12MB2471; 23:2oSRnf4NRUTnvxHQvaJR2Cs1g/t13DUivGnS3+QgK?= pAm4axJwBCfEbho0zdG5xDBgll3WV5FVmDEfG3w/R1elhfVHaAbDmT7XR3XV7SwFHB7y9cDq8qec7bF54fNcT3vXVBAtYyAqVft9the+3W7+5skjTSJ54j9hp8HpSQPlaOpCjtfVyLrUSESzgSbctMb1L0WHmI+Y8X5/G3/tuaQv9VA2a4WmdlqGsZxXt4D5pzeN3I4xHEMvSEHzFi/wVd8Xa9XaBWljsDlWHYA1vDcYonFzkHlVmhbYRQymhd6Lyi9GpArg6tAexAYFV+773+sTNEIbOtow2OAm/sB5XYUU1K5S4bgK+Voz6wFFkykrkDJfJhC4SntuJPqVZA5ue/DZUp/qR3irsFE6xxu8Eclj4F/Y/j3AzN5jeGMAlTZg2byQxsnD8Sns+7umW3srvGKHnygNT/BQgb/KpN4In4eVQML+sK3mfUNBPUnFNsYLZ1J248UruC4U0eyR19cvmCD6IhMyrLWkUSJZHi4vGGmGngqWAT089L8jk+7s2jToglQQJ8ya5CywGTy8V13g/EH5gSNabDmeEnb1jhiVIXJkZe8GRbxyt8MeKTlbLdn+6xBwsphNdZKtK/x3UvYDqs3vFiBoKJGF+ps6de6AaKy9ONaE2EoeQtT9w4pAffys44gaUS8hM5Rp2KPlgfkFBbsBVZ5p2cbas0c9D1a/6XEY5mQA6DFI7iz1rzHOj1kX3XAPENwYoTtcFHIeHS8MKP9bt1qOTI47m5uK+kfyE+jdnM6x+Hdyaavf16O49nghdfA01iY3HuoV+SokxIoBlUKwSfySkuEe5UlUYEse+C3nS9D3n72J+FArlnBm5yYHnIuL+5W1AP42aRXbSMjH4T/oABIq6OlrWD1epe8Ce3umrqks0a23991zOlwECDQ76mAJwvVi4sDTdkVNxJZh30u4QZ5kxl0/GSUY25Sk0Ww+GjhKcUldwg7xmTauq/QEMQnxkoex0UGZaJ59efrFcqpFgGCpexZEc/hcJFDmaev1KO5strmeZstA/gzIZVnEhuugA9LEAoh5yxIALwANqUP++I2XSGgIEYDjjI8cfRrG96ZlJc7XvaUvAglmmXwC3Df45/STMozu6ZVrtnG1az1MsbtL7PbxCgM/7KSbGn4tFD3x6+h1tdrGJWM+yDrq0dsMuQhBmVEST4CocpCwEzt5oNUovfjUXqenssDH3I0TQstZf7wT0YHc3+ZW06KNKGYxX6RS5HP2w1WxcmSNl5t1nC2iPHpQxEypkmdL2LcIHGaZSDyZOjM8lFhnzJP7Z1/YjCKfrCKrRJXC3N+KMRcHufkoXck4Vsp4gcMgD4NgQ== X-Microsoft-Antispam-Message-Info: mGQlA0SNmViQaTtxoHTQWPPBsgRKVStxP2FWF2+M+e5bmghFxp/W/9OF/6VVdrluHD0njBrc/SkOwbvMGLIsujLDmvt4DAhhOm9TAwFyiq5/fa/P9asPfMx+YBax9PnmyMwwVpWL+/Tb2/OOhDr4BHkOnv6PBoF4DIowhS1KJ8jGyujR597SwmIzWAWrXS21 X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 6:SowYMSn5dvet5bzFTz4ne/1lnWUx/DZivyKQ7WwTdb+A15KJVP4y6jhy8+4MZQiAADZBI+bI84kCoxnwoab2k9yWLg0b+tZwpSYNDd5CvnFGE/zcUVOcoOpsRaubGxofMHttKw64EFr03HguJ35zSERcAc8MfPvjb77WvpAQc3pgtMcd9oISepsSmrw1J8fD78LM3yIwNQle2LsrldB4Ti2zofR7k4PA6uqtlNosG3q4LYzyVX2QrUMpu0fv1piWCaC1O7fqOfwZXhbe/kcT3/VqErRfcip1IM78RuE+92VHDhFgme20LpabfolqN0oTfUddDXG6t40smgnOTz1rAJNmC70lw5RIsIW7xSQiHOyZrbSBGITxPlm7BTZ/TxpKu9/MsdfORdsCBewkIcBYwe/OgKQjUH1+b5ICzFMKkWWyYyfMcHcMhXM6uOgREZc4VxpjiPJyEtBrGJ86b9zL3Q==; 5:4iLKlyKiS/uD2Xmd9O+irSjSaLHXe97pUB9m6rg6ihCjewG10wKNgPmuWhcnnNPWyY97n4bsJQZhwIPSXKoMMV49aftLA/tm+RgcXZpeFYMfFemqKD87wqItaAlXJM2W0w6/YKL3H2ELeK6TUOU5TRinQLu0TG2aKP/Rp/7H7nY=; 24:dJUE5zAoHE5oyV3CIbOYffu5XBcJpSQL7HowcQ8Z9a5KS4i8kYpaEHtyOXYS8jQJviTGAtndTjcSC0GJxDrFlOL5FJGieQ/PWo/SDGq6Q/s= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 7:58JX+78rLehuWl89WD6kWAgJbuoh2qTYCq3w3PvnqvNmMRue3HwZ5U/2iFWKu36GFl1aJ/NQbnXT7sWE7iNxk5Yyzqw9ZQ3qw8Zorkml6ArBCowhOwXa/Ja4RcrDYpi5KofzqWIE7tkdytMUcPcrtfPjkdtKDNoVuuRa3XcDJkIP8yHM8KQvuVau2Mo7kMzSQZ4Sr2fNTIPnbZHHKOW/yXwOK41Ph52o9LwHFQnkhXUVMv1rU1jITKv7Uc8kV9+g; 20:f4rio0mN9nV96ToixCrjk6gobbxm8xloIH/reglPUERr6xd+DUutBjO5AnSySNjzcQeP3TkPOQODOAQTVtEdv9VXty6ewXw0bB1ImrkL0P/lOE3Dfhs2bWiSeQAdiJWVm8mim5SdJGVc8p044XjIjqDnEttRREQSD3nrzDZPfsKqRSKA9aLg2q4F5p7ZH+MMjC3CfSVzDwIv33gcBgWhWM/TNpWuTHuEhDEADJYwiZLQTxNRX1YZBRvlfGw12a4C X-MS-Office365-Filtering-Correlation-Id: 88d87d23-816e-45dd-67f6-08d5c18d248f X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 15:43:48.0564 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88d87d23-816e-45dd-67f6-08d5c18d248f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2471 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.38.40 Subject: [Qemu-devel] [PATCH v11 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add information for cpuid 0x8000001D leaf. Populate cache topology information for different cache types (Data Cache, Instruction Cache, L2 and L3) supported by 0x8000001D leaf. Please refer to the Processor Programming Reference (PPR) for AMD Family 17h Model for more details. Signed-off-by: Babu Moger Reviewed-by: Eduardo Habkost --- target/i386/cpu.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ target/i386/kvm.c | 29 ++++++++++++-- 2 files changed, 143 insertions(+), 3 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 5c9bdc9..0d423e5 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -337,6 +337,99 @@ static void encode_cache_cpuid80000006(CPUCacheInfo *l2, } /* + * Definitions used for building CPUID Leaf 0x8000001D and 0x8000001E + * Please refer to the AMD64 Architecture Programmer’s Manual Volume 3. + * Define the constants to build the cpu topology. Right now, TOPOEXT + * feature is enabled only on EPYC. So, these constants are based on + * EPYC supported configurations. We may need to handle the cases if + * these values change in future. + */ +/* Maximum core complexes in a node */ +#define MAX_CCX 2 +/* Maximum cores in a core complex */ +#define MAX_CORES_IN_CCX 4 +/* Maximum cores in a node */ +#define MAX_CORES_IN_NODE 8 +/* Maximum nodes in a socket */ +#define MAX_NODES_PER_SOCKET 4 + +/* + * Figure out the number of nodes required to build this config. + * Max cores in a node is 8 + */ +static int nodes_in_socket(int nr_cores) +{ + int nodes; + + nodes = DIV_ROUND_UP(nr_cores, MAX_CORES_IN_NODE); + + /* Hardware does not support config with 3 nodes, return 4 in that case */ + return (nodes == 3) ? 4 : nodes; +} + +/* + * Decide the number of cores in a core complex with the given nr_cores using + * following set constants MAX_CCX, MAX_CORES_IN_CCX, MAX_CORES_IN_NODE and + * MAX_NODES_PER_SOCKET. Maintain symmetry as much as possible + * L3 cache is shared across all cores in a core complex. So, this will also + * tell us how many cores are sharing the L3 cache. + */ +static int cores_in_core_complex(int nr_cores) +{ + int nodes; + + /* Check if we can fit all the cores in one core complex */ + if (nr_cores <= MAX_CORES_IN_CCX) { + return nr_cores; + } + /* Get the number of nodes required to build this config */ + nodes = nodes_in_socket(nr_cores); + + /* + * Divide the cores accros all the core complexes + * Return rounded up value + */ + return DIV_ROUND_UP(nr_cores, nodes * MAX_CCX); +} + +/* 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 l3_cores; + assert(cache->size == cache->line_size * cache->associativity * + cache->partitions * cache->sets); + + *eax = 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 == 3) { + l3_cores = cores_in_core_complex(cs->nr_cores); + *eax |= ((l3_cores * cs->nr_threads) - 1) << 14; + } else { + *eax |= ((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 = (cache->line_size - 1) | + ((cache->partitions - 1) << 12) | + ((cache->associativity - 1) << 22); + + assert(cache->sets > 0); + *ecx = cache->sets - 1; + + *edx = (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 * of these values please use builtin_x86_defs @@ -4005,6 +4098,30 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *edx = 0; } break; + case 0x8000001D: + *eax = 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 = *ebx = *ecx = *edx = 0; + break; + } + break; case 0xC0000000: *eax = env->cpuid_xlevel2; *ebx = 0; diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 0c656a9..871d1ef 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -980,9 +980,32 @@ int kvm_arch_init_vcpu(CPUState *cs) } c = &cpuid_data.entries[cpuid_i++]; - c->function = i; - c->flags = 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 = 0; ; j++) { + c->function = i; + c->flags = KVM_CPUID_FLAG_SIGNIFCANT_INDEX; + c->index = j; + cpu_x86_cpuid(env, i, j, &c->eax, &c->ebx, &c->ecx, &c->edx); + + if (c->eax == 0) { + break; + } + if (cpuid_i == 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 = &cpuid_data.entries[cpuid_i++]; + } + break; + default: + c->function = i; + c->flags = 0; + cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx, &c->edx); + break; + } } /* Call Centaur's CPUID instructions they are supported. */ From patchwork Thu May 24 15:43:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Moger, Babu" X-Patchwork-Id: 919962 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="1480JHzh"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40sDRV63Rxz9s29 for ; Fri, 25 May 2018 01:52:38 +1000 (AEST) Received: from localhost ([::1]:39346 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLsXc-0005yB-AQ for incoming@patchwork.ozlabs.org; Thu, 24 May 2018 11:52:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLsPE-000726-RU for qemu-devel@nongnu.org; Thu, 24 May 2018 11:43:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLsPA-00026E-VQ for qemu-devel@nongnu.org; Thu, 24 May 2018 11:43:56 -0400 Received: from mail-bl2nam02on0052.outbound.protection.outlook.com ([104.47.38.52]:37315 helo=NAM02-BL2-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 1fLsPA-00025z-PQ for qemu-devel@nongnu.org; Thu, 24 May 2018 11:43:52 -0400 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=m5b1Ebnwj4hezKHpc2yJsioUkypDv+QZ+1TsFcKanrg=; b=1480JHzhp9HdTHdyIiI8+PPLnsuBKfxUfCeIfwaj9EGmvwCL30eWAdwlDat8vcKnEQ2V+v8ZYq9qmqC/bLcMXG4R0+7338cKoJOqqhbThEyOs763vW76GN4CrbD5I5oJp4ZgHqUNEh2JgG4hUYKjM9YqqSM5oEwCCPOy24tPZas= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; Received: from linux-h3ml.amd.com (165.204.77.1) by DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Thu, 24 May 2018 15:43:49 +0000 From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mtosatti@redhat.com Date: Thu, 24 May 2018 11:43:32 -0400 Message-Id: <1527176614-26271-4-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1527176614-26271-1-git-send-email-babu.moger@amd.com> References: <1527176614-26271-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0501CA0024.namprd05.prod.outlook.com (2603:10b6:803:40::37) To DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DM5PR12MB2471; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 3:SHXJwLD897kk9/X9d0j7Dj6UpYekFzfoSlPXQepKY6WmX9FCCSuuv+cTljiq1y0O4g83c/+h2B66hjrn8Q+uhpaT1+uopRJtJQwQaQtiVGA97IX442x1odKVGcjR5XWnERyWqk3revXoZFGJaM6tec6npQY9EpMDVoyi6fpfAW/llxamEvjQszM1bBc0NYjLZNkvTJJxhLHMA+6q2aiOJAqADfChQvfvjCs30cNnQ0PdBH++mdLlDu5MnQzfdCeG; 25:zFQmiAEb4zoWw4TwDFi80AJiNpRDAMsAFiMF/FX9sr0zF/1Y86GsNLg4jzIB+61pnHaA48WoQyK6eqosrRxzSKxi4dfPVvX5DOAfx1WZ5LIz9Sh/nXZaUPl0FmXhcXAGw3LjWS1AjsJjAzOxbQiSZAMQGGZqopJozcL5kfYy4cr2+vAFX5YY4WJh5SlMzJ98txpzj69vlX+3zRem80OGjNomTv+DUr9WN7Dzsk6XD6kPIa2wHF2QE0DTqprhmJ5GXVUrQy+CytcnH7rB2MubBeufiRO6m9RsR0wkgNyE2fIGUfr/KvsVC3Bo9dgzdeiDXRQa6x7dwPDyRQUoNvdjgw==; 31:mI69usPWRUADWNvH5UFuoeZVM/vuOcL+UAz6VH21TuVLuZqR7yEQkwk23yyuaCI5mxYh1B64lB/0K554HwEwitPbhCayxYX/UcNBU+ikirhMJE8YyLKzQlxcYarCQTWIxoci56KmArccbe7Tw59WeAJJQqxFh/suODX2fOamYoKm736jokKq/S5LHEas6ME/szIQwFpo55QG8lwXK6N2eHWI3GrTuQUxOBzdo2KQnQE= X-MS-TrafficTypeDiagnostic: DM5PR12MB2471: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 20:A7dlglAy+MFn1ZvrURmDqwuF8cUhYAxQqeO3Uwvjv6vfO2gbOzmBSF7zVVZiuYAE17z4ifaJd0htH8Q/hilknEp4mdJzbHvHbyfp0ADv+vwtnMJMW8iHLcqQFG20aK9VCClmM8EMcN4mq0ZfueETsHqVZUMLy7Orkqpj+c7xrCu1oV8TF+Rc1LHROa/beDcMOlhhKsDpT3acr4NCZ3/Fb7edwzQhziZqItYvFrLVeGh/KmrLcxPN3x1hlkGT9GvcKSTlq0Eg7mrCtJKuCGqyU5Fg9kSeNkPD0lunnueoCeWhbMHGI1eFeyU+EgFo0xfIzUPaIJHXQxp5BC6JXlrfWgmICtk2Q6UjRHUaw9i1D9nTTuSLyzP97Nk7nhphSH+p7L5H+ApOjje4CMBL4EkgDhu2oajRP5PWbQPssWbYCPiG64qaM6ztAAj7DZKW1wHXsU3VHtbqee8eDZH8Q2sdib7ZlrnN5C/nR3GYZIi8etE/EOfKYAGH5nhSgtPewSwE; 4:CkJs6rORkOJ8BuvKNwhNQvmy9nNlak43YoZID/6bhrzbSO831jBGLgLqiPZtEClBa/AbHoSmmF0gOvfaYPryVLa95FTASLHUpbVyFUSST/PpQWQLa9zS9404JAhm88Qx6qDzha8uXN4KF+FhMdKbtyGCQGlmMxbxCeJq3jKHI4yqE/EdRRF7xjY024A2EYXAc1cvnPYSIBoKA7+0dHpaewCmR9R1e+bPl528Ai/uXTyQsra5ZVvVou5/afGjJKjTBimLRCGKR0W7dgsW4u9eOeioPxf9PZdEYt0JoD1QzYb7b/qkj9tQ11h5T90agDt1 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)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DM5PR12MB2471; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB2471; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(39380400002)(366004)(39860400002)(396003)(376002)(189003)(199004)(5660300001)(53416004)(6666003)(2616005)(446003)(11346002)(956004)(476003)(486006)(44832011)(16586007)(7416002)(4326008)(25786009)(478600001)(53936002)(39060400002)(26005)(47776003)(316002)(186003)(16526019)(386003)(86362001)(7696005)(51416003)(52116002)(66066001)(68736007)(76176011)(97736004)(2906002)(50466002)(3846002)(6116002)(72206003)(4720700003)(7736002)(6486002)(305945005)(36756003)(48376002)(50226002)(8676002)(8936002)(81166006)(81156014)(105586002)(106356001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB2471; H:linux-h3ml.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR12MB2471; 23:3AZPTYBsJ5lNWhCu9b6QUB79eUnAD0k62LFmiAtEe?= z15aEM5w+xhwbNNnKBQG1jWAhT5NAwfi43AotmYX5fPDAKvSkDL1bJuAblbbpXRWbCp3/2s9wEhJOUPxJTu8+s2aDUc4tFEq9RfWHyZ3G8Z+ktr8ZY7Gz8jF8lXarBGtzw8kWjc3zRkrWgQ2WImmNwHa8BZmnsAT0tKks+x+aEaPyRCnfcu8J8aJXcTORwasQvTo58JcsODzleqz4k/NbYoZ4dlbs/2sKW0eKPpTJczAshSk7ShzsvioSuYxew6WgArZfWHRsusDSm2zKiosPHg90ZJH3rFYdVbFQU0r3uiNLYIgClkF01kpzRImXsug9B1kJW3JMDBRrrR8st3bsj/nrEUHPmWOjTM3cjMoIKAnAsD973kAHwuRLd3BWFU2p5Dg7v3A5exG67jfOZnF7WLWhcJ8QBT2cpaO57lEW5wBi+S/5AAI0c/NaacqVqqpqhJPs71YYhNNkfEWwD6gtqTg4rl3+6d8gI1UsnimAy+2dK/V1qKg/cYmfoPXviTCamNLmiwEloUIk6Xdh2IPmNSumJQ+BvnVzg0CMM0ThCYQ8l9q2kFZ9GTTJpWeY0SS+cwAcqHWL3aBEsp6yPg3Hl6tEiPdNadenrJ6LeRufT1MJaz+RBIQQa5JXwA9F5ywnBzTXh2BzuByLC7NMamq2DWWhbwPyGsTF1zTdhJgo09g4oZvx8xhqjxvmQS2M/RO8hzgw3mXh/638lz5Y58r7QSOebmSE5LNqU9QXPeFxFbdI1lI1Wh5CXS7L9GoxXE7MD31NhLGb9KaUFWrDztAqo2sOivnKnXoabtNiRoeuZ0HCiUdnFHDYn7624c1tAon8yagIosQ5CIrl6k8c+8yMyiyk+4c5KQBjNxdYx45QVnyEcf8IWkLAt5i+ZxQ/2bJrE6qcI6hM1DLxZw/T8yoEtSDP+HzNE+0cJXwZaBpjA8Fbxwna84T2ID1k3k99SsuhndIErtw4CW7aBfWksJSvHQo0TcdLKAnBNHNyrdkWoiFuJqWuQicJPUuctGZps5Pwp19R9U8wVuotAPkOPtLww1f43n7AHY+VHrm3IssECV9Gl+zfb75ljKXXg7D69peVFjtuj4hmHUQTVLDNPVKEspr8VXGk5apIGo2Bd/lpasCfxTdnoJvGjTfETYItaZDfDI2GlMh58b7uXH8UYWEGIijM6JUUjoVTbBQM8GJahgKUaYiHAq1y/PlabxDciOTLC0ffy/rZQV+hKNXH8XHJYB X-Microsoft-Antispam-Message-Info: EPa5On5xBe9n5AcKcTN8c20JaswLtmYezX9t+/+UXgiDe4x4ywDts36V1axhrfiwDf5KUCA5o7EQMox29QE1jv0bSeOID/cYO9c68fFi+UlTOB9U2Hk4H/LU2xL/fIXEmnXgM4dotaWNTLO+IqsjZeJa4IkrswBhzZAcL7xsqM8dGRqzBjRDXNNUpp6f1/4R X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 6:9dlkrsNvEkJSZYscoPUswsftxn78Uw1ZEAXRyi8ryDtiarRVhUb+rlQP3QlM0KbN/yntHcdRbIbTNoBlmswwI4r2fRa6OmmcR5n3wOzCbQ8OiUsKjZ/5U5yI7MUPie6Tp+n8Pr6W7cHKgOdQdIz/J3CddfVq1DjGgEjD3/ruQyPCCoV6PQGC5fUUhxUFLeEvIn2DsPLJFEf4dRyMiEqfUXKzh2dsVpOLanaJSNinW1EKmVWDGEalycZmgXqy6fr1cVjnqfEKB8Wh/t4D8N3E6JPZK5wGrpgwB8dTCD8KGQvNL5fYJmDh2kn4nBxX19XaUKw8gIJvswDNDlbYMyfId++ON0cszpdDXYTagpFoa80eTis2AKr7V0UeLB4zQMluxRoyxxnHa74lNqkdnNpNIFe80ArpW9o1x0gLBrSX3pgD4mMx96IP73aV7ZITCExyFOFwRxupzA5A0HvJLY7rNg==; 5:viv1FdHJEzVNao8CdCaVJY2WVlUr0OKeXWVoAZGnTimGbjd3P1XkVHZG8U/0p2NWMWcvu1J8zDtlEqH+59YnJrX/kTfBFGVPqdxzf/Ang/AVOxhxRR5nAZv+bV45cQ5RaBJISCY2cvhvpfGoYk/zJU5RAucLrNQ966t80XXngNk=; 24:XKM2+xWwYk1fPqjaEV+H7JaC3LccftSJA3YeTP2UvBVxlKWay8+bmRTCBr23HrFrXsM6hzgwWZoOaDP7hfO7jbGAk1dTS5q3xmnW/c8IIzE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 7:iFfrrcJo4ec8h2JVoeXXorW9xeSsGQSTRte0zgZdFCoZpNuKiKqaoL4q+XvCiYjnfP81Q7nr24pYF/0cUU1oMjxxk/5jEiXkeFo2+1uK23krA24wyZFrfSACShrRknPBRB7IYmc3mx43Afkf/icbAZLcvx7B2vpgHr0ddWTn16CkhBFSjucpt4pXHy1vklzdlY5xOQtmUXov5D4B8o7xlpGNiT9uEi2q+ecZP0LZNV0LBB23V1cQbDHAfBUEx6S6; 20:lxPPZNbVyICOIu/WwkBVMjiDOvHpmVFMl/ZvHiELEe2X+MEgXviB0mC+VkKboZxCYig1fLT0wwCHzQkT7JLcQuFyKI7np+Lsm7lzwTVhXbPKdxZuY8+mwWAupZdmGb9uc9dFvBLjeJTaNwEY+2MI+0roP4qV9o/sG0eKmolnCAS9oC8qL5bAobtJwSaIwR6j2BUisB4lG6caF2D+D5htW4nh8z132l4ma4v7ROfuGr0hzSig2fnIttJBm96YgBjC X-MS-Office365-Filtering-Correlation-Id: 984f1564-e392-4794-1328-08d5c18d251c X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 15:43:49.3377 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 984f1564-e392-4794-1328-08d5c18d251c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2471 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.38.52 Subject: [Qemu-devel] [PATCH v11 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add support for cpuid leaf CPUID_8000_001E. Build the config that closely match the underlying hardware. Please refer to the Processor Programming Reference (PPR) for AMD Family 17h Model for more details. Signed-off-by: Babu Moger --- target/i386/cpu.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 0d423e5..9f8bad9 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -429,6 +429,62 @@ static void encode_cache_cpuid8000001d(CPUCacheInfo *cache, CPUState *cs, (cache->complex_indexing ? CACHE_COMPLEX_IDX : 0); } +/* Data structure to hold the configuration info for a given core index */ +struct core_topology { + /* core complex id of the current core index */ + int ccx_id; + /* Adjusted core id for this core index in the topology */ + int core_id; + /* Node id for this core index */ + int node_id; + /* Number of nodes in this config, 0 based */ + int num_nodes; +}; + +/* + * Build the configuration closely match the EPYC hardware. Using the EPYC + * hardware configuration values (MAX_CCX, MAX_CORES_IN_CCX, MAX_CORES_IN_NODE) + * right now. This could change in future. + * 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 index + */ +static void build_core_topology(int nr_cores, int core_id, + struct core_topology *topo) +{ + int nodes, cores_in_ccx; + + /* First get the number of nodes required */ + nodes = nodes_in_socket(nr_cores); + + cores_in_ccx = cores_in_core_complex(nr_cores); + + topo->node_id = core_id / (cores_in_ccx * MAX_CCX); + topo->ccx_id = (core_id % (cores_in_ccx * MAX_CCX)) / cores_in_ccx; + topo->core_id = core_id % cores_in_ccx; + /* num_nodes is 0 based, return n - 1 */ + topo->num_nodes = 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 core_topology topo = {0}; + + build_core_topology(cs->nr_cores, cpu->core_id, &topo); + *eax = cpu->apic_id; + if (cs->nr_threads - 1) { + *ebx = ((cs->nr_threads - 1) << 8) | (topo.node_id << 3) | + (topo.ccx_id << 2) | topo.core_id; + } else { + *ebx = (topo.node_id << 4) | (topo.ccx_id << 3) | topo.core_id; + } + *ecx = (topo.num_nodes << 8) | (cpu->socket_id << 2) | topo.node_id; + *edx = 0; +} + /* * Definitions of the hardcoded cache entries we expose: * These are legacy cache values. If there is a need to change any @@ -4122,6 +4178,11 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, break; } break; + case 0x8000001E: + assert(cpu->core_id <= 255); + encode_topo_cpuid8000001e(cs, cpu, + eax, ebx, ecx, edx); + break; case 0xC0000000: *eax = env->cpuid_xlevel2; *ebx = 0; From patchwork Thu May 24 15:43:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Moger, Babu" X-Patchwork-Id: 919964 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="O8PWCE//"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40sDVy68zWz9rxs for ; Fri, 25 May 2018 01:55:38 +1000 (AEST) Received: from localhost ([::1]:39360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLsaW-0008Ri-Eg for incoming@patchwork.ozlabs.org; Thu, 24 May 2018 11:55:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLsPD-00071S-VG for qemu-devel@nongnu.org; Thu, 24 May 2018 11:44:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLsPC-00026i-22 for qemu-devel@nongnu.org; Thu, 24 May 2018 11:43:56 -0400 Received: from mail-bl2nam02on0040.outbound.protection.outlook.com ([104.47.38.40]:18880 helo=NAM02-BL2-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 1fLsPB-00026T-Sz for qemu-devel@nongnu.org; Thu, 24 May 2018 11:43:54 -0400 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=dUQ9MgbnqPznGvXYthuIgrEQzY0fc8igTA6VURO/D5s=; b=O8PWCE//0tfzz16W14XK5I5VniWyrn1OI3O77pzopN9Qzo78FsKuucTzCyra/LfacutYW3N/lRaDJ5+as3PrM3p4uqHb35Q9Pc3ZRuufH4SUCsmr3LZuBZgqipJqUajxMbn40SCvdG1uTcbp03Woz0AQBi+sLl/CSPMF5UOUCD8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; Received: from linux-h3ml.amd.com (165.204.77.1) by DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Thu, 24 May 2018 15:43:50 +0000 From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mtosatti@redhat.com Date: Thu, 24 May 2018 11:43:33 -0400 Message-Id: <1527176614-26271-5-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1527176614-26271-1-git-send-email-babu.moger@amd.com> References: <1527176614-26271-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0501CA0024.namprd05.prod.outlook.com (2603:10b6:803:40::37) To DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DM5PR12MB2471; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 3:QXp1MgEqsivSGB3tyypkCG7TYmqCi5dCHZHgr0uoZtcEn/l1tMn8yM9qG6vJTJavfEWifJoRd2lLUxArZqCgPg/tUj6cKqVQQL9nDDKl95bjFFH5+apNnaBieRbXs0RRAyOSTH6Os3F+f0fKv/O0Fi4mnGyPSAYtPQCZkEWnPpRbZcKCKPW/TESxFlC5EN0IZCJeTjKZkfWYOZ7EUWIn0kbWZQlKMg48kU0jXbAPXFBTEeHPhjxQ0OpE69R1LtUI; 25:5Cqv+CdfIfAUrNsdn2cgSAwVLyQ3SeBbGw7kOrAoIFZ2DAZkRYTu/idsF7SWIZ3w6ugIvlUHjhEiy6pOX8pXL3sqioDIMEOujHU7Z+qJy4vBfRUXICjBfaexIqdpRtA6IOkFc/duRKp/oFyLIWExA91tGOwKFZkn5qp3duJY818kaS3Zp7TH4toVkTn11k1+0ucK+3AHRj+UT9exG/1AYZn5ve7EE4kBCgvnIuWEbxibrupPHZBG9/EMnHO6ehBwxvs9jtyIfblBp+aNQYQma1HuljGuFgqahBjs2TL44N2lVKFHkBjsOmmQJY6Ri8xkn4m6Fg2gx5JnOGQRcUrJvQ==; 31:sS5v1v9oPnMxEAdhKQN9/p5QFG4TlDq9RKo2/NXE0rjcpFCys6GkFdBmHml/IWV0BkoFLBYxZgqxG76wNwk8+BlsHSrbAAECAl9PF08IwfjhCP8sATFQcytJqXwl6ncdatjl/aOrIOQ1aWbZXMHwMO2Z0Qg3EPVvRCeA6za0/kYvIFvSPcUNbQb8sjZAq0o6/3N8dESWz8I98cQsYtvc8VrEa63lnD0c2CBLRT7Eh48= X-MS-TrafficTypeDiagnostic: DM5PR12MB2471: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 20:V+bxtGKS9u5dESC66bC7qf6n7vq5YjWnoN87OH0FLIU2l6WbACRt+Ar3ZKesgrH1QTYjiwpXPD5HkjEi8zlffaforN7GTMPAYrTwfm17tSek3aldAYomKf/WQctUG/M7MOY8B8RnPlc13L3z8C3Dg3fH4tlKlMXO8otql2jxmapdVJhn8nI4lsZyT8UH6k3IuNiO2Pf1s9wArB2bp3xYAoW7cdHV/xtcL+0t0brfTdeIWvI08z9wf65jTQqZsYCD4qgnJ0xf3hCpOwkiXWtGsUxPvlmdjrf+7u6yqtHpcmYRWYwjWnNiL/RYNMUjs6/Cetxgmzw8JomJvb38sjKV3hSzjpfca0HB4/OEpKocBfY1wHgjDt+J5JUcynRtDtmO8LDcwMvinxAXTImKL/LPz8DQkqUicJte9lLD6UIV9cWddH22vOvykQLExrUHPhZhgvLKuHw+Xo5VS5EIcuEaALYhOSicOofsSvlaWigt3yr7FrFIxuA/+1IH5XbNoXgo; 4:3IZJ0EvE8XbXk7mcQu50/BvIX+NEIazjpa1zw1zir/79imfoIUnzinb2Bg7idgpf+RHI/zGUM2iQeYBE+ZBoDStFlmRNpPKXx67e0/GhXhBOzbElnUS/Rjs14+4gLSMRDhpACKglcmhRRITIybDmKBzMtpbT/Fs8iBZ6gswMi+lfDXIAlL53d7Ea3RxvSTqAxYfJEgX6vFL/Fpr61KJjddud1R2vzHDgvuu1N2qf0p+8cjpPJ6Int2Np5Y3V+EVVeEtz5J3rOSaWQQN5v0v+rOwhW7z6PsqYbU2/3wrmihc7F8V820x5cLSEZzgEmm7n 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)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DM5PR12MB2471; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB2471; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(39380400002)(366004)(39860400002)(396003)(376002)(189003)(199004)(5660300001)(53416004)(6666003)(2616005)(446003)(11346002)(956004)(476003)(59450400001)(486006)(44832011)(16586007)(7416002)(4326008)(25786009)(478600001)(53936002)(39060400002)(26005)(47776003)(316002)(186003)(16526019)(386003)(575784001)(86362001)(7696005)(51416003)(52116002)(66066001)(68736007)(76176011)(97736004)(2906002)(50466002)(3846002)(6116002)(72206003)(4720700003)(7736002)(6486002)(305945005)(36756003)(48376002)(50226002)(8676002)(8936002)(81166006)(81156014)(105586002)(106356001)(217873001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB2471; H:linux-h3ml.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR12MB2471; 23:xzZmMwHbkisGT7o9uvPH2Zz7edL+SaUNIrm+6I2sq?= FboAVO3yx0ywpY2Xc3d++eIXCN2KkGADoyhm+ST40PBM9Ho7DUp57ZKYjADk7FzBUSucyOiU/CShsOnkOTNIn03fOjNcSWFUZTM1WXDpcyEEto+ZoD1Jv0/WQZL2QoGX2vsBSvWlthVKM3LRqTCxP55xiIgQ6KKDJgzNw9BAVik+hquBArVVkYRpPmlvIM15nTs5FWT6pIePwQ/BaVAQJZzv6RoNI7GY+I2Wyi7oUMiAHTPaj+A9WMWV0IMLAM88IYxydyecrakKlQ/Dd8hfHV0S1ZkL9qPwBent+8wyJRDScfRgdFH7LBNUw0gq9fwPyxZ6ZCW22WjuEZAf+HRMYt+h7oFZEDj40GVNLYzc5C45OEB5OmhBwGgZDX1/JnPiUuS8tY8txWvVsnrBK2LfboIB3qd5oTtFNXbM+XF5WqVZNniqoYtXnrC34JYhKoHTGqr7ijr8a+7AzqeVhds07yB0ONPki+DiuqbB4CLLXewR8UuigKo67B9xsq+4mepoIbLmF98uVM+SxhSBaFKQNV6oapNj9Y1nriEBx0oNN1ep4ThkltQ3dl1P+D75HYXb9/A6M63sCp49cf6ncLDky7thd+ltNLp25Q2GD6Wov8LqG2C1ceeGzprPArJrDwza9KrC+JTAQCb0KnUZCN846coW4Qe5TOcsHKqYX3LDgkkxkIiNJxkjJjYG5LTi9h46SngmoY2OZ+j0xVnvfbwj47ppiL+ku1tfsh970odO9pJN0CojEC2Jk1y11i12BJUSZzi3o/CB/NC2CuURZfoTtHovDabvOGjTH8pbkUsaOFTe6A1AJOh9qU6uvXo6oD7LHmI6Vu1GEP38mtPls9DteCqUj1KTe/oLZFDkmYm8ogiBSsSjYZB3QITfmdZJyevbJkHSWNz53VATt+XXDhekwtz2B8qxOrsSm0HXyHpkbTCG2+4CbmKFPP3D4PlqUYJrZrW/Csbx6/JTnjMAKiFxcCs4gF6G/1HJShJilRoppYVht/O4kP7cIt4oKqcrmbantXai/5YbJ1b7PCHbIbQppsQZ76WVLlDIAFwxElMlgHZ6BTuCSc737wJ725la9/nRn/lZYVMVvlMrGkpeZDVQ3V/i2CMc3VKoAx7XkQTYqWIgDZCeU+OkAmujk9RITPJFgEp6ZXyS41+KWctom1mQKNEd2sNDWReOsO53ReUUFxvulGTdvCgr/f+aAcDLPNzbjHxBAWUwovqak3PbhxDdUuob0Vj7DOu3omdaSqSI/UwuxK5kdvRcISZx11KF5Wm8iTrZ20OfVkdv4i7ubfLtPvyAzDnfuEtGCoedOYPJUVI1Q== X-Microsoft-Antispam-Message-Info: HlOw2vmLx/iyiKq7hB0/M8O6VHyBHznmpatKMyCliz0DvnHp39MvCbIKYJn0B1jhRybN96cleMu/+YLZ7HDhjsrssvFRCrpZh6q78lRaMCcsg2ppqllt1BakLBen4T/WrLxd2RbSd7ucaBzkM04uJV+Qs70SSPcNjtybxQsNVkPf1euV3vLbcDNDdQOo+QfK X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 6:ODWh6znFOeVGNUptI5us1VNSAeEaLecKUb6tG2YoQ4SlPvcVf1Z707wCOkP5qt7nd8+hSobGyVv1u+AHCRMFbNnBkmeYTPy7wO9VdfBFcttyiYc+ulEzGFg5KYtrx9bj45uXoF37FXrLgvyHPj9JkRu/YM0lkUQdGfUTLIjmje5S+GsVdpwmNsoAJg2eLYN60v2K/izFIGA3i4Md/Yp+iJFPV3i89qBMpEKN5QGxRvf1I0ijhlbIbB1YdlQCROIvBmV1fCBDqADZ/UCqaik4wT7S9azyxmga2LIcVZtFZ5EeZnBICypAAJ3afIoqh6odLcf6hTO0Dhqxk8UE4F+ysBGuEur5aNp5J5JHnJYWcgHG82R+ozmHSFQm4X4gH/cTI4gLcYgeYiHdsSZ89GtnQGfOGxNugARumu8D6pU+KEue2DU1ap89xLDG4A2xwD0dQVY1odzrrDzwg3v3rwcqwQ==; 5:0qc+ea5Jz2GEyAn7x2F4wY1M86jmQ/eakqa72V/PAo9sv3e5AOqHecSJlX7ts/YzT+P/cFYE+8j77IyQVYgharAqdfYiaHiq/Exbr3MBkIlgrtVpo3zs+Nh0oi8c1+jB53e8yJgSFyN4j8caRjtL3Ic679MOaOQ2JZRDATWXsUQ=; 24:83aE6hTnm1bV7hXuQVDOfUbxQafMtgIuNc1Pc9trDESa7+V7c3AWwYqrBrfRwEB7vWDS8ovcW/WWDbt8hcLwdzUzvYPhhLYE9wDSqloh3A0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 7:V08H71Dlt500sRQ3qv2xpaeR2xmeeP7T3UMIfX0DQWGrpC5cjJP4EknSR1QSIQPTfBQ//wAGk/1zGimCn83GC9kQg/Vp9+DywSBHqh/S1Q5zjmOkTHeQq0c6hSulyRVHCOE147OWr+cpwDTAipKuW2c50fIrQnOGNdCr/mR3cO/PZXjcCs4GylvVqx4Ik6JB1SX177HGxFCw4qXEB70/lKQqzpFhek81JTEUmBLtxE+0v4yfYSRGcgGxVONZP+48; 20:xAY9aTWeVDF6NBEKLpOzTh3yF5C6ZyXF5+uv0Yr69qv1yksxOsZ6Aa/7+M3wJMAliPUL/M/mFJ+WYW62N63eeOatQW2eu+fdrDObEV1pud/Xb3idk5bhRzwe3RZcSqbmhZ2+uaUgNsUQm6aomlpwWyF9k8skY51zlwgVZolp2z6kHp6+tYDMgvmeClqieDjjDf6XtHUmMJe9Ulsuvul7RxJtB3OdJjxRmxvDGhum+F86jdzvn11V86f2qqaRiOcC X-MS-Office365-Filtering-Correlation-Id: f50070b0-55c8-4a68-830c-08d5c18d25ad X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 15:43:50.2908 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f50070b0-55c8-4a68-830c-08d5c18d25ad X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2471 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.38.40 Subject: [Qemu-devel] [PATCH v11 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 = TYPE_X86_CPU,\ .property = "legacy-cache",\ .value = "on",\ + },{\ + .driver = "EPYC-" TYPE_X86_CPU,\ + .property = "topoext",\ + .value = "off",\ }, #define PC_COMPAT_2_11 \ diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 9f8bad9..0b62356 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -486,6 +486,20 @@ static void encode_topo_cpuid8000001e(CPUState *cs, X86CPU *cpu, } /* + * 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_PER_SOCKET)) || + (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 @@ -2531,7 +2545,8 @@ static X86CPUDefinition builtin_x86_defs[] = { .features[FEAT_8000_0001_ECX] = 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] = CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_RDSEED | @@ -2576,7 +2591,8 @@ static X86CPUDefinition builtin_x86_defs[] = { .features[FEAT_8000_0001_ECX] = 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] = CPUID_8000_0008_EBX_IBPB, .features[FEAT_7_0_EBX] = @@ -4156,6 +4172,12 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, break; case 0x8000001D: *eax = 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] &= !CPUID_EXT3_TOPOEXT; + break; + } switch (count) { case 0: /* L1 dcache info */ encode_cache_cpuid8000001d(env->cache_info_amd.l1d_cache, cs, @@ -4180,6 +4202,12 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, break; case 0x8000001E: assert(cpu->core_id <= 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] &= !CPUID_EXT3_TOPOEXT; + break; + } encode_topo_cpuid8000001e(cs, cpu, eax, ebx, ecx, edx); break; @@ -4644,6 +4672,11 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error **errp) x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000000A); } + /* 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); From patchwork Thu May 24 15:43:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Moger, Babu" X-Patchwork-Id: 919951 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="XZ+uyxO8"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40sDGH3q7Dz9s0q for ; Fri, 25 May 2018 01:44:39 +1000 (AEST) Received: from localhost ([::1]:39303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLsPt-00078N-3I for incoming@patchwork.ozlabs.org; Thu, 24 May 2018 11:44:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLsPG-00073v-Qc for qemu-devel@nongnu.org; Thu, 24 May 2018 11:44:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLsPC-000271-Oc for qemu-devel@nongnu.org; Thu, 24 May 2018 11:43:58 -0400 Received: from mail-bl2nam02on0077.outbound.protection.outlook.com ([104.47.38.77]:9040 helo=NAM02-BL2-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 1fLsPC-00026p-JN for qemu-devel@nongnu.org; Thu, 24 May 2018 11:43:54 -0400 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=DXWHowz4f+MZAy7FzX1t7oUmhcqC5eHjVzDUyhEZDbI=; b=XZ+uyxO8RjvGuYn8D12vDVE1HZnHhaNiisqE00HfwiYB9LLvTnX8smTumcq5P3sVGbTKWIMfsTZqnpszgWdwXB+JMz7aPyYFIp8TM4RH0kCAOnXgxiF/vfE29ctd7/lb06XnrP5y8CSpYdXvdd8CFfqho8vhrZdcwpO4oa65dfU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; Received: from linux-h3ml.amd.com (165.204.77.1) by DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Thu, 24 May 2018 15:43:51 +0000 From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mtosatti@redhat.com Date: Thu, 24 May 2018 11:43:34 -0400 Message-Id: <1527176614-26271-6-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1527176614-26271-1-git-send-email-babu.moger@amd.com> References: <1527176614-26271-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0501CA0024.namprd05.prod.outlook.com (2603:10b6:803:40::37) To DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DM5PR12MB2471; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 3:hpEEVOYMnzbuvZJEuX1HAhbGwT7KyQbFOKhYbDpLv52Ye+Kw0b+8W5Ial/cODkYDxlnBigAm2Tw+UCp3L8mm5vNMvcxzsFW36jGg10fLxUdWBjAC/3EkuFnay37PngYCCGvXaI5opnDBNJosYdWM7AGvyODDk80Sl/+xuv1e3FMYe9J3luc+2fJQPXrIw0FM0OKEOWGUnNeh7n/w5H/CK0WNpqGFzkvmGxP0eGvWEZ+UFlVEyqv6/ymCfVn6Xyho; 25:3jzNHdeviX4o00/OZ52GTFj+2SqpEV26HU6nGkjGS6c4HH97G0hjub/2VdTSBpd7fQwVkdm/pN+Y7NsmfpZfvdj6uhZzFLLBsondspt6Si5tCi6jOI93rrJ8SObkA29F7zynTP8wqe1fKQHKcywMiChSYFMMimNBgyuJOI5lHpUQzvQJx6kTlP8pyZVppHZXXE1cUHrQo/oLp9gmGF2w9NWPcUtvvNIhL22SJdNTNVRBcvDA4weACpYV4fNHq5GF8weNMkXiDuub71U+JEblQ0WntSvwQj6tvgzw++ZkP9vlEeDE/aUXQKnraKzF25wvMXRe451aAfOFXD5FNIXlqA==; 31:+4FRyqaH7ZQJcXFiqVCman/s+Z6skVnAFnOko/Mq4StEFsJgZxEuWffI7/XxBPuF8qz6uCvjpUvlph7R6TkpXvCO8oHzz/49P9ohJzBm0+awgoHX9t3JblCJoAiDdxpKPQdINDKyAHgnAxpCSeDXnvvSq2jNF0HypvEq8vRh/lY9hiKh27mZ4oaDloAzajlXgvZKoS9kp9CAoMP8gR7yVf5H4wdw+fbVYE5lEMbgY08= X-MS-TrafficTypeDiagnostic: DM5PR12MB2471: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 20:xIc7SmfXMiwjpCOQbIzP8MDzTddShGMumlcFXYltvMvusxVcZ+3p1eYysWOxzRwOCz4hn4mgetNjt8yY4NCNzubAOcVkr6Or4gzbdAVEWWbijXbGbndwY+3N5LhrCTSUad9t3hZld959AvJyMgJUpZtjEzoq26XxehUw6caryxWG43r69wCqR81LkVA1ffgkplWkxiqs04tmdx1XKQUaktL214wL+PzukRmD7HqxX0a9WxjiZIkCEZ8X2dhun/ZpGLK4uy9NBPNpvPPAOasI1oFx4mFmu56m3jeUTH/bNK1eTnXlzlJMegwEBmc07s2KysNtCfoXw644yANYl0gbfYgFVLTW3XsXuGTM2915lnIjI011FKKCMzmj4WajZOFXbbNP84bGSOY1BFqjWAF0ZHjJUFiPXZQ60rtJd5Ya6EiwV6Yw1/G/3SgAVq+HsV9XPnyBcd8MijBfvuZ8OR9DJT0cnsCjIE+JCEzh+RB4RuyMdCuuavsSnO5zq5F6CUJG; 4:ryBFFTR0JXvLhA711DgR3Ugz45FOiYvCZCgysjglDsCWyogTBZIMFdbrxG9+5e0H+9ZXEDCjIwYPE+FbxtIVgcTdufpDLnsCEwo2R4xjIpa98v+s/wKEm5k4o4fxcgng0sI7vRVFXkj6ZsN/agxWAzN2zPhremrujNipRteIhIfpTcGjTmjrGxiYnWIl7jDA/h8hWS9cXkXK8z0igQ1b9e6ZtOYH+8qzp+vGkpRsBPoL60D2MhRtLhj9DuqXqH/0/8llhlnIcU3OU+NIuf3jgSxeZWlIX7Cggo76is4biGPiAOWEJZu2nddV6RWXXzZQ 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)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DM5PR12MB2471; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB2471; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(39380400002)(366004)(39860400002)(396003)(376002)(189003)(199004)(5660300001)(53416004)(6666003)(2616005)(446003)(11346002)(956004)(476003)(59450400001)(486006)(44832011)(16586007)(7416002)(4326008)(25786009)(478600001)(53936002)(39060400002)(26005)(47776003)(316002)(186003)(16526019)(386003)(86362001)(7696005)(51416003)(52116002)(66066001)(68736007)(76176011)(97736004)(2906002)(50466002)(3846002)(6116002)(72206003)(4720700003)(7736002)(6486002)(305945005)(36756003)(48376002)(50226002)(8676002)(8936002)(81166006)(81156014)(105586002)(106356001)(41533002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB2471; H:linux-h3ml.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR12MB2471; 23:owfdgPQQxMewP8ZaDQyl3sOwgPISciVeBi2oe++fd?= dVWBGGIWF4UGDUsvo483uFGYfi45H2wn3f9lpo1utilU+3L2orkX+Mbd8Bj9mt1v5P5mOrH/lx4kH7MfOEPOeH/wQqshPzGyRtp3RFsVEZgXu+fjAvyn89TwuFZfhn7uUTgeARJ1eKjkKkktRNf2ogPXm0x8A+RzZuYEuV9Rxx4QlfRs9RnYg/Nba5mlbTpjoHspEjNRs1ALtA/sph5/nDEw98xwD2XqRjueroToq6pOFS6zAvWW8iNlhU6UO8MaA5nKDZlRq4xsfWnVKmfwiyV0UaaceiAKwlVocGovug8kSvLAzYOb0LYXJZVu6eGsccVn+ZeavTvd7XmRiADRm0ilBFWT3MmT8a8FmsecGkW/7ndSIX1eUuHbuPORIIErBj1Jbp5x2Zftu6IMoWV6O5jUzY0ZpeWSsLq85ET8xe0ulFhdU5XncS4r3Ah7dfC8GMVZ9ToxHey9CaEOi4DGNyz06sTbdeLoc6y/qhN7LCpV3c2RQMj28pCQSecf7SNHRduzthxNMaaWVEtEfSo5NgfOuyrxIuXZ0J+T5bzgslMcYvFWdrLRveV+zaQyYoqkOipaQMaSgS38Ie5DorpxMw0a4bsSD9salh7dDrsoK+RSlU6bjAxTRFUOgaZeejJgbnzqazZaob4nZEsylMi7m3pJqtVwtqliTVuBp5RNfZDX3CvwxZ+rY6AR3FT/prp97ZQICTFZOwr47rm/TezVos9oIgnleDkC4rLSeiiiENcce1yD+2azR0iNlYM/oDz1c++YQFLrTHotXqVHN7N1LicPfD0MtnraChOgL07bdqOL8M9uCjTr/un+pSomFeALUrf0et4WdAapZfp4HZtoG9Zk1jWzEy+lAsF0QBLlcEihHrjeCDzig5pH0ZEAt1Rzx7mVgwXhMiEuCq50Lc9Ub09NEztDrfMiH5Q35SrfECu4odG9Uz5lzcxB6TV6uiv2FU/fD08KOUEtUkCpCU0fMJznuOa451AJUMYjUfCIoTQ2+E637jjlW/083UTKkp9Gn54pJwszwmmbG3RlVPLGpz/LJYXI3FrdsoyGz0yeMxXKBoA2MO/g77trVAAQU7B5B3NwQfbWkGqxRmu/R81RrZ0kzLoxEJV53m4Wcdh7ZmtI7HxjHsUpggsX8D6YvCB4ojuEFhC+srqKbiAM6ZAh3TUGSxRJR3ZMsO7OrzVxUWz/F4CayKdZTe6Aw0pvVuDlOCKuFZ3UH5SFgsAXOE0Lnqoo5CW8WtEr1v6kKjYAwtY7tp9Bm3XB0TrX+QGrVFDLsheB4IgaBy+ZxWW6lKCxEsV X-Microsoft-Antispam-Message-Info: jZYyPoV+AZo2arpW7KBnttfJLJu/TyVRZrDxiHXvVOT0/jK6n8gaeV/Wkng1LGL9ZKLdgH2q9hUa+b3ADDE6xzObUWfuDlk522bsFAFQMlv4y+QShXikTjyZNfeek0uYHQrg6jgARxAx9t9dY/0DYTxY5gfF9fHhwllKMOgSoUGImXnPWsFqmikXB1DB3ieq X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 6:9Tv8+5gsEbcW6qyQdrr9/ghIHldYgnJTmm6fMEbfR881jM90sA1N+/XiRFG4bdCi58l6CohgW1jV1Eelzg8ldvalKTi/hCh6PE1uXxhYw3LJDMd9zEbC0hO6D5Ive5udJZJavAtAiwdV0fLGVloZjVitge0Ealfe3/lfKvJXVJdS6aBn2M3QNq7HNzx5oAkSNUA4beG+PdIjJUqt5Q2WL6e9Ergea0KxDBj/dZePUyi2uUNLdPh7wWu3nO5ob2LlLg8K5Y1WVG3W+upZAYd3TIgLrVR9qkgOciXQAQAUo/jxTBQRFFPFBeHvR/QTnEsdByHLHLbQhkm8zaC4Pio14RYCfIhrU0LtQdjTe6aW5J9KCfIB4YKx8ERITc9G6Jcs7IXpGSvgi6nCQbAnOZXPabj6CTkfoXBrMCJFKWsZ9XXFdN4LEe3l2YjuqXGuBwzVydCsc6zPeYTneQK8Sv5dUQ==; 5:x7bp+unMosoStS6ZM/ytuJWBR1x0R+DokD2mszmXjQNIHTUbZJuzlvVuPkZ3XoL2rlhJ73psUJ+e0tVKu6znyIUgqS5YiRR1a47OlwcNZuqkPZm5ZXk2glgXNj9iRp7JJ19Nkk+PrpvufhqO7ZfFznXy90TgvyQiqNf7dW23rUw=; 24:udXvPH/+7QYFMavRimfL9WFf4cUsy9H6xKa78oZp74Dg9yscCmr/CmkonmFeMdG4t5p0qC8GnbBOXhOZIwwUxjXVJhf5hcOADlDy1FHsfLE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 7:Y9be/pWdVzUFGNk8Q+k7grKSl5BD39BHGYmZxe7E2fg7/g9aW1RnVQuz+mDPBHg9LldtVkfG0P9aBYOCKBLRs4FnACIskqVRD5IXaNrxucmvio9xCZGCGh7e3MC9yzD5ftMITagoiWLIAF0Ukzdrivw9VxNCvRiPg+Rok5+Ej2790Em0xyQywe6hEJhc4LFwkbBMwQv77Srafli5qswYdTGbYBzB0NC44trpmZPmgslblUbm1cICh35mKREX4dxx; 20:MtQqqlBBmEX+ZB7ayoMNST58opUpKVCMCUKIct13HA9NEA54O8lE71E645mT9uNnyE6R1e5gJ9CFNc6POk/01ZswGzic4Kywf3fRU/DoCT7GBoeu4tGOHcVfl+eauHhBWSRzTb9pBaFmxUbjPZvTcdBgJoNXOyngBFAfk2/eE12PMQhUfSnA5beEu0i5wKfpF9nkwsfjdf4bYSV0PqJM12HKUQHaEVQhb4Qk4DzYyrtWfD7/SYU4a9WIyVnErXyP X-MS-Office365-Filtering-Correlation-Id: d7375cac-ff01-45f9-18af-08d5c18d2665 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 15:43:51.4939 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d7375cac-ff01-45f9-18af-08d5c18d2665 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2471 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.38.77 Subject: [Qemu-devel] [PATCH v11 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 0b62356..e09eedb 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4951,17 +4951,20 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) qemu_init_vcpu(cs); - /* 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_0008_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 incorrect. */ - if (!IS_INTEL_CPU(env) && cs->nr_threads > 1 && !ht_warned) { - error_report("AMD CPU doesn't support hyperthreading. Please configure" - " -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 = true; }