From nobody Fri Dec 12 19:32:36 2025 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=1764673062; cv=none; d=zohomail.com; s=zohoarc; b=NseqWlyPgmxxoi0lBDKFik/vFRaS9moF+SCysJOfecr6/AwIcLT+coXiaPAG+6opHVMKzF1lh6gTFRDGDXJOSkf2dKY2DVtcIokJ+kK8vlE43qRD/zxcThj2FAb49CILSXC4NNKETupsfj82hFraH4XlwHKUZN9B2cV9d6cutn0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764673062; 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=3uTknspdwfVlg5HxX4a1l7HLU0GTjm03g0aB2rEYFsg=; b=VIKf7hXfxUz1jc7c4zhSAW0NUb2zkPEY+zUS0CElaF6HdLoJoi+b9A6sA1B12KTDn9vVK13ZodtN2lz5SUS0RGmA4aKcFMXH9roIfa9QOPv5YzArPvN3PA/8SRfd7Im3PZO+FzDfR1vzH25K8YstE5FbjVPt/JMS93/ZVnw8RdM= 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 17646730620385.183919781220652; Tue, 2 Dec 2025 02:57:42 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1176072.1500646 (Exim 4.92) (envelope-from ) id 1vQO4R-0007mo-G2; Tue, 02 Dec 2025 10:57:23 +0000 Received: by outflank-mailman (output) from mailman id 1176072.1500646; Tue, 02 Dec 2025 10:57:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vQO4R-0007mf-DJ; Tue, 02 Dec 2025 10:57:23 +0000 Received: by outflank-mailman (input) for mailman id 1176072; Tue, 02 Dec 2025 10:57:22 +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 1vQO4Q-0007Nh-0n for xen-devel@lists.xenproject.org; Tue, 02 Dec 2025 10:57:22 +0000 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [2a00:1450:4864:20::334]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id aa719918-cf6d-11f0-980a-7dc792cee155; Tue, 02 Dec 2025 11:57:16 +0100 (CET) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-477632b0621so33135495e9.2 for ; Tue, 02 Dec 2025 02:57:16 -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-4791164d365sm289825795e9.12.2025.12.02.02.57.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Dec 2025 02:57:15 -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: aa719918-cf6d-11f0-980a-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1764673036; x=1765277836; 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=3uTknspdwfVlg5HxX4a1l7HLU0GTjm03g0aB2rEYFsg=; b=mlij7gWD6fPtxgJvZlrg8+0nusMdD/uE3/0nyjQs/MmrHapGl8NbF4up3zJC3/CDAE 0Xa7CidpUixZmiwu9DmdZN6ZVsZZtZyg5xcdp7KNCuolfTI0dQ9eDKj3xD8NW0LXKe9t rYowqWz7IM8f4oARIKSusK2lmcdeHKljwyfOo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764673036; x=1765277836; 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=3uTknspdwfVlg5HxX4a1l7HLU0GTjm03g0aB2rEYFsg=; b=W8hNFlq7RgD0dTQcEjwdpJFrW44AEE6WLg4RGln/zRj0OtNxx8Umy5j+nlmYlSESqD y8fiivC5L3Ts02d/2JL7jyEP/+K7G12rZUXJsp3Y6mSgSUY/6cc9Je7Vaz2QFHoDEhwV 4z1/CGAKCnyBMmEIJebab+pkyJi9nG7s8IMzDU8Ha3zTQVAWsudsEW4safQm1LqZ7C0n okMlyfqiaLvjhu2a42AT8UekzkfqZePd3C+kLReECAdfcQf95JvejbofWHaphIziRbh7 MHJOrIOzwbJ3XXn0CodpniBcSEYM0GTXFCNcWxdTU5L1XwaabtrOBvPcBr1/WMQCxjAb l1qA== X-Gm-Message-State: AOJu0YxQBZ9PhTx4zy5Q6ec7VInSSdOskqL6alZPGaL31b4X8XjDwaPv lHJgmk4lYCGnWxyjYwlDihW8ovMyAUI1a2ieZGQn/ZtriOawNv3vIRixtaQqnw0TWF8AjeQ31rL x/350 X-Gm-Gg: ASbGnctS1JrTFRBKiJpD7ywGGKXTKT3UDL1+lz7Tk4Or+SyQjWp+9Br5W0lh2nCr95r Q4scCIwKdPSQNLfdqtCORHE2E/fUI2FEKcFbE1a4ULeIcQbg0rZxTnWnS0Ri+nWVByYkbVpIN6P SJKsiEBkY6uVFX+jmUbLTq1uxfrje+TqnhsIW4g190+TRdB141lZ8Oegnce7XWCOAWMNv3YE/j/ WP1HmQkzaVA5KwxuBPRZEIbow8P4TMLRsnamIZHLzWwiAq9o5DBKShBEkDQjH6rm0hH2jeeJOlm W/yA9lPZV4P7k/eIE56q3RRFlo2gICgpeUqLV0EXkmr0wz8RDQ9vpyE1FNrNHurIuckU6g/Y6Ry 03/snIHbv55TG7tB95pbb4ixCFKTacwVapbzuFk5t7gm0AxZipycI3a9U2qf/Z8TzeiMSx6s1Yy HCANW4rupLtwTcBZztSxktUoh5FdwXSzXvFLBQqawBIpWDnG1Ns0fno/lu63XP8Q== X-Google-Smtp-Source: AGHT+IEu+buKMVbsAKdlEx9OLFYApjuDQtKjGSVYWrbbpb3M2OiazRwqK6TuNVelOV2m117N04nNhg== X-Received: by 2002:a05:600c:450f:b0:46e:1abc:1811 with SMTP id 5b1f17b1804b1-477c1124ecfmr404638545e9.27.1764673035896; Tue, 02 Dec 2025 02:57:15 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH 1/3] x86/amd: Fold another DE_CFG edit into amd_init_de_cfg() Date: Tue, 2 Dec 2025 10:57:08 +0000 Message-Id: <20251202105710.1472927-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251202105710.1472927-1-andrew.cooper3@citrix.com> References: <20251202105710.1472927-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: 1764673063564019200 Fam12h processors aren't SMT-capable so there are no race condition worries with this path. Nevertheless, group it together with the other DE_CFG modifications. Fixes: d0c75dc4c028 ("x86/amd: Fix race editing DE_CFG") Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 I apparently couldn't count how many examples we had editing DE_CFG... --- xen/arch/x86/cpu/amd.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 47c109f89804..4dc9157836ad 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -920,6 +920,13 @@ void amd_init_de_cfg(const struct cpuinfo_x86 *c) if ( zenbleed_use_chickenbit() ) new |=3D (1 << 9); =20 + /* + * Erratum #665, doc 44739. Integer divide instructions may cause + * unpredictable behaviour. + */ + if ( c->family =3D=3D 0x12 ) + new |=3D 1U << 31; + /* Avoid reading DE_CFG if we don't intend to change anything. */ if ( !new ) return; @@ -1201,15 +1208,6 @@ static void cf_check init_amd(struct cpuinfo_x86 *c) smp_processor_id()); wrmsrl(MSR_AMD64_LS_CFG, value | (1 << 15)); } - } else if (c->x86 =3D=3D 0x12) { - rdmsrl(MSR_AMD64_DE_CFG, value); - if (!(value & (1U << 31))) { - if (c =3D=3D &boot_cpu_data || opt_cpu_info) - printk_once(XENLOG_WARNING - "CPU%u: Applying workaround for erratum 665\n", - smp_processor_id()); - wrmsrl(MSR_AMD64_DE_CFG, value | (1U << 31)); - } } =20 /* AMD CPUs do not support SYSENTER outside of legacy mode. */ --=20 2.39.5 From nobody Fri Dec 12 19:32:36 2025 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=1764673063; cv=none; d=zohomail.com; s=zohoarc; b=Okjwf9w1hSiMnU6wJ2OrkQY8+6OiiXysR1T5y2o2ipAQxvxh2C2/eM47yTQYf42pweQG3TctEQkrvI5sDByRlW671PFHF8/7zMyzfoPR2bYO/wvccvV5Jrjx3V3GpK+YQSsqjzoMbsfem+xKtieSm4rc8q3tar5XultlHdBf5Dc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764673063; 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=Y3F0v8B5tAKK2oIAslcDrKA97kPJ4tzxA9EyhzU5Mmg=; b=nk/qohY4RQKefg9w82leXjwfh/MeP7hSY1wuVEarLfBBnuHQtQg8Mtg3bHNriicxRqXuYb9J0YNRalylDBRNT1Fihmr2f7FnT9J40oI9J+gIF816sQj5U/8/41lUaXeR6W2MEIV/rLTeDcjELu8AAMASssj4dlGvtd5Z5nH0jsk= 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 17646730633763.0297757657625652; Tue, 2 Dec 2025 02:57:43 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1176071.1500635 (Exim 4.92) (envelope-from ) id 1vQO4P-0007X5-6I; Tue, 02 Dec 2025 10:57:21 +0000 Received: by outflank-mailman (output) from mailman id 1176071.1500635; Tue, 02 Dec 2025 10:57:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vQO4P-0007Wy-3f; Tue, 02 Dec 2025 10:57:21 +0000 Received: by outflank-mailman (input) for mailman id 1176071; Tue, 02 Dec 2025 10:57:20 +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 1vQO4O-0007Nh-HB for xen-devel@lists.xenproject.org; Tue, 02 Dec 2025 10:57:20 +0000 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [2a00:1450:4864:20::32f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id aaccb00d-cf6d-11f0-980a-7dc792cee155; Tue, 02 Dec 2025 11:57:17 +0100 (CET) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-47789cd2083so31027195e9.2 for ; Tue, 02 Dec 2025 02:57:17 -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-4791164d365sm289825795e9.12.2025.12.02.02.57.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Dec 2025 02:57:16 -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: aaccb00d-cf6d-11f0-980a-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1764673037; x=1765277837; 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=Y3F0v8B5tAKK2oIAslcDrKA97kPJ4tzxA9EyhzU5Mmg=; b=wKnwYpRB3LL7Mw6aTy/TF4x/TSSlJez7GcXwFLKDO34xr5rS6JC+R/fDWRDtfmoe8B JV99Br7g336lLv4z0xVfBnRh0Hy92iE4m9p0vZK3y64cBrI12+vgzCKy53BD7kutRbJW CCdrx3892q4Ayn7VPj7mZxsNJBxNlCVYCahjM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764673037; x=1765277837; 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=Y3F0v8B5tAKK2oIAslcDrKA97kPJ4tzxA9EyhzU5Mmg=; b=bLEHcKllmr52zWAMrcVAEjWLnY4dCrQUdJGSCYrB1q4jvnljOUYYAmVFw18tfWKCeR mKZ95j+Qe9lwwep03dmgan0hA/QMzCEDxPlHWCumV5FSguB0C9iCPdjurTftHrfY4aSw Fd+KojDGd1b0HQCSMQ1DogaYfw3hSLOAsm6C/XTA4M1TON/CQ2tWiVPRE0TjMFIHTm+2 w4Cel4auz5IWirLDDuWHOGXR4xG4sokBsPR25KRqYtYVE9AWlaJxa3jrwxp+syqcYBBs IRGNKMbfFSvGrpxUhfgnuy/H9j9zoDaiS0I0tPPcF7dZmTPXeUHwG1cPU6Zv8rmZX9UH BGFg== X-Gm-Message-State: AOJu0YxWmkjxoRaz0fNo58aRrBRgFfnWNSY049epcBUtAFVFuE14zcF+ MnGCAu/2p3PJ9VsThXoMpQJs4zWnZ4veJDoedTvMYzQ9oM8J3Bbh/bVIZZI2Bze5diOrOg8rGtz r9PE5 X-Gm-Gg: ASbGnctGLMiduUcrsz6yYaRKm0keiGrQ9rbTdF1SwGuA3NU3M7ChKfYpoROB7To+xhy BJRc+jZ1FT/BQ01ZB7bbthxqpWdPTluIaMzjkKYP92F0KVQgygRzZTy/WcRjNsyoMFCGBf5x5oo 8otgCobqmZTdwL9xREZUnro8Q0gAtpTMdKrjKotU0KBX2sRvy7Bo76mFnhuUFJwCvYX4aAUwZ64 F5S1KnVckVROk51gLsjSPbLY+PZ+36begO2vfMtQG+wFjqrPcndPrjK528HWNoAljxOcWco+cfE T7jB1GZm2MSdf3/dkmXNkgu0BDh5G23yXONbFkjJjgBLGWWVWtQZZzksXO0KA04apq41MyFd5jb kYX0cBJOyT/cI5o/KQBHQ3zgelcuQe23NMM9TEMmetSSzYkHpf3b0nLw5dgAf1INdshM3UEjLCb C5BJtZ7Hp+4iOIQE5eqTq6kYXySarM/3pkXd14rvxoziT6Cr9r9ppewIlIJYcxeA== X-Google-Smtp-Source: AGHT+IEaso1pVFzc+d42WVIjUWuuXqzVjN0XMUbvo93FY2+XATOdq6XNtm++GWgxF/aHqfUMAshfCA== X-Received: by 2002:a05:600c:19ca:b0:477:a978:3a7b with SMTP id 5b1f17b1804b1-477c1143073mr407258435e9.22.1764673036572; Tue, 02 Dec 2025 02:57:16 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH 2/3] x86/amd: Exclude K8 RevD and earlier from levelling Date: Tue, 2 Dec 2025 10:57:09 +0000 Message-Id: <20251202105710.1472927-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251202105710.1472927-1-andrew.cooper3@citrix.com> References: <20251202105710.1472927-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: 1764673065930019200 Between RevD and RevE silicon, the feature MSRs moved location. This prope= rty is highlighted by the suggested workaround for Erratum #110 which gives the two different MSRs for the extended feature leaf. The other feature MSRs are not given and while they're easy enough to figure out I don't have any K8's to test the result with. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 --- xen/arch/x86/cpu/amd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 4dc9157836ad..73f43b0f9174 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -117,10 +117,12 @@ static void __init noinline probe_masking_msrs(void) /* * First, work out which masking MSRs we should have, based on * revision and cpuid. + * + * Fam11h doesn't support masking at all. FamFh RevD and earlier had + * the feature MSRs in different locations, as can be seen by the + * suggested workaround for Erratum #110, docID 25759. */ - - /* Fam11 doesn't support masking at all. */ - if (c->x86 =3D=3D 0x11) + if (c->family =3D=3D 0x11 || (c->family =3D=3D 0xf && c->model < 0x20)) return; =20 cpuidmask_defaults._1cd =3D --=20 2.39.5 From nobody Fri Dec 12 19:32:36 2025 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=1764673056; cv=none; d=zohomail.com; s=zohoarc; b=DAHKgeds/nINMEUqbSG0fwyZMGgJl09kOjt9hEVI5+kTmGql9AfrivHp7b0qKcOZ52y9ztARKed3ELC/lHFbjNZFKyEfRfK8rn5cPzx4XbfRV3H5p/BnSRouKzqXQzREs73tUXvkpHBceizOFRu+Z2DxrP6+rNnF9ygdwEY6kkI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764673056; 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=riRPJvWz61nwq2yHn5ai8Dg4B8xFn5kKgazweRThc40=; b=TxnXgT3nQbooVfcsKA+a3wDgzqe5RT793xRMLyx5+MjyrONSp4gPjCjS1lW7faVR5Yn5uLeH4hjWXa3f2Llh0KEN13BRRyv2j0laqndfQPm+CMUpa1qqW/18OkJOnHbc7J2gfc5UxLb0C3qF2QW7bd20/0IgZHAmdnva67RO8JY= 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 17646730568405.793162238560058; Tue, 2 Dec 2025 02:57:36 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1176070.1500620 (Exim 4.92) (envelope-from ) id 1vQO4N-00079A-0q; Tue, 02 Dec 2025 10:57:19 +0000 Received: by outflank-mailman (output) from mailman id 1176070.1500620; Tue, 02 Dec 2025 10:57:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vQO4M-00078H-T5; Tue, 02 Dec 2025 10:57:18 +0000 Received: by outflank-mailman (input) for mailman id 1176070; Tue, 02 Dec 2025 10:57:18 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vQO4M-00075j-GO for xen-devel@lists.xenproject.org; Tue, 02 Dec 2025 10:57:18 +0000 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [2a00:1450:4864:20::32e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ab33504f-cf6d-11f0-9d1a-b5c5bf9af7f9; Tue, 02 Dec 2025 11:57:18 +0100 (CET) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4779a4fc95aso40860875e9.1 for ; Tue, 02 Dec 2025 02:57:18 -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-4791164d365sm289825795e9.12.2025.12.02.02.57.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Dec 2025 02:57:16 -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: ab33504f-cf6d-11f0-9d1a-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1764673037; x=1765277837; 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=riRPJvWz61nwq2yHn5ai8Dg4B8xFn5kKgazweRThc40=; b=pdil9SN85+xLiSUie1v7OahUeFgphkAk3urlAAFokdg51Q+hjQ2kW6tXjgSCGjpjmy PVMop6nk7r8q6SRj8CVdzqg5zriM/MItPKklm1gnM5nDjZZ+cxK53zRR7ecXepx+IKDI 1FrQXqJHfdigII9UPnYnzjgpfGhz7KRW5BLM0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764673037; x=1765277837; 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=riRPJvWz61nwq2yHn5ai8Dg4B8xFn5kKgazweRThc40=; b=hWko3jhWImIQrddmdny/pHxJpXV9KBlB/qYyACExCRA4vDLFMsz+UUhHgFN1xlDdtI KrMqKK6ezuU28GTDOO7CC24jLML4fhujDX5II1OrVeyQSRj17ujLZ5cXSiWunvXb+jlX /S8nMsH/71sBr4WiD6wK1cAawKDsq5RTZSiaXo2zTQQqH14+Mm6iTAiGDdaAfvQVpxoP 2Kqr4HlxQEaVH6FG9Im69pq7jJHRHCoXLUACMnKtpUcCzVxE2K8eS0qYrF/GHnpXBrz3 ARbRcNvd2tabTj8Jp2JVTFPMxq3i6I4qkq8oL0BB/j2eFZFBlfgDzhl0Is4bjrkpAi67 DErA== X-Gm-Message-State: AOJu0Yz18E6HqETp7JQ3p0TkT4YxcCinKF6P2QGcB550jBDaVM1qmPVR pwMJGuUjiiCurXt5TQs1Zh5ZgDepIRO6kdX755EjdaeaeROxAggdRsSxhrfKDx2tdiM3isbkHZV nFOIW X-Gm-Gg: ASbGncueLH12+QchjRAyo/vWXmXfp/DtD3CTkvAiXBJovKZxZxIInayPnR20qU47xcl IIdPEDxxi5JqBV+OhLJT2YZgcnfBKjNLggKHFEesZ1g4i7HJEJbLqW/Tl7lN8MvMK+i31XS+Yuv nAbk7Nkpg6TiEc/VKuCYr41IdmMPrYf3ErgYm8jxGVEd806QX2THtE6mdp94GNfF5uE5kphM3rT RAaUsQcDAfY9kk1y7CYXXyLj3G88tpAHiPXwDA0xxtExV8uPpzK31d3tfX8o6Jxdbdb55n0aR+t TquLnPqaBVg+cdtpgyOauhyVIGS2LL0kZxyXXz0xvjar6820lKMDuULKQo+a84co2c2afR+Iw1/ 0vM3ltkVw7jay6GWGttSq3HKA2Wkt5V5KyAINcP8s6YQtg3sTkf56GMu1hRGB4XgDm7QksnuEdp wM1kDdCoUSmKhPQTIoPFydA/mD0n32wxtN4n75rpTNiZKrzC4qdcWfx08JjfKGcQ== X-Google-Smtp-Source: AGHT+IF8xRcUg1w/qTR4FnaeZsLwR12ATjw4zfcKNq+vdchgjluVzL8fyAnzMxYpc6oK21J/+MaZLA== X-Received: by 2002:a05:600c:1c9e:b0:477:9e0c:f59 with SMTP id 5b1f17b1804b1-47926f80703mr23758275e9.2.1764673037174; Tue, 02 Dec 2025 02:57:17 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH 3/3] x86/amd: Delay amd_init_levelling() until after fixes to the CPUID MSRs Date: Tue, 2 Dec 2025 10:57:10 +0000 Message-Id: <20251202105710.1472927-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251202105710.1472927-1-andrew.cooper3@citrix.com> References: <20251202105710.1472927-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: 1764673057867019200 There's no need for amd_init_levelling() to be specifically early. In fact, it must be after init_amd() edits the feature MSRs, e.g. enabling TOPOEXT on Fam15h, or we revert the change on the next context switch. As the only action in early_init_amd(), drop the function entirely. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 --- xen/arch/x86/cpu/amd.c | 16 ++++++---------- xen/arch/x86/cpu/cpu.h | 2 +- xen/arch/x86/cpu/hygon.c | 6 +++++- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 73f43b0f9174..b66601b3c51e 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -224,7 +224,7 @@ static const typeof(ctxt_switch_masking) __initconst_cf= _clobber __used csm =3D * avoid this, as the accidentally-advertised features will not actually * function. */ -static void __init noinline amd_init_levelling(void) +void __init amd_init_levelling(void) { /* * If there's support for CpuidUserDis or CPUID faulting then @@ -617,14 +617,6 @@ void amd_process_freq(const struct cpuinfo_x86 *c, *low_mhz =3D amd_parse_freq(c->x86, lo); } =20 -void cf_check early_init_amd(struct cpuinfo_x86 *c) -{ - if (c =3D=3D &boot_cpu_data) - amd_init_levelling(); - - ctxt_switch_levelling(NULL); -} - void amd_log_freq(const struct cpuinfo_x86 *c) { unsigned int low_mhz =3D 0, nom_mhz =3D 0, hi_mhz =3D 0; @@ -1270,10 +1262,14 @@ static void cf_check init_amd(struct cpuinfo_x86 *c) check_syscfg_dram_mod_en(); =20 amd_log_freq(c); + + if (c =3D=3D &boot_cpu_data) + amd_init_levelling(); /* After CPUID MSR adjustments. */ + + ctxt_switch_levelling(NULL); } =20 const struct cpu_dev __initconst_cf_clobber amd_cpu_dev =3D { - .c_early_init =3D early_init_amd, .c_init =3D init_amd, }; =20 diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index 8bed3f52490f..c05c620c29bc 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -22,9 +22,9 @@ extern void display_cacheinfo(struct cpuinfo_x86 *c); extern void detect_ht(struct cpuinfo_x86 *c); extern bool detect_extended_topology(struct cpuinfo_x86 *c); =20 -void cf_check early_init_amd(struct cpuinfo_x86 *c); void amd_log_freq(const struct cpuinfo_x86 *c); void amd_init_de_cfg(const struct cpuinfo_x86 *c); +void amd_init_levelling(void); void amd_init_lfence_dispatch(void); void amd_init_ssbd(const struct cpuinfo_x86 *c); void amd_init_spectral_chicken(void); diff --git a/xen/arch/x86/cpu/hygon.c b/xen/arch/x86/cpu/hygon.c index cab915a2fcf1..51104cbaf42c 100644 --- a/xen/arch/x86/cpu/hygon.c +++ b/xen/arch/x86/cpu/hygon.c @@ -90,9 +90,13 @@ static void cf_check init_hygon(struct cpuinfo_x86 *c) } =20 amd_log_freq(c); + + if (c =3D=3D &boot_cpu_data) + amd_init_levelling(); /* After CPUID MSR adjustments. */ + + ctxt_switch_levelling(NULL); } =20 const struct cpu_dev __initconst_cf_clobber hygon_cpu_dev =3D { - .c_early_init =3D early_init_amd, .c_init =3D init_hygon, }; --=20 2.39.5