From 3e927f61dc4759aad01ac532731b5eac2d44c23f Mon Sep 17 00:00:00 2001 From: tinhnt86 Date: Thu, 8 Oct 2020 18:42:26 +0700 Subject: [PATCH] mcctrl_perf_disable: check os instance & cpu info Change-Id: I7195272a65b31db72158f5e5bbfc490bac547b91 --- executer/kernel/mcctrl/control.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/executer/kernel/mcctrl/control.c b/executer/kernel/mcctrl/control.c index 729fab6d..b22c2da3 100644 --- a/executer/kernel/mcctrl/control.c +++ b/executer/kernel/mcctrl/control.c @@ -2419,15 +2419,20 @@ long mcctrl_perf_enable(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 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; int ret = 0; int i = 0, j = 0; int need_free; + if (!os || ihk_host_validate_os(os)) { + return -EINVAL; + } + + usrdata = ihk_host_os_get_usrdata(os); if (!usrdata) { pr_err("%s: error: mcctrl_usrdata not found\n", __func__); return -EINVAL; @@ -2450,6 +2455,11 @@ long mcctrl_perf_disable(ihk_os_t os) isp.msg = SCD_MSG_PERF_CTRL; 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++) { ret = mcctrl_ikc_send_wait(os, j, &isp, 0, wakeup_desc_of_perf_desc(perf_desc),