gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mcctrl_perf_disable: check os instance & cpu info

Browse Source 
Change-Id: I7195272a65b31db72158f5e5bbfc490bac547b91
This commit is contained in:
tinhnt86
2020-10-08 18:42:26 +07:00
committed by Masamichi Takagi
parent 64579830dd
commit 3e927f61dc
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
executer/kernel/mcctrl/control.c
View File

@ -2419,15 +2419,20 @@ long mcctrl_perf_enable(ihk_os_t os)
long mcctrl_perf_disable(ihk_os_t os) long mcctrl_perf_disable(ihk_os_t os)
{ {
struct mcctrl_usrdata *usrdata = ihk_host_os_get_usrdata(os); struct mcctrl_usrdata *usrdata = NULL;
struct ikc_scd_packet isp; struct ikc_scd_packet isp;
struct perf_ctrl_desc *perf_desc; struct perf_ctrl_desc *perf_desc;
struct ihk_cpu_info *info = ihk_os_get_cpu_info(os); struct ihk_cpu_info *info = NULL;
unsigned long cntr_mask = 0; unsigned long cntr_mask = 0;
int ret = 0; int ret = 0;
int i = 0, j = 0; int i = 0, j = 0;
int need_free; int need_free;
if (!os || ihk_host_validate_os(os)) {
return -EINVAL;
}
usrdata = ihk_host_os_get_usrdata(os);
if (!usrdata) { if (!usrdata) {
pr_err("%s: error: mcctrl_usrdata not found\n", __func__); pr_err("%s: error: mcctrl_usrdata not found\n", __func__);
return -EINVAL; return -EINVAL;
@ -2450,6 +2455,11 @@ long mcctrl_perf_disable(ihk_os_t os)
isp.msg = SCD_MSG_PERF_CTRL; isp.msg = SCD_MSG_PERF_CTRL;
isp.arg = virt_to_phys(perf_desc); isp.arg = virt_to_phys(perf_desc);
info = ihk_os_get_cpu_info(os);
if (!info || info->n_cpus < 1) {
kfree(perf_desc);
return -EINVAL;
}
for (j = 0; j < info->n_cpus; j++) { for (j = 0; j < info->n_cpus; j++) {
ret = mcctrl_ikc_send_wait(os, j, &isp, 0, ret = mcctrl_ikc_send_wait(os, j, &isp, 0,
wakeup_desc_of_perf_desc(perf_desc), wakeup_desc_of_perf_desc(perf_desc),