Date:   Tue, 31 Jan 2023 09:41:09 -0800
From:   Ashok Raj <ashok.raj@intel.com>
To:     "Luck, Tony" <tony.luck@intel.com>
CC:     Borislav Petkov <bp@alien8.de>,
        Thomas Gleixner <tglx@linutronix.de>,
        LKML <linux-kernel@vger.kernel.org>, x86 <x86@kernel.org>,
        Ingo Molnar <mingo@kernel.org>,
        "Hansen, Dave" <dave.hansen@intel.com>,
        "Schofield, Alison" <alison.schofield@intel.com>,
        "Chatre, Reinette" <reinette.chatre@intel.com>,
        Tom Lendacky <thomas.lendacky@amd.com>,
        "Stefan Talpalaru" <stefantalpalaru@yahoo.com>,
        David Woodhouse <dwmw2@infradead.org>,
        Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        Jonathan Corbet <corbet@lwn.net>,
        "Rafael J . Wysocki" <rafael@kernel.org>,
        Peter Zilstra <peterz@infradead.org>,
        "Lutomirski, Andy" <luto@kernel.org>,
        "andrew.cooper3@citrix.com" <andrew.cooper3@citrix.com>,
        "Ostrovsky, Boris" <boris.ostrovsky@oracle.com>,
        Martin Pohlack <mpohlack@amazon.de>,
        Ashok Raj <ashok.raj@intel.com>
Subject: Re: [Patch v3 Part2 3/9] x86/microcode/intel: Fix collect_cpu_info()
 to reflect current microcode
Message-ID: <Y9lStQd1LNq8STa7@a4bf019067fa.jf.intel.com>
References: <20230130213955.6046-1-ashok.raj@intel.com>
 <20230130213955.6046-4-ashok.raj@intel.com>
 <Y9lGdh+0faIrIIiQ@zn.tnic>
 <SJ1PR11MB6083580526A7FFA11F110B77FCD09@SJ1PR11MB6083.namprd11.prod.outlook.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <SJ1PR11MB6083580526A7FFA11F110B77FCD09@SJ1PR11MB6083.namprd11.prod.outlook.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GB/vnEXHJfYEjDZOoDF7UFNLIVE8HKwUd9WDIsBjNyLtSHv2GVg6jrOtt2Iu?=
 =?us-ascii?Q?uMtL9PmtQ1cGp0/T3LptVhkg8egItYrPOp4r0kz4byPPeQVw947FVDHY5LBT?=
 =?us-ascii?Q?dC33bnVqajyfMF3Svo1x6y2fN6gpOqEsZkKBjNtUCVd3Qp207hjIh/qGq6GQ?=
 =?us-ascii?Q?bngxPJa32DobXPgR1lRgf5Q56LuuVTQnnPWRLx0/0m6qKl3/88YibmUeiHzc?=
 =?us-ascii?Q?r89RHMF2WLhCh6Nd5NUCgmYfhnIXx9NmBNImAPXSkZUyk+XzTtLzz9LH21hg?=
 =?us-ascii?Q?5C6DScpxnVPAEzHi0hblEIaMYAr2+Tjajq5yxgU0kYsQ8XTNHJOMW+lvkKrH?=
 =?us-ascii?Q?bZ+3UOsHlkvWraPsxWIbPiyuCNnqfa4GOkyQXCp8MtBBWxxFjjuMwWn8C350?=
 =?us-ascii?Q?h4+VGMLwZ/2CcWnmK0Lzi1SBhGrRxGgeweguHb7i2vpobFXHqRtu8x28Tmqz?=
 =?us-ascii?Q?ACuy9wGfQkbcjlvqztk9cg4+rBN990jsQVKLrz9+hM8Mlj/EkXsb4hh+ZZhx?=
 =?us-ascii?Q?mkzqrDv8gLFLVab65alR/p+PRaeRt4O2QT3OkjkAUelK919EPfS8ntF0JxuT?=
 =?us-ascii?Q?OHCO/LJxbSQATaDpOKR8Q+0ZpDV9PfA3YQyJKadS6zJXxcbZqSOOlhLQLvcK?=
 =?us-ascii?Q?Ou9kPuINX2XuWxhsW8prN+oITPNr1BJZizekG9680m9bnXDLkU2LZQVlU9ba?=
 =?us-ascii?Q?hgPvWaOE5ilIX7iYYS2tgfSH6etMU4j6M91BDGdMdPk1+1ogi2CX0A1LEIp0?=
 =?us-ascii?Q?UYM+EMNIWmV2FaarOtIR6MoJ9E0rBy6Oeceoag8X6+KhHf58pV0jtruugfwy?=
 =?us-ascii?Q?KMFei+NVzYcm+SXWuJFnfDiGUmJ4j6J36IsJ9uRx87mLF9Z2k0GpzBtSUHGr?=
 =?us-ascii?Q?Yx1X7CE+0eT/lyGLn4r/NgzQsqtvzLEiemLMAkVhX6Y+pZNuUiI38EhemWs5?=
 =?us-ascii?Q?vlFU8vCHf8IQI7WFCzhKVrzcRZdtDpJ8D8EvT3GpQ96LVIhLob6BFt6sVzIp?=
 =?us-ascii?Q?OclAzTGt4WVooIH44WM0poU/W1GV107SZrNnqFfLaI+w3F5Ga/aNnVgrULQu?=
 =?us-ascii?Q?R6QC6Cb3LfBkKc/v2WHCa9e5od8iscbcTqViB3f7l5J5lYzOAee5hPa+7YBE?=
 =?us-ascii?Q?SmklJcAd9x5SDBEtOsFtA9DH4/RkmM4EMOcKPYcpuekHZ5fx1t171eCsltoh?=
 =?us-ascii?Q?SSwB3HUd/Nji98yJE5hL1qgQITzCZ0gUoh2WTKLJ11Le6J6kkpjZbE8xRv40?=
 =?us-ascii?Q?dqIJ4eNU9Uf6Mbe6DPF17CVYg/FGC/PLFwurwNzVn/bBgeV4TmvbnLM1DwiT?=
 =?us-ascii?Q?7CZqGG+bpDyF9J7sRyWScYomYAS/BXP/qklyLAQAiH6NetUrbFwsdt2S0iHL?=
 =?us-ascii?Q?IFblnEXQRrocpganEyPGHb7IQ40I9T/1OfHjszHRscPxb33v9bwe5sUPIaBA?=
 =?us-ascii?Q?138a8uTeAU8XaqyukxNn+e9udlWOMRV8xkO6mwqaA/nHcuSd40RMnbrVL8JI?=
 =?us-ascii?Q?DNrrXk4ivl4RaNHxlwcy08HrOmmr9DF9s+USC8WVaIXdZxWqB7LD8JI/wv6A?=
 =?us-ascii?Q?sZYBoZLln6xpKeLAEhSm1N1qlI9uNaLHiIV243HdEAdq37Vmn3/VWMblnsoD?=
 =?us-ascii?Q?sw=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 25cfbbc3-eb96-41f1-9006-08db03b258a5
X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6201.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2023 17:41:13.1551
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: qhiOwnBrlvIqsESBps3tGA/K4wYkOvPF3hipYWgiS5kdOQnzhkZQ4pwOcLRAITCu/N9RKBsv/EKylKmHqlxA0A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR11MB5860
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Jan 31, 2023 at 09:34:14AM -0800, Tony Luck wrote:
> >> Currently collect_cpu_info() is only returning what was cached earlier
> >> instead of reading the current revision from the proper MSR.
> >
> > Because this is how this is supposed to work: you collect what's
> > currently applied - which should be exactly the same as what's in the
> > MSR - and then see if there's a new patch in the cache and if so, update
> > it.
> 
> But those get out of step when applying ucode on one logical CPU does
> an update to other(s) (in this case the HT sibling for the same core).
> 
> Would you prefer that Ashok leave collect_cpu_info() as-is, and create
> a new function to read the MSR?
> 

Untested patch below. I think we could add a new function if needed as you
suggest.

Boris, do you have the same dependency to take the siblings through an
update to update some portions of the ucode? or they are only for early
loading?


diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index d144f918a896..0038690a5d4b 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -673,8 +673,10 @@ static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig)
 	 * mc_bp_resume() can call apply_microcode()
 	 */
 	p = find_patch(cpu);
-	if (p && (p->patch_id == csig->rev))
+	if (p) {
+		csig->rev = c->microcode = ((struct microcode_amd *)p->data)->hdr.patch_id;
 		uci->mc = p->data;
+	}
 
 	pr_info("CPU%d: patch_level=0x%08x\n", cpu, csig->rev);