Message ID | 20181127082452.8307-1-anju@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show |
Series | powerpc/perf: Fix loop exit condition in nest_imc_event_init | expand |
Context | Check | Description |
---|---|---|
snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
snowpatch_ozlabs/build-ppc64le | success | build succeded & removed 25 sparse warning(s) |
snowpatch_ozlabs/build-ppc64be | warning | build succeeded but added 6 new sparse warning(s) |
snowpatch_ozlabs/build-ppc64e | success | build succeded & removed 4 sparse warning(s) |
snowpatch_ozlabs/build-pmac32 | success | build succeded & removed 2 sparse warning(s) |
snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 16 lines checked |
diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c index 78514170cf71..e9dc771f3e3d 100644 --- a/arch/powerpc/perf/imc-pmu.c +++ b/arch/powerpc/perf/imc-pmu.c @@ -459,7 +459,7 @@ static void nest_imc_counters_release(struct perf_event *event) static int nest_imc_event_init(struct perf_event *event) { - int chip_id, rc, node_id; + int chip_id, rc, node_id, nr_chips = num_possible_nodes(); u32 l_config, config = event->attr.config; struct imc_mem_info *pcni; struct imc_pmu *pmu; @@ -508,7 +508,7 @@ static int nest_imc_event_init(struct perf_event *event) break; } pcni++; - } while (pcni); + } while (--nr_chips); if (!flag) return -ENODEV;
The data structure (i.e struct imc_mem_info) to hold the memory address information for nest imc units is allocated based on the number of nodes in the system. nest_imc_event_init() traverse this struct array to calculate the memory base address for the event-cpu. If we fail to find a match for the event cpu's chip-id in imc_mem_info struct array, then the do-while loop will iterate until we crash. Fix this by changing the loop exit condition based on the number of nodes in the system. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Fixes: 885dcd709ba91 ( powerpc/perf: Add nest IMC PMU support) Signed-off-by: Anju T Sudhakar <anju@linux.vnet.ibm.com> --- arch/powerpc/perf/imc-pmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)