From nobody Sun Apr 12 05:55:53 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; dmarc=pass(p=none dis=none) header.from=linux.microsoft.com ARC-Seal: i=1; a=rsa-sha256; t=1770826149; cv=none; d=zohomail.com; s=zohoarc; b=GlMgpT7Axk0yAIjz5jmLW6gTWxxh65frx5AM3sSZ2SC9ugMp0l+e8TeHKRxkzq1XfAONkHtQMS4LQvgoH8OdCWc4h7t5UUgIdqoFdXIkMTg/ip4++AIUYJ2SI3Dq1BNyd481zsgzpK2v8typpImXZQNZ441TmDldsP7Ca0i1rg4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770826149; h=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=c9Cqif7Bf9HNIGMAb4KJECjwGAGpn7SzhAVsuFQtugQ=; b=leNvv73lx7iXkGa0kPwaVwu9DtW+DdVXTr5AtB+nuH5BswBSNcK/rNuhsmMaJPrYU4wP9J97QTXrnBhhtpzO1NFWuszJqzvtSFMezL2TpqRuTCdYWnig8lGTlH1kKIoAiEepbhW2HVT34zbPgTlQSdFq9HxDHMIiAGS2R109VVM= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770826149712147.58718734718263; Wed, 11 Feb 2026 08:09:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vqCkl-0002qx-4W; Wed, 11 Feb 2026 11:07:47 -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 1vqCY0-0007Lc-HW for qemu-devel@nongnu.org; Wed, 11 Feb 2026 10:54:36 -0500 Received: from linux.microsoft.com ([13.77.154.182]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vqCXz-0003Ry-21 for qemu-devel@nongnu.org; Wed, 11 Feb 2026 10:54:36 -0500 Received: from DESKTOP-TUU1E5L.localdomain (unknown [167.220.208.59]) by linux.microsoft.com (Postfix) with ESMTPSA id 4692D20B7168; Wed, 11 Feb 2026 07:54:32 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4692D20B7168 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1770825273; bh=c9Cqif7Bf9HNIGMAb4KJECjwGAGpn7SzhAVsuFQtugQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=laV4mzC5JEM0kCDYEwfuA/wWhH52A092Za0U5dHOsWsU1YIP9x1CctwgC/1fMTquX CZX+0c4zgFvGoDqEVdYpchr9AurAJDzsEL5TCX9jpWbfYaXRrWUdC3t0OQNBbXGqI1 bZMcrhtF1nXWdWKTK5nZ6t6/0pYZdT1GkNyl1dXY= From: Magnus Kulke To: qemu-devel@nongnu.org Cc: Magnus Kulke , Wei Liu , Wei Liu , Zhao Liu , Paolo Bonzini , Magnus Kulke Subject: [PATCH 08/10] target/i386: query mshv accel for supported cpuids Date: Wed, 11 Feb 2026 16:54:08 +0100 Message-Id: <20260211155410.203883-9-magnuskulke@linux.microsoft.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260211155410.203883-1-magnuskulke@linux.microsoft.com> References: <20260211155410.203883-1-magnuskulke@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 client-ip=13.77.154.182; envelope-from=magnuskulke@linux.microsoft.com; helo=linux.microsoft.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 11 Feb 2026 11:07:32 -0500 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @linux.microsoft.com) X-ZM-MESSAGEID: 1770826151943154100 Content-Type: text/plain; charset="utf-8" We implement mshv_get_supported_cpuid() and invoke it in x86_cpu_get_supported_feature_word() retrieve the cpu features that the host is supporting. Initially we mask the virtualization capabilitities potentially we might need to mask more in the future. Signed-off-by: Magnus Kulke --- include/system/mshv.h | 3 +++ target/i386/cpu.c | 8 ++++++++ target/i386/mshv/mshv-cpu.c | 27 +++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/include/system/mshv.h b/include/system/mshv.h index 75286baf16..51b0420735 100644 --- a/include/system/mshv.h +++ b/include/system/mshv.h @@ -60,4 +60,7 @@ int mshv_irqchip_add_irqfd_notifier_gsi(const EventNotifi= er *n, const EventNotifier *rn, int virq); int mshv_irqchip_remove_irqfd_notifier_gsi(const EventNotifier *n, int vir= q); =20 +/* cpuid */ +uint32_t mshv_get_supported_cpuid(uint32_t func, uint32_t idx, int reg); + #endif diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 0a7b884528..b611afc21a 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -26,6 +26,7 @@ #include "tcg/helper-tcg.h" #include "exec/translation-block.h" #include "system/hvf.h" +#include "system/mshv.h" #include "hvf/hvf-i386.h" #include "kvm/kvm_i386.h" #include "kvm/tdx.h" @@ -7958,6 +7959,13 @@ uint64_t x86_cpu_get_supported_feature_word(X86CPU *= cpu, FeatureWord w) r =3D hvf_get_supported_cpuid(wi->cpuid.eax, wi->cpuid.ecx, wi->cpuid.reg); + } else if (mshv_enabled()) { + if (wi->type !=3D CPUID_FEATURE_WORD) { + return 0; + } + r =3D mshv_get_supported_cpuid(wi->cpuid.eax, + wi->cpuid.ecx, + wi->cpuid.reg); } else if (tcg_enabled()) { r =3D wi->tcg_features; } else { diff --git a/target/i386/mshv/mshv-cpu.c b/target/i386/mshv/mshv-cpu.c index 38e0a045c2..bbb58461a4 100644 --- a/target/i386/mshv/mshv-cpu.c +++ b/target/i386/mshv/mshv-cpu.c @@ -1757,6 +1757,33 @@ void mshv_arch_destroy_vcpu(CPUState *cpu) g_clear_pointer(&env->emu_mmio_buf, g_free); } =20 +uint32_t mshv_get_supported_cpuid(uint32_t func, uint32_t idx, int reg) +{ + uint32_t eax, ebx, ecx, edx; + uint32_t ret =3D 0; + + host_cpuid(func, idx, &eax, &ebx, &ecx, &edx); + switch (reg) { + case R_EAX: + ret =3D eax; break; + case R_EBX: + ret =3D ebx; break; + case R_ECX: + ret =3D ecx; break; + case R_EDX: + ret =3D edx; break; + } + + /* Disable nested virtualization features not yet supported by MSHV */ + if (func =3D=3D 0x80000001 && reg =3D=3D R_ECX) { + ret &=3D ~CPUID_EXT3_SVM; + } + if (func =3D=3D 0x01 && reg =3D=3D R_ECX) { + ret &=3D ~CPUID_EXT_VMX; + } + return ret; +} + /* * Default Microsoft Hypervisor behavior for unimplemented MSR is to send a * fault to the guest if it tries to access it. It is possible to override --=20 2.34.1