Re: [PATCH 3/3] kprobe/static_call: Restore missing static_call_text_reserved()

Peter Zijlstra
2021-06-28T15:42:07Z

On Mon, Jun 28, 2021 at 11:24:47PM +0900, Masami Hiramatsu wrote:
> On Mon, 28 Jun 2021 13:34:58 +0200
> Peter Zijlstra <peterz@infradead.org> wrote:
>
> > On Mon, Jun 28, 2021 at 01:24:12PM +0200, Peter Zijlstra wrote:
> > > Restore two hunks from commit 6333e8f73b83 ("static_call: Avoid
> > > kprobes on inline static_call()s") that went walkabout.
> > >
> > > Fixes: 76d4acf22b48 ("Merge tag 'perf-kprobes-2020-12-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip")
> >
> > FWIW, it was a royal pain in the arse to find that commit...
>
> I think if this is a fix, that fixes static_call introduction commit,
> because anyway kprobes has to check the static_call site as a reserved
> area for another self code modifying.

Yeah, so 6333e8f73b83 has these two hunks, so the initial commit was
fine, but the merge commit from the Fixes: tag lost them again for some
reason. So this really is a fix for a merge commit afaict.