From patchwork Fri Jun 15 17:15:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Babu Moger X-Patchwork-Id: 930131 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="CWB4MF4Y"; 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 416nGj0Zsvz9ry1 for ; Sat, 16 Jun 2018 03:17:01 +1000 (AEST) Received: from localhost ([::1]:48468 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTsLK-0006LG-Nn for incoming@patchwork.ozlabs.org; Fri, 15 Jun 2018 13:16:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53294) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTsKV-0006Hi-2f for qemu-devel@nongnu.org; Fri, 15 Jun 2018 13:16:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTsKP-0007SU-2J for qemu-devel@nongnu.org; Fri, 15 Jun 2018 13:16:07 -0400 Received: from mail-eopbgr730053.outbound.protection.outlook.com ([40.107.73.53]:16992 helo=NAM05-DM3-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 1fTsKO-0007R7-SU for qemu-devel@nongnu.org; Fri, 15 Jun 2018 13:16:00 -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=jmr3pEmNFqH1zeWrkQsaojO/Zvbbx5yFwLB8iYeefS4=; b=CWB4MF4YVN+Zt6s9fnewRJOxW3Fk/u6sVciVmc4QPX+VsKahRK34/yQB2nNJJRQYwrqhhJTsi8snmFviACzQk0PffKOhmqdJ8iulwvDb8Y+ayzs+ZNPhrc7wh/UzdxFEgmFgURxvysBoKvvPHRuNAKTq9/0PG1BBMb7fVAhBd0g= 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_GCM_SHA384) id 15.20.863.14; Fri, 15 Jun 2018 17:15:57 +0000 From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Date: Fri, 15 Jun 2018 13:15:45 -0400 Message-Id: <1529082947-60001-2-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1529082947-60001-1-git-send-email-babu.moger@amd.com> References: <1529082947-60001-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0201CA0010.namprd02.prod.outlook.com (2603:10b6:803:2b::20) To DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4213841f-944a-432c-9104-08d5d2e3a965 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DM5PR12MB2471; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 3:le9WYQa2om6dkvn+wLVJnttiLlEWO4bH8lAGyjNbD+l4s5F12mvwG8VdlaXMbSpxKOPUQD1sTM28BE5RM/ZtQ3mcnvaHHhL/tfHFA8EIu+eyxXbTGUOpxxJ8JmOCE5r2BDrV8QRRvnhAR/1+h7AIDdzpqKaoDwvwbFgia6SYKxb9wLVZCHp58oV/gHHNlx1+ZKCo9uARdhyjMHOS7+xwFZY711kUytXuy47HhANDSGnX96Ra12J8eqjERPf7O+jo; 25:/dYgaSxuzPP4sRA4PDkrZ+tO4JzGzctK8XGTKeol3fRtPGP/7fi9ncqhb5tPNj6H1phc8n1Ji9rXNQdVvj1wDifd1Ame6+qvYymqcyLJ4Qmuv8pMo28SnJDIMfeciNoUTqQVROLs/sVEzwBhDaBuNlWPlwnKWAQn/9Y3/aC2t42QEspqPvbyUdIyLGjepVLzqGqZm9tFbot1qBFR0ICQnxJivPFgP9T7l/3/rBXx6e5ru+yU0FNJuZ2CR9fMsKp4mGJ7p90faP9rcnBG8hA4NTVyIbs218XAtxtRI0hnhFXn5Hwcw0njjtCvr98/ck27tKfNi4T/O32TDaELvftjpQ==; 31:SEJwJvW23r3pziOaIOzCzBGPkVg79E4pzBi2J4P55BCGSXTJViZHh0jdn5yqDEWoHasDzGeWzgMDcCI6JifMcw0qcPXzR9fy6K1Mgqp5VcrL7weAD7V0pZ5Pp8bVXpuk2QYpiVYJcW6c8AzJPh8BLYGr0vEbW1vBs0IPTP57zIFHaw0jRz3edtF1vklgg/AKyQsuPL3mdE0KQD2/j1zRhYpDFSz2kSFCIn5Ybn/4EcU= X-MS-TrafficTypeDiagnostic: DM5PR12MB2471: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 20:38//eZbO54L+mjEie+8TGY4yl6pZBBbhkkeF7F1YFTqrJ69Ym4RT0pQe8lmpIV9qcLSuHzkEYpnhrJWUuLA1oab9UOzJOFNwKgZJSfMLY9E3f3bnIdH/20YPGpJVNAW0gkjUtwA085rjT32fYe+7mxFELlIRoGfDIKBFmpVQjRCOCUnVGArldqjSnL0L9nOP+YGpUKVgH7ZYvfOLj/PECBW/EQ85SU7CtaAagmjg606a+tSefhKJJj6giX4DEw0KIc4vx4Yq3j68M1hHltg1bQb5s17q1p0X8NBusTkqbr3Ztz0rPnQJAjKsOBpN6+7Wv5Ui3XmirBRY0OO2coopiMBWe8B1SY7HvEq9tbZfTieGqg08NDWZ5TcTgV+vKbDIcrqi/rNRxwDr6CfANwWaNMRYqD3uYRCJQ/e8vu3SjWsjhDQQrL843/6eq+zdOxOBVdFCwK9fQ0Ec5P3iF5nSjuz8GMZtv2Ej6LKueOTELGT3vyaKgjnC0Q6BDwxgqvSl; 4:fXSJzDObo9S+lZjQXNTDn7cAX5O4VYNR3oa43G460KHTdruz9955GNuOsofuKUWnKF/5YzZXusa12TwOD1km1bN8PrORWGOSgwv3iTxenrhc6PiAPkpqmNwcbGwCs9GeQT2WpHFPJy644lGTazaswzAOHbV12A1G+cQLQy49snJHkyv3gWgsUep/NgMXhEyA6J0jqSEkOovZANnsBpmVZ6HGJivExWaWPfL1GS44jZXi+A5IXviaTKuRm5fxXtLoNFdVPooZzZsIrO2fWv1pMJL9xc23/nHuKlW5xRec4OBlIhnDsPJ7gouw2J7RFxf2 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)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DM5PR12MB2471; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB2471; X-Forefront-PRVS: 0704670F76 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(39860400002)(346002)(366004)(39380400002)(396003)(189003)(199004)(186003)(66066001)(6666003)(86362001)(5660300001)(8676002)(68736007)(47776003)(36756003)(478600001)(7416002)(81166006)(26005)(50226002)(48376002)(59450400001)(386003)(6486002)(16526019)(50466002)(81156014)(4720700003)(72206003)(25786009)(76176011)(51416003)(316002)(446003)(52116002)(8936002)(7696005)(4326008)(53936002)(3846002)(11346002)(305945005)(6116002)(7736002)(956004)(476003)(2616005)(97736004)(2906002)(486006)(53416004)(106356001)(44832011)(39060400002)(105586002)(16586007); 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:HPocQu70C8E+y9elSYzKWTarykAZdIftyeUwPksX+?= ALxJfvYjZR1SYycF7O5ZAj0gemdxml500jPGYALJ2CwYRPVI4rDkPXxrP0K7h8tUu08lfrGx/UdP1RjvlVVSAir/vH+gaEH2Omxo9UtBYziL+HjJF8zdmsMZR3/4eits+onTtMjfCxldzDX5FoBpiecXWv77yKEbFAMSzKcPaWchfr65ReieQzWDpAqsfxFwB7IDDPfBASCeZzYW9TqfR3GaoloAMAWM52/zuLzcP8vWTiHGwTy6S736xrOVM24SzEhb2gM/VPv3PB5RHX12T3cEnDf/0NWkgO+jGmlb8Gpr5kbBI4wwGvTJRRHWeQDT5bHfLQvo1Y2pDNXTy5dNjKS97fYpmv27wWCJPTOJWJOg+7eo43Up5rTcp3fXq09eI+ArY1ICgdo7d2lhtfH/aMAN9Y1q7mjJHIHmMsSWW5xYxKBdUAvklDremt1eRkoXuSRKtJ0X+/c8jzZJJjE/QrmKNkoGjiD4NJrwoJEhywwzHC41azvrKK6v9KogrM9BLZQUT6NOuDoVAo1SiVwElmju8n/ZlUHaTu7eVKHI/7az2v3D8r+gpvEtuYcdJ6+sEcPBmU6HTUS9GEow0InxXv5WKP6123dGCF9N7kZq0WX4uAY8CLkUdHHvCVDfZV96G9u1Lk0J98ak9S8YJrQyXliXFhdVOBkF1kk05Eb1j2TVq67y05yAb+TBjFNwpxxtZh98CI01q9+2hMA/E5LQM4nVRF0yHtvTOp9gL2e/KWk50VHUjO6NV+E5CJMa55XCvR6zS42NJvp4+fB/NMUCaIjBUCROaXOnAlAXh587JMHx+moXisn8szu5pOsp9WVoB1ukKgl7jAIiLoHYfUsxmssOzZLIkJM6utM6uaRjx6O3dDcx3tG5jX6pn7X+pca6QfQkQYtKD+Rb9Z55l6r0e/Z3pRv/RRVWSZlHubA/c/UdSa8KyEaVQTZ5NygN0bWEIjzyre5XmCD/eaUzxjfkwZjOVekQW2W2A9qzwE+493rIP7lAnFaIymxk4qXjeX91bwVrkOz8qbru+053sTAgpBkeidMLyUTx3Kap3xa3qRFT+MlEOStd0fJRKvz7cT/3YEqaw0BG8b02Gl1Zu/Wat2Ge5HUyE68JbkAJ57lH676quQXR9Eu58Vgkgo7VdZP39bvTqqpNco3C+1Q/1UpElELI0QrBRhL1jwpi+I4JqDrVe1SAzmnnq+At58ErGT4L+hrvMYpBNrJBqirhNXR5xEm5G5pkVS7MFrE6mATmmy7uky7GtSai0Eklqr1Ed2sY3A= X-Microsoft-Antispam-Message-Info: xvuEDe2o7MlwTraC6H1yyUBE8iMOxzzAUolklhUXZKdzJqU1oD/gm1+zQePP/+lnrV/hDfIOHcC4Jq3m3SpEqc+rgGY7JLBJyaR7zorcXRJRzSAWE1a1w12iE82+KLSHCc8wB4DZRVfHsbKLaPnpf6p2RU6Br1IAlIVoxk0OsQo7YpOqF7ZCw8qHw3fQfXIL X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 6:h3YC+Q6SFSOU1P7PQgvEWDKCvxPWAfyy0cSu20Ho2qZ+qjw7A9QswrLHEtR+fFbJ6/fO5qS9nMCHRUeSAAru3RvIwTnz6yU6wlKlykMd5m33H8Twp3dE/9CJOnN3CLsIu42MR0A7PcW+6edytzwNoWDfeMDhhG9117pqPdk0Q8zjkYInPo4nYyTn2QTqQKGbk7xhXaXl5Albv31wVX/vdfr+QbqVnRNrafTEGHYN+n7672GZar2AQgiycvRq3/0/yHts+Bvc2inSiLCcLM7DP4whpLTOw5aLYq6WKbUdoeyNvfruT5WC53wRKwcmOqQKhgT/XyzfoIL3Y3jLtgUrbpBM45N8XoeHqU5YYAmYG3jP+v4omMb7/CsA1GtlxJfmrxfLDvnkRHNqnN4fj2bFwJeyQsd+2CDQ+0R1k6BUqDzZ4eNOfmn7HfkUKNzBgGtiMW7r73itBO1sN5dEkRx3dQ==; 5:KQ9tq4cP5s2kBGlKwy2wq8J8BeTxoOV/Et+jmHHiGtbytfPEFNo5eAzFxgqGxjRN/oAHdZxle5E5WBoMVjRkvDFgFgX15bt0bQVAfQn69j+RL49GvyKwTeDtGYqQc5gs4pPaANRH0mwUrYqYmV+UXpFJMgMjBstv3rJkb1kU130=; 24:CD8lAfFHLC5SFsttoAwlluxV2tqb4O07rxCoLbv2LJS44e1Or094oB/h4+8yIMT9j7MWia+KWVL/ozhjvqiEGx9wKGB5u/kzcr6NIyz6POY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 7:zzTupXiWG+Me0KUgc4/oQVz/0s+K8l+NyY48bpr65iyqBM5Si0nzOCEla4iVIOdT+9BJf+3W4OzyTAiUN3p9I4ox7EARIQFXcPlUAFwsTEo55uWl/OiQew7hX4pyr1N69Bb/nr8BKJs7Knjsh4ugCkRIzGTRJR4957Wd8rSpOskRTnB8WrTWBJnmIyvy4b4sbQMuy/5+cG25JtnkdsmN0okdDV1rLtG7cMZ3jIEeagecYCIvP55fpF5Dxuuhg7JS; 20:vIlv8osplv8OcyIA5123rEdcqzyT0nU/0xjLqICgLlyyJZ55tpFvz5hewzbTDqyak15f6DtjdZEAbSS9oKVSWnvHR9Zb2AXwPXUR4+RKazqM0VI1ix5sALTM/nqMa23W1kzDOzZq08XuEbYdSAHeFGRwQoRY+ieRD3fMaBC9ho12SKD7cPlZk0+L3HFTKLfE8jM+zoEvgXPEuPxnV+JDaTe/1XPRyRNm6MdLzvzGcpZLtV6cPelWlIeyTsCNqLWj X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2018 17:15:57.7713 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4213841f-944a-432c-9104-08d5d2e3a965 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: 40.107.73.53 Subject: [Qemu-devel] [PATCH v15 1/3] i386: Fix up the Node id for CPUID_8000_001E 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, kvm@vger.kernel.org, kash@tripleback.net, mtosatti@redhat.com, qemu-devel@nongnu.org, babu.moger@amd.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This is part of topoext support. To keep the compatibility, we need to support all the combination of nr_cores and nr_threads currently supported. With this combination, we might end up with more nodes than we can support with real hardware. We need to fix up the node id to accommodate more nodes here. We can achieve this by shifting the bits. Signed-off-by: Babu Moger --- target/i386/cpu.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 7a4484b..5246be4 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" +#include "qemu/bitops.h" #include "cpu.h" #include "exec/exec-all.h" @@ -472,6 +473,8 @@ static void encode_topo_cpuid8000001e(CPUState *cs, X86CPU *cpu, uint32_t *ecx, uint32_t *edx) { struct core_topology topo = {0}; + unsigned long nodes; + int shift; build_core_topology(cs->nr_cores, cpu->core_id, &topo); *eax = cpu->apic_id; @@ -504,7 +507,25 @@ static void encode_topo_cpuid8000001e(CPUState *cs, X86CPU *cpu, * 2 Socket id * 1:0 Node id */ - *ecx = ((topo.num_nodes - 1) << 8) | (cpu->socket_id << 2) | topo.node_id; + if (topo.num_nodes <= 4) { + *ecx = ((topo.num_nodes - 1) << 8) | (cpu->socket_id << 2) | + topo.node_id; + } else { + /* + * Node id fix up. Actual hardware supports up to 4 nodes. But with + * more than 32 cores, we may end up with more than 4 nodes. + * Node id is a combination of socket id and node id. Only requirement + * here is that this number should be unique accross the system. + * Shift the socket id to accommodate more nodes. We dont expect both + * socket id and node id to be big number at the same time. This is not + * an ideal config but we need to to support it. Max bit we can have + * here is 8. + */ + nodes = topo.num_nodes - 1; + shift = find_last_bit(&nodes, 8); + *ecx = ((topo.num_nodes - 1) << 8) | (cpu->socket_id << shift) | + topo.node_id; + } *edx = 0; } From patchwork Fri Jun 15 17:15:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Babu Moger X-Patchwork-Id: 930133 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="joA42B1X"; 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 416nJZ2v9Xz9ry1 for ; Sat, 16 Jun 2018 03:18:37 +1000 (AEST) Received: from localhost ([::1]:48478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTsMt-0007eM-C5 for incoming@patchwork.ozlabs.org; Fri, 15 Jun 2018 13:18:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTsKT-0006G3-26 for qemu-devel@nongnu.org; Fri, 15 Jun 2018 13:16:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTsKP-0007Sh-8h for qemu-devel@nongnu.org; Fri, 15 Jun 2018 13:16:05 -0400 Received: from mail-eopbgr730053.outbound.protection.outlook.com ([40.107.73.53]:16992 helo=NAM05-DM3-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 1fTsKP-0007R7-3E for qemu-devel@nongnu.org; Fri, 15 Jun 2018 13:16:01 -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=Kho/kKDdrXaIDYo5gGxvSTqKGAiUjrXNofmbuasyhIQ=; b=joA42B1Xogqoe9K/aCseDMiE3k9D2lVCF2LiW4kOa0Ks3n8zf+h0ds5FOSy1KoqkUuZodbuY3cyQdEYK++wsFtTK2wgeL6y703TSyOL46LfjzRjbFeujPjN78C9AEvdU1b1wzq/WV8H1hiPaC2DjvwdYWKJHqDN+WSvCJLqwUTE= 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_GCM_SHA384) id 15.20.863.14; Fri, 15 Jun 2018 17:15:58 +0000 From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Date: Fri, 15 Jun 2018 13:15:46 -0400 Message-Id: <1529082947-60001-3-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1529082947-60001-1-git-send-email-babu.moger@amd.com> References: <1529082947-60001-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0201CA0010.namprd02.prod.outlook.com (2603:10b6:803:2b::20) To DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3285b20c-167d-43d2-03bc-08d5d2e3a9f6 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DM5PR12MB2471; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 3:QiD4ZHvg7f3s5tjEu5Bz0NIj1ahoXq6Z+Y+mlk8qizf233I8k47v+hnwaYrITSz+gcH+jWDapCTn4mQyE65q12inubFR/rMEA1ktjl2QkMheq9irz4ZZU11N4HTbefEdulajxfdJKO0Z+O9MHwuxYW+NyiyCwirvoLysgk3xN3DrOgznD8x8w2BTA2/Go2GIRW81qUkno0d/2D2xwIqhGJoWdSAWJqw4uR9CARzDarD+7ESAOCcHQ8bEd/WYFslW; 25:MAvYou+5GxejCRavOQX6JaW9tFDkMyMTvwz4Jp9g5phCRPsyK5eAcJgvlZxMUbmPAsJQW8i/Rl4RAS3QoU1ekNjOzC2uNrmUZvY96olb2EOxcvSDsGSTZDVY9G2AkjD3nSRB/gyzfPEetQr+BnK9tJzjIMqXjmBKIIOh9rxngoBlQpucSZ2oib2OvITpqexT90F+eri9vIClhdQBMduDcVKJn/B4s/Ott5xnAyj/aUTEDTAEy1YfSkA0Z2mFyLmpkgkklFHuJLj8p1nHwEHLsWtp0cU2vHzJ6e49wUA/IryBCn242OIzEeBGW1Ed3c79GOfWiU/N663UNsTGs2Yt2Q==; 31:X/zNay+RFp5VN/Hwx2ieI4X/iqbBp2/qKxMPtt+r9KHoFwaNQ6cxTYQ9aIW6k7xSTeimKl8cuac/NnUf9mUBLW1nmKXJBG349jOo+c+peFFq5P0p7gX9zsO4cv6HT403eQW+4OFKcvqT8IhmxaiwtkJ/pf1xBfYtJy7j55HONoY5l5sdY3/Km2yop2NgEaagWsiWCLCHOYCQ7RjeyibGJxuFiVDDQE3pQW/SVxuaIvs= X-MS-TrafficTypeDiagnostic: DM5PR12MB2471: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 20:cHEyD/OFDey0YmIGFM5rDA3fYTs7IFiKU1vW7nwBtdnZo7sLXfNGh9Ngpq3/egr7qpCB55TSpLse2sbCHV5/IyEIL4dVKHRQPSeFWpX+fYdBLso4+ebsDOCbZQybQmP+dvKo+5059ZJq7OT0MyMP7d0QYbTsEw4Jgi2UJ7jOmAkponVp/MqoL7lKeAS0Vgepwf2LqT5Ldufx0ckw3fXj4lJE/Xs1SMaEy3Suv+6DkfIwOy+QDCld1aiE5XeWl/kUgCBAjwyd/MM7FglF8FiThLyBjHicwgTkxNEUcPMmF6dg1YeHh52n6sHSvDsjYsgLohQcv8SQVoEON7yO+sQFQbrhtOxJqOiunfIyDU7NjZflT7v5y/ec1wstlbznH24B6gKIWcHmFy0HgZ2YLCY4504Moy+IMCJtHvuVHnbg60cv7MWLx6zEE/T1RiLPG+sK7OgTh9w4CATf/E3VPXTXl8Du2ftoa9JgCTMURKsR+ER6Ad4G8TKMfMrOt5RuOorR; 4:LGNAUldrh50Jop3+07pEYzqLcfm9n13r5R7Vu+RPU5VuboeGY/Ee1awPKCE/KYPBaVWE0N+dHXWbopkexYyhGAdDdLbWWqREWv+iBZb2CuN6m6SCJphmzSxO+g5cWG3E8LBOVi8hmgGBbknMEY9+zvEpFqZ4CjIpanbASvvCUbMVgmQFNwuZ8zhnN69fH21n67UaZY5pSuzelrfyBBiKq5HcEXzkyXnPuKmff3s6pVbXZtc8lIEOWiVvTcn1hxnni6Lcn+CfYbxHlFrnbT0YIvt/Ma7/sfkzt3q6SehWnwgdBwZFI5GLc56EDUDPzZY6 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)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DM5PR12MB2471; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB2471; X-Forefront-PRVS: 0704670F76 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(39860400002)(346002)(366004)(39380400002)(396003)(189003)(199004)(186003)(66066001)(6666003)(86362001)(575784001)(5660300001)(8676002)(68736007)(47776003)(36756003)(478600001)(7416002)(81166006)(26005)(50226002)(48376002)(386003)(6486002)(16526019)(50466002)(81156014)(4720700003)(72206003)(25786009)(76176011)(51416003)(316002)(446003)(52116002)(8936002)(7696005)(4326008)(53936002)(3846002)(11346002)(305945005)(6116002)(7736002)(956004)(476003)(2616005)(97736004)(2906002)(486006)(53416004)(106356001)(44832011)(39060400002)(105586002)(16586007)(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:FysHzy3q4dgm0KlfHhTKMIrsBOUA0ssXqp6tEeQzA?= XmdER0VLLNxHglpaItFJ0WPs1UYb+8384D89VGTuk0/3eqjKPeMjDRIw8IZFZ8gTbFWtv5iVCau9bww9DZQkuqTYWJB682/Lhf5ZMNIo+ef/inlYE/0GHtbkDSGN0cU6j0tupVM8oyEtEtr8UKcge/quVm2PyvGn+48yj8c7YYeG0UfAp8GOxPPvohCqLpyFe2CG0ldctFTBSDJh3kf2iHjptMy4S27YAE/mGQm7Q7wP1ponXqYjewA9t2osgnGrLkKvWDJVHUQm6jlwPhVHBOkpttoV62F4tifS0yeeZmAZytNdfLwoSXleT/E7MxdTOdiAvjReeKEuatnzYz+ooFHG6DXt/FLWHSDUjxMx3oOq2wms9zaEaQlTJ6mZEav7q9wSozAkjhgOKDP/KMTfPDr/4A2zRpiA3bYvgx5oHd+GbX79kMOzCOc8iQJzE2dCYo1A4iOTVa+qigQ0kqgE+1HsxBuuINSbREB8ANkfVUNkCyhBoE7xyjfL1ltE6yn98Um97hg0bN89fvwcsEjtYeWm74x5rImEKwvCSh2SknSm6vOJN8opd9FfphfJ91HwNUUd+I957BaJP2U72q6/BIBtiDDp+Xl8oXhirvSvANVEsUGmuJJxasB9qM6XZrF589nOqaWiedXwA1UUmNzTk8XVFBtbzZuW+3JW1naR/Z0CckJ2syFGH1SC5GYRc4ap2ZydvMFsuXM2x0iwdec1qjzyexQiY3bkZnBu2aGPpZH6r+IfaHljQyZ0CWmK3Psnd+GhqxbpmgK+lY72hAwH1WInxKYhfCpphKqldQk49C9tdV+Ugu4QNL2voDkI3C0YeHg10qdbVqoBYEymUE/PLod3SmKI0Q6gJvw851h9XgRgbPegNQSC4ZhbtQLarWnYrbjM2VOdX/PYLvmHTw1LRIlSqd3ZOYPn1+amuafdfnttJ3fA/tMnCjRL/CElm+/C6bYLvMTFziy5zwktezq3WsgCB5dq65YOJBr8FCfSatP8E4mBJoInqTkNslT90u7It/cpkSFG4tL7wnb5KK1ToxR1F4cqHdcEjROWmRdVt4f+tBksObsjnqLVrvwQ9feN6cfQuGqtjlImxY+dIlZPZ+DxDSVBz7NE9nSWbSJCeSbRB7QAN5mZpeJBOZ46acaeBs7cOZJNbd6+jx73cWtbPLwF5WOHQ/m6u58nRnvZW6T+eb/hRJeCLsqfx15DyqnACjkiyPYqk746d7PKgbuUVx3gPOs3gMqXEESaKFGGR2OH6b4kgZBe9ulKuh3ZULHEcM= X-Microsoft-Antispam-Message-Info: 1qoHwdCvtYsfkZC3TFbOUbj+FkukBBR2IYL7Ili/7lnfJLhsT/YqiZsKklHr9TZgH8BhgCjNaALUqY0pKE2bGAfppQHKB+wFXo9offj1k9cB58yvq1FD5kCy2uzbSNusisFKedmVQ//avaxfIewN5CSSIpueL0ro7yfFe/cLtgbt7WT/E9eXt/IhQq49OUrA X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 6:t/K9zfvuTEy4IXftjg4HVOyKszSabqfRU6SyQrsl6anCYi2Du5eKNE/U0YzhFx0UhyknBbgL0CEVrWOVsEhPthSvLpgmUKypSXPJvPN4LAVOWrQ3JFM29U7JrZ5bMs6ozFHjUfY58FuZ7LRkiSkwZQyu7hXtAY9ASIYPSFCAEhTcuR+CXg+IV47TrGQLP4Rpz1dRvNs6kxyvcaIJzZ0CQSuEsd27UsCYDNg93fy7rkqMk+gOilhnwTmfaNGLB+Pm2v+AgGnPvw0H0cRpGvYPAgf4/+rDRygDTdmuaN0FRChvtjKMp5gfdPDGxQtS9NjQ3NqI1wI90SXrb2S2CZtR16mgnV5ayraYasRHiB3t+oYAIxg7XyfMuVtET31C2eG3ZfDFZV+nHQooiQ4KeKWpfP4BOGo9jWSOZ3vJB2dwcnsdXTqPz4eWnOQmXRKsGItwvvff2Yd3pjl9ufLWSC6jtg==; 5:Ql/NHNDzmWmfXi+zHIMWOhIrdUMuB15SYl6B6BGdDuOWNSeE04PGiAwET1aRoue3YBn/CfHujc7Ht9yJROKS5J0F0aDGjF5BFIy4EGn1HycXqcfIRcyXNc24Pbo/HxypvXpf7f72WnzO4MRnkbSP7/F7D5pU+vDs7l/djKPk1CI=; 24:WXdzq19YuFTxmIgHmtXDbQsbaGNiTfsFhiRDWIX2BcaO3TY+l2U59lv+2JNhmUACCcL3J3Rllzx3UrT0j0lww/dQzfmATk2JwIw21zf0rmI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 7:p0k0C8XSh8aw7LjQt+K7vLqJ++6Q80nK+I3dQlZxb5ZdZH3zTJMFzT4M8YkFnDdOkPSM5q1WLCVEa7GhGRyc8YhsrhEO/jW5xJGVgMsK1UMfdphXEBcMmEKkRZcHhUyVYIWP0e8woHCPyfQadwyR5KGtjcp0uWgqGHerN4Kr4p7GqRszFHrLvC1K/vAdG+miaapbiVumnQFYc6bAyOF7GOZvYitg1ynOqJirHnHHmgkBVmuZ2yvo+dQI0Q2b/3+D; 20:9jx2aOHmO2KrlXehp4b+3m7/IOe4i5N4plDYpiOValEJqQSNXzY3QtZ6M195p8IeiSMUf3exQtrN5mXXIU9gKK3z0ySKaYtyt6pX/lZ/aAuyo1bXXSgmdIVOz6C53SSvoy4l5Q4B0Kvyg4GfGv61YvjgoX7H7Y598vRtfqiq0/mBX1Ngq3IzFwQswhv9HSVikYlL33790bHuquPzFm/Ud1sShdP3f/HAb4Kn5MvH41lfzsA4byLhwWnBquhswrBo X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2018 17:15:58.7130 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3285b20c-167d-43d2-03bc-08d5d2e3a9f6 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: 40.107.73.53 Subject: [Qemu-devel] [PATCH v15 2/3] 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, kvm@vger.kernel.org, kash@tripleback.net, mtosatti@redhat.com, qemu-devel@nongnu.org, babu.moger@amd.com 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 on PC_COMPAT_2_12 and keep xlevel 0x8000000a. Signed-off-by: Babu Moger --- include/hw/i386/pc.h | 8 ++++++++ target/i386/cpu.c | 10 ++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index fc8dedc..d0ebeb9 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -303,6 +303,14 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .driver = TYPE_X86_CPU,\ .property = "legacy-cache",\ .value = "on",\ + },{\ + .driver = TYPE_X86_CPU,\ + .property = "topoext",\ + .value = "off",\ + },{\ + .driver = "EPYC-" TYPE_X86_CPU,\ + .property = "xlevel",\ + .value = stringify(0x8000000a),\ }, #define PC_COMPAT_2_11 \ diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 5246be4..2f839ec 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -2576,7 +2576,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 | @@ -2591,7 +2592,7 @@ static X86CPUDefinition builtin_x86_defs[] = { CPUID_XSAVE_XGETBV1, .features[FEAT_6_EAX] = CPUID_6_EAX_ARAT, - .xlevel = 0x8000000A, + .xlevel = 0x8000001E, .model_id = "AMD EPYC Processor", .cache_info = &epyc_cache_info, }, @@ -2621,7 +2622,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] = @@ -2638,7 +2640,7 @@ static X86CPUDefinition builtin_x86_defs[] = { CPUID_XSAVE_XGETBV1, .features[FEAT_6_EAX] = CPUID_6_EAX_ARAT, - .xlevel = 0x8000000A, + .xlevel = 0x8000001E, .model_id = "AMD EPYC Processor (with IBPB)", .cache_info = &epyc_cache_info, }, From patchwork Fri Jun 15 17:15:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Babu Moger X-Patchwork-Id: 930134 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="WNoFvCVh"; 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 416nMM5txDz9ry1 for ; Sat, 16 Jun 2018 03:21:03 +1000 (AEST) Received: from localhost ([::1]:48493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTsPF-00016w-EO for incoming@patchwork.ozlabs.org; Fri, 15 Jun 2018 13:21:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53291) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTsKU-0006HI-IS for qemu-devel@nongnu.org; Fri, 15 Jun 2018 13:16:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTsKQ-0007Ta-Fz for qemu-devel@nongnu.org; Fri, 15 Jun 2018 13:16:06 -0400 Received: from mail-eopbgr730061.outbound.protection.outlook.com ([40.107.73.61]:38533 helo=NAM05-DM3-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 1fTsKQ-0007T0-8S for qemu-devel@nongnu.org; Fri, 15 Jun 2018 13:16:02 -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=O9WOH8MIdu+CCjBsrkqtkatANQbJD5mpxxc3b4MmgbE=; b=WNoFvCVh61pLa4KUiEWXWeiG/ZRhRSdX/nhA04HLt6dUL/sVZroh6aPy8EkdOZkWIawGIyiHjxfgHRHPGS56kcXgVqGRjOboPIMDjkohUZGcan2WEdniRA2vgxFXY1uDDyDreKS8QOprZjOlShlTwufC4oyGqkgRLTt+5h6+TbQ= 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_GCM_SHA384) id 15.20.863.14; Fri, 15 Jun 2018 17:15:59 +0000 From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Date: Fri, 15 Jun 2018 13:15:47 -0400 Message-Id: <1529082947-60001-4-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1529082947-60001-1-git-send-email-babu.moger@amd.com> References: <1529082947-60001-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0201CA0010.namprd02.prod.outlook.com (2603:10b6:803:2b::20) To DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cba823b1-337e-44ae-d7c9-08d5d2e3aa7c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DM5PR12MB2471; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 3:VyLKic5o7APsUQh2961cufMUeT588QybOauQ5alAmyrBoIuevW9lOpStggNFXAJXE+GaDcKDXaqhiSvbn5UYiC72dLtZjR/4vjcGabGxjwWBKNj6Eb93aZxRmwBefambB/Fn2+GN547ydtD7c3LS4dWNIvrFBU1VV7LYP/eCNyzyYU8uh4bw+cSWV/uuAsCDeB2JDwNMI+JMulPZEGqXq+4raeHROSzBu1Ck3K96BTd3vvLciRgC3hI4miwSvAnL; 25:0QYEfgdbXn6Zp/G60cc0bqfVE5RsllTD0wV0DdqdzhIm333NQoSb0HASYXxyQn2sJ4CeqojmKXwTa8UaqMWEyPUEhhSqfkm5cJR6lYfjC2uznaoo5K+rKRy1w7vcFUZlA6UfeubMZoydG5MDLlbqnfi7RjGIB/Cjr+XseeWdM89YLoOFtt2zM6y06yGclWWmprjaLA/itUoffmSMXyNiT+p3Cth/3zdWuRBeLs14EYm3hSrbITOZXOZI9AZO/51fus8uHqFFHa+YYHx6gJiv30jzG1/4ol69IN9fvGPIN9Qw6NA2wg/dYxunms3pmVG3L0vvHUsWOfmRIyf7zs677w==; 31:QwPu51lZBamBk6fg7SpwC5un50r6Tulyc1CqzTKz++hfE8t9CYpI8l3WJbkcyUcKNqxRGcLoXhdiP2CbmzDgu4nkq5osoALYAlM0aGTFYyEtdnmjkh6rKK1ciUhClL5gd02uOrX2w9HdCXM/ZaZQsycEIeZqgblq18FVLY0JB/koqxMSVDUYWJVSlXlBzsmqQWTM4/V9DJzjKxJY+NReALoIGEO8p6XJqIFGmhYX+sM= X-MS-TrafficTypeDiagnostic: DM5PR12MB2471: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 20:lsSwiE/iGfFu+3zxDYghOd0ojalXNn+TvqmjCHt1sa/RW4TLMTJiARO8rKGGayEazM+ipNKsSBwvUFed9Ez0JNfhoLXwYaC9q1dXjNQcrZYGSvmAvZy569Ye1KUUvwaW4dgZqjTGd1JXOF3MOXXcytrNXhwxg1ZrEEwibuSmSA6bD11snOFfX2Wzm7bSI5HqxsxvsU8mcN3eiBDtvcdTvZ6FNwne44xtg9q3ykbDhPpq6MW2Dgl3A9okLWHq2gZKOpdAaYYJGxAsfIA/OnAJeX6l85LtzpAcZxTMyrZ2qmJMGs97eKQhRZFxU50QinWzNXXy+eP97K9iGmB6rpsfaqh/MejXF7GBEmmN/j8bZggr3zT4k6zL3jBCergYOd98GfhRF0S4w4siUTvbjIRrYukqE5gNfdjsd7zaOMVnBknBB3iJCNhgg4PfY1xGOKocMX5YfaNoYmmWCvHfMgw4O+MtWkITNj+TPLFmg8nl7sf/My7j/uH7ePhN82xSOng7; 4:RHszvu2Pyu29TMnILQKlkdmijEjDsxPu5F9v52lO++84nIKDYPkpo3XMlrPWOqCMaFcvhwoWEH8bXSkOWhYJg//rHUP57Vjg0P//NNnY/c812gt8+3uWTjWEUBTyV7qKuWAlLXmlaq8isWEcz8+IGrvR0sHiTTYok9yxqBPT7ZNcKWJMKXwWrHhxLvLEKOgDLf/5Gjhisz/w4DK4w+FYXwfYJO3JA2BMxxU500lGq4qVF0Y+FWudXyMgrOxDmPxs8zVh9GOE4tmbrMLRNgboTHwyyNpEfQ/hujLhjjfEbccp8BMUiYaA13+5SG0zzPUf 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)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DM5PR12MB2471; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB2471; X-Forefront-PRVS: 0704670F76 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(39860400002)(346002)(366004)(39380400002)(396003)(189003)(199004)(186003)(66066001)(6666003)(86362001)(5660300001)(8676002)(68736007)(47776003)(36756003)(478600001)(7416002)(81166006)(26005)(50226002)(48376002)(59450400001)(386003)(6486002)(16526019)(50466002)(81156014)(4720700003)(72206003)(25786009)(76176011)(51416003)(316002)(446003)(52116002)(8936002)(7696005)(4326008)(53936002)(3846002)(11346002)(305945005)(6116002)(7736002)(956004)(476003)(2616005)(97736004)(2906002)(486006)(53416004)(106356001)(44832011)(39060400002)(105586002)(16586007)(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:ILyEww+NBhlXoHja7n4nWMSpWU9fFzbgBq6U8R5I4?= kiWq+TLklFb35ivj4iY+krmF6dNFcmExVh3u+K/dJYJJxKtmrcyJ8jhRAHff/oFD0UZm+alg74xP5KIkag1FdIYtWjv5G0mEUzvIAECWJsalI+wubC/Lxb5oClBn/eb87g+tkeRAbFatavtY3DjeNP29PA/TORC3bY3Kh5VqmJ+qxab2/3PLlrJ6n5s1GVO/tNpOScHa3GvVt7gQrxfZIEdwSJhX+67YjWhICFVKEj+qZrRcc9uVKKXC9UZHSw9SufGIWDx6+eZDlhx0IwK4JHCj3WpYohvzGgPqstn2/86g76XJR2enbMfOHdd2Helu7YYAh4BPOudRz/D5gQSdwbhlrlyLlCcSuwqQSMAGIXRLyXnx6u4jqsuLcbYvc1OTkS3FHtfwIZnyt64Cw1jSAIQZDPSTZ7+gVNBjfORkYjqWXHWMsDfDTeH6SXljHqLi3SWSVcxRfIiL2P9wpawL12CQiFy3rL7Tc/A9YyfT/WIdSf9Thbp4qa110EehgpjqPKudggNUj+6vRE4A7RJxkH3KXxJ+0O3Hf6AcCbrc6qrwycwZaVjZg+xKZ0r6DvWdMQQ+Vs3pCAPY85ed55dN4gTB9Le9oFk6zO40IbVE2hkDAGmBLG9cIPGquuhJkKsn+iLnLi7a2Xg8uqe+zS8sSF2PIq49J0GvN4EzArD8DPKPQ6/Nq+ZBnZmI8C860UmZQzecqMMsjpkngUdJbvtTAR/l7d++WxXeE3RPADD4O3Bz/BgGxK/rBOOrdj2fxxWv22Y87Zn1nX6iItjwO/tVQ+ASkgwSbzrDuuXulJS9IZnNa/bKCwczWOFVMqmSmzrYTZLVJ/xe6qcLBfcHR3uWqOlyf9vppGQBz+zWcjbuunGmaRWy2td0XaWDtxbJZu88VyMgeRUQR2UEGqauFBf6ZCNIbmkOzPJPkksa21KbDtGKaAqD6Gz9DqoumOobM0Tcy5KfVuOAmRZRkqfsj2VZxhunqAj32OJkiN9oHdWfRoNO27H0tz97rezR5Uv+NI2PQehTPoBoQ8Up+fnpjlFWSeVxABWbQ6U21CuvyuOsrKq5kX1X+QvLHOMbBNHG2uclzgvbp2sHpC2e0YL72uwb+8ucZ0kxhEr2uUXjtZaOCuo7nu6aubin/9lHCtDHt8iHkL5mX/aH+RsTdks6nlXr8GVwjurU5rk7EgZvYvy5MyaZxbUTEbBW+UIPt1+oLUfacIJlIieCtfjmt7c6NAOAlax2iOl/obD3UWhGXJGkL7anPGT+BzsaWfQBp85HhNOei5OxTpclHQUG4vrexwF7vVX X-Microsoft-Antispam-Message-Info: ZURHLDzWK6SKcakuYTy1kwQh0QuO5NW6T5ri86kVEsXZcCXSLLo7qPwJxCncec3K6AnwI8Y8XJfMswl4ThW3XqM8pfG+eaqy3/7YzAoYCCBBLXjXsNkFN59z/AObM7DYqZ3VPzXfa/ECe9fL9TumUsc9U3X66Are1cnm0agLW0RD8YlTl6F5G9yPeFXVNvWw X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 6:E9AH4wipB/M/S9/1aZTq0bHsfXfqp4iQJ6aKndZE79wZBhtXIJ9Ni0YAXSZRSyt0T+Y4prGsbxiz5ZAkZ5hpfMBAlDFqyuWT6tAIdMYyvTu1t3oiQocK2P1sCkYxxON1PoPgV/4qpKp3UExqmX7k6piFMJQ6129Vzm+JSDOfPUnXoFVrdkU7imphfTM2sqy5nPkHFuDw9HXe1zN7YrVyJHsjajY2cyEDfNpPdBIF1ySDuJZW8S4wiujF9Br7ED3RDhICqrqMIS1/s92UuUvFgyh351Sp363EGCaUHM5GyaFMQmo+ynH+hAEuvkmDaihwCyPd6GulaJS/5/1KQ3k4oDVNkrq3/tt8RKN0/y661dqp1oppWbemS9uT2mRoZbhYkeRcVs/oibLds0EF7oqLc+yA144qfTYaPfbG+UZs9Gt89dlsPg2l2+ZaPGOmbAclMt0BIxQBXWeh/+eX4ccorw==; 5:yrNfzlcYOo5HW9NhxhV4jKsTspknCD0CXXWU9eFs/8W7Op6URC9AW+K5mBsOhLpln+KgBjid3KbGaElXzEShsiqw5Hf7zaxTomryvLe94dPvvRle3UtzS/fconLAuOH4XsZICslleRXdX9zzre4PtlYe9oeN6/Z6z1D+PGjw6Bk=; 24:VLCpPqOaCcZvdDGpI2BPbG7hllWBXEYs3ujXMMQHZiW9nKVmWHiAqBmuluhT3pOZvcFmcj1udibJSWUV9Fd45Mhvkm+Bk4YTdp0ITVK36QY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2471; 7:kt96+4uN+0hStxiF5Qtl/zaHk47EgwuzPHW37Z30ugMwWHSAHkeBXaPJrEPiyAXIGsnImCY3rUUHQ23iOe79NrbDmwM95Hro0sAn/inubHqDunm5CSL3Uh4A5f3Y5Izy/F1BAmgyvSFfJ+fMzquq2rl9HmoccNpFnwIIFd64tG6GSAoHyalKwsZtFpTMuPjZ1PeR4s3uwcjkq+TMPI/7v7rG11fZeXqviUu258YervSzsEC3WZ7lMSeKEXd/AJPc; 20:vmWg9KEEEq9peHeLw9ZvCmmEDSqIJd5N6H38+gM4s9F8+zGYgmj7JfkofoZUna7DcW/67WGdKQBKd1XOREULf9v8Oe2jDc+2WKWj9hQjK5T0aKgmDQgIdij3mPIF9+OhJYSHpT4Irukgh0pDp+ImQg6liij1yFYcVs1zQpLQFGytDn9EqSaQwUe+21OXKe4wVCf6nwSVdkP/WvZrM4emdkh46GFFGxUY9n2RBAcfVY1Hwp6K34OoPt3AiE5mx8EG X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2018 17:15:59.5986 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cba823b1-337e-44ae-d7c9-08d5d2e3aa7c 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: 40.107.73.61 Subject: [Qemu-devel] [PATCH v15 3/3] 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, kvm@vger.kernel.org, kash@tripleback.net, mtosatti@redhat.com, qemu-devel@nongnu.org, babu.moger@amd.com 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 | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 2f839ec..cecf421 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4982,17 +4982,22 @@ 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 or try enabling topoext feature.", + cs->nr_threads); ht_warned = true; }