[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <c59c9724-ee35-45bf-a368-a440b45750c5@suse.com>
Date: Tue, 30 Sep 2025 10:04:20 +0200
From: Jürgen Groß <jgross@...e.com>
To: Peter Zijlstra <peterz@...radead.org>
Cc: linux-kernel@...r.kernel.org, x86@...nel.org,
Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>,
Borislav Petkov <bp@...en8.de>, Dave Hansen <dave.hansen@...ux.intel.com>,
"H. Peter Anvin" <hpa@...or.com>
Subject: Re: [PATCH 3/3] x86/alternative: Patch a single alternative location
only once
On 30.09.25 09:39, Peter Zijlstra wrote:
> On Tue, Sep 30, 2025 at 09:33:25AM +0200, Jürgen Groß wrote:
>> On 30.09.25 09:26, Peter Zijlstra wrote:
>
>>>> @@ -692,14 +698,19 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start,
>>>> * - feature not present but ALT_FLAG_NOT is set to mean,
>>>> * patch if feature is *NOT* present.
>>>> */
>>>> - if (!boot_cpu_has(a->cpuid) == !(a->flags & ALT_FLAG_NOT)) {
>>>> - memcpy(insn_buff, instr, a->instrlen);
>>>> - optimize_nops(instr, insn_buff, a->instrlen);
>>>> - } else {
>>>> + if (!boot_cpu_has(a->cpuid) != !(a->flags & ALT_FLAG_NOT)) {
>>>> apply_one_alternative(instr, insn_buff, a);
>>>> + patched = true;
>>>> }
>>>> - text_poke_early(instr, insn_buff, a->instrlen);
>>>> + instances--;
>>>> + if (!instances) {
>>>> + if (!patched) {
>>>> + memcpy(insn_buff, instr, a->instrlen);
>>>> + optimize_nops(instr, insn_buff, a->instrlen);
>>>> + }
>>>> + text_poke_early(instr, insn_buff, a->instrlen);
>>>> + }
>>>> }
>>>> kasan_enable_current();
>>>
>>> I think you lost the optimize_nops() call for the patched case.
>>>
>>> That is, note how apply_one_alternative() does 0x90 padding, but then
>>> you only do optimize_nops() when !patched.
>>
>> The call of optimize_nops() is part of text_poke_apply_relocation() when
>> patching, like without my series.
>
> Indeed it is. Clearly I need more wakeup juice :-)
>
> Therefore the patches seem fine. I'll try and hold onto them until the
> merge window closes and then stick them in x86/core or thereabout.
Thanks.
Juergen
Download attachment "OpenPGP_0xB0DE9DD628BF132F.asc" of type "application/pgp-keys" (3684 bytes)
Download attachment "OpenPGP_signature.asc" of type "application/pgp-signature" (496 bytes)
Powered by blists - more mailing lists