From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Mon, 1 Dec 2014 10:43:24 -0800 From: Sukadev Bhattiprolu To: lizf@kernel.org Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org, Cong Wang , Cong Wang , Peter Zijlstra , Paul Mackerras , Arnaldo Carvalho de Melo , Linus Torvalds , Ingo Molnar , Zefan Li Subject: Re: [PATCH 3.4 43/91] perf: Fix a race condition in perf_remove_from_context() Message-ID: <20141201184324.GA5032@us.ibm.com> References: <1417077368-9217-1-git-send-email-lizf@kernel.org> <1417077794-9299-43-git-send-email-lizf@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1417077794-9299-43-git-send-email-lizf@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: lizf@kernel.org [lizf@kernel.org] wrote: | From: Cong Wang | | 3.4.105-rc1 review patch. If anyone has any objections, please let me know. | | | 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/