4a5ee0f11d
5537a4d8-libxl-use-DEBUG-log-level-instead-of-INFO.patch - Upstream patches from Jan 55dc78e9-x86-amd_ucode-skip-updates-for-final-levels.patch 55dc7937-x86-IO-APIC-don-t-create-pIRQ-mapping-from-masked-RTE.patch 55df2f76-IOMMU-skip-domains-without-page-tables-when-dumping.patch 55e43fd8-x86-NUMA-fix-setup_node.patch 55e43ff8-x86-NUMA-don-t-account-hotplug-regions.patch 55e593f1-x86-NUMA-make-init_node_heap-respect-Xen-heap-limit.patch 54c2553c-grant-table-use-uint16_t-consistently-for-offset-and-length.patch 54ca33bc-grant-table-refactor-grant-copy-to-reduce-duplicate-code.patch 54ca340e-grant-table-defer-releasing-pages-acquired-in-a-grant-copy.patch - bsc#944463 - VUL-0: CVE-2015-5239: qemu-kvm: Integer overflow in vnc_client_read() and protocol_client_msg() CVE-2015-5239-qemuu-limit-client_cut_text-msg-payload-size.patch CVE-2015-5239-qemut-limit-client_cut_text-msg-payload-size.patch - bsc#944697 - VUL-1: CVE-2015-6815: qemu: net: e1000: infinite loop issue CVE-2015-6815-qemuu-e1000-fix-infinite-loop.patch CVE-2015-6815-qemut-e1000-fix-infinite-loop.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=375
87 lines
3.0 KiB
Diff
87 lines
3.0 KiB
Diff
# Commit 5a9899ddc42040e139233a6b1f0f65f3b65eda6d
|
|
# Date 2015-06-15 13:23:34 +0200
|
|
# Author David Vrabel <david.vrabel@citrix.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
gnttab: introduce maptrack lock
|
|
|
|
Split grant table lock into two separate locks. One to protect
|
|
maptrack free list (maptrack_lock) and one for everything else (lock).
|
|
|
|
Based on a patch originally by Matt Wilson <msw@amazon.com>.
|
|
|
|
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
|
|
Reviewed-by: Jan Beulich <jbeulich@suse.com>
|
|
|
|
--- a/docs/misc/grant-tables.txt
|
|
+++ b/docs/misc/grant-tables.txt
|
|
@@ -87,6 +87,7 @@ is complete.
|
|
inconsistent grant table state such as current
|
|
version, partially initialized active table pages,
|
|
etc.
|
|
+ grant_table->maptrack_lock : spinlock used to protect the maptrack free list
|
|
active_grant_entry->lock : spinlock used to serialize modifications to
|
|
active entries
|
|
|
|
@@ -94,6 +95,9 @@ is complete.
|
|
that access members of struct grant_table must acquire the lock
|
|
around critical sections.
|
|
|
|
+ The maptrack free list is protected by its own spinlock. The maptrack
|
|
+ lock may be locked while holding the grant table lock.
|
|
+
|
|
Active entries are obtained by calling active_entry_acquire(gt, ref).
|
|
This function returns a pointer to the active entry after locking its
|
|
spinlock. The caller must hold the grant table lock for the gt in
|
|
--- a/xen/common/grant_table.c
|
|
+++ b/xen/common/grant_table.c
|
|
@@ -288,10 +288,10 @@ static inline void
|
|
put_maptrack_handle(
|
|
struct grant_table *t, int handle)
|
|
{
|
|
- spin_lock(&t->lock);
|
|
+ spin_lock(&t->maptrack_lock);
|
|
maptrack_entry(t, handle).ref = t->maptrack_head;
|
|
t->maptrack_head = handle;
|
|
- spin_unlock(&t->lock);
|
|
+ spin_unlock(&t->maptrack_lock);
|
|
}
|
|
|
|
static inline int
|
|
@@ -303,7 +303,7 @@ get_maptrack_handle(
|
|
struct grant_mapping *new_mt;
|
|
unsigned int new_mt_limit, nr_frames;
|
|
|
|
- spin_lock(&lgt->lock);
|
|
+ spin_lock(&lgt->maptrack_lock);
|
|
|
|
while ( unlikely((handle = __get_maptrack_handle(lgt)) == -1) )
|
|
{
|
|
@@ -332,7 +332,7 @@ get_maptrack_handle(
|
|
nr_frames + 1);
|
|
}
|
|
|
|
- spin_unlock(&lgt->lock);
|
|
+ spin_unlock(&lgt->maptrack_lock);
|
|
|
|
return handle;
|
|
}
|
|
@@ -3016,6 +3016,7 @@ grant_table_create(
|
|
|
|
/* Simple stuff. */
|
|
spin_lock_init(&t->lock);
|
|
+ spin_lock_init(&t->maptrack_lock);
|
|
t->nr_grant_frames = INITIAL_NR_GRANT_FRAMES;
|
|
|
|
/* Active grant table. */
|
|
--- a/xen/include/xen/grant_table.h
|
|
+++ b/xen/include/xen/grant_table.h
|
|
@@ -82,6 +82,8 @@ struct grant_table {
|
|
struct grant_mapping **maptrack;
|
|
unsigned int maptrack_head;
|
|
unsigned int maptrack_limit;
|
|
+ /* Lock protecting the maptrack page list, head, and limit */
|
|
+ spinlock_t maptrack_lock;
|
|
/* Lock protecting updates to active and shared grant tables. */
|
|
spinlock_t lock;
|
|
/* The defined versions are 1 and 2. Set to 0 if we don't know
|