Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

xen: events: dynamically allocate irq info structures

Browse Source 
Removes nr_irq sized array allocation at start of day.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Ian Campbell 2011-03-10 16:08:12 +00:00 committed by Konrad Rzeszutek Wilk
parent 6cb6537d34
commit ca62ce8cde
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/xen/events.c
View File

@ -107,7 +107,6 @@ struct irq_info
#define PIRQ_NEEDS_EOI (1 << 0) #define PIRQ_NEEDS_EOI (1 << 0)
#define PIRQ_SHAREABLE (1 << 1) #define PIRQ_SHAREABLE (1 << 1)
static struct irq_info *irq_info;
static int *pirq_to_irq; static int *pirq_to_irq;
static int *evtchn_to_irq; static int *evtchn_to_irq;
@ -125,7 +124,7 @@ static struct irq_chip xen_pirq_chip;
/* Get info for IRQ */ /* Get info for IRQ */
static struct irq_info *info_for_irq(unsigned irq) static struct irq_info *info_for_irq(unsigned irq)
{ {
return &irq_info[irq]; return get_irq_data(irq);
} }
/* Constructors for packed IRQ information. */ /* Constructors for packed IRQ information. */
@ -309,7 +308,7 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)
clear_bit(chn, per_cpu(cpu_evtchn_mask, cpu_from_irq(irq))); clear_bit(chn, per_cpu(cpu_evtchn_mask, cpu_from_irq(irq)));
set_bit(chn, per_cpu(cpu_evtchn_mask, cpu)); set_bit(chn, per_cpu(cpu_evtchn_mask, cpu));
irq_info[irq].cpu = cpu; info_for_irq(irq)->cpu = cpu;
} }
static void init_evtchn_cpu_bindings(void) static void init_evtchn_cpu_bindings(void)
@ -328,7 +327,6 @@ static void init_evtchn_cpu_bindings(void)
for_each_possible_cpu(i) for_each_possible_cpu(i)
memset(per_cpu(cpu_evtchn_mask, i), memset(per_cpu(cpu_evtchn_mask, i),
(i == 0) ? ~0 : 0, sizeof(*per_cpu(cpu_evtchn_mask, i))); (i == 0) ? ~0 : 0, sizeof(*per_cpu(cpu_evtchn_mask, i)));
} }
static inline void clear_evtchn(int port) static inline void clear_evtchn(int port)
@ -411,10 +409,14 @@ static void xen_irq_init(unsigned irq)
/* By default all event channels notify CPU#0. */ /* By default all event channels notify CPU#0. */
cpumask_copy(desc->irq_data.affinity, cpumask_of(0)); cpumask_copy(desc->irq_data.affinity, cpumask_of(0));
info = &irq_info[irq]; info = kzalloc(sizeof(*info), GFP_KERNEL);
if (info == NULL)
panic("Unable to allocate metadata for IRQ%d\n", irq);
info->type = IRQT_UNBOUND; info->type = IRQT_UNBOUND;
set_irq_data(irq, info);
list_add_tail(&info->list, &xen_irq_list_head); list_add_tail(&info->list, &xen_irq_list_head);
} }
@ -481,12 +483,14 @@ static int xen_allocate_irq_gsi(unsigned gsi)
static void xen_free_irq(unsigned irq) static void xen_free_irq(unsigned irq)
{ {
struct irq_info *info = &irq_info[irq]; struct irq_info *info = get_irq_data(irq);
info->type = IRQT_UNBOUND;
list_del(&info->list); list_del(&info->list);
set_irq_data(irq, NULL);
kfree(info);
/* Legacy IRQ descriptors are managed by the arch. */ /* Legacy IRQ descriptors are managed by the arch. */
if (irq < NR_IRQS_LEGACY) if (irq < NR_IRQS_LEGACY)
return; return;
@ -649,10 +653,9 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi,
spin_lock(&irq_mapping_update_lock); spin_lock(&irq_mapping_update_lock);
if ((pirq > nr_irqs) || (gsi > nr_irqs)) { if (pirq > nr_irqs) {
printk(KERN_WARNING "xen_map_pirq_gsi: %s %s is incorrect!\n", printk(KERN_WARNING "xen_map_pirq_gsi: pirq %d > nr_irqs %d!\n",
pirq > nr_irqs ? "pirq" :"", pirq, nr_irqs);
gsi > nr_irqs ? "gsi" : "");
goto out; goto out;
} }
@ -889,7 +892,7 @@ static void unbind_from_irq(unsigned int irq)
evtchn_to_irq[evtchn] = -1; evtchn_to_irq[evtchn] = -1;
} }
BUG_ON(irq_info[irq].type == IRQT_UNBOUND); BUG_ON(info_for_irq(irq)->type == IRQT_UNBOUND);
xen_free_irq(irq); xen_free_irq(irq);
@ -1509,8 +1512,6 @@ void __init xen_init_IRQ(void)
{ {
int i; int i;
irq_info = kcalloc(nr_irqs, sizeof(*irq_info), GFP_KERNEL);
/* We are using nr_irqs as the maximum number of pirq available but /* We are using nr_irqs as the maximum number of pirq available but
* that number is actually chosen by Xen and we don't know exactly * that number is actually chosen by Xen and we don't know exactly
* what it is. Be careful choosing high pirq numbers. */ * what it is. Be careful choosing high pirq numbers. */