Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
Date:   Thu, 28 Sep 2023 12:52:05 +0200
From:   Borislav Petkov <bp@alien8.de>
To:     Thomas Gleixner <tglx@linutronix.de>
Cc:     LKML <linux-kernel@vger.kernel.org>, x86@kernel.org,
        "Chang S. Bae" <chang.seok.bae@intel.com>,
        Arjan van de Ven <arjan@linux.intel.com>,
        Nikolay Borisov <nik.borisov@suse.com>
Subject: Re: [patch V3 26/30] x86/microcode: Protect against instrumentation
Message-ID: <20230928105205.GAZRVa1Rl0CPi-_cxX@fat_crate.local>
References: <20230912065249.695681286@linutronix.de>
 <20230912065502.386652173@linutronix.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20230912065502.386652173@linutronix.de>
Precedence: bulk

On Tue, Sep 12, 2023 at 09:58:24AM +0200, Thomas Gleixner wrote:
>  	for (timeout = 0; timeout < USEC_PER_SEC; timeout++) {
> -		if (!atomic_read(cnt))
> +		if (!raw_atomic_read(cnt))
>  			return true;
> -		udelay(1);
> +
> +		for (loops = 0; loops < loops_per_usec; loops++)
> +			cpu_relax();
> +

Ah, you're dropping udelay because it is not noinstr...

> @@ -427,25 +464,43 @@ static void ucode_load_primary(unsigned
>  	}
>  }
>  
> -static bool microcode_update_handler(void)
> +static noinstr bool microcode_update_handler(void)
>  {
> -	unsigned int cpu = smp_processor_id();
> +	unsigned int cpu = raw_smp_processor_id();
>  
> -	if (this_cpu_read(ucode_ctrl.ctrl_cpu) == cpu)
> +	if (raw_cpu_read(ucode_ctrl.ctrl_cpu) == cpu) {
> +		instrumentation_begin();
>  		ucode_load_primary(cpu);
> -	else
> +		instrumentation_end();

Might as well make the load on the primary noinstr too. I wouldn't lose
any sleep over the late microcode loading code not being traceable.

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette