From nobody Tue Feb 10 04:15:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1763719082; cv=pass; d=zohomail.com; s=zohoarc; b=nwTJk2IDt5rxSb4OG5BVSBDBanM6yGn5lQZ5hfRrEuVT/gOujUlXmdiPkbjt8fZPAQocFmBzQlXt1jX1iWk9ipYzO8+Whmb99+s1vPeLt61gerxeX/8cnOYL4zUKD9GBIZygvV/HrS6TgPuqWw0g+k+Jn0AybSd1FzO1L0y7Isk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763719082; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=deJyHN+Z8DoZzHVeFyoB0co5whkZUqI2937I3WDC2WE=; b=TjDOO+13WumYu8dp5eO5hkG+WVgrBsghIP50JCR2OSjUstl8gAfGAiSsgCcs41ydc5qsFFSYXq8ss7KtmQY4f7+bQw4HoLvIk/HpWxv22yOEnyWE2ZZSAMGOkp3aRJq69F/bp0YdWNQoqMX06t7uw86OaIy73tzrO4+ASAMeTXI= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176371908257940.43315602226426; Fri, 21 Nov 2025 01:58:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vMNtR-0008I5-Iv; Fri, 21 Nov 2025 04:57:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vMMdW-00053H-Ov for qemu-devel@nongnu.org; Fri, 21 Nov 2025 03:36:58 -0500 Received: from mail-centralusazlp170110009.outbound.protection.outlook.com ([2a01:111:f403:c111::9] helo=DM5PR21CU001.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vMMdU-0000Jd-OX for qemu-devel@nongnu.org; Fri, 21 Nov 2025 03:36:58 -0500 Received: from BN1PR12CA0007.namprd12.prod.outlook.com (2603:10b6:408:e1::12) by PH8PR12MB6770.namprd12.prod.outlook.com (2603:10b6:510:1c5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Fri, 21 Nov 2025 08:36:47 +0000 Received: from BN2PEPF000044A6.namprd04.prod.outlook.com (2603:10b6:408:e1:cafe::75) by BN1PR12CA0007.outlook.office365.com (2603:10b6:408:e1::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9343.12 via Frontend Transport; Fri, 21 Nov 2025 08:36:40 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by BN2PEPF000044A6.mail.protection.outlook.com (10.167.243.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.9 via Frontend Transport; Fri, 21 Nov 2025 08:36:47 +0000 Received: from purico-abeahost.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Fri, 21 Nov 2025 00:36:44 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mkr0TbeeJDeizRG9jmWihDp1vvP8ICYDvHoFSv9DplMWpXARFfu+nTgWHd/AMrfwM20AxFPcqwQXR+nyz7um/J1m92KoxymwDrCZHtlF3mLcdIW8IByzITg8fth5VCdUCOySBgNCNhSDyJH0cRvo1Nmp9f2GjdP6+EwIEeHdZ/qgMTSfj2oIwwx+C6kFGKJqOh1X8FhyAx8BNmRg+8qZ+9hXagu8/jk1ghxnKceQxuAm9yFT81+wWG6OIxkTznEA93kHBLJumTRZUQSOGlCiL2SUT95J842XWlJ8+dmfnptIC0rR98CqsyKT+xfpBPuleZg2qJLeAcTRdFXoGGyjXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=deJyHN+Z8DoZzHVeFyoB0co5whkZUqI2937I3WDC2WE=; b=TFj4h8GNqGr63psKWFLQVnXfEA3IBWhKqianh0ICOaABBXnehZ2TbHKaXOK5rfVSZ+cRNaiH68fCzyJT/33gMT+EAgUIhAt1Amg05PTVQJXm2v7GY2t5DmzLahZu1yltSR3uTF6NbbR+izdIUD4Cm7BncaqcIGXCLYSp1cYXeAg/qIbqxr1oVLamQD1h11sF2RRg5doVg75CMHacqj1uMVBbeh8tlWFUwyY3damqAChP8080snHUDCrxAcMkNVfVaqReAROiHOIyfyxm4BrqrMsY6PDhIUdZMnb9fH1XSMPfEnT2jWGIdMgiLZlTwbloYfVwTxnJ45/x74qNNt2CMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=deJyHN+Z8DoZzHVeFyoB0co5whkZUqI2937I3WDC2WE=; b=umNvGludCGkv5RKkijNqgF2aFxrz/uJEp4y1ekrkKd8YZRFygPAkHhHyzNDM3RGgXImoy16tBLFZZOmFpkGt7YAj/VM/5Z339raeE75oczkCSxKd7zowlcz4NzrQsTbdLXRrVNSVaUHNgSGs4bUib1WcuU5j/itVpeiLqFXtS0Q= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C From: Shivansh Dhiman To: , , , CC: , , , , , , Subject: [PATCH 1/5] i386: Implement CPUID 0x80000026 Date: Fri, 21 Nov 2025 08:34:48 +0000 Message-ID: <20251121083452.429261-2-shivansh.dhiman@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251121083452.429261-1-shivansh.dhiman@amd.com> References: <20251121083452.429261-1-shivansh.dhiman@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000044A6:EE_|PH8PR12MB6770:EE_ X-MS-Office365-Filtering-Correlation-Id: 0039a8e8-09ec-45f9-d75a-08de28d91bc6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?jNU0GnnymknY3qPymtL6zeNCYtDO2Rk09Z2szYowIh83KZT+tnaOyecLUcPJ?= =?us-ascii?Q?tDizthjR8rpjAqwKvyYAz+HorRYX89L/9V1izR0FCd0uxhzRNdJEvftIg+lH?= =?us-ascii?Q?IPzFNofSkz8lA+7unMLEg0FnSgTcpXj5wZ4fVZJ+YdgexAt31S1xVUuPGO+t?= =?us-ascii?Q?Xz2UXApT7YFdVTHpxBvgwv3om5LoPSxxQdmS9pxBxrjyAeKrseJR0rVZjmS3?= =?us-ascii?Q?3hRIqpo7Wyx/6tFcWs4bOAB2jYKEoZuywKqE2sUOJ9ZCcMyWScZJgjDs1Fz/?= =?us-ascii?Q?lGvT+7X4iKERUwcWQx+hrnoOIH2FeDz9i5bCEhpdYH7t+HDfxqao0dHFxLFp?= =?us-ascii?Q?kcpWQgDe9niHh29jZ52q9tmKP4R+9BRDvRYOrs2E/SsYS9YKx2on0ZesTOZN?= =?us-ascii?Q?HPkhAYXxNNnxUG7fbkUp+GB1bxaPb75GI4Owmuy5T8Eq36yH8NU37m1Mnob6?= =?us-ascii?Q?QyHYT/PsiIAMr3TwyabKh39PeChCdyBZQdGmhE1BEatItQ15b2iT0McAdRGb?= =?us-ascii?Q?KI7P9lrbClqJJDc5PvAlKlPv/UrpRlc/Gqdk4CdK7dcgHoQkQnGLPe8S0A1R?= =?us-ascii?Q?B9eLYzUApIlNhA4oqDC1euG5Ayh/+Q5Iau660DUGdUlSp8isoEI9fGN7ANSF?= =?us-ascii?Q?KJSOYa8vNybk/5DDJEIvuJUyD0de+dQ0dS9joD29LgThAoa21nBKsgnMy5Lb?= =?us-ascii?Q?rLzLJh5fcZ27Owm0bl/XJ0RWN15j+dmO0nmiQzIygNauBXzd8HbN93mQA7i3?= =?us-ascii?Q?C0s4FbFF4h8hntnKgmNjUEym6kA2bZLY4ntBpDWtkKmwULgGAK3Nrv9IVTva?= =?us-ascii?Q?7Qva67es7z1FpIIw0tsKxoe79mC2Wuz/LisSHoJ2oGgP+KxEVuM2XOOJbo+c?= =?us-ascii?Q?5glLC+6qTPdzLJGko0d/njxcOVBK1V5EkX7UUYEdzKOCuylRWq6KJlYjY45+?= =?us-ascii?Q?FyLeUsArn7LYwVL3x+VLOv1co8mCTK7CH/u6ov9suRra2BqEmVTCcqF3Qx4P?= =?us-ascii?Q?4TRgF6pc3TJBQ5BY+NgRqRPXPMtbq/bllVwMeucJkup7ikpihAOaXdFw5Xxs?= =?us-ascii?Q?youk5fZaXsXrg6WGHCMLAG+3fz2l2pfb1KEKiH6d/Bt175L8qIC3DMcdoZLw?= =?us-ascii?Q?4KL4xGt+DvdusgNQCt7whNY8vyYGADq6gxMOt7ignXnsvarFuTScANt4yAM+?= =?us-ascii?Q?rC2d2A+Njpcrqb01M3xr0bgRy9AyjI5sEWpd3Ml1e0Rw6PbsqOU0IEnP61f7?= =?us-ascii?Q?KcEWlSOWCoNCmAsdVaEM6QXCjGlNpj/cN4NXDMwTMKMGyiTrreSkuGeDHAqV?= =?us-ascii?Q?ihjELYuEVjn3U1vVKg8v35tyjBiQKuAQOUM9Cb1aYt2P4mIgUoS9D+JoX1Gz?= =?us-ascii?Q?J+KcWrsMC3T+LsnA55LppXWVuSMjd8ZeC404FP+JE6090xurZyO5COwIWN0Z?= =?us-ascii?Q?v1WPRuqB8NOCA1G3lKwV5jeQQifYFg71f6a0JupeKFw6GBOlQ+6o6pNxQu9i?= =?us-ascii?Q?G/tDzcKJzziVfAXTGfnuRj5V2ZXvMEEJd3X+qrGGFppK1nSpb5vtAQEKGjO1?= =?us-ascii?Q?409Dt7fjWPJEh3GkyMA=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:satlexmb07.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(82310400026)(376014)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2025 08:36:47.1799 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0039a8e8-09ec-45f9-d75a-08de28d91bc6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF000044A6.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6770 Received-SPF: permerror client-ip=2a01:111:f403:c111::9; envelope-from=Shivansh.Dhiman@amd.com; helo=DM5PR21CU001.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 21 Nov 2025 04:57:24 -0500 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1763719086110018900 Content-Type: text/plain; charset="utf-8" Implement CPUID leaf 0x80000026 (AMD Extended CPU Topology). It presents the complete topology information to guests via a single CPUID with multiple subleafs, each describing a specific hierarchy level, viz. core, complex, die, socket. Note that complex/CCX level relates to "die" in QEMU, and die/CCD level is not supported in QEMU yet. Hence, use CCX at CCD level until diegroups are implemented. Signed-off-by: Shivansh Dhiman --- target/i386/cpu.c | 76 +++++++++++++++++++++++++++++++++++++++++++ target/i386/kvm/kvm.c | 17 ++++++++++ 2 files changed, 93 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 641777578637..b7827e448aa5 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -495,6 +495,78 @@ static void encode_topo_cpuid1f(CPUX86State *env, uint= 32_t count, assert(!(*eax & ~0x1f)); } =20 +/* + * CPUID_Fn80000026: Extended CPU Topology + * + * EAX Bits Description + * 31:5 Reserved + * 4:0 Number of bits to shift Extended APIC ID right to get a unique + * topology ID of the current hierarchy level. + * + * EBX Bits Description + * 31:16 Reserved + * 15:0 Number of logical processors at the current hierarchy level. + * + * ECX Bits Description + * 31:16 Reserved + * 15:8 Level Type. Values: + * Value Description + * 0h Reserved + * 1h Core + * 2h Complex + * 3h Die + * 4h Socket + * FFh-05h Reserved + * 7:0 Input ECX + * + * EDX Bits Description + * 31:0 Extended APIC ID of the logical processor + */ +static void encode_topo_cpuid80000026(CPUX86State *env, uint32_t count, + X86CPUTopoInfo *topo_info, + uint32_t *eax, uint32_t *ebx, + uint32_t *ecx, uint32_t *edx) +{ + X86CPU *cpu =3D env_archcpu(env); + uint32_t shift, nr_logproc, lvl_type; + + switch (count) { + case 0: + shift =3D apicid_core_offset(topo_info); + nr_logproc =3D num_threads_by_topo_level(topo_info, CPU_TOPOLOGY_L= EVEL_CORE); + lvl_type =3D 1; + break; + + case 1: + shift =3D apicid_die_offset(topo_info); + nr_logproc =3D num_threads_by_topo_level(topo_info, CPU_TOPOLOGY_L= EVEL_DIE); + lvl_type =3D 2; + break; + + case 2: + shift =3D apicid_die_offset(topo_info); + nr_logproc =3D num_threads_by_topo_level(topo_info, CPU_TOPOLOGY_L= EVEL_DIE); + lvl_type =3D 3; + break; + + case 3: + shift =3D apicid_pkg_offset(topo_info); + nr_logproc =3D num_threads_by_topo_level(topo_info, CPU_TOPOLOGY_L= EVEL_SOCKET); + lvl_type =3D 4; + break; + + default: + shift =3D 0; + nr_logproc =3D 0; + lvl_type =3D 0; + } + + *eax =3D shift & 0x1F; + *ebx =3D nr_logproc; + *ecx =3D ((lvl_type & 0xFF) << 8) | (count & 0xFF); + *edx =3D cpu->apic_id; +} + /* Encode cache info for CPUID[0x80000005].ECX or CPUID[0x80000005].EDX */ static uint32_t encode_cache_cpuid80000005(CPUCacheInfo *cache) { @@ -8554,6 +8626,10 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, R_EBX) & 0xf; } break; + case 0x80000026: + /* AMD Extended CPU Topology */ + encode_topo_cpuid80000026(env, count, topo_info, eax, ebx, ecx, ed= x); + break; case 0xC0000000: *eax =3D env->cpuid_xlevel2; *ebx =3D 0; diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 60c798113823..ed3d40bf073e 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -2037,6 +2037,23 @@ uint32_t kvm_x86_build_cpuid(CPUX86State *env, struc= t kvm_cpuid_entry2 *entries, c =3D &entries[cpuid_i++]; } break; + case 0x80000026: + /* Query for all AMD extended topology information leaves */ + for (j =3D 0; ; j++) { + c->function =3D i; + c->flags =3D KVM_CPUID_FLAG_SIGNIFCANT_INDEX; + c->index =3D j; + cpu_x86_cpuid(env, i, j, &c->eax, &c->ebx, &c->ecx, &c->ed= x); + + if (((c->ecx >> 8) & 0xFF) =3D=3D 0) { + break; + } + if (cpuid_i =3D=3D KVM_MAX_CPUID_ENTRIES) { + goto full; + } + c =3D &entries[cpuid_i++]; + } + break; default: c->function =3D i; c->flags =3D 0; --=20 2.43.0