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

fix: memory leak due to forced termination during startup

Browse Source 
Change-Id: Ide519f01702bfd17ae4576e04806b6d155ae846a
refs: #1397
This commit is contained in:
TOIDA,Suguru
2019-11-25 12:11:36 +09:00
committed by Masamichi Takagi
parent 93581cb142
commit 9e2196c9ce
9 changed files with 318 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,8 +86,19 @@ int syscall_backward(struct mcctrl_usrdata *, int, unsigned long, unsigned long,
unsigned long, unsigned long, unsigned long,
unsigned long, unsigned long *);
struct mcos_handler_info {
int pid;
int cpu;
struct mcctrl_usrdata *ud;
struct file *file;
unsigned long user_start;
unsigned long user_end;
unsigned long prepare_thread;
};
static long mcexec_prepare_image(ihk_os_t os,
struct program_load_desc * __user udesc)
struct program_load_desc * __user udesc,
struct file *file)
{
struct program_load_desc *desc = NULL;
struct program_load_desc *pdesc = NULL;
@ -99,6 +110,7 @@ static long mcexec_prepare_image(ihk_os_t os,
struct mcctrl_per_proc_data *ppd = NULL;
int num_sections;
int free_ikc_pointers = 1;
struct mcos_handler_info *info;
if (!usrdata) {
pr_err("%s: error: mcctrl_usrdata not found\n", __func__);
@ -121,6 +133,14 @@ static long mcexec_prepare_image(ihk_os_t os,
goto free_out;
}
info = ihk_os_get_mcos_private_data(file);
if (!info) {
ret = -EFAULT;
goto free_out;
}
/* To serialize SCD_MSG_SCHEDULE_PROCESS and SCD_MSG_CLEANUP_PROCESS */
info->cpu = desc->cpu;
ppd = mcctrl_get_per_proc_data(usrdata, desc->pid);
if (!ppd) {
printk("%s: ERROR: no per process data for PID %d\n",
@ -192,6 +212,11 @@ static long mcexec_prepare_image(ihk_os_t os,
/* either send or remote prepare_process failed */
goto put_and_free_out;
}
/*
* Used as SCD_MSG_CLEANUP_PROCESS target which isn't scheduled
* with SCD_MSG_SCHEDULE_PROCESS
*/
info->prepare_thread = pdesc->rprocess;
/* Update rpgtable */
ppd->rpgtable = pdesc->rpgtable;
@ -306,15 +331,6 @@ int mcexec_transfer_image(ihk_os_t os, struct remote_transfer *__user upt)
#endif
}
struct mcos_handler_info {
int pid;
int cpu;
struct mcctrl_usrdata *ud;
struct file *file;
unsigned long user_start;
unsigned long user_end;
};
struct mcos_handler_info;
static LIST_HEAD(host_threads); /* Used for FS switch */
DEFINE_RWLOCK(host_thread_lock);
@ -379,6 +395,7 @@ static void release_handler(ihk_os_t os, void *param)
memset(&isp, '\0', sizeof isp);
isp.msg = SCD_MSG_CLEANUP_PROCESS;
isp.pid = info->pid;
isp.arg = info->prepare_thread;
dprintk("%s: SCD_MSG_CLEANUP_PROCESS, info: %p, cpu: %d\n",
__FUNCTION__, info, info->cpu);
@ -414,6 +431,7 @@ static long mcexec_start_image(ihk_os_t os,
struct mcctrl_channel *c;
struct mcctrl_usrdata *usrdata = ihk_host_os_get_usrdata(os);
struct mcos_handler_info *info;
struct mcos_handler_info *prev_info;
int ret = 0;
if (!usrdata) {
@ -434,6 +452,7 @@ static long mcexec_start_image(ihk_os_t os,
goto out;
}
prev_info = ihk_os_get_mcos_private_data(file);
info = new_mcos_handler_info(os, file);
if (info == NULL) {
ret = -ENOMEM;
@ -444,6 +463,7 @@ static long mcexec_start_image(ihk_os_t os,
info->cpu = desc->cpu;
info->user_start = desc->user_start;
info->user_end = desc->user_end;
info->prepare_thread = prev_info->prepare_thread;
ihk_os_register_release_handler(file, release_handler, info);
ihk_os_set_mcos_private_data(file, info);
@ -460,8 +480,10 @@ static long mcexec_start_image(ihk_os_t os,
ret = mcctrl_ikc_send(os, desc->cpu, &isp);
if (ret < 0) {
printk("%s: error: sending IKC msg\n", __FUNCTION__);
goto out;
}
/* clear prepared thread struct */
info->prepare_thread = 0;
out:
kfree(desc);
return ret;
@ -3224,7 +3246,8 @@ long __mcctrl_control(ihk_os_t os, unsigned int req, unsigned long arg,
switch (req) {
case MCEXEC_UP_PREPARE_IMAGE:
return mcexec_prepare_image(os,
(struct program_load_desc *)arg);
(struct program_load_desc *)arg,
file);
case MCEXEC_UP_TRANSFER:
return mcexec_transfer_image(os, (struct remote_transfer *)arg);