From nobody Sun Apr 12 22:37:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1775747825; cv=none; d=zohomail.com; s=zohoarc; b=kxscYK0lhpZKc+HZFaiaIznXpidq295XZ8JnsKmphXiUb064GuEnev9YyktAe4bVHflG7+7rV5oqOuCNyr25Jtx11m12p2qdQo4CylfQuv+n4QTn1nZTuLhHSETo6n337rIAQlQUafqb9pM0R1f4vEz23CmmPtgwPEyHQJwIQa8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775747825; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=v+iaE1R216FimeHL2+m+TLpXQymHeRezEIEvo5K46i4=; b=T8y10UWtN3+en4C4VOqeGLG2GKfbPIB/+IGKoJWVa25rbaROnYhZX3CDeFCgZRmFC0Q2/bTZvuPzpIvhTQ0e72oto01ZBjSkXY05PJNDHgojvKkPBZkTuSDDHZpcXkAQs2ARVHZDYTYhnEIbsk0gMoIPEkM61SqdBx/iO/c1Cl0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 177574782598557.795542984543886; Thu, 9 Apr 2026 08:17:05 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1277852.1562959 (Exim 4.92) (envelope-from ) id 1wAr7g-0000C6-7N; Thu, 09 Apr 2026 15:16:48 +0000 Received: by outflank-mailman (output) from mailman id 1277852.1562959; Thu, 09 Apr 2026 15:16:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wAr7g-0000Bz-4p; Thu, 09 Apr 2026 15:16:48 +0000 Received: by outflank-mailman (input) for mailman id 1277852; Thu, 09 Apr 2026 15:16:46 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wAr7e-0000BP-7z for xen-devel@lists.xenproject.org; Thu, 09 Apr 2026 15:16:46 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wAr7d-00CmTr-KJ for xen-devel@lists.xenproject.org; Thu, 09 Apr 2026 17:16:45 +0200 Received: from [10.42.69.9] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 69d7c2dc-2eae-0a2a0a5409dd-0a2a4509cfb6-2 for ; Thu, 09 Apr 2026 17:16:45 +0200 Received: from [209.85.128.44] (helo=mail-wm1-f44.google.com) by tlsNG-bad1c0.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.0) (envelope-from ) id 69d7c2dd-bf79-0a2a45090019-d155802ca98a-3 for ; Thu, 09 Apr 2026 17:16:45 +0200 Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-488b3f8fa2bso13160625e9.1 for ; Thu, 09 Apr 2026 08:16:45 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488cd0cbea7sm26729375e9.6.2026.04.09.08.16.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 09 Apr 2026 08:16:44 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:In-Reply-To:Autocrypt:Content-Language:References:Cc:To:From:Subject:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1775747805; x=1776352605; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=v+iaE1R216FimeHL2+m+TLpXQymHeRezEIEvo5K46i4=; b=RCd0S9ARdsPJexQs9HPEHAZv8M6hHY81suEm4GzhDz/SC1Q9uiTe7JVFzDzAsgoM3E 3CZZT5FDfgD4vTuqPIfMX6jzV9oeTNWyyVMTmrqkb8/n44MrM5x/yCu1Onvh6dr6tKji Oed49yAFUe5KgVBWNGGATxEkOQNI1Ll/7Q2I03CBfcx53WAL0VIdIHCsbhM5ppIcipME ASaj/OxeMo/SRx3gKk2M5qBdUT/q0VMKgmr+LL4Dv7JQ3j2J7TGEJ/g+uZerHtRGZ9Pp peIm/suwcaTnsfoehMJcMNHVGXM4QqW5Cpim4VafO5bZTMzxGumqUGkkH33kodvPxh7g gtNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775747805; x=1776352605; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=v+iaE1R216FimeHL2+m+TLpXQymHeRezEIEvo5K46i4=; b=laTwwyB1+yNO4JxUonqSEBAF6hahF/iLpuzpHGLdugQSGfcuxpRctrCfDwEbX27BvH PEkYT70HCwu0U0GNLNmE49KYo+lgFwGUCTPI7+3NsIQEsK585yLv5yQPAVYydi6A6iPu Vx6D86NgiSwX6Vopu8/PcI/sPRlzKsX2RWmIUnRw+RkQQqvyMjx353fjT0XXTLsp3eb9 mOn7lTcdl6341KYYm5fBdLxjFqJwJpwnXVRgWPEJ4J/RE3cLTHaUieMgGmaFxwYX96gt PM+hRDHcREFq50aIysagGfOgKYK1zkwshWTzdCBNfKXez9wc8Hkyp55zSccR26EZ1XVx tO4Q== X-Gm-Message-State: AOJu0Yy2arBvKdDLJpWOnmQZOo93KY6Z6DTmJIjwB0goJYFllgFHsXIe Idmdj+T3W/eLgnw6w9+iDYCbxE1dwBV+NzK6IinEYLlWTasBISHsHNN1mX8f3JUjSii6XqvpeP7 rjn02rg== X-Gm-Gg: AeBDieuDfu55uXPRNz+DTKDr9Hbjuqg+d7Pg646pol7KtqpiifET5SBzT5ihtn6ACiW wK2BpZNwp3S/dO+RustVEKQ3BGXfDW2WgA/N/WgbXkkshJOouAUIFrseidVwSOlkc11eMYPch8f cGzngBSbsGr97Mt5wKme6jdaP3tOKfLE30bzzTrOXHUX9mFd8+M8kl85GPrpk3pvrFJTSw2mBhf qrG/QRjGT6+Wq0Hiy9W2xZsROzfDLDQ0IP7Z+cj/hIFnhUTQNZ1gVJM8r/H+D0kqxsoMwT3MB+w 300SuHYrdCxTSE//2VccyvcFx1RDb4U8i6uWT2dN5K3nxmQ64UNhfvNzdyDL5+V847pN+8odO5k ufKX6L1KJuafWbmxKrgcoL64c6RtOD+nv+yLaHtRD1ve+zXMKbxl0MMTv/IBxFe2PJSlLTcin+7 3ZOYc6Dq8fmSqdAMmHbdQPp7d++WvVSBmrMQJDo9bq6VibU4EkD4dKTbR26ujbQETHQmsxY4WDi XCTmf/xCGZ6LigQSTVviGtVvg== X-Received: by 2002:a05:600c:354f:b0:488:c239:d498 with SMTP id 5b1f17b1804b1-488cd557418mr53176105e9.8.1775747804824; Thu, 09 Apr 2026 08:16:44 -0700 (PDT) Message-ID: Date: Thu, 9 Apr 2026 17:16:42 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v4 00.9/16] x86/CPUID: enable AVX10 leaf From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie References: <1e2ff012-b07a-43be-9ba6-290b38d3c97c@suse.com> Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <1e2ff012-b07a-43be-9ba6-290b38d3c97c@suse.com> Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-bad1c0/1775747805-54364152-F06AC54C/0/0 X-purgate-type: clean X-purgate-size: 13690 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1775747828283154100 Content-Type: text/plain; charset="utf-8" This requires bumping the number of basic leaves we support. Apart from this the logic is modeled as closely as possible after that of leaf 7 handling. Signed-off-by: Jan Beulich --- The gen-cpuid.py adjustment is merely the minimum needed. It's not really clear to me whether someone turning off e.g. AVX512BW might then also validly expect AVX10 to be turned off. Do we want to synthesize AVX10 in the (max?) policies when all necessary AVX512* features are available, thus allowing migration from an AVX10 host to a suitable non-AVX10 one? The prior vsz bits are now defined as reserved-at-1: No idea yet how to represent this properly. How a toolstack side equivalent (if any) of the init_dom0_cpuid_policy() change would look like is entirely unclear to me. How much should we take from the max policy, and how much should we permit/require the user to specify (and how would the latter look like)? While, as per a comment next to the call site of recalculate_cpuid_policy(), recalculate_*() are supposed to go away when x86_cpu_policies_are_compatible() is complete, some of the checking done in recalculate_misc() really wouldn't below there. We'd need another "is self-consistent" checking function. --- v4: Drop all traces of AVX10/256. Add max_subleaf check to x86_cpu_policies_are_compatible(). Add/adjust vsz checks in recalculate_misc(). In the max policies, synthesize AVX512* when AVX10 is available. v3: Re-base. v2: Add logic to init_dom0_cpuid_policy(). Drop vsz128 field. Re-base. --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -211,7 +211,7 @@ static void recalculate_xstate(struct cp if ( p->feat.mpx ) xstates |=3D X86_XCR0_BNDREGS | X86_XCR0_BNDCSR; =20 - if ( p->feat.avx512f ) + if ( p->feat.avx512f || p->feat.avx10 ) xstates |=3D X86_XCR0_OPMASK | X86_XCR0_ZMM | X86_XCR0_HI_ZMM; =20 if ( p->feat.pku ) @@ -272,6 +272,18 @@ static void recalculate_misc(struct cpu_ =20 p->basic.raw[0xc] =3D EMPTY_LEAF; =20 + zero_leaves(p->basic.raw, 0xe, 0x23); + + p->avx10.raw[0].b &=3D 0x000700ff; + p->avx10.raw[0].c =3D 0; + p->avx10.raw[0].d =3D 0; + if ( !p->feat.avx10 || !p->avx10.version || + !p->avx10.vsz512 || !p->avx10.vsz256 || !p->avx10.vsz128 ) + { + p->feat.avx10 =3D false; + memset(p->avx10.raw, 0, sizeof(p->avx10.raw)); + } + p->extd.e1d &=3D ~CPUID_COMMON_1D_FEATURES; =20 /* Most of Power/RAS hidden from guests. */ @@ -400,6 +412,7 @@ static void __init guest_common_max_leav { p->basic.max_leaf =3D ARRAY_SIZE(p->basic.raw) - 1; p->feat.max_subleaf =3D ARRAY_SIZE(p->feat.raw) - 1; + p->avx10.max_subleaf =3D ARRAY_SIZE(p->avx10.raw) - 1; p->extd.max_leaf =3D 0x80000000U + ARRAY_SIZE(p->extd.raw) - 1; } =20 @@ -408,6 +421,7 @@ static void __init guest_common_default_ { p->basic.max_leaf =3D host_cpu_policy.basic.max_leaf; p->feat.max_subleaf =3D host_cpu_policy.feat.max_subleaf; + p->avx10.max_subleaf =3D host_cpu_policy.avx10.max_subleaf; p->extd.max_leaf =3D host_cpu_policy.extd.max_leaf; } =20 @@ -503,6 +517,28 @@ static void __init guest_common_max_feat * function correctly when migrated here, even if ERMS isn't available. */ __set_bit(X86_FEATURE_ERMS, fs); + + /* + * AVX10 is merely a re-declaration of a combination of AVX512 feature= s. + * Synthesize the latter from the former, when available. Doing it the + * other way around would also require synthesizing the AVX10 CPUID le= af. + */ + if ( test_bit(X86_FEATURE_AVX10, fs) ) + { + __set_bit(X86_FEATURE_AVX512F, fs); + __set_bit(X86_FEATURE_AVX512VL, fs); + __set_bit(X86_FEATURE_AVX512BW, fs); + __set_bit(X86_FEATURE_AVX512DQ, fs); + __set_bit(X86_FEATURE_AVX512_BF16, fs); + __set_bit(X86_FEATURE_AVX512_FP16, fs); + __set_bit(X86_FEATURE_AVX512CD, fs); + __set_bit(X86_FEATURE_AVX512_BITALG, fs); + __set_bit(X86_FEATURE_AVX512_IFMA, fs); + __set_bit(X86_FEATURE_AVX512_VBMI, fs); + __set_bit(X86_FEATURE_AVX512_VBMI2, fs); + __set_bit(X86_FEATURE_AVX512_VNNI, fs); + __set_bit(X86_FEATURE_AVX512_VPOPCNTDQ, fs); + } } =20 static void __init guest_common_default_feature_adjustments(uint32_t *fs) @@ -966,6 +1002,7 @@ void recalculate_cpuid_policy(struct dom =20 p->basic.max_leaf =3D min(p->basic.max_leaf, max->basic.max_leaf); p->feat.max_subleaf =3D min(p->feat.max_subleaf, max->feat.max_subleaf= ); + p->avx10.max_subleaf =3D min(p->avx10.max_subleaf, max->avx10.max_subl= eaf); p->extd.max_leaf =3D 0x80000000U | min(p->extd.max_leaf & 0xffff, ((p->x86_vendor & (X86_VENDOR_= AMD | X86_VENDOR_= HYGON)) @@ -1012,6 +1049,8 @@ void recalculate_cpuid_policy(struct dom =20 if ( p->basic.max_leaf < XSTATE_CPUID ) __clear_bit(X86_FEATURE_XSAVE, fs); + if ( p->basic.max_leaf < 0x24 ) + __clear_bit(X86_FEATURE_AVX10, fs); =20 sanitise_featureset(fs); =20 @@ -1081,9 +1120,18 @@ void __init init_dom0_cpuid_policy(struc /* Apply dom0-cpuid=3D command line settings, if provided. */ if ( dom0_cpuid_cmdline ) { + const struct cpu_policy *max =3D is_pv_domain(d) + ? (IS_ENABLED(CONFIG_PV) ? &pv_max_cpu_policy : NULL) + : (IS_ENABLED(CONFIG_HVM) ? &hvm_max_cpu_policy : NULL); uint32_t fs[FSCAPINTS]; unsigned int i; =20 + if ( !max ) + { + ASSERT_UNREACHABLE(); + return; + } + x86_cpu_policy_to_featureset(p, fs); =20 for ( i =3D 0; i < ARRAY_SIZE(fs); ++i ) @@ -1093,6 +1141,13 @@ void __init init_dom0_cpuid_policy(struc } =20 x86_cpu_featureset_to_policy(fs, p); + + /* + * Default-off features with their own leaves need those leaves + * re-populated from the max policy. + */ + if ( p->feat.avx10 ) + p->avx10 =3D max->avx10; } =20 /* @@ -1125,6 +1180,8 @@ static void __init __maybe_unused build_ sizeof(raw_cpu_policy.feat.raw)); BUILD_BUG_ON(sizeof(raw_cpu_policy.xstate) !=3D sizeof(raw_cpu_policy.xstate.raw)); + BUILD_BUG_ON(sizeof(raw_cpu_policy.avx10) !=3D + sizeof(raw_cpu_policy.avx10.raw)); BUILD_BUG_ON(sizeof(raw_cpu_policy.extd) !=3D sizeof(raw_cpu_policy.extd.raw)); } --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -226,6 +226,15 @@ void guest_cpuid(const struct vcpu *v, u *res =3D array_access_nospec(p->xstate.raw, subleaf); break; =20 + case 0x24: + ASSERT(p->avx10.max_subleaf < ARRAY_SIZE(p->avx10.raw)); + if ( subleaf > min_t(uint32_t, p->avx10.max_subleaf, + ARRAY_SIZE(p->avx10.raw) - 1) ) + return; + + *res =3D array_access_nospec(p->avx10.raw, subleaf); + break; + default: *res =3D array_access_nospec(p->basic.raw, leaf); break; --- a/xen/arch/x86/lib/cpu-policy/copy-to-buffer.c +++ b/xen/arch/x86/lib/cpu-policy/copy-to-buffer.c @@ -123,6 +123,13 @@ int x86_cpuid_copy_to_buffer(const struc break; } =20 + case 0x24: + for ( subleaf =3D 0; + subleaf <=3D MIN(p->avx10.max_subleaf, + ARRAY_SIZE(p->avx10.raw) - 1); ++subleaf ) + COPY_LEAF(leaf, subleaf, &p->avx10.raw[subleaf]); + break; + default: COPY_LEAF(leaf, XEN_CPUID_NO_SUBLEAF, &p->basic.raw[leaf]); break; --- a/xen/arch/x86/lib/cpu-policy/copy-from-buffer.c +++ b/xen/arch/x86/lib/cpu-policy/copy-from-buffer.c @@ -108,6 +108,13 @@ int x86_cpuid_copy_from_buffer(struct cp array_access_nospec(p->xstate.raw, data.subleaf) =3D l; break; =20 + case 0x24: + if ( data.subleaf >=3D ARRAY_SIZE(p->avx10.raw) ) + goto out_of_range; + + array_access_nospec(p->avx10.raw, data.subleaf) =3D l; + break; + default: if ( data.subleaf !=3D XEN_CPUID_NO_SUBLEAF ) goto out_of_range; --- a/xen/arch/x86/lib/cpu-policy/cpuid.c +++ b/xen/arch/x86/lib/cpu-policy/cpuid.c @@ -125,6 +125,7 @@ void x86_cpu_policy_fill_native(struct c switch ( i ) { case 0x4: case 0x7: case 0xb: case 0xd: + case 0x24: /* Multi-invocation leaves. Deferred. */ continue; } @@ -218,6 +219,15 @@ void x86_cpu_policy_fill_native(struct c } } =20 + if ( p->basic.max_leaf >=3D 0x24 ) + { + cpuid_count_leaf(0x24, 0, &p->avx10.raw[0]); + + for ( i =3D 1; i <=3D MIN(p->avx10.max_subleaf, + ARRAY_SIZE(p->avx10.raw) - 1); ++i ) + cpuid_count_leaf(0x24, i, &p->avx10.raw[i]); + } + /* Extended leaves. */ cpuid_leaf(0x80000000U, &p->extd.raw[0]); for ( i =3D 1; i <=3D MIN(p->extd.max_leaf & 0xffffU, @@ -287,6 +297,9 @@ void x86_cpu_policy_clear_out_of_range_l ARRAY_SIZE(p->xstate.raw) - 1); } =20 + if ( p->basic.max_leaf < 0x24 ) + memset(p->avx10.raw, 0, sizeof(p->avx10.raw)); + zero_leaves(p->extd.raw, ((p->extd.max_leaf >> 16) =3D=3D 0x8000 ? (p->extd.max_leaf & 0xffff) + 1 : 0), @@ -299,6 +312,8 @@ void __init x86_cpu_policy_bound_max_lea min_t(uint32_t, p->basic.max_leaf, ARRAY_SIZE(p->basic.raw) - 1); p->feat.max_subleaf =3D min_t(uint32_t, p->feat.max_subleaf, ARRAY_SIZE(p->feat.raw) - 1); + p->avx10.max_subleaf =3D + min_t(uint32_t, p->avx10.max_subleaf, ARRAY_SIZE(p->avx10.raw) - 1= ); p->extd.max_leaf =3D 0x80000000U | min_t(uint32_t, p->extd.max_leaf & = 0xffff, ARRAY_SIZE(p->extd.raw) - 1); } @@ -326,6 +341,8 @@ void x86_cpu_policy_shrink_max_leaves(st */ p->basic.raw[0xd] =3D p->xstate.raw[0]; =20 + p->basic.raw[0x24] =3D p->avx10.raw[0]; + for ( i =3D p->basic.max_leaf; i; --i ) if ( p->basic.raw[i].a | p->basic.raw[i].b | p->basic.raw[i].c | p->basic.raw[i].d ) --- a/xen/arch/x86/lib/cpu-policy/policy.c +++ b/xen/arch/x86/lib/cpu-policy/policy.c @@ -24,6 +24,10 @@ int x86_cpu_policies_are_compatible(cons if ( guest->feat.max_subleaf > host->feat.max_subleaf ) FAIL_CPUID(7, 0); =20 + if ( guest->avx10.version > host->avx10.version || + guest->avx10.max_subleaf > host->avx10.max_subleaf ) + FAIL_CPUID(0x24, 0); + if ( guest->extd.max_leaf > host->extd.max_leaf ) FAIL_CPUID(0x80000000U, NA); =20 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -366,6 +366,7 @@ XEN_CPUFEATURE(PREFETCHI, 15*32 XEN_CPUFEATURE(USER_MSR, 15*32+15) /*s U{RD,WR}MSR Instructions= */ XEN_CPUFEATURE(UIRET_UIF, 15*32+17) /* UIRET updates UIF */ XEN_CPUFEATURE(CET_SSS, 15*32+18) /* CET Supervisor Shadow St= acks safe to use */ +XEN_CPUFEATURE(AVX10, 15*32+19) /* AVX10 Converged Vector I= SA */ XEN_CPUFEATURE(SLSM, 15*32+24) /* Static Lockstep Mode */ =20 /* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.eax, word 16 */ --- a/xen/include/xen/lib/x86/cpu-policy.h +++ b/xen/include/xen/lib/x86/cpu-policy.h @@ -59,11 +59,12 @@ unsigned int x86_cpuid_lookup_vendor(uin */ const char *x86_cpuid_vendor_to_str(unsigned int vendor); =20 -#define CPUID_GUEST_NR_BASIC (0xdu + 1) +#define CPUID_GUEST_NR_BASIC (0x24u + 1) #define CPUID_GUEST_NR_CACHE (5u + 1) #define CPUID_GUEST_NR_FEAT (2u + 1) #define CPUID_GUEST_NR_TOPO (1u + 1) #define CPUID_GUEST_NR_XSTATE (62u + 1) +#define CPUID_GUEST_NR_AVX10 (0u + 1) #define CPUID_GUEST_NR_EXTD_INTEL (0x8u + 1) #define CPUID_GUEST_NR_EXTD_AMD (0x21u + 1) #define CPUID_GUEST_NR_EXTD MAX(CPUID_GUEST_NR_EXTD_INTEL, \ @@ -264,6 +265,19 @@ struct cpu_policy } comp[CPUID_GUEST_NR_XSTATE]; } xstate; =20 + /* Structured AVX10 information leaf: 0x000000024[xx] */ + union { + struct cpuid_leaf raw[CPUID_GUEST_NR_AVX10]; + struct { + /* Subleaf 0. */ + uint32_t max_subleaf; + uint32_t version:8, :8; + bool vsz128:1, vsz256:1, vsz512:1; + uint32_t :13; + uint32_t /* c */:32, /* d */:32; + }; + } avx10; + /* Extended leaves: 0x800000xx */ union { struct cpuid_leaf raw[CPUID_GUEST_NR_EXTD]; --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -294,7 +294,7 @@ def crunch_numbers(state): # enabled. Certain later extensions, acting on 256-bit vectors of # integers, better depend on AVX2 than AVX. AVX2: [AVX512F, VAES, VPCLMULQDQ, AVX_VNNI, AVX_IFMA, AVX_VNNI_INT= 8, - AVX_VNNI_INT16, SHA512, SM4], + AVX_VNNI_INT16, SHA512, SM4, AVX10], =20 # AVX512F is taken to mean hardware support for 512bit registers # (which in practice depends on the EVEX prefix to encode) as well