763b78040d
config handling stack overflow CVE-2015-3259-xsa137.patch - Upstream patches from Jan 558bfaa0-x86-traps-avoid-using-current-too-early.patch 5592a116-nested-EPT-fix-the-handling-of-nested-EPT.patch 559b9dd6-x86-p2m-ept-don-t-unmap-in-use-EPT-pagetable.patch 559bdde5-pull-in-latest-linux-earlycpio.patch - Upstream patches from Jan pending review 552d0fd2-x86-hvm-don-t-include-asm-spinlock-h.patch 552d0fe8-x86-mtrr-include-asm-atomic.h.patch 552d293b-x86-vMSI-X-honor-all-mask-requests.patch 552d2966-x86-vMSI-X-add-valid-bits-for-read-acceleration.patch 554c7aee-x86-provide-arch_fetch_and_add.patch 554c7b00-arm-provide-arch_fetch_and_add.patch 55534b0a-x86-provide-add_sized.patch 55534b25-arm-provide-add_sized.patch 5555a4f8-use-ticket-locks-for-spin-locks.patch 5555a5b9-x86-arm-remove-asm-spinlock-h.patch 5555a8ec-introduce-non-contiguous-allocation.patch 55795a52-x86-vMSI-X-support-qword-MMIO-access.patch 557eb55f-gnttab-per-active-entry-locking.patch 557eb5b6-gnttab-introduce-maptrack-lock.patch 557eb620-gnttab-make-the-grant-table-lock-a-read-write-lock.patch 557ffab8-evtchn-factor-out-freeing-an-event-channel.patch 5582bf43-evtchn-simplify-port_is_valid.patch 5582bf81-evtchn-remove-the-locking-when-unmasking-an-event-channel.patch 5583d9c5-x86-MSI-X-cleanup.patch 5583da09-x86-MSI-track-host-and-guest-masking-separately.patch 5583da64-gnttab-use-per-VCPU-maptrack-free-lists.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=369
70 lines
2.7 KiB
Diff
70 lines
2.7 KiB
Diff
# Commit 01280dc19cf3da089f98faf4f524b54b5a191df0
|
|
# Date 2015-06-18 14:53:23 +0200
|
|
# Author David Vrabel <david.vrabel@citrix.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
evtchn: simplify port_is_valid()
|
|
|
|
By keeping a count of the number of currently valid event channels,
|
|
port_is_valid() can be simplified.
|
|
|
|
d->valid_evtchns is only increased (while holding d->event_lock), so
|
|
port_is_valid() may be safely called without taking the lock (this
|
|
will be useful later).
|
|
|
|
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
|
|
|
|
Index: xen-4.5.1-testing/xen/common/event_channel.c
|
|
===================================================================
|
|
--- xen-4.5.1-testing.orig/xen/common/event_channel.c
|
|
+++ xen-4.5.1-testing/xen/common/event_channel.c
|
|
@@ -191,6 +191,8 @@ static int get_free_port(struct domain *
|
|
return -ENOMEM;
|
|
bucket_from_port(d, port) = chn;
|
|
|
|
+ write_atomic(&d->valid_evtchns, d->valid_evtchns + EVTCHNS_PER_BUCKET);
|
|
+
|
|
return port;
|
|
}
|
|
|
|
@@ -1267,6 +1269,7 @@ int evtchn_init(struct domain *d)
|
|
d->evtchn = alloc_evtchn_bucket(d, 0);
|
|
if ( !d->evtchn )
|
|
return -ENOMEM;
|
|
+ d->valid_evtchns = EVTCHNS_PER_BUCKET;
|
|
|
|
spin_lock_init(&d->event_lock);
|
|
if ( get_free_port(d) != 0 )
|
|
Index: xen-4.5.1-testing/xen/include/xen/event.h
|
|
===================================================================
|
|
--- xen-4.5.1-testing.orig/xen/include/xen/event.h
|
|
+++ xen-4.5.1-testing/xen/include/xen/event.h
|
|
@@ -90,11 +90,7 @@ static inline bool_t port_is_valid(struc
|
|
{
|
|
if ( p >= d->max_evtchns )
|
|
return 0;
|
|
- if ( !d->evtchn )
|
|
- return 0;
|
|
- if ( p < EVTCHNS_PER_BUCKET )
|
|
- return 1;
|
|
- return group_from_port(d, p) != NULL && bucket_from_port(d, p) != NULL;
|
|
+ return p < read_atomic(&d->valid_evtchns);
|
|
}
|
|
|
|
static inline struct evtchn *evtchn_from_port(struct domain *d, unsigned int p)
|
|
Index: xen-4.5.1-testing/xen/include/xen/sched.h
|
|
===================================================================
|
|
--- xen-4.5.1-testing.orig/xen/include/xen/sched.h
|
|
+++ xen-4.5.1-testing/xen/include/xen/sched.h
|
|
@@ -335,8 +335,9 @@ struct domain
|
|
/* Event channel information. */
|
|
struct evtchn *evtchn; /* first bucket only */
|
|
struct evtchn **evtchn_group[NR_EVTCHN_GROUPS]; /* all other buckets */
|
|
- unsigned int max_evtchns;
|
|
- unsigned int max_evtchn_port;
|
|
+ unsigned int max_evtchns; /* number supported by ABI */
|
|
+ unsigned int max_evtchn_port; /* max permitted port number */
|
|
+ unsigned int valid_evtchns; /* number of allocated event channels */
|
|
spinlock_t event_lock;
|
|
const struct evtchn_port_ops *evtchn_port_ops;
|
|
struct evtchn_fifo_domain *evtchn_fifo;
|