github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-01 17:06:51 +00:00
Code Issues Projects Releases Wiki Activity

hv: add pre-condition for vcpu APIs

Browse Source 
remove unnecessary state check and
add pre-condition for vcpu APIs.

Tracked-On: #4320
Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com>
Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Mingqiang Chi
2020-03-17 13:53:07 +08:00
committed by wenlingz
parent 0584981c03
commit f90100e382
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
hypervisor/arch/x86/guest/vcpu.c
View File

@@ -660,18 +660,17 @@ int32_t run_vcpu(struct acrn_vcpu *vcpu)
/* /*
* @pre vcpu != NULL * @pre vcpu != NULL
* @pre vcpu->state == VCPU_ZOMBIE
*/ */
void offline_vcpu(struct acrn_vcpu *vcpu) void offline_vcpu(struct acrn_vcpu *vcpu)
{ {
if (vcpu->state == VCPU_ZOMBIE) { vlapic_free(vcpu);
vlapic_free(vcpu); per_cpu(ever_run_vcpu, pcpuid_from_vcpu(vcpu)) = NULL;
per_cpu(ever_run_vcpu, pcpuid_from_vcpu(vcpu)) = NULL;
/* This operation must be atomic to avoid contention with posted interrupt handler */ /* This operation must be atomic to avoid contention with posted interrupt handler */
per_cpu(vcpu_array, pcpuid_from_vcpu(vcpu))[vcpu->vm->vm_id] = NULL; per_cpu(vcpu_array, pcpuid_from_vcpu(vcpu))[vcpu->vm->vm_id] = NULL;
vcpu->state = VCPU_OFFLINE; vcpu->state = VCPU_OFFLINE;
}
} }
void kick_vcpu(const struct acrn_vcpu *vcpu) void kick_vcpu(const struct acrn_vcpu *vcpu)
@@ -709,28 +708,24 @@ static uint64_t build_stack_frame(struct acrn_vcpu *vcpu)
/* NOTE: /* NOTE:
* vcpu should be paused before call this function. * vcpu should be paused before call this function.
* @pre vcpu != NULL
* @pre vcpu->state == VCPU_ZOMBIE
*/ */
void reset_vcpu(struct acrn_vcpu *vcpu, enum reset_mode mode) void reset_vcpu(struct acrn_vcpu *vcpu, enum reset_mode mode)
{ {
pr_dbg("vcpu%hu reset", vcpu->vcpu_id); pr_dbg("vcpu%hu reset", vcpu->vcpu_id);
ASSERT(vcpu->state == VCPU_ZOMBIE,
"reset vcpu only when it's in zombie");
if (vcpu->state == VCPU_ZOMBIE) { vcpu_reset_internal(vcpu, mode);
vcpu_reset_internal(vcpu, mode); vcpu->state = VCPU_INIT;
vcpu->state = VCPU_INIT;
}
} }
void pause_vcpu(struct acrn_vcpu *vcpu, enum vcpu_state new_state) void pause_vcpu(struct acrn_vcpu *vcpu, enum vcpu_state new_state)
{ {
uint16_t pcpu_id = pcpuid_from_vcpu(vcpu); uint16_t pcpu_id = pcpuid_from_vcpu(vcpu);
pr_dbg("vcpu%hu paused, new state: %d", pr_dbg("vcpu%hu paused, new state: %d", vcpu->vcpu_id, new_state);
vcpu->vcpu_id, new_state);
if (((vcpu->state == VCPU_RUNNING) || (vcpu->state == VCPU_PAUSED) || (vcpu->state == VCPU_INIT)) if (((vcpu->state == VCPU_RUNNING) || (vcpu->state == VCPU_INIT)) && (new_state == VCPU_ZOMBIE)) {
&& ((new_state == VCPU_PAUSED) || (new_state == VCPU_ZOMBIE))) {
vcpu->prev_state = vcpu->state; vcpu->prev_state = vcpu->state;
vcpu->state = new_state; vcpu->state = new_state;
@@ -813,16 +808,19 @@ static void context_switch_in(struct thread_object *next)
vcpu->running = true; vcpu->running = true;
} }
/**
* @pre vcpu != NULL
* @pre vcpu->state == VCPU_INIT
*/
void launch_vcpu(struct acrn_vcpu *vcpu) void launch_vcpu(struct acrn_vcpu *vcpu)
{ {
uint16_t pcpu_id = pcpuid_from_vcpu(vcpu); uint16_t pcpu_id = pcpuid_from_vcpu(vcpu);
pr_dbg("vcpu%hu scheduled on pcpu%hu", vcpu->vcpu_id, pcpu_id); pr_dbg("vcpu%hu scheduled on pcpu%hu", vcpu->vcpu_id, pcpu_id);
vcpu->state = VCPU_RUNNING;
wake_thread(&vcpu->thread_obj);
if (vcpu->state == VCPU_INIT) {
vcpu->state = VCPU_RUNNING;
wake_thread(&vcpu->thread_obj);
}
} }
/* help function for vcpu create */ /* help function for vcpu create */

8
hypervisor/include/arch/x86/guest/vcpu.h
View File

@@ -613,7 +613,7 @@ int32_t run_vcpu(struct acrn_vcpu *vcpu);
* *
* @param[inout] vcpu pointer to vcpu data structure * @param[inout] vcpu pointer to vcpu data structure
* @pre vcpu != NULL * @pre vcpu != NULL
* * @pre vcpu->state == VCPU_ZOMBIE
* @return None * @return None
*/ */
void offline_vcpu(struct acrn_vcpu *vcpu); void offline_vcpu(struct acrn_vcpu *vcpu);
@@ -625,7 +625,8 @@ void offline_vcpu(struct acrn_vcpu *vcpu);
* *
* @param[inout] vcpu pointer to vcpu data structure * @param[inout] vcpu pointer to vcpu data structure
* @param[in] mode the reset mode * @param[in] mode the reset mode
* * @pre vcpu != NULL
* @pre vcpu->state == VCPU_ZOMBIE
* @return None * @return None
*/ */
void reset_vcpu(struct acrn_vcpu *vcpu, enum reset_mode mode); void reset_vcpu(struct acrn_vcpu *vcpu, enum reset_mode mode);
@@ -659,7 +660,8 @@ int32_t resume_vcpu(struct acrn_vcpu *vcpu);
* Adds a vCPU into the run queue and make a reschedule request for it. It sets the vCPU state to VCPU_RUNNING. * Adds a vCPU into the run queue and make a reschedule request for it. It sets the vCPU state to VCPU_RUNNING.
* *
* @param[inout] vcpu pointer to vcpu data structure * @param[inout] vcpu pointer to vcpu data structure
* * @pre vcpu != NULL
* @pre vcpu->state == VCPU_INIT
* @return None * @return None
*/ */
void launch_vcpu(struct acrn_vcpu *vcpu); void launch_vcpu(struct acrn_vcpu *vcpu);