OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

dm: Fix race between ioreq client destroy and access 

vcpu thread need to exit when doing VM full reset and VM shutdown.
Change the code to align the logic. This also can fix race condition
between ioreq client destruction and accessing.

Tracked-On: #1857
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Signed-off-by: Shuo Liu <shuo.a.liu@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Shuo Liu 2018-11-19 14:31:25 +08:00 committed by lijinxia
parent 3b24c34cbf
commit 611944c018
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devicemodel/core/main.c
View File

@ -96,8 +96,6 @@ static cpuset_t cpumask;
static void vm_loop(struct vmctx *ctx); static void vm_loop(struct vmctx *ctx);
static int quit_vm_loop;
static char vhm_request_page[4096] __attribute__ ((aligned(4096))); static char vhm_request_page[4096] __attribute__ ((aligned(4096)));
static struct vhm_request *vhm_req_buf = static struct vhm_request *vhm_req_buf =
@ -286,11 +284,8 @@ delete_cpu(struct vmctx *ctx, int vcpu)
exit(1); exit(1);
} }
/* wait for vm_loop cleanup */ pthread_join(mt_vmm_info[0].mt_thr, NULL);
quit_vm_loop = 1;
vm_destroy_ioreq_client(ctx); vm_destroy_ioreq_client(ctx);
while (quit_vm_loop)
usleep(10000);
CPU_CLR_ATOMIC(vcpu, &cpumask); CPU_CLR_ATOMIC(vcpu, &cpumask);
return CPU_EMPTY(&cpumask); return CPU_EMPTY(&cpumask);
@ -666,6 +661,11 @@ vm_loop(struct vmctx *ctx)
handle_vmexit(ctx, vhm_req, vcpu_id); handle_vmexit(ctx, vhm_req, vcpu_id);
} }
if (VM_SUSPEND_FULL_RESET == vm_get_suspend_mode() ||
VM_SUSPEND_POWEROFF == vm_get_suspend_mode()) {
break;
}
if (VM_SUSPEND_SYSTEM_RESET == vm_get_suspend_mode()) { if (VM_SUSPEND_SYSTEM_RESET == vm_get_suspend_mode()) {
vm_system_reset(ctx); vm_system_reset(ctx);
} }
@ -674,7 +674,6 @@ vm_loop(struct vmctx *ctx)
vm_suspend_resume(ctx); vm_suspend_resume(ctx);
} }
} }
quit_vm_loop = 0;
printf("VM loop exit\n"); printf("VM loop exit\n");
} }
@ -756,7 +755,6 @@ dm_run(int argc, char *argv[])
guest_ncpus = 1; guest_ncpus = 1;
memsize = 256 * MB; memsize = 256 * MB;
mptgen = 1; mptgen = 1;
quit_vm_loop = 0;
if (signal(SIGHUP, sig_handler_term) == SIG_ERR) if (signal(SIGHUP, sig_handler_term) == SIG_ERR)
fprintf(stderr, "cannot register handler for SIGHUP\n"); fprintf(stderr, "cannot register handler for SIGHUP\n");