Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 18 Aug 2022 09:58:52 +0000
From:   Ashok Raj <ashok.raj@intel.com>
To:     Borislav Petkov <bp@alien8.de>
CC:     Ashok Raj <ashok_raj@linux.intel.com>, X86 ML <x86@kernel.org>,
        "Andrew Cooper" <amc96@srcf.net>,
        LKML <linux-kernel@vger.kernel.org>,
        =?utf-8?Q?=C8=98tefan?= Talpalaru <stefantalpalaru@yahoo.com>,
        Ashok Raj <ashok.raj@intel.com>
Subject: Re: [PATCH] x86/microcode/AMD: Attempt applying on every logical
 thread
Message-ID: <Yv4NXOlLHcx1Ghf3@araj-dh-work>
References: <20220814120026.16118-1-bp@alien8.de>
 <YvtcGEHX8eSFpALX@araj-dh-work>
 <YvuQgx698T5cgF+C@zn.tnic>
 <YvzbFXnBjNjK+UJK@araj-dh-work>
 <Yvz53AAh+p5Db7CK@zn.tnic>
 <Yv0JQGa/2BlbQChZ@araj-dh-work>
 <Yv0vu6OqCptK6gc+@zn.tnic>
 <Yv1WXxcIXSQ7nMji@araj-dh-work>
 <Yv1j8v7o3lOniUoH@zn.tnic>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <Yv1j8v7o3lOniUoH@zn.tnic>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BThLsTs+uliR3auWXFwL1n4+MituAsGctiJPY/lob4fnjlnaUHXLziES7AP9?=
 =?us-ascii?Q?fhjSXE2cfEvHnw8K3BMKozKuJPqV4wbY7ZaWIYoxmpvtVZnDzMi7+WeuTiv0?=
 =?us-ascii?Q?+Ok1GXe0zhOjBKA1myM72LF0vjCkxACvImhEiGTzzwBprFoVVUTErNnox6il?=
 =?us-ascii?Q?N2b4mKB7qg+dVh2yqPUJiB0PjKUM4C+EVAGPmlfLcnJCafFwiiznxbAJdssd?=
 =?us-ascii?Q?g8A0EHoRlQOQFxcxvI1LsQMMT9VWXDMgxLM67bVED45ug/talcdMcHBvkfsk?=
 =?us-ascii?Q?NJZtM0S03ff8RXbE+46zF6eqAoYj6qk13TEbXjCk/17RwdMhN1QC12T8pdcg?=
 =?us-ascii?Q?ypJI/9aVrfAWf+jb0uZk/ceCz7422hm3Hfe9corKFPDq/M44LB73R20fgfCG?=
 =?us-ascii?Q?KwIZBn7JOlp67B60rjB2ZGuk94niZGhoTBzr80MDoEWGWTK8I5uPBjSNwAoB?=
 =?us-ascii?Q?qzR7FtmDLlJRUgdrj8SjS/YJauh2Mq4jxUERDydDovQA1gClHk0bVuNIx+fU?=
 =?us-ascii?Q?hnJOHtfPd/4uTpEMSnSnRIyBx0LYViYVeJWzg9yAG98eWO38ToDo3F734uAM?=
 =?us-ascii?Q?N46Mczt1D63pFioR87FS1ODo/FOexqIWDr6hQWNOKy2dt71H2snYpTB2vTKC?=
 =?us-ascii?Q?y3p/JueoLCkn/14m6xzSuklmqJ8TDzsK1wajXhiGEffv8Ewjh03P7HO+9xcA?=
 =?us-ascii?Q?giqVu81ZSBbaaSRJWYzytWJa5FAgdGkMCZnWK3H5UYB/8Vy2QY084pyutTBQ?=
 =?us-ascii?Q?x+iuMx72sJUBRjsGx1lMDeZImOGvj3kA3gL17mMe1rJIQScN9iabMmEagymY?=
 =?us-ascii?Q?WA2WwVwV7xWHblRQRaYRIEm0x4CzSuwgJnfLQnoEAn9SBqeLvz2NoSuzdiNQ?=
 =?us-ascii?Q?DShyxRVTmVFF4Uo6x70IF5uiXhe9M2N5zpc31pVAq3+IbYN/i9GUCqaAFY28?=
 =?us-ascii?Q?zvz4R+IvG+W0OkcuqIBPsKuXTzma//SeTecoMWZPAoW8ZIUdDDdqA+fi+8d7?=
 =?us-ascii?Q?0j2p492M828mybsyvmf45hyw5crj28XeJRGhiKHyQHHL+QxKnbvvH17JA04x?=
 =?us-ascii?Q?B47DwiPg+lIIuEX7oJXOJuWHyOtYg7vdQzANa/qdrM1UK+oxIl6lVWnfjpdd?=
 =?us-ascii?Q?PIBmm8PBeMUmjXfWnfVOytL/WQeCBbgP0NrKXhtM6izMdBCrFvNDJsDP0/zi?=
 =?us-ascii?Q?R4qfODwyE195wNUPh4zSIfkGxLsga9C3AM1WlLOiS09XOSBEayhfu6aly/Yv?=
 =?us-ascii?Q?S7yc/SAjdxxlvecAdRMVSNYrXEfZRTdteg4obnyVBPSMccSdMmb3L+kiiTA9?=
 =?us-ascii?Q?pZTL90lIaaVkwJQ6jfJCaSt02VpW62OoPLxcJRwI2P1ofcSgq5U2OT+UlCzL?=
 =?us-ascii?Q?j148p4dpd2dc8XeqdTx4bqJkh6mD3J7sCZqE1DHaZwGUbQYP7zm4AeD1+PnP?=
 =?us-ascii?Q?SLQK9KCTS1YiCimhdGo18NBdjotl39GQBXh8M1CSsR1nz4YnMVGEjC/JXlGV?=
 =?us-ascii?Q?yr1oWjid6J1dLDD4hgJ0gJQFrpJ1r2lG3dUyN2WHba5OQbppJezARgEcO6ew?=
 =?us-ascii?Q?r776NnF66gBqoEj45GBDwsrh9WHUcgPuwQwggbceO/q+kDN2zSdf32/ev2D9?=
 =?us-ascii?Q?oA=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 65ffc5cb-f9d4-49f5-4358-08da81004cc3
X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6201.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2022 09:59:11.5600
 (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: AsAfhkoEKYLv+Rw7XIqZd9Fkx9+y+FkRn8iqdfO0yhA6w+XNSRrv9gAUnloyaaAUKOSLLVLMW0bvd/t4NsZjIg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1246
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Boris

On Wed, Aug 17, 2022 at 11:56:02PM +0200, Borislav Petkov wrote:
> On Wed, Aug 17, 2022 at 08:58:07PM +0000, Ashok Raj wrote:
> > For this specific patch in question, its not for testing though.. Its
> > required for functional purposes?
> 
> From its commit message:
> 
> "However, there are microcode patches which do per-thread modification,
> see Link tag below.
> 

I did read the commit log. I was just stating the fact that reload isn't
just for testing, for e.g. in this case its required for functional
reasons.

if cpu_rev > ucode_rev, there is no need to reload microcode correct?
There are a bunch of changes in the original post that seemed like it had
nothing to do with force load on a sibling.

Completely untested, no commit log to spare you from fixing them :-)

Seemed like we were simply passing over each other with emails, thought
I'll convey what I meant here via a patch. Hope this helps.

lemme know what you think.

Cheers,
Ashok

---
 arch/x86/kernel/cpu/microcode/amd.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index 8b2fcdfa6d31..124e15b8559b 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -440,7 +440,7 @@ apply_microcode_early_amd(u32 cpuid_1_eax, void *ucode, size_t size, bool save_p
 		return ret;
 
 	native_rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);
-	if (rev >= mc->hdr.patch_id)
+	if (rev > mc->hdr.patch_id)
 		return ret;
 
 	if (!__apply_microcode_amd(mc)) {
@@ -679,6 +679,7 @@ static enum ucode_state apply_microcode_amd(int cpu)
 	struct ucode_patch *p;
 	enum ucode_state ret;
 	u32 rev, dummy __always_unused;
+	int first_cpu;
 
 	BUG_ON(raw_smp_processor_id() != cpu);
 
@@ -691,10 +692,17 @@ static enum ucode_state apply_microcode_amd(int cpu)
 	mc_amd  = p->data;
 	uci->mc = p->data;
 
+	first_cpu = cpumask_first(topology_sibling_cpumask(cpu));
 	rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);
 
 	/* need to apply patch? */
-	if (rev >= mc_amd->hdr.patch_id) {
+	if (((cpu == first_cpu) && rev >= mc_amd->hdr.patch_id)) {
+		ret = UCODE_OK;
+		goto out;
+	}
+
+	/* Siblings need to reload microcode even if rev is same */
+	if (rev > mc_amd->hdr.patch_id) {
 		ret = UCODE_OK;
 		goto out;
 	}