提交 711bd207 编写于 作者: M Madhavan Srinivasan 提交者: Michael Ellerman

powerpc/perf: Fix usage of nest_imc_refc

nest_imc_refc is a reference count struct, used to track number of
active perf sessions using the nest units.

Currently the code accesses nest_imc_refc using node_id, which is
incorrect, the array is indexed by node number. Meaning in the case of
sparse node ids we index off the end of the array.

Fix it to use get_nest_pmu_ref() which uses the existing per-cpu
variable local_nest_imc_refc.

Fixes: 885dcd70 ('powerpc/perf: Add nest IMC PMU support')
Reported-by: NDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: NMadhavan Srinivasan <maddy@linux.vnet.ibm.com>
[mpe: Tweak change log]
Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
上级 8bfa42ab
...@@ -404,7 +404,7 @@ static void nest_imc_counters_release(struct perf_event *event) ...@@ -404,7 +404,7 @@ static void nest_imc_counters_release(struct perf_event *event)
rc = opal_imc_counters_stop(OPAL_IMC_COUNTERS_NEST, rc = opal_imc_counters_stop(OPAL_IMC_COUNTERS_NEST,
get_hard_smp_processor_id(event->cpu)); get_hard_smp_processor_id(event->cpu));
if (rc) { if (rc) {
mutex_unlock(&nest_imc_refc[node_id].lock); mutex_unlock(&ref->lock);
pr_err("nest-imc: Unable to stop the counters for core %d\n", node_id); pr_err("nest-imc: Unable to stop the counters for core %d\n", node_id);
return; return;
} }
...@@ -487,7 +487,7 @@ static int nest_imc_event_init(struct perf_event *event) ...@@ -487,7 +487,7 @@ static int nest_imc_event_init(struct perf_event *event)
rc = opal_imc_counters_start(OPAL_IMC_COUNTERS_NEST, rc = opal_imc_counters_start(OPAL_IMC_COUNTERS_NEST,
get_hard_smp_processor_id(event->cpu)); get_hard_smp_processor_id(event->cpu));
if (rc) { if (rc) {
mutex_unlock(&nest_imc_refc[node_id].lock); mutex_unlock(&ref->lock);
pr_err("nest-imc: Unable to start the counters for node %d\n", pr_err("nest-imc: Unable to start the counters for node %d\n",
node_id); node_id);
return rc; return rc;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册