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: irq: fix 'Pointer arithmetic is not on array'

Browse Source 
- Define the array for 'struct irq_desc' with its size
  The array size for 'struct irq_desc' is constant and will not be
   changed.

- Use array rather than a pointer to avoid the pointer arithmetic.

Signed-off-by: Shiqing Gao <shiqing.gao@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Shiqing Gao 2018-07-10 16:01:25 +08:00 committed by Jack Ren
parent 401ffd1e39
commit 194fd8ba1e
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
hypervisor/arch/x86/irq.c
View File

@ -8,27 +8,19 @@
static spinlock_t exception_spinlock = { .head = 0U, .tail = 0U, }; static spinlock_t exception_spinlock = { .head = 0U, .tail = 0U, };
static struct irq_desc *irq_desc_base; static struct irq_desc irq_desc_array[NR_MAX_IRQS];
static uint32_t vector_to_irq[NR_MAX_VECTOR + 1]; static uint32_t vector_to_irq[NR_MAX_VECTOR + 1];
spurious_handler_t spurious_handler; spurious_handler_t spurious_handler;
static void init_irq_desc(void) static void init_irq_desc(void)
{ {
uint32_t i, page_num = 0; uint32_t i;
uint32_t desc_size = NR_MAX_IRQS * sizeof(struct irq_desc);
page_num = (desc_size + CPU_PAGE_SIZE - 1U) >> CPU_PAGE_SHIFT;
irq_desc_base = alloc_pages(page_num);
ASSERT(irq_desc_base != NULL, "page alloc failed!");
(void)memset(irq_desc_base, 0, page_num * CPU_PAGE_SIZE);
for (i = 0U; i < NR_MAX_IRQS; i++) { for (i = 0U; i < NR_MAX_IRQS; i++) {
irq_desc_base[i].irq = i; irq_desc_array[i].irq = i;
irq_desc_base[i].vector = VECTOR_INVALID; irq_desc_array[i].vector = VECTOR_INVALID;
spinlock_init(&irq_desc_base[i].irq_lock); spinlock_init(&irq_desc_array[i].irq_lock);
} }
for (i = 0U; i <= NR_MAX_VECTOR; i++) { for (i = 0U; i <= NR_MAX_VECTOR; i++) {
@ -75,7 +67,7 @@ uint32_t irq_mark_used(uint32_t irq)
if (irq > NR_MAX_IRQS) if (irq > NR_MAX_IRQS)
return IRQ_INVALID; return IRQ_INVALID;
desc = irq_desc_base + irq; desc = &irq_desc_array[irq];
spinlock_irqsave_obtain(&desc->irq_lock); spinlock_irqsave_obtain(&desc->irq_lock);
if (desc->used == IRQ_NOT_ASSIGNED) if (desc->used == IRQ_NOT_ASSIGNED)
desc->used = IRQ_ASSIGNED_NOSHARE; desc->used = IRQ_ASSIGNED_NOSHARE;
@ -95,7 +87,7 @@ static uint32_t alloc_irq(void)
spinlock_rflags; spinlock_rflags;
for (i = irq_gsi_num(); i < NR_MAX_IRQS; i++) { for (i = irq_gsi_num(); i < NR_MAX_IRQS; i++) {
desc = irq_desc_base + i; desc = &irq_desc_array[i];
spinlock_irqsave_obtain(&desc->irq_lock); spinlock_irqsave_obtain(&desc->irq_lock);
if (desc->used == IRQ_NOT_ASSIGNED) { if (desc->used == IRQ_NOT_ASSIGNED) {
desc->used = IRQ_ASSIGNED_NOSHARE; desc->used = IRQ_ASSIGNED_NOSHARE;
@ -112,7 +104,7 @@ static void _irq_desc_set_vector(uint32_t irq, uint32_t vr)
{ {
struct irq_desc *desc; struct irq_desc *desc;
desc = irq_desc_base + irq; desc = &irq_desc_array[irq];
vector_to_irq[vr] = irq; vector_to_irq[vr] = irq;
desc->vector = vr; desc->vector = vr;
} }
@ -124,7 +116,7 @@ static void irq_desc_set_vector(uint32_t irq, uint32_t vr)
spinlock_rflags; spinlock_rflags;
desc = irq_desc_base + irq; desc = &irq_desc_array[irq];
spinlock_irqsave_obtain(&desc->irq_lock); spinlock_irqsave_obtain(&desc->irq_lock);
vector_to_irq[vr] = irq; vector_to_irq[vr] = irq;
desc->vector = vr; desc->vector = vr;
@ -141,7 +133,7 @@ static void _irq_desc_free_vector(uint32_t irq)
if (irq > NR_MAX_IRQS) if (irq > NR_MAX_IRQS)
return; return;
desc = irq_desc_base + irq; desc = &irq_desc_array[irq];
vr = desc->vector; vr = desc->vector;
desc->used = IRQ_NOT_ASSIGNED; desc->used = IRQ_NOT_ASSIGNED;
@ -258,7 +250,7 @@ common_register_handler(uint32_t irq,
goto OUT; goto OUT;
} }
desc = irq_desc_base + irq; desc = &irq_desc_array[irq];
added = irq_desc_append_dev(desc, node, info->share); added = irq_desc_append_dev(desc, node, info->share);
if (!added) { if (!added) {
free(node); free(node);
@ -306,7 +298,7 @@ uint32_t irq_desc_alloc_vector(uint32_t irq, bool lowpri)
if (irq > NR_MAX_IRQS) if (irq > NR_MAX_IRQS)
return VECTOR_INVALID; return VECTOR_INVALID;
desc = irq_desc_base + irq; desc = &irq_desc_array[irq];
spinlock_irqsave_obtain(&desc->irq_lock); spinlock_irqsave_obtain(&desc->irq_lock);
if (desc->vector != VECTOR_INVALID) { if (desc->vector != VECTOR_INVALID) {
/* already allocated a vector */ /* already allocated a vector */
@ -335,7 +327,7 @@ void irq_desc_try_free_vector(uint32_t irq)
if (irq > NR_MAX_IRQS || irq < NR_LEGACY_IRQ) if (irq > NR_MAX_IRQS || irq < NR_LEGACY_IRQ)
return; return;
desc = irq_desc_base + irq; desc = &irq_desc_array[irq];
spinlock_irqsave_obtain(&desc->irq_lock); spinlock_irqsave_obtain(&desc->irq_lock);
if (desc->dev_list == NULL) if (desc->dev_list == NULL)
_irq_desc_free_vector(irq); _irq_desc_free_vector(irq);
@ -347,7 +339,7 @@ void irq_desc_try_free_vector(uint32_t irq)
uint32_t irq_to_vector(uint32_t irq) uint32_t irq_to_vector(uint32_t irq)
{ {
if (irq < NR_MAX_IRQS) if (irq < NR_MAX_IRQS)
return irq_desc_base[irq].vector; return irq_desc_array[irq].vector;
else else
return VECTOR_INVALID; return VECTOR_INVALID;
} }
@ -416,7 +408,7 @@ void dispatch_interrupt(struct intr_excp_ctx *ctx)
if (irq == IRQ_INVALID) if (irq == IRQ_INVALID)
goto ERR; goto ERR;
desc = irq_desc_base + irq; desc = &irq_desc_array[irq];
per_cpu(irq_count, get_cpu_id())[irq]++; per_cpu(irq_count, get_cpu_id())[irq]++;
if (vr != desc->vector) if (vr != desc->vector)
@ -572,7 +564,7 @@ void update_irq_handler(uint32_t irq, irq_handler_t func)
if (irq >= NR_MAX_IRQS) if (irq >= NR_MAX_IRQS)
return; return;
desc = irq_desc_base + irq; desc = &irq_desc_array[irq];
spinlock_irqsave_obtain(&desc->irq_lock); spinlock_irqsave_obtain(&desc->irq_lock);
desc->irq_handler = func; desc->irq_handler = func;
spinlock_irqrestore_release(&desc->irq_lock); spinlock_irqrestore_release(&desc->irq_lock);
@ -688,7 +680,7 @@ void get_cpu_interrupt_info(char *str, int str_max)
str += len; str += len;
for (irq = 0U; irq < NR_MAX_IRQS; irq++) { for (irq = 0U; irq < NR_MAX_IRQS; irq++) {
desc = irq_desc_base + irq; desc = &irq_desc_array[irq];
vector = irq_to_vector(irq); vector = irq_to_vector(irq);
if (desc->used != IRQ_NOT_ASSIGNED && if (desc->used != IRQ_NOT_ASSIGNED &&
vector != VECTOR_INVALID) { vector != VECTOR_INVALID) {