github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-13 13:56:19 +00:00
Code Issues Projects Releases Wiki Activity

softirq: disable interrupt when modify timer_list

Browse Source 
In current code, the timer_list for per cpu can be accessed both in
vmexit and softirq handler. There is a case that, the timer_list is
modifying in vmexit, but an interrupt occur, the timer_list is also
modified in softirq handler. So the time_list may in unpredictable
state. In some platforms, the hv console may hang as its timer handler
is not invoked because of the corruption for timer_list.
So, to fix the issue, disable the interrupt before modifying the
timer_list.

Tracked-On: #3512
Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
Signed-off-by: Conghui Chen <conghui.chen@intel.com>
Reviewed-by: Li, Fei1 <fei1.li@intel.com>
This commit is contained in:
Conghui Chen 2019-07-31 10:23:04 +00:00 committed by ACRN System Integration
parent f49ab66b65
commit c4f6681045
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hypervisor/arch/x86/timer.c
View File

@ -89,6 +89,7 @@ int32_t add_timer(struct hv_timer *timer)
struct per_cpu_timers *cpu_timer; struct per_cpu_timers *cpu_timer;
uint16_t pcpu_id; uint16_t pcpu_id;
int32_t ret = 0; int32_t ret = 0;
uint64_t rflags;
if ((timer == NULL) || (timer->func == NULL) || (timer->fire_tsc == 0UL)) { if ((timer == NULL) || (timer->func == NULL) || (timer->fire_tsc == 0UL)) {
ret = -EINVAL; ret = -EINVAL;
@ -103,10 +104,12 @@ int32_t add_timer(struct hv_timer *timer)
pcpu_id = get_pcpu_id(); pcpu_id = get_pcpu_id();
cpu_timer = &per_cpu(cpu_timers, pcpu_id); cpu_timer = &per_cpu(cpu_timers, pcpu_id);
CPU_INT_ALL_DISABLE(&rflags);
/* update the physical timer if we're on the timer_list head */ /* update the physical timer if we're on the timer_list head */
if (local_add_timer(cpu_timer, timer)) { if (local_add_timer(cpu_timer, timer)) {
update_physical_timer(cpu_timer); update_physical_timer(cpu_timer);
} }
CPU_INT_ALL_RESTORE(rflags);
TRACE_2L(TRACE_TIMER_ACTION_ADDED, timer->fire_tsc, 0UL); TRACE_2L(TRACE_TIMER_ACTION_ADDED, timer->fire_tsc, 0UL);
} }
@ -117,9 +120,13 @@ int32_t add_timer(struct hv_timer *timer)
void del_timer(struct hv_timer *timer) void del_timer(struct hv_timer *timer)
{ {
uint64_t rflags;
CPU_INT_ALL_DISABLE(&rflags);
if ((timer != NULL) && !list_empty(&timer->node)) { if ((timer != NULL) && !list_empty(&timer->node)) {
list_del_init(&timer->node); list_del_init(&timer->node);
} }
CPU_INT_ALL_RESTORE(rflags);
} }
static void init_percpu_timer(uint16_t pcpu_id) static void init_percpu_timer(uint16_t pcpu_id)