From nobody Mon Apr 29 11:54:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529444136717413.4741385541091; Tue, 19 Jun 2018 14:35:36 -0700 (PDT) Received: from localhost ([::1]:45083 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVOHn-0000wR-Vp for importer@patchew.org; Tue, 19 Jun 2018 17:35:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59816) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVOEe-00075A-BJ for qemu-devel@nongnu.org; Tue, 19 Jun 2018 17:32:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVOEb-000349-DO for qemu-devel@nongnu.org; Tue, 19 Jun 2018 17:32:20 -0400 Received: from mail-sn1nam02on0082.outbound.protection.outlook.com ([104.47.36.82]:38970 helo=NAM02-SN1-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 1fVOEb-00032O-7J for qemu-devel@nongnu.org; Tue, 19 Jun 2018 17:32:17 -0400 Received: from linux-h3ml.amd.com (165.204.77.1) by DM5PR12MB2469.namprd12.prod.outlook.com (2603:10b6:4:b4::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Tue, 19 Jun 2018 21:32:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jR1LJUivIvmuobjR9V8AfqVQKNDqoGtRKBP47ylJSDs=; b=RQ3IKhI5dQV4k/eoDOgwxy6LPbAFBPyHD6yrqjSPmMTAFCOPT1DUQbNLlkTig57jjf91lpdo5XZgQ4KkSIjDj2FGkjVwDPzgdIPzWsI5OzwSnDBx/pk8fG6FTQNN23czn3FnbUOddhnk1wLV+UkMVcETC4BFHIARndEES+qT2Lo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Date: Tue, 19 Jun 2018 17:31:57 -0400 Message-Id: <1529443919-67509-2-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1529443919-67509-1-git-send-email-babu.moger@amd.com> References: <1529443919-67509-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0701CA0016.namprd07.prod.outlook.com (2603:10b6:803:28::26) To DM5PR12MB2469.namprd12.prod.outlook.com (2603:10b6:4:b4::38) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1af72feb-5795-4284-6134-08d5d62c1f97 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:DM5PR12MB2469; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2469; 3:EjKlugjRJsHs2OskjlJZOcOWVKZJvTD9zt8ItRwjxqFexil0IyXASWQXiHCeVVLf85yB8An6Dlm3Sgt+wkx1WXJOOu8gF1JIXzuq5B54dz384FSENIdTgqqb2pecApJhFNTyvBlhtMBg2Y86uu5CGN+4TZuonaT7U257IuRHGyogxXqewSBzXqDCDd37ssoSgi/nStPaDss3mCqXGHiO7Z8Dm01U+V1l5dcRaHdRdxV5lZhgb/+n1sKvcoszNYIO; 25:mNINZdgrwEdDkXSIW97OHH+u8LvmEq2Fgrm1Pvy5Cz4l10NmDyHrLvYrmjGyHckv/czLNw7jfqIo3UynLUiYxDnBbpdKfJxw8E1XbIleJHLLnlUZwqeTI6KrarCmB/W8y3F3bFkbH7zqeASdw9UzrJTqOD0WV0fuuXWTCMaKtt6cW9IURY0b08oDtBd/jndwqZChBtTYEeJmVlbnbr+2dcc8jh//Z4dNXIQ1oRlUv63lRvmXo0aX/quyL0XlQB3rn9I/M8eyhggSk3gsQ/MnzmVNa6/OXGVc0E00/rOnHJL/OTn+xD2kfhn/F3mqbY8dgiRv8+EaLsNdten0ckSoYA==; 31:ZKeLss99/UHky+Hlt8cAz6aUkiX4DHxnweKFDOpD6S6fRkKOwZlgUEA2c34yRdoqMysHPjQpB2BERaiYKiJ5NlMrM9A/SC5ad6aUYQWw6Z70NraKlJK9/9N5d9H7vG77X/acaAC8rdYkvm3745qF8yUzfSIU+hYBIZH19AmwVIAMihd2QOzO5lNgp704WG+/H2NtXLbnuIrwjPkpeolvRZNcp5nPNV/M6qPkzkq0Cx4= X-MS-TrafficTypeDiagnostic: DM5PR12MB2469: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2469; 20:VTDzVe0lWp0lEzYWCVeNlHpaZPNj1nML2q3+wb+DIEJ3zMf+I4Z6WbHqQB9f6zfo16bBkw2N09UIyY1pig96Nk3zgEEP5DKrRzAy0C8WiwrrWrTnh21HcgszQwCxe6hEovZuKzpVxCKFP55iG42J3CbwvZ1iwZ8IaceoJAdidorRPNn6yrM3XxDeklkHoGf76TqIdp9nsOAhxyUj1MMtWmcS5k/I7KeGRXQNdM+JzhnWe86JcXjJ3WVThwFUV9x0FwviJ0opLODuZYIN4i4DptJERbNSEsogccZVu9uxL1+L2leZiyPxyQjm0xVhzbZUWvnRLTq/qV1ot/t1g698f8lUX7Zw2G0JCL6mE2qS3PV1Ljnes43e3E6xMrJfyV3XPfzBLH9AVCkAOy2VKTOqmXjCeiokBxeBD9jkKlPLZB/D0OSLm6uXGJs/g7A6xTucejhmdw4qnATUE6BquXt3g8EUyB82Q5Nv7c2ryRga2fgIjRPPSR8uo6I74yIJBUiW; 4:A8Vq+y0NSykGzN4UVvurVBiXr9+hQOUCHcqmItZdIJVqlzu3d5F/Y8QyaIR4CMsM8luwoz5tUZoOF4a7Pkz9K6ZRRgmK6uY+nOO0uLaE2MyEcO64xXuQyad6HdVLFXEsFPMXVRpP05Jf4KGF2NXmqEdVuI/6H6ApOtuTE5695ss+OJQmbn3a51cpiudy6pCUOusvo7Y8+5m/pNenWNhVxXzDgE16x4pH249yxK5FlwzW+EjnQ1+aQyCD3uc65ixhsAnfXaf4yWotlCdo3PCZpHzyTVG2QeXjk92m55sL9JPtpAXt5QpRnbj2M+NK1aJg 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)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DM5PR12MB2469; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB2469; X-Forefront-PRVS: 07083FF734 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(366004)(396003)(376002)(346002)(189003)(199004)(106356001)(97736004)(26005)(386003)(76176011)(316002)(25786009)(4720700003)(16586007)(39060400002)(478600001)(59450400001)(6666003)(72206003)(186003)(16526019)(53936002)(66066001)(86362001)(105586002)(4326008)(48376002)(47776003)(50466002)(476003)(2616005)(5660300001)(53416004)(50226002)(7736002)(956004)(305945005)(36756003)(52116002)(2906002)(8936002)(7696005)(51416003)(81156014)(11346002)(446003)(81166006)(6486002)(486006)(7416002)(44832011)(6116002)(3846002)(68736007)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB2469; H:linux-h3ml.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR12MB2469; 23:WxIut5afwXJ4Y5S8p9L1Rm45cNSwWxmBdZO5wCOat?= =?us-ascii?Q?5Va/jvR09FbWf1pitCh3O2VaSpt/szH8pdWtrVDkD9gi5m3UmpdJudsB7+aO?= =?us-ascii?Q?RhuBU5jyyky37lAsAsA/Kkt7+cJPMWIFm1/2MCO26jByVRz9j/UsWMgh/3+9?= =?us-ascii?Q?HzsKxVwFPEnREa1/G/vm4fxkDWt0BZ/fkNbLfXRfWiWf8YBG7FDML6/i6Yos?= =?us-ascii?Q?gu27zD5QIdKZJiM8+rrFRYK4RvCH+zvMa/WKtCLM22nkd94dRZg1vl60BOIz?= =?us-ascii?Q?bMCGkNdL6nsTEE64joTJii0UAefjUWBZv+qP0qSdO6dGfO6UisFLnLhKYstC?= =?us-ascii?Q?OTIf/Rt6w2564u/nvQ1dlZhwrcOb54XATARfdIR2qME7ufRse8DTcoLtiJ6i?= =?us-ascii?Q?QxCoSLDJTx72+J/hR4WwZfgFvinF9SrQh4l/AvXDatTXI7Df761XxUOxtO4y?= =?us-ascii?Q?wUcB2rc8WOpus/9sjbutMgKpt4Ra0zuTROGiKiuRkHZ2qejdzHBhQC0UX43C?= =?us-ascii?Q?iDPNBRZ0YPzkUuGNp79H1uOEy21WlRy6nXI1pcNjnFvBYxLl0YMr/hsNOmjH?= =?us-ascii?Q?sQXZ+zm6/68yJj59LsrCYHrpqSibUeRM9NGqMxU06rlGFafvwfBo7Q3EyUye?= =?us-ascii?Q?4f6GahOazsway/Z1plF9W5R5oEgOHtX77TLla9IbO9i2EwJkwIWRBJ8hFS+4?= =?us-ascii?Q?nX4gNlQW8p8XzcHALi9zsMg0soyVQh7VJ/bzqagej7uQAAcMJ7vMCa4gE90l?= =?us-ascii?Q?KPn0p8UdPa4ES7oZW9EhQSvWeXPHI5Fqy8PHwm7RRj3o4/V9h8U2MR1j/+6P?= =?us-ascii?Q?dHKkbaYKe/ovTioa1Ka9MfGpKjgMF0s1XK3T4b3jsips9LKTIaszFrCXBDgJ?= =?us-ascii?Q?uTis6r185cZq1M8tPrOx1A+akVEgUIqGy4Y4GtlKVbAFqjqdoMUp/PA3ez31?= =?us-ascii?Q?MlGzi7m0/fV5QTF3c8peCXyTaxUGS0cD9ojT0iO+xJ8IZrUYwy3Hsws7XMq6?= =?us-ascii?Q?EJQs53Wl1R701spZZYd5EvBwsx0+3Q4VMEjps49S4cydJeXN7yv/P0rQ4LMt?= =?us-ascii?Q?yvUrDXnwOxNhL0+SREZ9AadqvuVJcEbORvgj1p/535+DhMYDTHItam/ip1ev?= =?us-ascii?Q?gG1EuRegPL/SXwnKJhmeXi4tJVAvGZqIlBFmd6NQ+jWrxbdkJJ1mwHOvNimV?= =?us-ascii?Q?WzMnNUAk12EvkAZxIx7Wx9543Q5xnoC1t4dm0tgT8+xiPP+4+c6SzqIOwbFM?= =?us-ascii?Q?d/H1B0XWQ25Ss1ZpQ1zMcIT4mM6c3Lpd4LFyU5VvFQhPxvmOmMO1mfcCoHWu?= =?us-ascii?Q?wNMQTUqa4Yj+9yEscaYFdA=3D?= X-Microsoft-Antispam-Message-Info: NoAFKbr/KTRDQHx75cD3YhGzeBHImt1E3P7dC87c2S0nXcM7wXW0v6zFW1Ks4CCxHoQx4KKEQDLMhaRdAqAPofYbhT6GVxy35+41GRujVzFI4wn0HXa/owNYyNowUfdBrFcTtKfT79gwsM9Xw7CQ3l8tX6bTe8YTW7pmnz0xU5a+65HH/DwWV/CvQYM5hWlag4zSrtW3QtNELyvOmgohMXSIEbd4gdmododC+x8BqTkE3qK8MhD6A7F0/hWM3Meqdyv1KsJ703+vyts/F7kJ9MYqc7H/x9gIE3hzypu/pAuKKFWIUTbh60i0dSlNFm5L X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2469; 6:2HG/E/EXDiFuJPf7z3/OZtQPK1g5trcSpM5DeNjyq4cNB08MtgLVYID4PHTPloyY9xgXm+8NRiJ/KE3mEEXbnYlCr4lQYdxWwyMtZ2nTPnqIKgu9UUL4zKoE29j7EnOMVRd/i6IKwIbndD7gKAkWF9/EJaK5GqRYlaG5vISFyjKdUj9UcgJf1Q0aQmJTo/LGymkRNkJHg2a04h+Ajl1Csj+QMrJo42JHyhARKIqf/MAD0hJDSNFkMQMZzI4GfHlX655ztmH46mfu+PaLFJlLoGZeQKKrl/m04qNHDDQwp1Hzu6I8ASri8Hn0Rj4zddjzaP6qvEPW0IVMggOLok6qx5lF/A9xKgBYitrJx3ZPdikNAc51vGEXdSDCTQAqVtLW2CiT/IWWiQNMDoqhWlIR9p4wcs7krDAeeykXVpitBZhbJ7vdDt3yV0tYoixTTL/QeKgvY+FqziPnabh+rvo33w==; 5:Xk8NZynFNP+tfnc1eJ717nzddpsPYTpynfdAN2tRK0CxSAY8J/Xls4k917+tfkTe7kDsE4epPKDiTOeuucHmYO6flHttvX6saZ+4now/cusrZOvCKS867K3miPN3aevGfFNK2p52o1VCAN8jpsP+Qn/2dzFfloCtvzAoteiMK48=; 24:M6v39rAvHbaICi+wJz8EEBzyUzaIoDvNGIa9kLg1SSl3KnkpUHgR2ecBH8arSkQpv5tqvRZtjKkH4Tt8fH6B4bvcYnnM6MN1nzA9ZZpRrGU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2469; 7:QH0KeNCp6CjGV5C8DG3qqX0ST8QmPUYE40t6dIjt8inA4soSO1X+gyKX50RWOP74MocR5YQph0QCAMNuRytd5LU7yNQZCWq8asZOXoRoK/fKWJ6XvWckWRkxo8hiMuViAsCwH+139657PhWd/hLhfsv8xibGGRDm6+MLADsBLtubWQAVlXZs9yyD8Bl0sO1lqxphYk4RxHq6ymRUvLpoDD+qXXsZoabEllJQdBQpp77ZgxF9tUjtUEqB2H0f4x99; 20:isWC/NSYj3CX86kKncfesanFcA/TTNGFsEuDGgDDeXbai/fnOMfVZ3t2fcOmRen3Ne96s9LUmGbmvVdlHtW4tPyjnwITcol40b+PpHR5Q+FDnRwaq7FaFkBptBPhDiolSvetI6pKSlb4/qBVIqpL6aK3eSZPDTJylYDu5MUWmRDVfQ0Bmvz38FDA9+hRS07vJ57KBbOkNCQ73363YyLCNc+iCdL1yUfEgAe0EvMglmoIlaoJjPY/KXKpuxGcXXsV X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2018 21:32:13.3228 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1af72feb-5795-4284-6134-08d5d62c1f97 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2469 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.82 Subject: [Qemu-devel] [PATCH v16 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is part of topoext support. To keep the compatibility, it is better we support all the combination of nr_cores and nr_threads currently supported. By allowing more nr_cores and nr_threads, we might end up with more nodes than we can actually support with the real hardware. We need to fix up the node id to make this work. We can achieve this by shifting the socket_id bits left to address more nodes. Signed-off-by: Babu Moger Reviewed-by: Eduardo Habkost --- target/i386/cpu.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 7a4484b..130391c 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -19,6 +19,7 @@ =20 #include "qemu/osdep.h" #include "qemu/cutils.h" +#include "qemu/bitops.h" =20 #include "cpu.h" #include "exec/exec-all.h" @@ -472,6 +473,8 @@ static void encode_topo_cpuid8000001e(CPUState *cs, X86= CPU *cpu, uint32_t *ecx, uint32_t *edx) { struct core_topology topo =3D {0}; + unsigned long nodes; + int shift; =20 build_core_topology(cs->nr_cores, cpu->core_id, &topo); *eax =3D cpu->apic_id; @@ -504,7 +507,28 @@ static void encode_topo_cpuid8000001e(CPUState *cs, X8= 6CPU *cpu, * 2 Socket id * 1:0 Node id */ - *ecx =3D ((topo.num_nodes - 1) << 8) | (cpu->socket_id << 2) | topo.no= de_id; + if (topo.num_nodes <=3D 4) { + *ecx =3D ((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 require= ment + * here is that this number should be unique accross the system. + * Shift the socket id to accommodate more nodes. We dont expect b= oth + * socket id and node id to be big number at the same time. This i= s not + * an ideal config but we need to to support it. Max nodes we can = have + * is 32 (255/8) with 8 cores per node and 255 max cores. We only = need + * 5 bits for nodes. Find the left most set bit to represent the t= otal + * number of nodes. find_last_bit returns last set bit(0 based). L= eft + * shift(+1) the socket id to represent all the nodes. + */ + nodes =3D topo.num_nodes - 1; + shift =3D find_last_bit(&nodes, 8); + *ecx =3D ((topo.num_nodes - 1) << 8) | (cpu->socket_id << (shift += 1)) | + topo.node_id; + } *edx =3D 0; } =20 --=20 1.8.3.1 From nobody Mon Apr 29 11:54:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529444184364734.9554243628697; Tue, 19 Jun 2018 14:36:24 -0700 (PDT) Received: from localhost ([::1]:45087 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVOIZ-0001Ya-N5 for importer@patchew.org; Tue, 19 Jun 2018 17:36:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVOEe-000759-Ar for qemu-devel@nongnu.org; Tue, 19 Jun 2018 17:32:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVOEb-00034X-P3 for qemu-devel@nongnu.org; Tue, 19 Jun 2018 17:32:20 -0400 Received: from mail-sn1nam02on0082.outbound.protection.outlook.com ([104.47.36.82]:38970 helo=NAM02-SN1-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 1fVOEb-00032O-HA for qemu-devel@nongnu.org; Tue, 19 Jun 2018 17:32:17 -0400 Received: from linux-h3ml.amd.com (165.204.77.1) by DM5PR12MB2469.namprd12.prod.outlook.com (2603:10b6:4:b4::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Tue, 19 Jun 2018 21:32:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LKt38xu8Zefuzmj+daEztLUOHSPdxpFcznxbTSwMhdc=; b=ebcKoMmfcRzthjCyHlKR5UG/pp9DqbSTyzpDatgYEEh5obiC5sv7nejX7NgWU7VGxWx8MTGXHLNDoXPIVXYNHPSKTMLaUd69rm126wxqNyTq50L3wbRyxzc59lyuvyG6OPN7S4Ab4UvApg86l48S2tzjJAQJ3E/pMsbisNUW53s= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Date: Tue, 19 Jun 2018 17:31:58 -0400 Message-Id: <1529443919-67509-3-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1529443919-67509-1-git-send-email-babu.moger@amd.com> References: <1529443919-67509-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0701CA0016.namprd07.prod.outlook.com (2603:10b6:803:28::26) To DM5PR12MB2469.namprd12.prod.outlook.com (2603:10b6:4:b4::38) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 17d761d2-b954-4f28-862f-08d5d62c2027 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:DM5PR12MB2469; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2469; 3:Iqa61jb1Txjkz6QTs1iP8iyDUoRTaTpnbfiT5V3KFWVbL3EICzZsULyVDtKbNs3ukTzRptknklvjWyoXUwicns8tnilmdjCV0ioVb0QKMg8Em/iwNyf5GMl2NtWhoMTW2y5hWkmCIWrozeG334I64vvAaCFh9n7sHZfhKtl+XEr+Z9nmFvwN5yE5FyNpCocmy+RUs3glQL+UA7urQykRCKa8M0tLBBqBMuVoCbYiAPfj7gwLbH4I7MNnHvt82Hzi; 25:/Eb8oV32ypDr7NrJDp+ino/31gXDuPJTVXiedhu32cw1OlRhK+6t0JTYbutk+FiNnxXLOWow3i9rssK893pw/QwtE7BatO6HEBbJ7ZHtzb3MW+mK2kkHdla8nUJuz8+ONVXdKLWBG+OrLsu2ifGVMKWOqJgzVTrr+2nrMJLxKSUdcFH6dnQ8kOnsuU5ZQwUUVZiXltC36seEicUYwWh19FGpuxOd1dxO9/Z8lRrVgfw8OOcborxBFUF9SYLkJ13o+2g5blTmGCS62mkoANI+eSPaPLZhhjFo4+j6Xj5gpEyG7LbciJBCNyvBrTd2m/zrmP0eIuQ5v7efW0Cbm8ZAQQ==; 31:oN2jTJhO68FKP7hrfsUTBTp+dTqQh2eg5KYfdsFh/md8FGidXvosemew6aMEVI/vggZpqLZ4wbGrESGx1clcrEzJbwYMBfzmqqhwNASeF6DuzXMfbP4Zvv9SVav6NIAKuTQJTashvTsMvQznxbigw356lo2NBeJ54wrfU2Rs2SBbI++JpKBSCQhgO/PgdnSi6sadVX/zDgMd8sH3TiU4CBz1nyhMkzBMd65BR5qjNvc= X-MS-TrafficTypeDiagnostic: DM5PR12MB2469: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2469; 20:NRgh3Fg2Ci0+YERqOtDd/XcODGYTTNR2BSGg5Gne5y0Fx9kRRXiQ099bliGepRxyV/ClotqF6UxWRyqxSttqUbL7NrPIgtwqmEbmRYoeooMWkj8si7nxQtNobX35ppEW1Oa6sV8E+ne11ZlMHgmracXnnujUM78Hj1Vbs4kL4Atm84t5YuHnUxu/hFDvYPXwhuTmJyrwtRy/xtMaDXY7bx1UkD19fLl5eoie+Az+Q+egKAi4zMVQ2iEn6wh1+6CLU+W6arXukT6tmX+HTkIEwDIbsDlc7RQW8NnDZmXGN2YDw3EbAFBFrr7nhcK5xAOrjX9/jmczl5oGzKGs4felNH4QjW5ApdIj8ZuhK/MsJyS4ktl/Kiub3TKGs1aqIMo+91gpdZvqbnCHgPJd4iMGHkYuvy6zb8JIiqZyP0b/WrKS8W3Lyl0Zi6kZxouraSBEsype5ZpzahIsQndxre2h2KTfCcUBkXEXjfocJCVQwwco4PDKVVZe1SZyox5YRz0r; 4:zRjH8DFzBNfF5oopYi135MDOHmnM4+sfRyLhOlGjFHjX5sZkvhh0WJjF6v6JQFJesXt0nOyF5kbU73x8XuRJ4zgrU4bPUG4vszz5Oqt9ai6m/W0oYBnO2Y9qLJxqGU/jyfY2Vy+wrpBmzrQtcr2X9pGTd/641qorEe3QYoStHp3BBrBBtkrT5X4nA9FtZVFXD63XTzZk3zZShQOTT3LDNEQZqWtRX9/JK3x7O+b/HpQckGCM62GaUGa1/KzorXojCeiQKzwyL5lu9p/0oa28skxlN7q80CiwCGDxrtAM2ba0hb4ksWgiEmAFfCJxzHBT 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)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DM5PR12MB2469; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB2469; X-Forefront-PRVS: 07083FF734 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(366004)(396003)(376002)(346002)(189003)(199004)(106356001)(575784001)(97736004)(26005)(386003)(76176011)(316002)(25786009)(4720700003)(16586007)(39060400002)(478600001)(6666003)(72206003)(186003)(16526019)(53936002)(66066001)(86362001)(105586002)(4326008)(48376002)(47776003)(50466002)(476003)(2616005)(5660300001)(53416004)(50226002)(7736002)(956004)(305945005)(36756003)(52116002)(2906002)(8936002)(7696005)(51416003)(81156014)(11346002)(446003)(81166006)(6486002)(486006)(7416002)(44832011)(6116002)(3846002)(68736007)(8676002)(217873001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB2469; H:linux-h3ml.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR12MB2469; 23:hVP7u6cnmcfXgzIAbbJtn9Sh/hXD0v4PnXXCPyZdA?= =?us-ascii?Q?bxPX4OhW5iVpcEVpM++HgBk2vOvcIHG/dE64ayCtYNF057/iglY7PsWH/D31?= =?us-ascii?Q?gahXJKS9PkzOjjeL6IXyMy6Gey7jmI25IqlVpbMcVcISodv1ElDEahCH7z4j?= =?us-ascii?Q?deY/a53awHOSWxwZZtiSrzqG/uidqlzXiRl4esEXuz24aqfrPLpPFSls3Fh1?= =?us-ascii?Q?1zmfNg5MNRdEe1wtrQpHW2IhxaXjYlUZgiLZOYdPL2jPCawufCgOAO9JN+0Q?= =?us-ascii?Q?PuydKdtfrGpm3yyEfq+Q72Meaa5A9aauOyeA2ImscIWcnK8T0J4L4zgcZfL0?= =?us-ascii?Q?f8CmXWerkhL4xdAn6owh/QDmGkZMBz5dDr7mG5THjluR7mVGUs4gLcTP/MJ/?= =?us-ascii?Q?Lh1s9eNgbaza5kpM0iKA4Ork0bGv2bGuX7d+FwE7r11t/OfBcWOwjXi4oaXs?= =?us-ascii?Q?mHH212S+VIFUNVH8t01ls9cz6zOXB0ZLda2mwrn47cKPT6yyuoSsY2f/S16a?= =?us-ascii?Q?56IfbiCO9I9VFPwop347j19rJpeoYWl3bCx15D5EjFXM9EL8K6iT3VybIa3j?= =?us-ascii?Q?VN5XSPWs+cn9pJekgk5tsoGzgK+PT05Av8BijhVFBQBffUEaiyaK4e5dxzrV?= =?us-ascii?Q?57V0LDQEjJ5O9WxjStG6Ct83SRHuuwfCxXaIRoCZpRkWEezM6EqQ6/fW/29n?= =?us-ascii?Q?7Bd5ZvgrgSqhpptb9LLpVRa4nCQvfqEtf00t2puY4ZuPLSaVXKSrJNxrWXlw?= =?us-ascii?Q?5sztRgUaA1AtGlKz7h6hmR5TqS/u0DhrU4OIUqtxGcCMe7WBRzXbPfkLnfcB?= =?us-ascii?Q?IBAm1Vn9csIa9KYULFdfAKsY1Cv1+TPadqq5V7X/VmrXpi4PRu4HBsCm5TnZ?= =?us-ascii?Q?zyuKw2Tu4uBK9l/G5KY1AYYF7c2x/DTRRb5oU8RZ6xxhSskOUIY9u7D4wrWa?= =?us-ascii?Q?DPCr4WdQG9LRVB6f92/ZLDKbe9X4ErQaM3XgUo8rw/9E5VuwlysmacPX3bjp?= =?us-ascii?Q?B0pG/mPNa5KqvoZ1VA31in8nsOLFzHTlraRgceqFvQdD91zLd/c/lD8uXOdD?= =?us-ascii?Q?sn9Vbsoiu+dee3Z8PK+EJlEN0KqqsvhXfOCWaYiFveufCX+7LZuQfLGGkEBt?= =?us-ascii?Q?xW6+NXJLyqFLpwxXvFLlXl/kkHfH0ZOtvl4N6ZDhKx9TXLOz1GS+Gkmt5N6Q?= =?us-ascii?Q?l5io1lhjvxbQI/PgvJXmFpLwA3u830QVHRouCEAPC/VqU0uieIs4zJijIGje?= =?us-ascii?Q?yrDOk3gPg7XnwTQndFnmzDwRHT6xL+srPQzIBWuklLgPOY1Tl3q1Z2pwhkkz?= =?us-ascii?Q?2SBHK5kzafXIOJX3Oc5sBY=3D?= X-Microsoft-Antispam-Message-Info: jsgiN1iftzKF2V1/fzLUQ+clNYkwFAowHo/lgVuf9mgzg4CnSCntFf6PTiht779obBEOyCYkYlR7Qa4hVAjHhyfJSHvJ3PLluJlrp6z3abAibnLvFwamHbX641+9kXMNHA8EkUTuujucUVP0IiSDBSaJr8stSjKpOGesDvqWHEC4YDPlCxoCIqTUp4PNDgUQteMcP7KeZtJMB/zYhb3ErMAx7mWXkbNu3nvYhUnVZmgfHfo2nxrbQyJ2tWTQn5IRwvQUbSnAuxLsyKI4DxpiFBCVJhu2u6N5sNtdfllKGCSiqSu6Hf+1hSa3S5psDxiuIPIYjC4W9gkZ4xi6ZnXrGQ== X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2469; 6:NYOEkXN0c9ELIJ9q29H43T6TDDemcem4pn0ROIcbuUWZSIAAppyRkp41vz8CQL62lx3Mz11kWjHCj75z1s8kWG/1z026BfYOLiVrXDwpG8aRZP7m7OQGwicqa/InsH2ddx4hBQmFexM1Po4tL8tOfpkUnkgd7bM2sJTxfdrwEwnrcOAOmIIvN5tZKe5rtcMe179C+KulquqA/pP8h7QhbcP3IPJsXXAQWMbjaj1eHAvZ3E0thY/PfF7FgSG8nZG87x6MtjbVY38Xtp9wQVtfKCCz+gY3tP1yCfuJ5OsEAPmrUECXXtZxSCgiH62xju/S/XcB2/uG7HfdUrT6mAkVVH1dqL9Na+JfUI8BHN5vsVFZ3J9tPJcKbboJO1o4jMX0uZj/OG0Mwns9TDKozq4SmLnsvXYZSLu8n9xA/TN5RQVLLOCAtEI5S5akFxUjWU3tVghh0LDptsI3b1jx1QHMLA==; 5:VdheNuMtgFp9d5cmqKpNgMFdB9gEEsUCPRQMglfKIwagsnUS3/borpZzllzFlkHB0u3IW2v4WINB/psJZ96d+IQADBqrzbR3B9oCV298rSlWfDx7MVl94xmPTcq6FxDBJ7J1d0VG229lpZoACCWmCvTEF+T9Btt3X8EtwXGTQHg=; 24:35Bu9Sp9UM6whQvpEWtRmg0GKTSriqAMqBq0jlP/jQr5RwI82A2/1elq7QM7hNWWdU5ArTT3xRvOVscroWEhF++vdnOZZNvXc6v4n7KvwLw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2469; 7:tjQ5T3EWtrSdZW24kPelwSQ5+o+TY2DKeua4T71RcuFHRhwTpkwcJIQr/VsbrTkqL7LJAe+sBkZLSXJKAoyoWTdhYvXDZbncDD1nvqukkHWLMejP8V1JhwfSv0K5fm2SiyL/13VMKEvLo1GkDqu+YDg09BWD1xvKLjGs11A5DXRJXo66xpkz1N/+8w2XCwi5aO0NZwerCz7Fz3BTp9B0z0uJxebOvUz0AZLepOC0ZgdTNwBfVht5NWyao0+2A+PH; 20:yPegv1OEwJvv7EcIROh3nyvgeysoj+waWLtnLBFCxoCwUlzbwfjZZXpBYQbReFZOqDQLdedq1cvRsePPBxkZn5x10cp+kl63ucuIvWStkiw+DhK2iIuirNVaY/hkoAhD94Hv/ciO5obYgpTCp66rWdtLYWE+xkvO1nwrsDeQWDXWLGzju0skQyM80FbAqxsWO1pUtXiIAwlVOkiOrTcQczVg38uB2I0oCYvnX2mXUeE4a82igwDvUYMyI4KLn94E X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2018 21:32:14.2644 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 17d761d2-b954-4f28-862f-08d5d62c2027 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2469 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.82 Subject: [Qemu-devel] [PATCH v16 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Enable TOPOEXT feature on EPYC CPU. This is required to support hyperthreading on VM guests. Also extend xlevel to 0x8000001E. Disable topoext 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 =3D TYPE_X86_CPU,\ .property =3D "legacy-cache",\ .value =3D "on",\ + },{\ + .driver =3D TYPE_X86_CPU,\ + .property =3D "topoext",\ + .value =3D "off",\ + },{\ + .driver =3D "EPYC-" TYPE_X86_CPU,\ + .property =3D "xlevel",\ + .value =3D stringify(0x8000000a),\ }, =20 #define PC_COMPAT_2_11 \ diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 130391c..d6ed29b 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -2579,7 +2579,8 @@ static X86CPUDefinition builtin_x86_defs[] =3D { .features[FEAT_8000_0001_ECX] =3D CPUID_EXT3_OSVW | CPUID_EXT3_3DNOWPREFETCH | CPUID_EXT3_MISALIGNSSE | CPUID_EXT3_SSE4A | CPUID_EXT3_ABM | - CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM, + CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM | + CPUID_EXT3_TOPOEXT, .features[FEAT_7_0_EBX] =3D CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 | CPUID_7_0_EBX_AV= X2 | CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_RDSEED= | @@ -2594,7 +2595,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_XSAVE_XGETBV1, .features[FEAT_6_EAX] =3D CPUID_6_EAX_ARAT, - .xlevel =3D 0x8000000A, + .xlevel =3D 0x8000001E, .model_id =3D "AMD EPYC Processor", .cache_info =3D &epyc_cache_info, }, @@ -2624,7 +2625,8 @@ static X86CPUDefinition builtin_x86_defs[] =3D { .features[FEAT_8000_0001_ECX] =3D CPUID_EXT3_OSVW | CPUID_EXT3_3DNOWPREFETCH | CPUID_EXT3_MISALIGNSSE | CPUID_EXT3_SSE4A | CPUID_EXT3_ABM | - CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM, + CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM | + CPUID_EXT3_TOPOEXT, .features[FEAT_8000_0008_EBX] =3D CPUID_8000_0008_EBX_IBPB, .features[FEAT_7_0_EBX] =3D @@ -2641,7 +2643,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_XSAVE_XGETBV1, .features[FEAT_6_EAX] =3D CPUID_6_EAX_ARAT, - .xlevel =3D 0x8000000A, + .xlevel =3D 0x8000001E, .model_id =3D "AMD EPYC Processor (with IBPB)", .cache_info =3D &epyc_cache_info, }, --=20 1.8.3.1 From nobody Mon Apr 29 11:54:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529444058746896.8573802567546; Tue, 19 Jun 2018 14:34:18 -0700 (PDT) Received: from localhost ([::1]:45074 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVOGW-0007vw-Jk for importer@patchew.org; Tue, 19 Jun 2018 17:34:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVOEe-00075B-BL for qemu-devel@nongnu.org; Tue, 19 Jun 2018 17:32:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVOEc-00034x-5j for qemu-devel@nongnu.org; Tue, 19 Jun 2018 17:32:20 -0400 Received: from mail-sn1nam02on0082.outbound.protection.outlook.com ([104.47.36.82]:38970 helo=NAM02-SN1-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 1fVOEb-00032O-S6 for qemu-devel@nongnu.org; Tue, 19 Jun 2018 17:32:18 -0400 Received: from linux-h3ml.amd.com (165.204.77.1) by DM5PR12MB2469.namprd12.prod.outlook.com (2603:10b6:4:b4::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Tue, 19 Jun 2018 21:32:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GUT05WAzpHsTS8cwez0Iq5tzt5zRuD373pWSf9hcuyQ=; b=Nq/3xg8n7JSszIXoXVzj5Ph+gg+YNzOYd1LdxGmW5s0EmOhv4yEezbmrYgS4KQRPzxhxxG/B/b8H1ShNCafUR6V0ibi4u625VO9HgXy3gufdzMeJqDgff3nc+65aChGGWCMFNSsPp0H0vMJuLVVA01gu3cIwNz5a11zMcWiIXxo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Date: Tue, 19 Jun 2018 17:31:59 -0400 Message-Id: <1529443919-67509-4-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1529443919-67509-1-git-send-email-babu.moger@amd.com> References: <1529443919-67509-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0701CA0016.namprd07.prod.outlook.com (2603:10b6:803:28::26) To DM5PR12MB2469.namprd12.prod.outlook.com (2603:10b6:4:b4::38) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ac8733f5-dc6c-449e-2448-08d5d62c20b6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:DM5PR12MB2469; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2469; 3:rOoDlHN8AjROZGlPVZ3zVRi9zi8rdS8sUygh5F8FxsXwwC8iSODbliPMF87mbB58/rtKaRV7kFRXINEOdu72TBV3m1Y9BDGCzoxrQaymuXCqIHUyTg+wr469zlxDM2ZiLc/fQKasnOwiIsXssOQrUjgEWq0P7LgQbEowLTypmQth6vZXPkWBIFBWygQ/0fnyv3XUuWty+wACygvHk6ClelF9h2yx3R22iXFyiLdRewn0oLBnbeAizL3OTAG26oCp; 25:9R02FJiK+2dypbzUe3igenyww1DqK5gQub7KqgNauUNpQLdmOq2KBi0K3mpXqwusLz2NYf/TmAuZUrPm8FLoJP6fyhfdPNBqdT+6S5KOJT2b1H3Nzn8tmTaBCKxh0sThCBy/Gu/0xB6fx5VD2e9qqkFBSVeqPCbr2bzLx7PW6yNbcZIMBc6lCW6BBfkxz0slJeeQWf23Fr8Jw/kvWAosbynhfPaZ81kZXIEvNBcFSHuRTsUIVioHpROa4gnPfd2v3rHgX38aa7mOjIlcGLAbu+K2tDC25wI1WIgilfU+eR7AKM1l3aoki00oOSrlijczHmOXBy5eerKMYMKHkVav3A==; 31:qVqC4XKMrh5B81HMXfcYmZ5BxlANn0sPgWtQozVgt9tHd3qRuZ/0GxxDgQoZ5/cnAKoMSe6f6E9VueOqK54cNAgcvZKbOF4CxAgfBN99FR8S/hpyfSZ3NXzFAnkfO6WdZbCPb0R5oqMoBdZLfCOmwXWh48NerIM/x1wNLLhQN1jYoVCiAeb336h7G/taGokJPEZQVjdyTVcqcI4iClRkKkcyRfd3GVY0d4J+z3vrHmI= X-MS-TrafficTypeDiagnostic: DM5PR12MB2469: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2469; 20:RtjAj6cDJbPrHivYe5JBznhWnzpKhZlpg110b664mhmJPXBTM//l9BwptzOkl62Ol4jMIjsC0DbiGX6VSAWyPDIo0awmMRQBqWUe5KSZ1tmM8AO2JDqK1GMDyGtDs7SuMJ7Unv2xnXlagGMRoKdFM9Kyy4fr9Rp8Bxo0LAicFbkrmgc8NsWJUn+R/VgGWyIaxj0nDjLVoop2cZNMTIndJDuNWbhJl3vt1UFh0fu2XVrdUH6LLFFYnwZoA1V4klzc1NQdPZWzCuAm6akDTSUeBQz8enoI1l2y1w8NcGTcgkUDrPN0ztDxvn0QuefnTtmzFpsuSwBMPfOQJixjKo49tODjB/k6tCXRrfEj4KA756ndIPPWLALeczTUljIZ7Bfe6/3DnE+XfynqhqtSTqRKobXGJYVndU82cZ/tYqqs82oEyFNIcSzyqffALayILcqKLV49BMbjbUaLp96OqBIeVVm6DAa61ss9AIAh7R4r+hws+L8RPDkgtmkNXrthWyH1; 4:4I1gR4cW3oI6X65ZwIHiI8HqimSw3SfStcUW7upmdmAOQiQYdRidp73phOHRYKMuKjyondJmspr4BSYugAvQ4nnlbdoponDpDn49W5j8BGqvQJc/TP96g/s6vhviTy8scSiKhbmb+6R6JdgRCR5Cb4NyyE3dXOPGkl4wUmb7pUdQm7T3VsrOiPo8tKlE//IX5P01JHqd74BxycezYzwu3DL+h6NCM+2eQhfN+iHXPE9/JJLHSaLmSCTOUal74zyMDDG9qD735wJoTgGjFOhxpUNdhrDzZOnsv3gIf7ah06hH0dIf/XwqJl5xRPSXbeVk 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)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DM5PR12MB2469; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB2469; X-Forefront-PRVS: 07083FF734 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(366004)(396003)(376002)(346002)(189003)(199004)(106356001)(97736004)(26005)(386003)(76176011)(316002)(25786009)(4720700003)(16586007)(39060400002)(478600001)(59450400001)(6666003)(72206003)(186003)(16526019)(53936002)(66066001)(86362001)(105586002)(4326008)(48376002)(47776003)(50466002)(476003)(2616005)(5660300001)(53416004)(50226002)(7736002)(956004)(305945005)(36756003)(52116002)(2906002)(8936002)(7696005)(51416003)(81156014)(11346002)(446003)(81166006)(6486002)(486006)(7416002)(44832011)(6116002)(3846002)(68736007)(8676002)(41533002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB2469; H:linux-h3ml.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR12MB2469; 23:hDV3cZWAeG841ZzZ0GXKVbuuw7r20QjXQPVao6IDx?= =?us-ascii?Q?MchVqzpY7MUzK6QArM4xbKMtcJTllIFM4+6dBoonZ1Z/q5f9V77fDThZuetp?= =?us-ascii?Q?1OOzBG1Di2GAsBqOKOunAuHx3hbmzdi3QUA9Bop4ey7QZOjR7kHVl7lUEz0g?= =?us-ascii?Q?KQXZ2v9Z/iABc+qixoeO9qSNhf/nErCdaeifDHrMZmmLercQydEYwcpWQPri?= =?us-ascii?Q?uFuRChnJ4TqCOZVMe2Zsn8MCkZVFm2tATKcWxg768GSsdrzSmOJOySmUOHhR?= =?us-ascii?Q?bXHJgeGvIZHY7zI+LnIx/2Bg8gmr0jwdRpi1y7r8jZS+LY9FCvjzQ2TAIKkk?= =?us-ascii?Q?QwefdsSBGtsItGRtW1ZAN8KFgkgkx1IKVbY9PqOg0wk8xjcNVJ+teTdZkgbx?= =?us-ascii?Q?9pXG0nfdtjfRokQ/qDZNi/xznJ4b8BVX41/5ozgFI608yLlHKkSlhhWWhjzS?= =?us-ascii?Q?J67Xit7cT9wWXyhZmnrPpxNABmQuumeNlhOqkuNxVYzCZ1i0uho3lnKWboWi?= =?us-ascii?Q?P5VGJ0tKaKaBmBJzujEaljp45RyImtarmK2EB4TvyiiMayL/z6aL9DGzjbMP?= =?us-ascii?Q?9a50B8CIhDu+OC/s6HKrenm+0LX28Auit3n/LZVVBybkvSzRQBhhupUCShUb?= =?us-ascii?Q?tB3znCCZDOO8k4FD5gjjjXQh2fWG1gOcmBrdzZcd7gW5NI+IbEbfgz0tI+6/?= =?us-ascii?Q?3ABHB2CZ556mfkcvWpny43ftDiSOi17n2KdOfb2HQ+uyHijvU4SSqlDDQcXm?= =?us-ascii?Q?EFY84ACDxT+3V2dTBfXeO1YTs3kE49xhEl1vkaLTK2sm7uYXqxHAGvyrEqa9?= =?us-ascii?Q?d9aei+0r0Vx6/9qvpZ7frJ9dOzT+i4eZsgzdYPAHT1ZUCygnR1mlCc5a0GZL?= =?us-ascii?Q?htmY6eqbrLkHau8QANlLXl5rZdtHlJJdbihli+l5ctIt77gciglRTKIKKu6P?= =?us-ascii?Q?VD3299jWRL5SNSe6ceS/oytOeelaFHmYT4OTfpH7ngHCHczVvGQTSlr3+83a?= =?us-ascii?Q?ReI+o+KuUxVHHerR9OXv4EESPUekGZatYGPYDZ/jxYqp7arQdYm6TSBMjFdJ?= =?us-ascii?Q?0f7hmzzI+LAo/LgcwKF8dvV8P4fH4702LVBttr6hlvcN5Cn5tcyY0OnbuTyl?= =?us-ascii?Q?eDDSNRI+3MR5kJJslWTqnJIWTKiVMi5OGrn7W14LLfdhxFr87m57yLEGct3p?= =?us-ascii?Q?FurKRi7YEwD/Kub0udHIeJWL5UMVQe9kVprp0OoyRDBvuC4gdrJLdq2uDgfT?= =?us-ascii?Q?8YFrIR1PeMFwOykx7WF27UwA9qFnrhBBzwrth6bbhGSpKrvKQFz/33zSdgRk?= =?us-ascii?Q?UpADrJ6w1EslB64fKJ9TH0heuzy755I/oywUe9JixkF?= X-Microsoft-Antispam-Message-Info: RKrIh6FiJu1Rx/6fwLjWkQ+QWoTPrGFrX/V5jJghj8OTGKLtrGfjPH1zFXbhgz8uv5zpSjMtOKiV6hutYoSPKSVblvl1iGkntgf2xvX2CF+JKqeQVs3X2g+OQ76J+qJv94xcYCLbR1n2+XVg45rxx/QmNAnZjiUatB6wtKW99sAKB3YW8Gnhn62RYVCGw5VK5lL6YOTt972RK5NbnGN2KHDs9Jp/1Y3Mj5V9c4CLnDr6Jtzr6z7WwtyX1bbqtGe2/R0BnrHlG5o/PocSFaYdTWidQhzZaXXOc9bLJl9M+IEJXv5JOt/ufV4m7V1cHe9xEHQHuZgSdaP/5GlAojvMag== X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2469; 6:bQ+fKwwJZErqrhwjDr2oo2qxkNSsSCC9rBVygSowMWiJkzV/IGoBAiUQbZwsQPuN0qCHDWa2CeZMarPHMR5Bnc35HsHGvmf05P6ooZQIFZH+iVQwrfSa5NM9MrN4C1va0wVAghq6ylGorLUmxKXO1mMPrdkrQ8oy9GgjOubQR8r5Q7HFNlt9emILMfJqbawu/4OBfeGSVy1YDVX149kBJi+Cm+TNxMTUwznvd2bpmdAzfXF9O9UGC0W2w0oxPnDz2ZJ+sBNCNZaNlbUExWPNy6knpRmI2u5VBr8GWeuX82a3qCbxdHbamdgbb54bUy37yojWlOwWO1hRU8WzohhN7EDJT6uy6LWpeD8jEu7X1tMr/AF/YLJ1vvYxYBfKPEwzLX2+S7e63eb0nc3J7+d++BJadbaMfQuC20O+Hn7KMZnl7QnJa/waqCvzFPPKgfgCaZyavnXk2yNm9XtMpNnl0Q==; 5:vz6lACQ7Y4IJ/btov11sqh5Uh8ohOiILnmE8N4ZR/4GK9+AazCuk1u4QMaPU6by/zp7m7oMiMiuA6hvypVSWabf/vzm8A8FDW1ifRAiKGjt/82KCaftqKbyyqD/CrmBzPnBPyNDBwW1brkJqjrVsUFEwGfGBTpkEt2bVW/xMqCU=; 24:ivOfipfSbNIcvfqHYEdxt47dIYBkvKGHAja+PrpN45c3MI31kWb762rqfDUbrtyxyVOCigQNHsJs6wXJvdCImP4XgEa23dGIgsBTnzVB1Q0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2469; 7:azejcw8YN8VQlkBB5RhY8mdxD6gzAp2/eDHPR7dMQlg0O1dn8cMEkLwdjUfw3JpC+Nhc0cX5pO7MT7iEJWgvDgurNfWPiJA18aZ8lyInsYyYb7e/PqeqtlrfJUVDk/S93erM9ZrFCUN6JZVk/AFpRzpvA2RAP7WuXi+jxXq2rFiAEKMcNMqzZz3aCjmaiTBdhHxPiizIyUu4T6lQDxPSs1/zRX7daDzzcAFAqPjzLVtKz0GUspVubfGban1mlcp7; 20:iowZZlUMMD7cclVaqmPpCzHA8ASj22wVaykcioMVYhA4BZJDYfV6Z89Fq2snmlJY3jK01/kr8/O9QDCbbFaU6ObAUX5lrEyhBgonQRdlH0az3y1QuSyoLxJQMEqUpitNj7ueasll3nKP+5oMFQyed8ofSFTiGtZhdyq/InY6nL+QrH0vrKthPVCB2w/Q+AU2Cw/sElGQfi7QzhHEPI+1WALadrkupWkWys+wwpOeRQBNAqRsiTitN5GX847yVFVg X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2018 21:32:15.2031 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ac8733f5-dc6c-449e-2448-08d5d62c20b6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2469 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.82 Subject: [Qemu-devel] [PATCH v16 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove generic non-intel check while validating hyperthreading support. Certain AMD CPUs can support hyperthreading now. CPU family with TOPOEXT feature can support hyperthreading now. Signed-off-by: Babu Moger Tested-by: Geoffrey McRae Reviewed-by: Eduardo Habkost --- target/i386/cpu.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index d6ed29b..e6c2f8a 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4985,17 +4985,22 @@ static void x86_cpu_realizefn(DeviceState *dev, Err= or **errp) =20 qemu_init_vcpu(cs); =20 - /* Only Intel CPUs support hyperthreading. Even though QEMU fixes this - * issue by adjusting CPUID_0000_0001_EBX and CPUID_8000_0008_ECX - * based on inputs (sockets,cores,threads), it is still better to gives + /* + * Most Intel and certain AMD CPUs support hyperthreading. Even though= QEMU + * fixes this issue by adjusting CPUID_0000_0001_EBX and CPUID_8000_00= 08_ECX + * based on inputs (sockets,cores,threads), it is still better to give * users a warning. * * NOTE: the following code has to follow qemu_init_vcpu(). Otherwise * cs->nr_threads hasn't be populated yet and the checking is incorrec= t. */ - if (!IS_INTEL_CPU(env) && cs->nr_threads > 1 && !ht_warned) { - error_report("AMD CPU doesn't support hyperthreading. Please confi= gure" - " -smp options properly."); + if (IS_AMD_CPU(env) && + !(env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_TOPOEXT) && + cs->nr_threads > 1 && !ht_warned) { + error_report("This family of AMD CPU doesn't support " + "hyperthreading(%d). Please configure -smp " + "options properly or try enabling topoext feature= .", + cs->nr_threads); ht_warned =3D true; } =20 --=20 1.8.3.1