{"id":2223158,"url":"http://patchwork.ozlabs.org/api/patches/2223158/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260414155433.483186-4-magnuskulke@linux.microsoft.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260414155433.483186-4-magnuskulke@linux.microsoft.com>","list_archive_url":null,"date":"2026-04-14T15:54:27","name":"[v4,3/9] target/i386/mshv: fix various cpuid traversal bugs","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"403993219a398bb4967ba5cb7f4c183bcb8e240e","submitter":{"id":90753,"url":"http://patchwork.ozlabs.org/api/people/90753/?format=json","name":"Magnus Kulke","email":"magnuskulke@linux.microsoft.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260414155433.483186-4-magnuskulke@linux.microsoft.com/mbox/","series":[{"id":499862,"url":"http://patchwork.ozlabs.org/api/series/499862/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=499862","date":"2026-04-14T15:54:24","name":"Support QEMU cpu models in MSHV accelerator","version":4,"mbox":"http://patchwork.ozlabs.org/series/499862/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2223158/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2223158/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=linux.microsoft.com header.i=@linux.microsoft.com\n header.a=rsa-sha256 header.s=default header.b=Im0f3QVh;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fw84L1bPHz1xtJ\n\tfor ; Wed, 15 Apr 2026 01:55:14 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wCg6E-0004K4-9Y; Tue, 14 Apr 2026 11:54:50 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wCg6C-0004Ix-FR\n for qemu-devel@nongnu.org; Tue, 14 Apr 2026 11:54:48 -0400","from linux.microsoft.com ([13.77.154.182])\n by eggs.gnu.org with esmtp (Exim 4.90_1)\n (envelope-from ) id 1wCg6A-0000Ey-Qp\n for qemu-devel@nongnu.org; Tue, 14 Apr 2026 11:54:48 -0400","from DESKTOP-TUU1E5L.localdomain (unknown [167.220.208.32])\n by linux.microsoft.com (Postfix) with ESMTPSA id 6D62C20B6F01;\n Tue, 14 Apr 2026 08:54:44 -0700 (PDT)"],"DKIM-Filter":"OpenDKIM Filter v2.11.0 linux.microsoft.com 6D62C20B6F01","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1776182086;\n bh=ItrHOC5nPemd66dEK2NgZsgS7P6ajPcgEYGrhuuCrYE=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=Im0f3QVh6FiJ3kkFLPChO41f5o8+fgy4VlAaq/zSdnv8ZNzL5te7RBZa4YV6zOgDY\n xbkMvswE92ckYOtUh5WGCIsusiFd04RpRPJCXqPpLjukII5ojp9doqwNfbf2JsHpt6\n ucruxKWSC11iDa9dltkPOCdrkeX0XnuBPdjfG0Kc=","From":"Magnus Kulke ","To":"qemu-devel@nongnu.org","Cc":"Wei Liu , Wei Liu ,\n Magnus Kulke ,\n Magnus Kulke , Zhao Liu ,\n Paolo Bonzini ","Subject":"[PATCH v4 3/9] target/i386/mshv: fix various cpuid traversal bugs","Date":"Tue, 14 Apr 2026 17:54:27 +0200","Message-Id":"<20260414155433.483186-4-magnuskulke@linux.microsoft.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20260414155433.483186-1-magnuskulke@linux.microsoft.com>","References":"<20260414155433.483186-1-magnuskulke@linux.microsoft.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=13.77.154.182;\n envelope-from=magnuskulke@linux.microsoft.com; helo=linux.microsoft.com","X-Spam_score_int":"-42","X-Spam_score":"-4.3","X-Spam_bar":"----","X-Spam_report":"(-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"- Hardcoded max_leaf was not accurate. We query leaf 0x0 and 0x80000000 to\n get the actual max leaves\n\n- On all 0 zeroes on leaf 0x0d, we register 0-63 subleaves with zeros\n indicating XSAVE is disabled\n\n- Subleaf 0 was hardcoded, so the Hypervisor returned defaults for other\n subleaves\n\n- Subleaf 0 was hardcoded, so we were passing 0 instead of actual subleaf\n when adding entries. We now pass the correct subleaf value to\n add_cpuid_entry()\n\n- Leaves 0x04,0x07,0d,0f,10 weren't marked as subleaf-specific\n\nSigned-off-by: Magnus Kulke \nAcked-by: Wei Liu \n---\n target/i386/mshv/mshv-cpu.c | 88 +++++++++++++++++++++++++------------\n 1 file changed, 61 insertions(+), 27 deletions(-)","diff":"diff --git a/target/i386/mshv/mshv-cpu.c b/target/i386/mshv/mshv-cpu.c\nindex f1cc4abc5c..4183727a86 100644\n--- a/target/i386/mshv/mshv-cpu.c\n+++ b/target/i386/mshv/mshv-cpu.c\n@@ -465,14 +465,17 @@ static void collect_cpuid_entries(const CPUState *cpu, GList **cpuid_entries)\n CPUX86State *env = &x86_cpu->env;\n uint32_t eax, ebx, ecx, edx;\n uint32_t leaf, subleaf;\n- size_t max_leaf = 0x1F;\n- size_t max_subleaf = 0x20;\n-\n- uint32_t leaves_with_subleaves[] = {0x4, 0x7, 0xD, 0xF, 0x10};\n+ uint32_t max_basic_leaf, max_extended_leaf;\n+ uint32_t max_subleaf = 0x20;\n+ uint32_t leaves_with_subleaves[] = {0x04, 0x07, 0x0d, 0x0f, 0x10};\n int n_subleaf_leaves = ARRAY_SIZE(leaves_with_subleaves);\n \n- /* Regular leaves without subleaves */\n- for (leaf = 0; leaf <= max_leaf; leaf++) {\n+ /* Get maximum basic and and extended CPUID leaves */\n+ cpu_x86_cpuid(env, 0, 0, &max_basic_leaf, &ebx, &ecx, &edx);\n+ cpu_x86_cpuid(env, 0x80000000, 0, &max_extended_leaf, &ebx, &ecx, &edx);\n+\n+ /* Collect basic leaves (0x0 to max_basic_leaf) */\n+ for (leaf = 0; leaf <= max_basic_leaf; leaf++) {\n bool has_subleaves = false;\n for (int i = 0; i < n_subleaf_leaves; i++) {\n if (leaf == leaves_with_subleaves[i]) {\n@@ -483,27 +486,40 @@ static void collect_cpuid_entries(const CPUState *cpu, GList **cpuid_entries)\n \n if (!has_subleaves) {\n cpu_x86_cpuid(env, leaf, 0, &eax, &ebx, &ecx, &edx);\n- if (eax == 0 && ebx == 0 && ecx == 0 && edx == 0) {\n- /* all zeroes indicates no more leaves */\n- continue;\n- }\n-\n add_cpuid_entry(cpuid_entries, leaf, 0, eax, ebx, ecx, edx);\n continue;\n }\n \n+ /*\n+ * Valid XSAVE components can exist at a higher index se we need to set\n+ * all subleaves for leaf 0x0d, even if we encounter an empty one.\n+ */\n+ if (leaf == 0x0d) {\n+ for (subleaf = 0; subleaf <= 63; subleaf++) {\n+ cpu_x86_cpuid(env, leaf, subleaf, &eax, &ebx, &ecx, &edx);\n+ add_cpuid_entry(cpuid_entries, leaf, subleaf,\n+ eax, ebx, ecx, edx);\n+ }\n+ continue;\n+ }\n+\n subleaf = 0;\n while (subleaf < max_subleaf) {\n cpu_x86_cpuid(env, leaf, subleaf, &eax, &ebx, &ecx, &edx);\n \n if (eax == 0 && ebx == 0 && ecx == 0 && edx == 0) {\n- /* all zeroes indicates no more leaves */\n break;\n }\n- add_cpuid_entry(cpuid_entries, leaf, 0, eax, ebx, ecx, edx);\n+ add_cpuid_entry(cpuid_entries, leaf, subleaf, eax, ebx, ecx, edx);\n subleaf++;\n }\n }\n+\n+ /* Collect extended leaves (0x80000000 to max_extended_leaf) */\n+ for (leaf = 0x80000000; leaf <= max_extended_leaf; leaf++) {\n+ cpu_x86_cpuid(env, leaf, 0, &eax, &ebx, &ecx, &edx);\n+ add_cpuid_entry(cpuid_entries, leaf, 0, eax, ebx, ecx, edx);\n+ }\n }\n \n static int register_intercept_result_cpuid_entry(const CPUState *cpu,\n@@ -576,22 +592,40 @@ static int register_intercept_result_cpuid(const CPUState *cpu,\n subleaf_specific = 0;\n always_override = 1;\n \n- /* Intel */\n- /* 0xb - Extended Topology Enumeration Leaf */\n- /* 0x1f - V2 Extended Topology Enumeration Leaf */\n- /* AMD */\n- /* 0x8000_001e - Processor Topology Information */\n- /* 0x8000_0026 - Extended CPU Topology */\n- if (entry->function == 0xb\n- || entry->function == 0x1f\n- || entry->function == 0x8000001e\n- || entry->function == 0x80000026) {\n+ /*\n+ * Intel\n+ * 0xb - Extended Topology Enumeration Leaf\n+ * 0x1f - V2 Extended Topology Enumeration Leaf\n+ * AMD\n+ * 0x8000_001e - Processor Topology Information\n+ * 0x8000_0026 - Extended CPU Topology\n+ */\n+ if (entry->function == 0xb ||\n+ entry->function == 0x1f ||\n+ entry->function == 0x8000001e ||\n+ entry->function == 0x80000026) {\n+ subleaf_specific = 1;\n+ always_override = 1;\n+ /*\n+ * Feature enumeration leaves (subleaf-specific)\n+ * 0x04: Deterministic Cache Parameters\n+ * 0x07: Structured Extended Feature Flags\n+ * 0x0D: Processor Extended State Enumeration\n+ * 0x0F: Platform QoS Monitoring\n+ * 0x10: Platform QoS Enforcement\n+ */\n+ } else if (entry->function == 0x04 ||\n+ entry->function == 0x07 ||\n+ entry->function == 0x0d ||\n+ entry->function == 0x0f ||\n+ entry->function == 0x10) {\n subleaf_specific = 1;\n always_override = 1;\n- } else if (entry->function == 0x00000001\n- || entry->function == 0x80000000\n- || entry->function == 0x80000001\n- || entry->function == 0x80000008) {\n+ /* Basic feature leaves (no subleaves) */\n+ } else if (entry->function == 0x00000001 ||\n+ entry->function == 0x80000000 ||\n+ entry->function == 0x80000001 ||\n+ entry->function == 0x80000008) {\n subleaf_specific = 0;\n always_override = 1;\n }\n","prefixes":["v4","3/9"]}