Re: [PATCH] x86/bugs: Restructure ITS mitigation

[Pawan Gupta <pawan.kumar.gupta@linux.intel.com>]

On Thu, May 15, 2025 at 09:15:59PM +0000, Kaplan, David wrote:
> [AMD Official Use Only - AMD Internal Distribution Only]
> 
> > -----Original Message-----
> > From: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
> > Sent: Thursday, May 15, 2025 4:12 PM
> > To: Kaplan, David <David.Kaplan@amd.com>
> > Cc: Thomas Gleixner <tglx@linutronix.de>; Borislav Petkov <bp@alien8.de>; Peter
> > Zijlstra <peterz@infradead.org>; Josh Poimboeuf <jpoimboe@kernel.org>; Ingo
> > Molnar <mingo@redhat.com>; Dave Hansen <dave.hansen@linux.intel.com>;
> > x86@kernel.org; H. Peter Anvin <hpa@zytor.com>; linux-kernel@vger.kernel.org
> > Subject: Re: [PATCH] x86/bugs: Restructure ITS mitigation
> >
> > Caution: This message originated from an External Source. Use proper caution
> > when opening attachments, clicking links, or responding.
> >
> >
> > On Thu, May 15, 2025 at 08:47:56AM -0500, David Kaplan wrote:
> > ...
> > > +static void __init its_apply_mitigation(void) {
> > > +     /* its=stuff forces retbleed stuffing and is enabled there. */
> > > +     if (its_mitigation != ITS_MITIGATION_ALIGNED_THUNKS)
> > > +             return;
> > > +
> > > +     if (!boot_cpu_has(X86_FEATURE_RETPOLINE))
> > > +             setup_force_cpu_cap(X86_FEATURE_INDIRECT_THUNK_ITS);
> > > +
> > > +     setup_force_cpu_cap(X86_FEATURE_RETHUNK);
> > > +     set_return_thunk(its_return_thunk);
> > > +}
> > > +
> > >  #undef pr_fmt
> > >  #define pr_fmt(fmt)     "Spectre V2 : " fmt
> > >
> > >
> > > base-commit: 04bdd560124ec4d02d1d11ee3abc88d51954d7b8
> >
> > I am having trouble applying this patch to upstream and tip/master. I can't seem to
> > find this base-commit in Linus's or tip tree. Please let me know what am I missing?
> 
> Hmm.  I was working off origin/master on tip.  This was the base commit in my git log from this morning:
> 
> commit 04bdd560124ec4d02d1d11ee3abc88d51954d7b8 (origin/master, origin/HEAD)
> Merge: 61e94712bb24 e59236b5a09e
> Author: Ingo Molnar <mingo@kernel.org>
> Date:   Thu May 15 10:16:23 2025 +0200
> 
> Not sure if something happened to it since?

Likely yes. I am getting:

	Notice: this object is not reachable from any branch.

when I go to this link:

https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit?id=04bdd560124ec4d02d1d11ee3abc88d51954d7b8

> Or is there something else I can provide to help?

No, I am able to apply now. Earlier my b4 based script failed because it
couldn't find the base-commit. It works when I am apply manually, sorry to
bother you.