From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH V2 09/13] xen: dynamically allocate cpu_evtchn_mask Date: Mon, 4 Feb 2013 17:23:50 +0000 Message-ID: <1359998635-16866-10-git-send-email-wei.liu2@citrix.com> References: <1359998635-16866-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1359998635-16866-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: david.vrabel@citrix.com, Wei Liu , ian.campbell@citrix.com, jbeulich@suse.com, konrad.wilk@oracle.com List-Id: xen-devel@lists.xenproject.org Signed-off-by: Wei Liu --- drivers/xen/events.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 355dbda..94d6570 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -123,8 +123,7 @@ static int *evtchn_to_irq; static unsigned long *pirq_eoi_map; static bool (*pirq_needs_eoi)(unsigned irq); -static DEFINE_PER_CPU(unsigned long [NR_EVENT_CHANNELS_L2/BITS_PER_LONG], - cpu_evtchn_mask); +static DEFINE_PER_CPU(unsigned long *, cpu_evtchn_mask); /* Xen will never allocate port zero for any purpose. */ #define VALID_EVTCHN(chn) ((chn) != 0) @@ -333,7 +332,8 @@ static void init_evtchn_cpu_bindings(void) for_each_possible_cpu(i) memset(per_cpu(cpu_evtchn_mask, i), - (i == 0) ? ~0 : 0, sizeof(*per_cpu(cpu_evtchn_mask, i))); + (i == 0) ? ~0 : 0, + sizeof(unsigned long)*(nr_event_channels/BITS_PER_LONG)); } static inline void clear_evtchn(int port) @@ -1835,6 +1835,7 @@ void xen_callback_vector(void) {} void __init xen_init_IRQ(void) { int i, rc; + int cpu; struct shared_info *s = HYPERVISOR_shared_info; evtchn_pending = s->evtchn_pending; @@ -1849,6 +1850,17 @@ void __init xen_init_IRQ(void) for (i = 0; i < nr_event_channels; i++) evtchn_to_irq[i] = -1; + for_each_possible_cpu(cpu) { + void *p; + unsigned int nr = nr_event_channels / BITS_PER_LONG; + + p = kzalloc_node(sizeof(unsigned long) * nr, + GFP_KERNEL, + cpu_to_node(cpu)); + BUG_ON(!p); + per_cpu(cpu_evtchn_mask, cpu) = p; + } + init_evtchn_cpu_bindings(); /* No event channels are 'live' right now. */ -- 1.7.10.4