From nobody Thu Jul 23 21:53:00 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=1783522570; cv=none; d=zohomail.com; s=zohoarc; b=Rm4wSV4h0v6KN62xiq0Wxlv4rcElq8QARC4LEHA+yIEq+mqhifxX5WRyf6PtI15gRma25RYFtrt2ygK4xc/Jdr+4f9WNGXlYz42gU8bwKGoeEuOey17eEOHe7rY14Zi7PNOLBxbW+LTn7UobRcT86cBqH801aMXUro9OEGDc6CI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1783522570; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bFF/1aIEUZe7ClGY7L9LcVeNotxS1viNd9h5I3egz24=; b=V7SeBoKoGUMy2M1AvzSnzzqYh7LehaLiMLiKfCCwJsMId2pBYipGKUlZRllQc9VxzBIQKfm4Ha4XqmhTCL+Q3XXAkNGepGfhoHutQvgWVfZdn6qB4eXlhuWrGl4+3gd3/iMTbUbtWDIHJ4XFouAQ0dz5KDwFt7xztR912xPcjuU= 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 1783522570851988.4786536200527; Wed, 8 Jul 2026 07:56:10 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1357135.1611624 (Exim 4.92) (envelope-from ) id 1whTgg-00080K-ND; Wed, 08 Jul 2026 14:55:46 +0000 Received: by outflank-mailman (output) from mailman id 1357135.1611624; Wed, 08 Jul 2026 14:55:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1whTgg-00080D-Jj; Wed, 08 Jul 2026 14:55:46 +0000 Received: by outflank-mailman (input) for mailman id 1357135; Wed, 08 Jul 2026 14:55:45 +0000 Received: from mx.expurgate.net ([194.145.224.20]) by lists.xenproject.org with esmtp (Exim 4.92) id 1whTgf-000807-85 for xen-devel@lists.xenproject.org; Wed, 08 Jul 2026 14:55:45 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1whTge-0007NS-LI for xen-devel@lists.xenproject.org; Wed, 08 Jul 2026 16:55:44 +0200 Received: from [10.42.69.5] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a4e64dd-bab6-0a2a0a5309dd-0a2a4505dc9a-48 for ; Wed, 08 Jul 2026 16:55:44 +0200 Received: from [209.85.221.49] (helo=mail-wr1-f49.google.com) by tlsNG-c201ff.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6a4e64f0-3cb2-0a2a45050019-d155dd31a486-3 for ; Wed, 08 Jul 2026 16:55:44 +0200 Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-4758bd3731bso605109f8f.0 for ; Wed, 08 Jul 2026 07:55:44 -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 ffacd0b85a97d-47aa039b126sm43066599f8f.24.2026.07.08.07.55.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 08 Jul 2026 07:55:43 -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:Content-Type:Autocrypt:Content-Language:Cc:To:Subject:From:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1783522544; x=1784127344; darn=lists.xenproject.org; h=content-transfer-encoding:content-type:autocrypt:content-language :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to:content-type; bh=bFF/1aIEUZe7ClGY7L9LcVeNotxS1viNd9h5I3egz24=; b=VBfzoQYOaaJgmDu4zOXkIfeMNXWUwWtG5FZ8QHHvGBYp6HEvdW58mBR/KZW+38p5Is DT50gC8BJZh+DKkuBt/S4uxNLEDWjIEVcAhzue1dKlzJyWYBBf4LCheKfye8bkrc7OOW UKf4I6K/gLbJqXmJCeiDD5cWUp+LqFJns8mdVTkjxvSA/+QxHGra2eGVW2kHuu1Y1r5a G6/rHH+EUuiQKiw5S58XxwL6OI+eArWJbsgNAJs5NPsOMPzU1Ro29P16KKgORJRZxRPn JT6vqGaAZswvT8T/Qtz7clCxA7GJCt1FvH039wrYcYUIR1k+ytxb4oxoMzy/3n9f21Fv wsUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783522544; x=1784127344; h=content-transfer-encoding:content-type:autocrypt:content-language :cc:to:subject:from:user-agent:mime-version:date:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=bFF/1aIEUZe7ClGY7L9LcVeNotxS1viNd9h5I3egz24=; b=FftNpRb0OJQCkdrXimYzc5OvuBYkqNod782ciJrCgoxv5zLioQeDP53xvJXNuLXQuj VXXFqWlCUcZha5dBnvPBRXZUUuT7MjXVscLUYR4Ems6jCoTiT6J8JRz0Ja3gwV5JgLPL fjjm4UTmVOnRTLzd3e5axaJ0RZMTYdd0qLLEiuitPsEO5SX4O8ZxenvCA7U/xjgfuFz/ 7CZU4+dtbD0227sS80Z9aRg1BGn2JRkfHqYJqcurgQLnaEcrLLDJIFioxwQPZ144al/i 2BfCkOCpDWlG75VG7N6TAeLDcQA7oTsWH7H1l2dLbwL65Ura0shU2Ux7oGKR7IIli/Gt dQHA== X-Gm-Message-State: AOJu0YyoNdQq/KGHJOqPhao5w8pzxqZN7pCVrlWdWiq5df3zTXVowvlt RY4oehHwqQGKf+uvFRfybQro6H+i2QtBWNmky/AJXiI+iP4EAiSBG0iiFalmvL4wkfJwkjTgRcu EO4mCLQ== X-Gm-Gg: AfdE7ckWn9Oex862e7kNJtN23MoOh2/BaENMWU4kjaVlX9ZZ9qsstqV+MS7rdbpYSFc QrI/t4aHGom6AQcCa3IExFoTd6RYD5hn52TEIont0VP89suebvVagD8/Eog9X/qocrVJQ1F+Dxk 4fa2lwyv4K9VR3ygmHYPkWOWI/Y3pidP3qKEvhO+Q/GpohuVLlhN+Lw3UGXgAzwr7H6KQpBT2Dj wcpOsxz7hlZ5r2VFsP++x3WrG7YKHx8QlZFI44U0246Q1fpo+XK8cM7eS9WYf0wdGIPlYahQYw8 qeDwxAr0EKpDtSCyMg2k4KOqk22gjqfU8CJXxzuJkSXhXBMidr7RL/VyfTvON7VKB5pzJwW1AMq EHC4COFIQb2s2fpr39zWICTzyooMedcRVUQwwLg6BcA20u45W/FoT+BAfJ28qtdNThsBOuy7Iv4 ojIIiCZ5jrsXFxzkomU5YeUpm2rIw2/T7m7UsGdz9Px4NLk6WvefqMCCTtNufflhRdyjctwjqa8 Gbu X-Received: by 2002:a05:6000:387:b0:460:6b12:1783 with SMTP id ffacd0b85a97d-47df02459b8mr3564130f8f.4.1783522543946; Wed, 08 Jul 2026 07:55:43 -0700 (PDT) Message-ID: Date: Wed, 8 Jul 2026 16:55:42 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Jan Beulich Subject: [PATCH v3 for-4.22] x86/cpu-policy: set up host policy earlier To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Marek Marczykowski , Teddy Astie , Oleksii Kurochko 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-c201ff/1783522544-17B192B8-0BD7AB3F/10/73395122804 X-purgate-type: spam X-purgate-size: 3498 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1783522572413158500 In order to use cpu_has_* expanding to host_cpu_policy.*, the host policy needs setting up alongside boot_cpu_data.x86_capability[]. Arrange for that towards the end of identify_cpu(). Then make sure .x86_capability[] and host policy remain in sync when setup_{force,clear}_cpu_cap() are used. Rename the function now it's no longer static. Fixes: 894bd7617924 ("x86/Intel: use host CPU policy for ARAT checking") Reported-by: Marek Marczykowski-G=C3=B3recki Signed-off-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- This really was part of one of the XSTATE cleanup patches at the head of the AMX series. This explains the specific placement ahead of the call to xstate_init()). Likely anything from there downwards shouldn't really live in identify_cpu() anyway. --- v3: Make call from setup_force_cpu_cap() conditional. v2: Call calculate_host_cpu_policy() from setup_{force,clear}_cpu_cap() instead of from init_guest_cpu_policies(). --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -66,8 +66,10 @@ void __init setup_clear_cpu_cap(unsigned __clear_bit(cap, boot_cpu_data.x86_capability); dfs =3D x86_cpu_policy_lookup_deep_deps(cap); =20 - if (!dfs) + if (!dfs) { + calculate_host_cpu_policy(); return; + } =20 for (i =3D 0; i < FSCAPINTS; ++i) { cleared_caps[i] |=3D dfs[i]; @@ -78,6 +80,8 @@ void __init setup_clear_cpu_cap(unsigned __builtin_return_address(0), i, forced_caps[i] & dfs[i]); } + + calculate_host_cpu_policy(); } =20 void __init setup_force_cpu_cap(unsigned int cap) @@ -92,6 +96,10 @@ void __init setup_force_cpu_cap(unsigned } =20 __set_bit(cap, boot_cpu_data.x86_capability); + + /* Don't recalculate when the bit isn't represented in the policy. */ + if (cap < FSCAPINTS * 32) + calculate_host_cpu_policy(); } =20 bool __init is_forced_cpu_cap(unsigned int cap) @@ -586,6 +594,8 @@ void identify_cpu(struct cpuinfo_x86 *c) } =20 /* Now the feature flags better reflect actual CPU features! */ + if (c =3D=3D &boot_cpu_data) + calculate_host_cpu_policy(); =20 xstate_init(c); =20 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -359,11 +359,18 @@ void calculate_raw_cpu_policy(void) /* Was already added by probe_cpuid_faulting() */ } =20 -static void __init calculate_host_policy(void) +void __init calculate_host_cpu_policy(void) { struct cpu_policy *p =3D &host_cpu_policy; unsigned int max_extd_leaf; =20 + /* + * Bail if the raw policy wasn't set up yet. At least recalculate_xsta= te() + * can't be used yet in that case. + */ + if ( !raw_cpu_policy.basic.max_leaf ) + return; + *p =3D raw_cpu_policy; =20 p->basic.max_leaf =3D @@ -904,8 +911,6 @@ static void __init calculate_hvm_def_pol =20 void __init init_guest_cpu_policies(void) { - calculate_host_policy(); - if ( IS_ENABLED(CONFIG_PV) ) { calculate_pv_max_policy(); --- a/xen/arch/x86/include/asm/cpu-policy.h +++ b/xen/arch/x86/include/asm/cpu-policy.h @@ -30,4 +30,10 @@ void recalculate_cpuid_policy(struct dom */ void calculate_raw_cpu_policy(void); =20 +/* + * Collect the host CPU policy. Called after collecting enough CPUID outp= ut, + * and again after all feature overrides have been put in place. + */ +void calculate_host_cpu_policy(void); + #endif /* X86_CPU_POLICY_H */