Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754145AbbBRRQU (ORCPT ); Wed, 18 Feb 2015 12:16:20 -0500 Received: from terminus.zytor.com ([198.137.202.10]:39445 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752553AbbBRRQR (ORCPT ); Wed, 18 Feb 2015 12:16:17 -0500 Date: Wed, 18 Feb 2015 09:15:23 -0800 From: "tip-bot for Yan, Zheng" Message-ID: Cc: torvalds@linux-foundation.org, tglx@linutronix.de, zheng.z.yan@intel.com, hpa@zytor.com, paulus@samba.org, kan.liang@intel.com, acme@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org, peterz@infradead.org Reply-To: mingo@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org, acme@kernel.org, kan.liang@intel.com, paulus@samba.org, hpa@zytor.com, zheng.z.yan@intel.com, torvalds@linux-foundation.org, tglx@linutronix.de In-Reply-To: <1415156173-10035-7-git-send-email-kan.liang@intel.com> References: <1415156173-10035-7-git-send-email-kan.liang@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf: Always switch pmu specific data during context switch Git-Commit-ID: 5a158c3ccd2183a7b0866be6685d001fe653430f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1948 Lines: 50 Commit-ID: 5a158c3ccd2183a7b0866be6685d001fe653430f Gitweb: http://git.kernel.org/tip/5a158c3ccd2183a7b0866be6685d001fe653430f Author: Yan, Zheng AuthorDate: Tue, 4 Nov 2014 21:56:02 -0500 Committer: Ingo Molnar CommitDate: Wed, 18 Feb 2015 17:16:07 +0100 perf: Always switch pmu specific data during context switch If two tasks were both forked from the same parent task, Events in their perf task contexts can be the same. Perf core may leave out switching the perf event contexts. Previous patch inroduces pmu specific data. The data is for saving the LBR stack, it is task specific. So we need to switch the data even when context switch is optimized out. Signed-off-by: Yan, Zheng Signed-off-by: Kan Liang Signed-off-by: Peter Zijlstra (Intel) Cc: Arnaldo Carvalho de Melo Cc: Linus Torvalds Cc: Paul Mackerras Cc: eranian@google.com Cc: jolsa@redhat.com Link: http://lkml.kernel.org/r/1415156173-10035-7-git-send-email-kan.liang@intel.com Signed-off-by: Ingo Molnar --- kernel/events/core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/events/core.c b/kernel/events/core.c index 688086b..84451c0 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -2562,6 +2562,9 @@ static void perf_event_context_sched_out(struct task_struct *task, int ctxn, next->perf_event_ctxp[ctxn] = ctx; ctx->task = next; next_ctx->task = task; + + swap(ctx->task_ctx_data, next_ctx->task_ctx_data); + do_switch = 0; perf_event_sync_stat(ctx, next_ctx); -- 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/