From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932353AbdJJQwJ (ORCPT ); Tue, 10 Oct 2017 12:52:09 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:56462 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932075AbdJJQwH (ORCPT ); Tue, 10 Oct 2017 12:52:07 -0400 From: Anju T Sudhakar To: mpe@ellerman.id.au Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, maddy@linux.vnet.ibm.com, hemant@linux.vnet.ibm.com, anju@linux.vnet.ibm.com, ppaidipe@linux.vnet.ibm.com Subject: [PATCH] powerpc/perf: Fix IMC initialization crash Date: Tue, 10 Oct 2017 22:21:55 +0530 X-Mailer: git-send-email 2.7.4 X-TM-AS-MML: disable x-cbid: 17101016-0020-0000-0000-000003BF6F46 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17101016-0021-0000-0000-000042528DFE Message-Id: <1507654315-1620-1-git-send-email-anju@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-10-10_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=4 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1710100239 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Call trace observed with latest firmware, and upstream kernel. [ 14.499938] NIP [c0000000000f318c] init_imc_pmu+0x8c/0xcf0 [ 14.499973] LR [c0000000000f33f8] init_imc_pmu+0x2f8/0xcf0 [ 14.500007] Call Trace: [ 14.500027] [c000003fed18f710] [c0000000000f33c8] init_imc_pmu+0x2c8/0xcf0 (unreliable) [ 14.500080] [c000003fed18f800] [c0000000000b5ec0] opal_imc_counters_probe+0x300/0x400 [ 14.500132] [c000003fed18f900] [c000000000807ef4] platform_drv_probe+0x64/0x110 [ 14.500185] [c000003fed18f980] [c000000000804b58] driver_probe_device+0x3d8/0x580 [ 14.500236] [c000003fed18fa10] [c000000000804e4c] __driver_attach+0x14c/0x1a0 [ 14.500302] [c000003fed18fa90] [c00000000080156c] bus_for_each_dev+0x8c/0xf0 [ 14.500353] [c000003fed18fae0] [c000000000803fa4] driver_attach+0x34/0x50 [ 14.500397] [c000003fed18fb00] [c000000000803688] bus_add_driver+0x298/0x350 [ 14.500449] [c000003fed18fb90] [c00000000080605c] driver_register+0x9c/0x180 [ 14.500500] [c000003fed18fc00] [c000000000807dec] __platform_driver_register+0x5c/0x70 [ 14.500552] [c000003fed18fc20] [c00000000101cee0] opal_imc_driver_init+0x2c/0x40 [ 14.500603] [c000003fed18fc40] [c00000000000d084] do_one_initcall+0x64/0x1d0 [ 14.500654] [c000003fed18fd00] [c00000000100434c] kernel_init_freeable+0x280/0x374 [ 14.500705] [c000003fed18fdc0] [c00000000000d314] kernel_init+0x24/0x160 [ 14.500750] [c000003fed18fe30] [c00000000000b4e8] ret_from_kernel_thread+0x5c/0x74 [ 14.500799] Instruction dump: [ 14.500827] 4082024c 2f890002 419e054c 2e890003 41960094 2e890001 3ba0ffea 419602d8 [ 14.500884] 419e0290 2f890003 419e02a8 e93e0118 2fa30000 419e0010 4827ba41 [ 14.500945] ---[ end trace 27b734ad26f1add4 ]--- [ 15.908719] [ 16.908869] Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000007 [ 16.908869] [ 18.125813] ---[ end Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000007] While registering nest imc at init, cpu-hotplug callback `nest_pmu_cpumask_init()` makes an opal call to stop the engine. And if the OPAL call fails, imc_common_cpuhp_mem_free() is invoked to cleanup memory and cpuhotplug setup. But when cleaning up the attribute group, we were dereferencing the attribute element array without checking whether the backing element is not NULL. This causes the kernel panic. Factor out the memory freeing part from imc_common_cpuhp_mem_free() to handle the failing case gracefully. Signed-off-by: Anju T Sudhakar Reported-by: Pridhiviraj Paidipeddi --- arch/powerpc/perf/imc-pmu.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c index 9ccac86..213d976 100644 --- a/arch/powerpc/perf/imc-pmu.c +++ b/arch/powerpc/perf/imc-pmu.c @@ -224,8 +224,10 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu) /* Allocate memory for attribute group */ attr_group = kzalloc(sizeof(*attr_group), GFP_KERNEL); - if (!attr_group) + if (!attr_group) { + kfree(pmu->events); return -ENOMEM; + } /* * Allocate memory for attributes. @@ -1115,6 +1117,15 @@ static void cleanup_all_thread_imc_memory(void) } } +/* Function to free the attr_groups which are dynamically allocated */ +static void imc_common_mem_free(struct imc_pmu *pmu_ptr) +{ + kfree(pmu_ptr->attr_groups[IMC_EVENT_ATTR]->attrs); + kfree(pmu_ptr->attr_groups[IMC_EVENT_ATTR]); + kfree(pmu_ptr); + return; +} + /* * Common function to unregister cpu hotplug callback and * free the memory. @@ -1147,10 +1158,6 @@ static void imc_common_cpuhp_mem_free(struct imc_pmu *pmu_ptr) cleanup_all_thread_imc_memory(); } - /* Only free the attr_groups which are dynamically allocated */ - kfree(pmu_ptr->attr_groups[IMC_EVENT_ATTR]->attrs); - kfree(pmu_ptr->attr_groups[IMC_EVENT_ATTR]); - kfree(pmu_ptr); return; } @@ -1289,17 +1296,19 @@ int init_imc_pmu(struct device_node *parent, struct imc_pmu *pmu_ptr, int pmu_id ret = update_pmu_ops(pmu_ptr); if (ret) - goto err_free; + goto err_free_mem; ret = perf_pmu_register(&pmu_ptr->pmu, pmu_ptr->pmu.name, -1); if (ret) - goto err_free; + goto err_free_mem; pr_info("%s performance monitor hardware support registered\n", pmu_ptr->pmu.name); return 0; +err_free_mem: + imc_common_mem_free(pmu_ptr); err_free: imc_common_cpuhp_mem_free(pmu_ptr); return ret; -- 1.8.3.1