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:   Sat, 21 Jan 2023 19:36:37 -0800
From:   Ashok Raj <ashok.raj@intel.com>
To:     Thomas Gleixner <tglx@linutronix.de>,
        Borislav Petkov <bp@alien8.de>
CC:     LKML <linux-kernel@vger.kernel.org>, x86 <x86@kernel.org>,
        Ingo Molnar <mingo@kernel.org>,
        Tony Luck <tony.luck@intel.com>,
        Dave Hansen <dave.hansen@intel.com>,
        Alison Schofield <alison.schofield@intel.com>,
        Reinette Chatre <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>,
        "Andy Lutomirski" <luto@kernel.org>,
        Andrew Cooper <Andrew.Cooper3@citrix.com>,
        Boris Ostrovsky <boris.ostrovsky@oracle.com>,
        Martin Pohlack <mpohlack@amazon.de>,
        Ashok Raj <ashok.raj@intel.com>
Subject: Re: [Part 2 v2[cleanup] 4/4] x86/microcode: Do not call
 apply_microde() on sibling threads
Message-ID: <Y8yvRb3Af+2V1+r0@a4bf019067fa.jf.intel.com>
References: <87y1pygiyf.ffs@tglx>
 <20230121213512.251578-1-ashok.raj@intel.com>
 <20230121213512.251578-5-ashok.raj@intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20230121213512.251578-5-ashok.raj@intel.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PRCXjnJx47kpUiTY0Wi+eGOJd09Ayk9/LHjx+w3ZzNom0HmeQbnr4UF58KaG?=
 =?us-ascii?Q?MJF48pcyKZ3/RG+eBksxhcllszpiKV+9smJhqj/pRwecvCQh3JTscA5EFYAo?=
 =?us-ascii?Q?i8ecPpsmtTMSAW9CgIeDgmK8vOJf5pIu3vNOYiBqoyBchbT3I4VnfWa2O1te?=
 =?us-ascii?Q?DJrN7aHzyxv+hy9wLd/ixfFkjT1dTcm5VIWEB0czP/ES2Lqxu3FEm8ycpTQX?=
 =?us-ascii?Q?teVT9061iuiq6MhGlFimgeSCWGfUL7/NQ73/GCXNQtHBpobVo+vgoAgJc2++?=
 =?us-ascii?Q?h/gELiue33gSHiA8bijTGSV+kzTNjTRpYASr7G79tW3ocBFV+B9HWOWDgxkK?=
 =?us-ascii?Q?J0MpUyazUIqZbWk+6JLJHxf/6kPAmzssd0VsDpy6jSgU+S3SOY6K8mXxeo2g?=
 =?us-ascii?Q?bgiiaRrC1lXmY/Zu6h9sv8M1gr5U/MEvk8TjHlK98Pq9gDHmD+Yw9d+wiUY6?=
 =?us-ascii?Q?NKihUQlBAymobI140Z+1aDQQWEllYVmOIU5sgeafglWPk4NYWzAWtQTvFXT3?=
 =?us-ascii?Q?cIw+mwe3/vMtXPw00kkC7DdzveK0pnnRVlwtT3qUTufVtDUAOjFOKNg9M1y8?=
 =?us-ascii?Q?z6Klcbz3B7KRvPMUVL4+WcD8QKZ1sF+OcN+J1UQkGc0TVwzezgCChDoHW9qe?=
 =?us-ascii?Q?Xu5gdwmCDnQni6lWXHY8Qb0Me+npViGvRCGIZDrPsio2PaZdFARAn2hnYvb2?=
 =?us-ascii?Q?T6YePNj3YzAPMLqIkLYFdLgbH0UelE5m9wwU0LpdgbdLXV2iBQvwW1cTvzK/?=
 =?us-ascii?Q?yzhy8OCbuBwN4NnOgJFq7XE7I/AJ+O21cm/flDQzOVNxqk5EJiysNi9ya2PC?=
 =?us-ascii?Q?4Ih2MlC1/BoNzSm9HJTtRUOjESl4BdjF7kfnTXOUjBKweC7tOE4MFIgmLqER?=
 =?us-ascii?Q?WAWe9RQ5mTdiDCYroGUq8O1N2LoMzxNcKmHQ9JADTmfjUv1cSusESLXoIzxs?=
 =?us-ascii?Q?MNxp4PFMDl+yigSAH2ZtBHv0CWT2I1znwek7+sXgpYQwVH0VyACgO8Orkkel?=
 =?us-ascii?Q?LDWk2b+FKMeQtZJbQWGqk2J815W7l8rC2JbSn616EI7qnoHmpcpD9yvADM96?=
 =?us-ascii?Q?6NB2VJxAirUmTPn85dg1BB9oQtNdnoFaoGXyjScDomkLcevgyQug1MmyUIt3?=
 =?us-ascii?Q?orGpaTaepFj3jFGmGt7e5aJDDRdGWD6WgXOjOhK11v1LaCg8ZvH9gkaFtvws?=
 =?us-ascii?Q?Y3jq11E3ICO5gKt4eRwCXBGGuDkng0NXi9rh1x5Q+/sPacz4Ydt4kgZrJ7RZ?=
 =?us-ascii?Q?YAWxA7GUTMWLxac7M0BGhHz4nnHzTkWVdPka2Iz7jWpIxXjDV3QjHMfj7dps?=
 =?us-ascii?Q?pIVIw3YnnSQ3zzCJLjJzYoBgfEarjWa64V9Lx5+d7det4cFxnxX4KNoYAQzz?=
 =?us-ascii?Q?y681p/yHb52EUwbA2YxzLKdkePKT+am1aiSXchYhFcUw24k9LR8qHQEPxi3N?=
 =?us-ascii?Q?C5DLlvfRmER9PxKyNfwQDV7pRNS3EkJRQPc+1jmipUOK3Od7oxvAQnh9xGyG?=
 =?us-ascii?Q?vEztRgr+bHE1Gnu5KoFktfLVZa/CgnP2zKyAvrbY6kRUNsqOQDjg2z6QMHsJ?=
 =?us-ascii?Q?OeEDnSddDpPnSxPU89xmtTHvOFF1c9bA00A9IoEouHIH28kCarzurKdap2jD?=
 =?us-ascii?Q?TA=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 9c465eda-bf9c-438f-880f-08dafc29e01b
X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6201.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2023 03:36:41.3086
 (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: Sw8nncjzIIPH2ibxX15lqdj6+IzNitmLSJbHPa1vYTiptlu6wMSHcC0tysj+RUXoY+0ubktDDnzT0ZTQn0AWOw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5772
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,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        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

On Sat, Jan 21, 2023 at 01:35:12PM -0800, Ashok Raj wrote:

[snip]

> ---
>  arch/x86/kernel/cpu/microcode/core.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
> index 6ade3d59c404..089636b1643f 100644
> --- a/arch/x86/kernel/cpu/microcode/core.c
> +++ b/arch/x86/kernel/cpu/microcode/core.c
> @@ -386,6 +386,7 @@ static int __wait_for_cpus(atomic_t *t, long long timeout)
>   */
>  static int __reload_late(void *info)
>  {
> +	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;

In a quest to keep the christmas tree effect, screwed up the ordering. 
I fixed it before i resent the next time. Modified diff below.

>  	int cpu = smp_processor_id();
>  	enum ucode_state err;
>  	int ret = 0;
> @@ -422,12 +423,11 @@ static int __reload_late(void *info)
>  
>  	/*
>  	 * At least one thread has completed update on each core.
> -	 * For others, simply call the update to make sure the
> -	 * per-cpu cpuinfo can be updated with right microcode
> -	 * revision.
> +	 * For siblings, collect the cpuinfo and update the
> +	 * per-cpu cpuinfo with the current microcode revision.
>  	 */
>  	if (cpumask_first(topology_sibling_cpumask(cpu)) != cpu)
> -		err = microcode_ops->apply_microcode(cpu);
> +		microcode_ops->collect_cpu_info(cpu, &uci->cpu_sig);
>  
>  	return ret;
>  }
> -- 
> 2.34.1
> 

diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index 6ade3d59c404..07764c1a2dd3 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -387,6 +387,7 @@ static int __wait_for_cpus(atomic_t *t, long long timeout)
 static int __reload_late(void *info)
 {
        int cpu = smp_processor_id();
+       struct ucode_cpu_info *uci;
        enum ucode_state err;
        int ret = 0;

@@ -422,12 +423,13 @@ static int __reload_late(void *info)

        /*
         * At least one thread has completed update on each core.
-        * For others, simply call the update to make sure the
-        * per-cpu cpuinfo can be updated with right microcode
-        * revision.
+        * For siblings, collect the cpuinfo and update the
+        * per-cpu cpuinfo with the current microcode revision.
         */
-       if (cpumask_first(topology_sibling_cpumask(cpu)) != cpu)
-               err = microcode_ops->apply_microcode(cpu);
+       if (cpumask_first(topology_sibling_cpumask(cpu)) != cpu) {
+               uci = ucode_cpu_info + cpu;
+               microcode_ops->collect_cpu_info(cpu, &uci->cpu_sig);
+       }

        return ret;
 }