From: Peter Zijlstra <peterz@infradead.org>
To: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: acme@kernel.org, alexander.shishkin@linux.intel.com,
jolsa@redhat.com, namhyung@kernel.org, songliubraving@fb.com,
eranian@google.com, alexey.budankov@linux.intel.com,
ak@linux.intel.com, mark.rutland@arm.com, megha.dey@intel.com,
frederic@kernel.org, maddy@linux.ibm.com, irogers@google.com,
kim.phillips@amd.com, linux-kernel@vger.kernel.org,
santosh.shukla@amd.com
Subject: Re: [RFC v2] perf: Rewrite core context handling
Date: Mon, 13 Jun 2022 16:36:54 +0200 [thread overview]
Message-ID: <YqdLhrJnJUqONjim@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <YqdLH+ZU/sf4n0pa@hirez.programming.kicks-ass.net>
On Mon, Jun 13, 2022 at 04:35:11PM +0200, Peter Zijlstra wrote:
>
>
> Right, so sorry for being incredibly tardy on this. Find below the
> patch fwd ported to something recent.
>
> I'll reply to this with fixes and comments.
You write:
>> A simple perf stat/record/top survives with the patch but machine
>> crashes with first run of perf test (stale cpc->task_epc causing the
>>crash). Lockdep is also screaming a lot :)
> @@ -7669,20 +7877,15 @@ static void perf_event_addr_filters_exec
> void perf_event_exec(void)
> {
> struct perf_event_context *ctx;
> - int ctxn;
> -
> - for_each_task_context_nr(ctxn) {
> - perf_event_enable_on_exec(ctxn);
> - perf_event_remove_on_exec(ctxn);
>
> - rcu_read_lock();
> - ctx = rcu_dereference(current->perf_event_ctxp[ctxn]);
> - if (ctx) {
> - perf_iterate_ctx(ctx, perf_event_addr_filters_exec,
> - NULL, true);
> - }
> - rcu_read_unlock();
> + rcu_read_lock();
> + ctx = rcu_dereference(current->perf_event_ctxp);
> + if (ctx) {
> + perf_event_enable_on_exec(ctx);
> + perf_event_remove_on_exec(ctx);
> + perf_iterate_ctx(ctx, perf_event_addr_filters_exec, NULL, true);
> }
> + rcu_read_unlock();
> }
>
> struct remote_output {
The above goes *bang* because perf_event_remove_on_exec() will take a
mutex, which isn't allowed under rcu_read_lock().
The below cures.
---
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -4384,8 +4384,6 @@ static void perf_event_remove_on_exec(st
unsigned long flags;
bool modified = false;
- perf_pin_task_context(current);
-
mutex_lock(&ctx->mutex);
if (WARN_ON_ONCE(ctx->task != current))
@@ -4406,13 +4404,11 @@ static void perf_event_remove_on_exec(st
raw_spin_lock_irqsave(&ctx->lock, flags);
if (modified)
clone_ctx = unclone_ctx(ctx);
- --ctx->pin_count;
raw_spin_unlock_irqrestore(&ctx->lock, flags);
unlock:
mutex_unlock(&ctx->mutex);
- put_ctx(ctx);
if (clone_ctx)
put_ctx(clone_ctx);
}
@@ -7878,14 +7874,16 @@ void perf_event_exec(void)
{
struct perf_event_context *ctx;
- rcu_read_lock();
- ctx = rcu_dereference(current->perf_event_ctxp);
- if (ctx) {
- perf_event_enable_on_exec(ctx);
- perf_event_remove_on_exec(ctx);
- perf_iterate_ctx(ctx, perf_event_addr_filters_exec, NULL, true);
- }
- rcu_read_unlock();
+ ctx = perf_pin_task_context(current);
+ if (!ctx)
+ return;
+
+ perf_event_enable_on_exec(ctx);
+ perf_event_remove_on_exec(ctx);
+ perf_iterate_ctx(ctx, perf_event_addr_filters_exec, NULL, true);
+
+ perf_unpin_context(ctx);
+ put_ctx(ctx);
}
struct remote_output {
next prev parent reply other threads:[~2022-06-13 16:52 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-13 13:47 [RFC v2] perf: Rewrite core context handling Ravi Bangoria
2022-01-17 7:18 ` [perf] f7cf7134e4: WARNING:at_kernel/events/core.c:#__pmu_ctx_sched_out kernel test robot
2022-01-31 4:43 ` [RFC v2] perf: Rewrite core context handling Ravi Bangoria
2022-06-13 14:35 ` Peter Zijlstra
2022-06-13 14:36 ` Peter Zijlstra [this message]
2022-06-13 14:38 ` Peter Zijlstra
2022-08-02 6:11 ` Ravi Bangoria
2022-08-22 15:29 ` Peter Zijlstra
2022-08-22 15:43 ` Peter Zijlstra
2022-08-22 16:37 ` Ravi Bangoria
2022-08-23 4:20 ` Ravi Bangoria
2022-08-29 3:54 ` Ravi Bangoria
2022-08-23 6:30 ` Peter Zijlstra
2022-08-29 4:00 ` Ravi Bangoria
2022-08-29 11:58 ` Peter Zijlstra
2022-08-22 16:52 ` Peter Zijlstra
2022-08-23 4:57 ` Ravi Bangoria
2022-06-13 14:41 ` Peter Zijlstra
2022-08-22 14:38 ` Ravi Bangoria
2022-06-13 14:43 ` Peter Zijlstra
2022-08-02 6:16 ` Ravi Bangoria
2022-08-23 8:57 ` Peter Zijlstra
2022-08-24 5:07 ` Ravi Bangoria
2022-08-24 7:27 ` Peter Zijlstra
2022-08-24 7:53 ` Ravi Bangoria
2022-06-13 14:55 ` Peter Zijlstra
2022-08-02 6:10 ` Ravi Bangoria
2022-08-22 16:44 ` Peter Zijlstra
2022-08-23 4:46 ` Ravi Bangoria
2022-06-17 13:36 ` Peter Zijlstra
2022-08-24 10:13 ` Peter Zijlstra
2022-06-27 4:18 ` Ravi Bangoria
2022-08-02 6:06 ` Ravi Bangoria
2022-08-24 12:15 ` Peter Zijlstra
2022-08-24 14:59 ` Peter Zijlstra
2022-08-25 5:39 ` Ravi Bangoria
2022-08-25 9:17 ` Peter Zijlstra
2022-08-25 11:03 ` Ravi Bangoria
2022-08-02 6:13 ` Ravi Bangoria
2022-08-23 7:10 ` Peter Zijlstra
2022-08-02 6:17 ` Ravi Bangoria
2022-08-23 7:26 ` Peter Zijlstra
2022-08-23 15:14 ` Ravi Bangoria
2022-08-22 14:40 ` Ravi Bangoria
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=YqdLhrJnJUqONjim@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexey.budankov@linux.intel.com \
--cc=eranian@google.com \
--cc=frederic@kernel.org \
--cc=irogers@google.com \
--cc=jolsa@redhat.com \
--cc=kim.phillips@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maddy@linux.ibm.com \
--cc=mark.rutland@arm.com \
--cc=megha.dey@intel.com \
--cc=namhyung@kernel.org \
--cc=ravi.bangoria@amd.com \
--cc=santosh.shukla@amd.com \
--cc=songliubraving@fb.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).