[PATCH V2 6/6] perf/x86/intel/uncore: do not implicitly set uncore event cpu

From: Kan Liang <kan.liang@intel.com>
To: acme@kernel.org, a.p.zijlstra@chello.nl
Cc: eranian@google.com, andi@firstfloor.org,
	linux-kernel@vger.kernel.org, Kan Liang <kan.liang@intel.com>
Subject: [PATCH V2 6/6] perf/x86/intel/uncore: do not implicitly set uncore event cpu
Date: Wed, 15 Apr 2015 03:56:16 -0400	[thread overview]
Message-ID: <1429084576-1078-6-git-send-email-kan.liang@intel.com> (raw)
In-Reply-To: <1429084576-1078-1-git-send-email-kan.liang@intel.com>

From: Kan Liang <kan.liang@intel.com>

There is cpumask exposed to the uncore pmu sysfs directory. User should
set the cpu according to the cpumask. Kernel should not implicitly
change the event->cpu.

Signed-off-by: Kan Liang <kan.liang@intel.com>
---
 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index c635b8b..cd80731 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -621,9 +621,8 @@ static int uncore_pmu_event_init(struct perf_event *event)
 	if (event->cpu < 0)
 		return -EINVAL;
 	box = uncore_pmu_to_box(pmu, event->cpu);
-	if (!box || box->cpu < 0)
+	if (!box || box->cpu < 0 || (box->cpu != event->cpu))
 		return -EINVAL;
-	event->cpu = box->cpu;
 
 	event->hw.idx = -1;
 	event->hw.last_tag = ~0ULL;
-- 
1.8.3.1

