microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

powerpc/perf: IMC code cleanup with some code refactoring 

Factor out memory freeing part for attribute elements from
imc_common_cpuhp_mem_free().

Signed-off-by: Anju T Sudhakar <anju@linux.vnet.ibm.com>
Reviewed-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Anju T Sudhakar 2017-12-11 11:28:36 +05:30 коммит произвёл Michael Ellerman
Родитель e7673818d9
Коммит ed8e443fee
1 изменённых файлов: 21 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

33
arch/powerpc/perf/imc-pmu.c
Просмотреть файл

@ -1157,6 +1157,16 @@ 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)
{
if (pmu_ptr->attr_groups[IMC_EVENT_ATTR])
kfree(pmu_ptr->attr_groups[IMC_EVENT_ATTR]->attrs);
kfree(pmu_ptr->attr_groups[IMC_EVENT_ATTR]);
kfree(pmu_ptr);
kfree(per_nest_pmu_arr);
}
/* /*
* Common function to unregister cpu hotplug callback and * Common function to unregister cpu hotplug callback and
* free the memory. * free the memory.
@ -1188,14 +1198,6 @@ static void imc_common_cpuhp_mem_free(struct imc_pmu *pmu_ptr)
cpuhp_remove_state(CPUHP_AP_PERF_POWERPC_THREAD_IMC_ONLINE); cpuhp_remove_state(CPUHP_AP_PERF_POWERPC_THREAD_IMC_ONLINE);
cleanup_all_thread_imc_memory(); cleanup_all_thread_imc_memory();
} }
/* Only free the attr_groups which are dynamically allocated */
if (pmu_ptr->attr_groups[IMC_EVENT_ATTR])
kfree(pmu_ptr->attr_groups[IMC_EVENT_ATTR]->attrs);
kfree(pmu_ptr->attr_groups[IMC_EVENT_ATTR]);
kfree(pmu_ptr);
kfree(per_nest_pmu_arr);
return;
} }
@ -1244,8 +1246,10 @@ static int imc_mem_init(struct imc_pmu *pmu_ptr, struct device_node *parent,
core_imc_refc = kcalloc(nr_cores, sizeof(struct imc_pmu_ref), core_imc_refc = kcalloc(nr_cores, sizeof(struct imc_pmu_ref),
GFP_KERNEL); GFP_KERNEL);
if (!core_imc_refc) if (!core_imc_refc) {
kfree(pmu_ptr->mem_info);
return -ENOMEM; return -ENOMEM;
}
core_imc_pmu = pmu_ptr; core_imc_pmu = pmu_ptr;
break; break;
@ -1258,9 +1262,11 @@ static int imc_mem_init(struct imc_pmu *pmu_ptr, struct device_node *parent,
thread_imc_mem_size = pmu_ptr->counter_mem_size; thread_imc_mem_size = pmu_ptr->counter_mem_size;
for_each_online_cpu(cpu) { for_each_online_cpu(cpu) {
res = thread_imc_mem_alloc(cpu, pmu_ptr->counter_mem_size); res = thread_imc_mem_alloc(cpu, pmu_ptr->counter_mem_size);
if (res) if (res) {
cleanup_all_thread_imc_memory();
return res; return res;
} }
}
break; break;
default: default:
@ -1285,8 +1291,10 @@ int init_imc_pmu(struct device_node *parent, struct imc_pmu *pmu_ptr, int pmu_id
int ret; int ret;
ret = imc_mem_init(pmu_ptr, parent, pmu_idx); ret = imc_mem_init(pmu_ptr, parent, pmu_idx);
if (ret) if (ret) {
goto err_free; imc_common_mem_free(pmu_ptr);
return ret;
}
switch (pmu_ptr->domain) { switch (pmu_ptr->domain) {
case IMC_DOMAIN_NEST: case IMC_DOMAIN_NEST:
@ -1351,6 +1359,7 @@ int init_imc_pmu(struct device_node *parent, struct imc_pmu *pmu_ptr, int pmu_id
return 0; return 0;
err_free: err_free:
imc_common_mem_free(pmu_ptr);
imc_common_cpuhp_mem_free(pmu_ptr); imc_common_cpuhp_mem_free(pmu_ptr);
return ret; return ret;
} }