From: Peter Zijlstra <peterz@infradead.org>
To: Masami Hiramatsu <mhiramat@kernel.org>
Cc: jpoimboe@redhat.com, jbaron@akamai.com, rostedt@goodmis.org,
ardb@kernel.org, naveen.n.rao@linux.ibm.com,
anil.s.keshavamurthy@intel.com, davem@davemloft.net,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 3/3] kprobe/static_call: Restore missing static_call_text_reserved()
Date: Mon, 28 Jun 2021 17:03:26 +0200 [thread overview]
Message-ID: <YNnkvpLoDsql2mdq@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20210628232447.540fe9d53f0d2011d6590379@kernel.org>
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.
next prev parent reply other threads:[~2021-06-28 15:42 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-28 11:24 [PATCH 0/3] jump_label/static_call/kprobes: *_text_reserved() fixes Peter Zijlstra
2021-06-28 11:24 ` [PATCH 1/3] jump_label: Fix jump_label_text_reserved() vs __init Peter Zijlstra
2021-06-28 13:43 ` Masami Hiramatsu
2021-07-05 7:53 ` [tip: locking/urgent] " tip-bot2 for Peter Zijlstra
2021-07-05 9:05 ` tip-bot2 for Peter Zijlstra
2021-06-28 11:24 ` [PATCH 2/3] static_call: Fix static_call_text_reserved() " Peter Zijlstra
2021-06-28 14:26 ` Masami Hiramatsu
2021-07-05 7:53 ` [tip: locking/urgent] " tip-bot2 for Peter Zijlstra
2021-07-05 9:05 ` tip-bot2 for Peter Zijlstra
2021-06-28 11:24 ` [PATCH 3/3] kprobe/static_call: Restore missing static_call_text_reserved() Peter Zijlstra
2021-06-28 11:34 ` Peter Zijlstra
2021-06-28 14:24 ` Masami Hiramatsu
2021-06-28 15:03 ` Peter Zijlstra [this message]
2021-06-28 14:25 ` Masami Hiramatsu
2021-07-05 7:53 ` [tip: locking/urgent] " tip-bot2 for Peter Zijlstra
2021-07-05 9:05 ` tip-bot2 for Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YNnkvpLoDsql2mdq@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=anil.s.keshavamurthy@intel.com \
--cc=ardb@kernel.org \
--cc=davem@davemloft.net \
--cc=jbaron@akamai.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=naveen.n.rao@linux.ibm.com \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.