diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2013-10-14 10:18:24 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-10-14 10:18:24 +0200 |
| commit | 48974e6ce52ee21e08d0e621611371dc05624bbc (patch) | |
| tree | 16e17bfaab58a77a9b6fa55c7312c41fda977d5d | |
| parent | 611d0ecc81bf948f6f9c592afdd6c2aebcfaaadb (diff) | |
| download | xen-48974e6ce52ee21e08d0e621611371dc05624bbc.tar.gz xen-48974e6ce52ee21e08d0e621611371dc05624bbc.tar.bz2 xen-48974e6ce52ee21e08d0e621611371dc05624bbc.zip | |
evtchn: use a per-domain variable for the max number of event channels
Instead of the MAX_EVTCHNS(d) macro, use d->max_evtchns instead. This
avoids having to repeatedly check the ABI type.
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
| -rw-r--r-- | xen/common/event_2l.c | 1 | ||||
| -rw-r--r-- | xen/common/event_channel.c | 4 | ||||
| -rw-r--r-- | xen/common/schedule.c | 2 | ||||
| -rw-r--r-- | xen/include/xen/event.h | 2 | ||||
| -rw-r--r-- | xen/include/xen/sched.h | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/xen/common/event_2l.c b/xen/common/event_2l.c index a9d99d3e92..5837ae8d26 100644 --- a/xen/common/event_2l.c +++ b/xen/common/event_2l.c @@ -96,6 +96,7 @@ static const struct evtchn_port_ops evtchn_port_ops_2l = void evtchn_2l_init(struct domain *d) { d->evtchn_port_ops = &evtchn_port_ops_2l; + d->max_evtchns = BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d); } /* diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index f73c7a9afd..539a1980f5 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -134,7 +134,7 @@ static int get_free_port(struct domain *d) if ( evtchn_from_port(d, port)->state == ECS_FREE ) return port; - if ( port == MAX_EVTCHNS(d) ) + if ( port == d->max_evtchns ) return -ENOSPC; chn = xzalloc_array(struct evtchn, EVTCHNS_PER_BUCKET); @@ -1236,7 +1236,7 @@ static void domain_dump_evtchn_info(struct domain *d) spin_lock(&d->event_lock); - for ( port = 1; port < MAX_EVTCHNS(d); ++port ) + for ( port = 1; port < d->max_evtchns; ++port ) { const struct evtchn *chn; char *ssid; diff --git a/xen/common/schedule.c b/xen/common/schedule.c index b8e4cb4417..bfa6bee283 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -756,7 +756,7 @@ static long do_poll(struct sched_poll *sched_poll) goto out; rc = -EINVAL; - if ( port >= MAX_EVTCHNS(d) ) + if ( port >= d->max_evtchns ) goto out; rc = 0; diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 2445562ecd..6933f02608 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -73,7 +73,7 @@ void notify_via_xen_event_channel(struct domain *ld, int lport); #define bucket_from_port(d,p) \ ((d)->evtchn[(p)/EVTCHNS_PER_BUCKET]) #define port_is_valid(d,p) \ - (((p) >= 0) && ((p) < MAX_EVTCHNS(d)) && \ + (((p) >= 0) && ((p) < (d)->max_evtchns) && \ (bucket_from_port(d,p) != NULL)) #define evtchn_from_port(d,p) \ (&(bucket_from_port(d,p))[(p)&(EVTCHNS_PER_BUCKET-1)]) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 7c9eca38d2..f8fc7c254a 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -50,7 +50,6 @@ extern struct domain *dom0; #else #define BITS_PER_EVTCHN_WORD(d) (has_32bit_shinfo(d) ? 32 : BITS_PER_XEN_ULONG) #endif -#define MAX_EVTCHNS(d) (BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d)) #define EVTCHNS_PER_BUCKET 128 #define NR_EVTCHN_BUCKETS (NR_EVENT_CHANNELS / EVTCHNS_PER_BUCKET) @@ -273,6 +272,7 @@ struct domain /* Event channel information. */ struct evtchn *evtchn[NR_EVTCHN_BUCKETS]; + unsigned int max_evtchns; spinlock_t event_lock; const struct evtchn_port_ops *evtchn_port_ops; |