From nobody Tue Feb 10 02:43:45 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=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1769450069; cv=none; d=zohomail.com; s=zohoarc; b=S8IqQNQx0NqfkDc/mHyNZEq1HXdgsmvEuMBON0Fr3fCYhhSEoB4ddUHyaLWWF51HRMyoawZXXK9pJjP6BlLMg255WMzMfrxh1AScePYe6IKv4kFHYiaRCVSuyCkNUzZBHYi2qA1ZDDii6pW9iSn2qDWSf8hSBZkPAl1u2fre154= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769450069; 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=FPbCiqCcqf0/NbE9zeJiJem+K34lkoRlbsFPYopIEac=; b=eF711NppCSd9aTzMBWrhX3J2F04d+4HwR7G7MApjQ0H76PuvBs+/V3qcn5LDMyZ94HWGf0uzVzkkOy4zz0ooedtYlTM1QHaBJ4PVOeNGQkII1vaQi942OeQ88/lu6hbqlfrCE5nqTnxrtkQQ6c+o4RCcc0EA5+QLzOzdNWnKvo8= 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=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 17694500699581007.0257509626796; Mon, 26 Jan 2026 09:54:29 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1213830.1524277 (Exim 4.92) (envelope-from ) id 1vkQmh-0004RQ-AJ; Mon, 26 Jan 2026 17:53:55 +0000 Received: by outflank-mailman (output) from mailman id 1213830.1524277; Mon, 26 Jan 2026 17:53:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vkQmh-0004Qj-3e; Mon, 26 Jan 2026 17:53:55 +0000 Received: by outflank-mailman (input) for mailman id 1213830; Mon, 26 Jan 2026 17:53:53 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vkQmf-0004HX-JH for xen-devel@lists.xenproject.org; Mon, 26 Jan 2026 17:53:53 +0000 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [2a00:1450:4864:20::332]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id f95da1ba-fadf-11f0-9ccf-f158ae23cfc8; Mon, 26 Jan 2026 18:53:51 +0100 (CET) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-47ee301a06aso55313185e9.0 for ; Mon, 26 Jan 2026 09:53:51 -0800 (PST) Received: from localhost.localdomain (host-92-26-102-188.as13285.net. [92.26.102.188]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48066c10dbasm3896455e9.15.2026.01.26.09.53.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jan 2026 09:53:50 -0800 (PST) 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" X-Inumbo-ID: f95da1ba-fadf-11f0-9ccf-f158ae23cfc8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1769450031; x=1770054831; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FPbCiqCcqf0/NbE9zeJiJem+K34lkoRlbsFPYopIEac=; b=uKXW59LQ+j6pC//HqjWHvCbuP2qjKwXraAW7xOlMuOCZIJrrj3m3FEdcVN/3+o9YML BSRDecAih92Sf8W+IL0CHtXVK3sgxM69+eRPUn3wuIJM4r2nINEp+P8ez7dYUb9daqBz TYgXIPsXZyCbxYD+JkrJ9i+YCyjEKLgSx2RbU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769450031; x=1770054831; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FPbCiqCcqf0/NbE9zeJiJem+K34lkoRlbsFPYopIEac=; b=Cqv2cQzygRi/xZdgCjteKk3385jSajPtRHYU+2mwrz1sYp/nzSYtPrrvx0CXhIEFet MgN7DDQjCXBzZmrn3tVvJpmwZjLPSMVTWstjyMDj2N5fr1F5vrEYLJo5a7P7HoJ2//BQ Fah1sLkza91nOUvs8v2K49Tl8Io/u9ebrY/8/awRaBPctC8JwWEhMRCn9WAWmYGktEMt 5T0Qn23mrpgdWIt+iW6kj3FFev2tSP0Q958cvbqdSNZ+ZF3e75aZl5LbIll9jkgn6B27 DCkML4t0CELVF++e65fyk3b9pTSILF4ftN40sgbbzaOOHiP63YQRbLrXp9Apc/6OU2Qq 6Z3Q== X-Gm-Message-State: AOJu0YwZ8tfzxiQ0uAaxY0qaN51Q3a+/Eq2Sg527MZu3T7lEMh6sAOfs +coc14dyxS7WxSVlzrvK095l1WwcRvKHauhVuzswCMkVsuNPHgVMMQR6flBtcc05UlmLraqJrBr urReF X-Gm-Gg: AZuq6aL3ohplvANNSvzSYoD8NdqTfJvrIw2RtPeonE+Z624sxeX7kIrHjQjCnpPd2v7 XUJgryDlnA0n+AuFj5leTYfCu2TBOVEowEgZrxkgCdUZP8j0boGQQEcrUJYLWh5gmjfTeOjaMpD p1EOgiAysmfZLxKRULWwPnW1XXwKkfQEAf4R4AK+yGvtybv6IrwZDyLgznYszTEvsQSEpz9uhZW wf2JEvUbywuqObmNx4zXBtmYBZ9yzwo74RHnwURUTzYQ41i6C5Gigluvyd0cy/pqkYXfI8JQ38x GdP/YbxseLeGndrVeASFYGehZponJgOpJChocO5iiMALq8d81merU2pOzYoLRtLk0+rbqzuc/on T/jZwxRhQPi9BrtWS5WBF3LnbkPfJGKz44IwRgF7hV0LRPkCK2ymAzFalde54zGHditCW34FI31 0mVBO4tF2YfV47VgSnGhxHujOkVBsBDOz4CePbwXE2o/0V5fRk/DZ/ZgQV3yq+rA== X-Received: by 2002:a05:600c:444c:b0:47e:e779:36e with SMTP id 5b1f17b1804b1-4805cf67274mr86300515e9.19.1769450030306; Mon, 26 Jan 2026 09:53:50 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Julian Vetter , Teddy Astie Subject: [PATCH 02/16] x86/cpu: Drop cpuid_level adjustment from generic_identify() Date: Mon, 26 Jan 2026 17:53:31 +0000 Message-Id: <20260126175345.2078371-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260126175345.2078371-1-andrew.cooper3@citrix.com> References: <20260126175345.2078371-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1769450072266154100 early_cpu_init() calls intel_unlock_cpuid_leaves(), which arranges for the boot trampoline to make the adjustment for all APs, meaning the call from early_init_intel() is a no-op. Drop it, allowing intel_unlock_cpuid_leaves= () to become __init code. In turn, the adjustments in generic_identify() were a no-op too. Nothing in the c_early_init() hooks modifies the 1c/1d features, so their values in c->x86_capability[] are still good from just above. The ebx variable used to calculate c->x86_clflush_size is still good too, b= ut move the logic earlier so it's more obviously correct. Fixes: fa4d026737a4 ("x86/Intel: unlock CPUID earlier for the BSP") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Julian Vetter CC: Teddy Astie --- xen/arch/x86/cpu/common.c | 10 +--------- xen/arch/x86/cpu/intel.c | 4 +--- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index f8c80db6eb1d..dda0d5d39c92 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -479,6 +479,7 @@ static void generic_identify(struct cpuinfo_x86 *c) cpuid(1, &eax, &ebx, &ecx, &edx); c->x86 =3D get_cpu_family(eax, &c->x86_model, &c->x86_mask); c->apicid =3D phys_pkg_id((ebx >> 24) & 0xFF, 0); + c->x86_clflush_size =3D ((ebx >> 8) & 0xff) * 8; c->phys_proc_id =3D c->apicid; =20 /* @@ -502,15 +503,6 @@ static void generic_identify(struct cpuinfo_x86 *c) if (actual_cpu.c_early_init) alternative_vcall(actual_cpu.c_early_init, c); =20 - /* c_early_init() may have adjusted cpuid levels/features. Reread. */ - c->cpuid_level =3D cpuid_eax(0); - cpuid(1, &eax, &ebx, - &c->x86_capability[FEATURESET_1c], - &c->x86_capability[FEATURESET_1d]); - - if ( cpu_has(c, X86_FEATURE_CLFLUSH) ) - c->x86_clflush_size =3D ((ebx >> 8) & 0xff) * 8; - /* AMD-defined flags: level 0x80000001 */ if (c->extended_cpuid_level >=3D 0x80000001) cpuid(0x80000001, &tmp, &tmp, diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 584588e406f2..d585161dd32f 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -310,7 +310,7 @@ static void __init noinline intel_init_levelling(void) } =20 /* Unmask CPUID levels if masked. */ -void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c) +void __init intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c) { uint64_t misc_enable, disable; =20 @@ -335,8 +335,6 @@ static void cf_check early_init_intel(struct cpuinfo_x8= 6 *c) bootsym(trampoline_misc_enable_off) & MSR_IA32_MISC_ENABLE_XD_DISABLE) printk(KERN_INFO "re-enabled NX (Execute Disable) protection\n"); =20 - intel_unlock_cpuid_leaves(c); - /* CPUID workaround for Intel 0F33/0F34 CPU */ if (boot_cpu_data.x86 =3D=3D 0xF && boot_cpu_data.x86_model =3D=3D 3 && (boot_cpu_data.x86_mask =3D=3D 3 || boot_cpu_data.x86_mask =3D=3D 4)) --=20 2.39.5