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

hv: timer: rename cpu/cpu_id to pcpu_id 

timer is physical cpu related.

Signed-off-by: Li, Fei1 <fei1.li@intel.com>
Acked-by: Eddie Dong <eddie.dong>
This commit is contained in:
Li, Fei1 2018-04-23 13:01:04 +08:00 committed by Jack Ren
parent d129659ecd
commit 7f4332f539
2 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ struct timer {
uint64_t priv_data; /* func private data */ uint64_t priv_data; /* func private data */
uint64_t deadline; /* tsc deadline to interrupt */ uint64_t deadline; /* tsc deadline to interrupt */
long handle; /* unique handle for user */ long handle; /* unique handle for user */
int cpu_id; /* armed on which CPU */ int pcpu_id; /* armed on which CPU */
int id; /* timer ID, used by release */ int id; /* timer ID, used by release */
struct list_head node; /* link all timers */ struct list_head node; /* link all timers */
}; };
@ -50,7 +50,7 @@ struct per_cpu_timers {
struct timer *timers_pool; /* it's timers pool for allocation */ struct timer *timers_pool; /* it's timers pool for allocation */
uint64_t free_bitmap; uint64_t free_bitmap;
struct list_head timer_list; /* it's for runtime active timer list */ struct list_head timer_list; /* it's for runtime active timer list */
int cpu_id; int pcpu_id;
uint64_t used_handler; uint64_t used_handler;
}; };
@ -63,13 +63,13 @@ DEFINE_CPU_DATA(struct dev_handler_node *, timer_node);
static struct timer* static struct timer*
find_expired_timer(struct per_cpu_timers *cpu_timer, uint64_t tsc_now); find_expired_timer(struct per_cpu_timers *cpu_timer, uint64_t tsc_now);
static struct timer *alloc_timer(int cpu_id) static struct timer *alloc_timer(int pcpu_id)
{ {
int idx; int idx;
struct per_cpu_timers *cpu_timer; struct per_cpu_timers *cpu_timer;
struct timer *timer; struct timer *timer;
cpu_timer = &per_cpu(cpu_timers, cpu_id); cpu_timer = &per_cpu(cpu_timers, pcpu_id);
idx = bitmap_ffs(&cpu_timer->free_bitmap); idx = bitmap_ffs(&cpu_timer->free_bitmap);
if (idx < 0) { if (idx < 0) {
return NULL; return NULL;
@ -82,8 +82,8 @@ static struct timer *alloc_timer(int cpu_id)
timer = cpu_timer->timers_pool + idx; timer = cpu_timer->timers_pool + idx;
timer->handle = cpu_timer->used_handler; timer->handle = cpu_timer->used_handler;
ASSERT((cpu_timer->timers_pool[cpu_id].cpu_id == cpu_id), ASSERT((cpu_timer->timers_pool[pcpu_id].pcpu_id == pcpu_id),
"timer cpu_id did not match"); "timer pcpu_id did not match");
return timer; return timer;
} }
@ -91,7 +91,7 @@ static void release_timer(struct timer *timer)
{ {
struct per_cpu_timers *cpu_timer; struct per_cpu_timers *cpu_timer;
cpu_timer = &per_cpu(cpu_timers, timer->cpu_id); cpu_timer = &per_cpu(cpu_timers, timer->pcpu_id);
timer->priv_data = 0; timer->priv_data = 0;
timer->func = NULL; timer->func = NULL;
timer->deadline = 0; timer->deadline = 0;
@ -178,10 +178,10 @@ static int tsc_deadline_handler(__unused int irq, __unused void *data)
return 0; return 0;
} }
static inline void schedule_next_timer(int cpu) static inline void schedule_next_timer(int pcpu_id)
{ {
struct timer *timer; struct timer *timer;
struct per_cpu_timers *cpu_timer = &per_cpu(cpu_timers, cpu); struct per_cpu_timers *cpu_timer = &per_cpu(cpu_timers, pcpu_id);
timer = _search_nearest_timer(cpu_timer); timer = _search_nearest_timer(cpu_timer);
if (timer) { if (timer) {
@ -190,21 +190,22 @@ static inline void schedule_next_timer(int cpu)
} }
} }
int request_timer_irq(int cpu, dev_handler_t func, void *data, const char *name) int request_timer_irq(int pcpu_id, dev_handler_t func,
void *data, const char *name)
{ {
struct dev_handler_node *node = NULL; struct dev_handler_node *node = NULL;
if (cpu >= phy_cpu_num) if (pcpu_id >= phy_cpu_num)
return -1; return -1;
if (per_cpu(timer_node, cpu)) { if (per_cpu(timer_node, pcpu_id)) {
pr_err("CPU%d timer isr already added", cpu); pr_err("CPU%d timer isr already added", pcpu_id);
unregister_handler_common(per_cpu(timer_node, cpu)); unregister_handler_common(per_cpu(timer_node, pcpu_id));
} }
node = pri_register_handler(TIMER_IRQ, VECTOR_TIMER, func, data, name); node = pri_register_handler(TIMER_IRQ, VECTOR_TIMER, func, data, name);
if (node != NULL) { if (node != NULL) {
per_cpu(timer_node, cpu) = node; per_cpu(timer_node, pcpu_id) = node;
update_irq_handler(TIMER_IRQ, quick_handler_nolock); update_irq_handler(TIMER_IRQ, quick_handler_nolock);
} else { } else {
pr_err("Failed to add timer isr"); pr_err("Failed to add timer isr");
@ -227,7 +228,7 @@ static void init_timer_pool(void)
for (i = 0; i < phy_cpu_num; i++) { for (i = 0; i < phy_cpu_num; i++) {
cpu_timer = &per_cpu(cpu_timers, i); cpu_timer = &per_cpu(cpu_timers, i);
cpu_timer->cpu_id = i; cpu_timer->pcpu_id = i;
timers_pool = timers_pool =
calloc(MAX_TIMER_ACTIONS, sizeof(struct timer)); calloc(MAX_TIMER_ACTIONS, sizeof(struct timer));
ASSERT(timers_pool, "Create timers pool failed"); ASSERT(timers_pool, "Create timers pool failed");
@ -238,7 +239,7 @@ static void init_timer_pool(void)
INIT_LIST_HEAD(&cpu_timer->timer_list); INIT_LIST_HEAD(&cpu_timer->timer_list);
for (j = 0; j < MAX_TIMER_ACTIONS; j++) { for (j = 0; j < MAX_TIMER_ACTIONS; j++) {
timers_pool[j].id = j; timers_pool[j].id = j;
timers_pool[j].cpu_id = i; timers_pool[j].pcpu_id = i;
timers_pool[j].priv_data = 0; timers_pool[j].priv_data = 0;
timers_pool[j].func = NULL; timers_pool[j].func = NULL;
timers_pool[j].deadline = 0; timers_pool[j].deadline = 0;
@ -263,10 +264,10 @@ static void init_tsc_deadline_timer(void)
void timer_init(void) void timer_init(void)
{ {
char name[32] = {0}; char name[32] = {0};
int cpu = get_cpu_id(); int pcpu_id = get_cpu_id();
snprintf(name, 32, "timer_tick[%d]", cpu); snprintf(name, 32, "timer_tick[%d]", pcpu_id);
if (request_timer_irq(cpu, tsc_deadline_handler, NULL, name) < 0) { if (request_timer_irq(pcpu_id, tsc_deadline_handler, NULL, name) < 0) {
pr_err("Timer setup failed"); pr_err("Timer setup failed");
return; return;
} }
@ -277,22 +278,22 @@ void timer_init(void)
void timer_cleanup(void) void timer_cleanup(void)
{ {
int cpu = get_cpu_id(); int pcpu_id = get_cpu_id();
if (per_cpu(timer_node, cpu)) if (per_cpu(timer_node, pcpu_id))
unregister_handler_common(per_cpu(timer_node, cpu)); unregister_handler_common(per_cpu(timer_node, pcpu_id));
per_cpu(timer_node, cpu) = NULL; per_cpu(timer_node, pcpu_id) = NULL;
} }
int timer_softirq(int cpu_id) int timer_softirq(int pcpu_id)
{ {
struct per_cpu_timers *cpu_timer; struct per_cpu_timers *cpu_timer;
struct timer *timer; struct timer *timer;
int max = MAX_TIMER_ACTIONS; int max = MAX_TIMER_ACTIONS;
/* handle passed timer */ /* handle passed timer */
cpu_timer = &per_cpu(cpu_timers, cpu_id); cpu_timer = &per_cpu(cpu_timers, pcpu_id);
/* This is to make sure we are not blocked due to delay inside func() /* This is to make sure we are not blocked due to delay inside func()
* force to exit irq handler after we serviced >31 timers * force to exit irq handler after we serviced >31 timers
@ -310,7 +311,7 @@ int timer_softirq(int cpu_id)
} }
/* update nearest timer */ /* update nearest timer */
schedule_next_timer(cpu_id); schedule_next_timer(pcpu_id);
return 0; return 0;
} }
@ -323,29 +324,29 @@ long add_timer(timer_handle_t func, uint64_t data, uint64_t deadline)
{ {
struct timer *timer; struct timer *timer;
struct per_cpu_timers *cpu_timer; struct per_cpu_timers *cpu_timer;
int cpu_id = get_target_cpu(); int pcpu_id = get_target_cpu();
if (deadline == 0 || func == NULL) if (deadline == 0 || func == NULL)
return -1; return -1;
/* possible interrupt context please avoid mem alloct here*/ /* possible interrupt context please avoid mem alloct here*/
timer = alloc_timer(cpu_id); timer = alloc_timer(pcpu_id);
if (timer == NULL) if (timer == NULL)
return -1; return -1;
timer->func = func; timer->func = func;
timer->priv_data = data; timer->priv_data = data;
timer->deadline = deadline; timer->deadline = deadline;
timer->cpu_id = get_target_cpu(); timer->pcpu_id = get_target_cpu();
cpu_timer = &per_cpu(cpu_timers, timer->cpu_id); cpu_timer = &per_cpu(cpu_timers, timer->pcpu_id);
/* We need irqsave here even softirq enabled to protect timer_list */ /* We need irqsave here even softirq enabled to protect timer_list */
list_add_tail(&timer->node, &cpu_timer->timer_list); list_add_tail(&timer->node, &cpu_timer->timer_list);
TRACE_4I(TRACE_TIMER_ACTION_ADDED, timer->id, timer->deadline, TRACE_4I(TRACE_TIMER_ACTION_ADDED, timer->id, timer->deadline,
timer->deadline >> 32, cpu_timer->used_handler); timer->deadline >> 32, cpu_timer->used_handler);
schedule_next_timer(cpu_id); schedule_next_timer(pcpu_id);
return timer->handle; return timer->handle;
} }
@ -358,14 +359,14 @@ update_timer(long handle, timer_handle_t func, uint64_t data,
{ {
struct timer *timer; struct timer *timer;
struct per_cpu_timers *cpu_timer; struct per_cpu_timers *cpu_timer;
int cpu_id = get_target_cpu(); int pcpu_id = get_target_cpu();
bool ret = false; bool ret = false;
if (deadline == 0) if (deadline == 0)
return -1; return -1;
cpu_timer = &per_cpu(cpu_timers, cpu_id); cpu_timer = &per_cpu(cpu_timers, pcpu_id);
timer = _search_timer_by_handle(cpu_timer, handle); timer = _search_timer_by_handle(cpu_timer, handle);
if (timer) { if (timer) {
/* update deadline and re-sort */ /* update deadline and re-sort */
@ -379,7 +380,7 @@ update_timer(long handle, timer_handle_t func, uint64_t data,
} }
if (ret) if (ret)
schedule_next_timer(cpu_id); schedule_next_timer(pcpu_id);
else { else {
/* if update failed, we add to new, and update handle */ /* if update failed, we add to new, and update handle */
/* TODO: the correct behavior should be return failure here */ /* TODO: the correct behavior should be return failure here */
@ -389,15 +390,15 @@ update_timer(long handle, timer_handle_t func, uint64_t data,
return handle; return handle;
} }
/* NOTE: cpu_id referred to physical cpu id here */ /* NOTE: pcpu_id referred to physical cpu id here */
bool cancel_timer(long handle, int cpu_id) bool cancel_timer(long handle, int pcpu_id)
{ {
struct timer *timer; struct timer *timer;
struct per_cpu_timers *cpu_timer; struct per_cpu_timers *cpu_timer;
bool ret = false; bool ret = false;
cpu_timer = &per_cpu(cpu_timers, cpu_id); cpu_timer = &per_cpu(cpu_timers, pcpu_id);
timer = _search_timer_by_handle(cpu_timer, handle); timer = _search_timer_by_handle(cpu_timer, handle);
if (timer) { if (timer) {
/* NOTE: we can not directly release timer here. /* NOTE: we can not directly release timer here.

4
hypervisor/include/arch/x86/timer.h
View File

@ -34,11 +34,11 @@
typedef int (*timer_handle_t)(uint64_t); typedef int (*timer_handle_t)(uint64_t);
long add_timer(timer_handle_t func, uint64_t data, uint64_t deadline); long add_timer(timer_handle_t func, uint64_t data, uint64_t deadline);
bool cancel_timer(long handle, int cpu_id); bool cancel_timer(long handle, int pcpu_id);
long update_timer(long handle, timer_handle_t func, uint64_t data, long update_timer(long handle, timer_handle_t func, uint64_t data,
uint64_t deadline); uint64_t deadline);
int timer_softirq(int cpu_id); int timer_softirq(int pcpu_id);
void timer_init(void); void timer_init(void);
void timer_cleanup(void); void timer_cleanup(void);
void check_tsc(void); void check_tsc(void);