lkml.org 
[lkml]   [2014]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 3.4 43/91] perf: Fix a race condition in perf_remove_from_context()
lizf@kernel.org [lizf@kernel.org] wrote:
| From: Cong Wang <cwang@twopensource.com>
|
| 3.4.105-rc1 review patch. If anyone has any objections, please let me know.
|
<snip>
|
| diff --git a/kernel/events/core.c b/kernel/events/core.c
| index 685ce46..c958be1 100644
| --- a/kernel/events/core.c
| +++ b/kernel/events/core.c
| @@ -1702,6 +1702,16 @@ retry:
| */
| if (ctx->is_active) {
| raw_spin_unlock_irq(&ctx->lock);
| + /*
| + * Reload the task pointer, it might have been changed by
| + * a concurrent perf_event_context_sched_out().
| + */
| + task = ctx->task;
| + /*
| + * Reload the task pointer, it might have been changed by
| + * a concurrent perf_event_context_sched_out().
| + */
| + task = ctx->task;

Something wrong in the way the patch was applied ?
The lines are identical...

The original commit, 3577af70, has the change applied in two
places: perf_event_disable() and perf_remove_from_context().

| goto retry;
| }
|
| --
| 1.9.1
|
| --
| To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
| the body of a message to majordomo@vger.kernel.org
| More majordomo info at http://vger.kernel.org/majordomo-info.html
| Please read the FAQ at http://www.tux.org/lkml/



\
 
 \ /
  Last update: 2014-12-01 20:21    [W:2.919 / U:0.000 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site