github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-25 15:02:13 +00:00
Code Issues Projects Releases Wiki Activity

hv: clear NEED_RESCHEDULE flag in schedule

Browse Source 
Now, need_reschedule will test_and_clear the bit NEED_RESCHEDULE in
schedule context, then call schedule. It is not a exact match with the
name.
This patch move the flag clearing into scheudle, and need_reschedule
just check and return.

Tracked-On: #1821
Signed-off-by: Shuo A Liu <shuo.a.liu@intel.com>
Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>
This commit is contained in:
Shuo A Liu 2018-12-25 14:48:17 +08:00 committed by wenlingz
parent 2c70a1e115
commit 3e9f4b958d
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hypervisor/common/hv_main.c
View File

@ -44,7 +44,7 @@ void vcpu_thread(struct acrn_vcpu *vcpu)
continue; continue;
} }
if (need_reschedule(vcpu->pcpu_id) != 0) { if (need_reschedule(vcpu->pcpu_id)) {
/* /*
* In extrem case, schedule() could return. Which * In extrem case, schedule() could return. Which
* means the vcpu resume happens before schedule() * means the vcpu resume happens before schedule()

10
hypervisor/common/schedule.c
View File

@ -106,11 +106,11 @@ void make_reschedule_request(const struct acrn_vcpu *vcpu)
} }
} }
int32_t need_reschedule(uint16_t pcpu_id) bool need_reschedule(uint16_t pcpu_id)
{ {
struct sched_context *ctx = &per_cpu(sched_ctx, pcpu_id); struct sched_context *ctx = &per_cpu(sched_ctx, pcpu_id);
return bitmap_test_and_clear_lock(NEED_RESCHEDULE, &ctx->flags); return bitmap_test(NEED_RESCHEDULE, &ctx->flags);
} }
static void context_switch_out(struct acrn_vcpu *vcpu) static void context_switch_out(struct acrn_vcpu *vcpu)
@ -172,7 +172,7 @@ void default_idle(void)
uint16_t pcpu_id = get_cpu_id(); uint16_t pcpu_id = get_cpu_id();
while (1) { while (1) {
if (need_reschedule(pcpu_id) != 0) { if (need_reschedule(pcpu_id)) {
schedule(); schedule();
} else if (need_offline(pcpu_id) != 0) { } else if (need_offline(pcpu_id) != 0) {
cpu_dead(); cpu_dead();
@ -225,11 +225,13 @@ static void switch_to(struct acrn_vcpu *curr)
void schedule(void) void schedule(void)
{ {
uint16_t pcpu_id = get_cpu_id(); uint16_t pcpu_id = get_cpu_id();
struct sched_context *ctx = &per_cpu(sched_ctx, pcpu_id);
struct acrn_vcpu *next = NULL; struct acrn_vcpu *next = NULL;
struct acrn_vcpu *prev = per_cpu(sched_ctx, pcpu_id).curr_vcpu; struct acrn_vcpu *prev = ctx->curr_vcpu;
get_schedule_lock(pcpu_id); get_schedule_lock(pcpu_id);
next = select_next_vcpu(pcpu_id); next = select_next_vcpu(pcpu_id);
bitmap_clear_lock(NEED_RESCHEDULE, &ctx->flags);
if (prev == next) { if (prev == next) {
release_schedule_lock(pcpu_id); release_schedule_lock(pcpu_id);

2
hypervisor/include/common/schedule.h
View File

@ -32,7 +32,7 @@ void remove_vcpu_from_runqueue(struct acrn_vcpu *vcpu);
void default_idle(void); void default_idle(void);
void make_reschedule_request(const struct acrn_vcpu *vcpu); void make_reschedule_request(const struct acrn_vcpu *vcpu);
int32_t need_reschedule(uint16_t pcpu_id); bool need_reschedule(uint16_t pcpu_id);
void make_pcpu_offline(uint16_t pcpu_id); void make_pcpu_offline(uint16_t pcpu_id);
int32_t need_offline(uint16_t pcpu_id); int32_t need_offline(uint16_t pcpu_id);