Fixes: cf7fe8b72dea ("x86/ucode: Fix stability of the raw CPU Policy rescan")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Wei Liu <wl@xen.org>

I don't know what went wrong here.
---
 xen/arch/x86/cpu/microcode/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c
index 6f95f7bbe223..1c9f66ea8a0f 100644
--- a/xen/arch/x86/cpu/microcode/core.c
+++ b/xen/arch/x86/cpu/microcode/core.c
@@ -685,12 +685,12 @@ static long cf_check microcode_update_helper(void *data)
          * Disable CPUID masking if in use, to avoid having current's
          * cpu_policy affect the rescan.
          */
-	if ( ctxt_switch_masking )
+        if ( ctxt_switch_masking )
             alternative_vcall(ctxt_switch_masking, NULL);
 
         calculate_raw_cpu_policy();
 
-	if ( ctxt_switch_masking )
+        if ( ctxt_switch_masking )
             alternative_vcall(ctxt_switch_masking, current);
     }
     else

base-commit: 3f819af8a796c0e2f798dd301ec8c3f8cccbc9fc
-- 
2.30.2

On 02.02.2024 19:00, Andrew Cooper wrote:
> Fixes: cf7fe8b72dea ("x86/ucode: Fix stability of the raw CPU Policy rescan")
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

I had spotted those as odd while backporting, but didn't consider the
issue bad enough to raise it when the change had gone in already anyway.

Acked-by: Jan Beulich <jbeulich@suse.com>

Jan

On 05/02/2024 8:57 am, Jan Beulich wrote:
> On 02.02.2024 19:00, Andrew Cooper wrote:
>> Fixes: cf7fe8b72dea ("x86/ucode: Fix stability of the raw CPU Policy rescan")
>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> I had spotted those as odd while backporting, but didn't consider the
> issue bad enough to raise it when the change had gone in already anyway.
>
> Acked-by: Jan Beulich <jbeulich@suse.com>

Thanks.  I noticed too on backports to 4.17.

~Andrew