c608e23838
Turn off building the KMPs now that we are using the pvops kernel xen.spec - Upstream patches from Jan 561bbc8b-VT-d-don-t-suppress-invalidation-address-write-when-it-is-zero.patch 561d20a0-x86-hide-MWAITX-from-PV-domains.patch 561e3283-x86-NUMA-fix-SRAT-table-processor-entry-parsing-and-consumption.patch 5632118e-arm-Support-hypercall_create_continuation-for-multicall.patch 56321222-arm-rate-limit-logging-from-unimplemented-PHYSDEVOP-and-HVMOP.patch 56321249-arm-handle-races-between-relinquish_memory-and-free_domheap_pages.patch 5632127b-x86-guard-against-undue-super-page-PTE-creation.patch 5632129c-free-domain-s-vcpu-array.patch (Replaces CVE-2015-7969-xsa149.patch) 563212c9-x86-PoD-Eager-sweep-for-zeroed-pages.patch 563212e4-xenoprof-free-domain-s-vcpu-array.patch 563212ff-x86-rate-limit-logging-in-do_xen-oprof-pmu-_op.patch 56323737-libxl-adjust-PoD-target-by-memory-fudge-too.patch 56377442-x86-PoD-Make-p2m_pod_empty_cache-restartable.patch 5641ceec-x86-HVM-always-intercept-AC-and-DB.patch (Replaces CVE-2015-5307-xsa156.patch) 5644b756-x86-HVM-don-t-inject-DB-with-error-code.patch - Dropped 55b0a2db-x86-MSI-track-guest-masking.patch - Use upstream variants of block-iscsi and block-nbd - Remove xenalyze.hg, its part of xen-4.6 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=389
89 lines
2.5 KiB
Diff
89 lines
2.5 KiB
Diff
# Commit 59a5061723ba47c0028cf48487e5de551c42a378
|
|
# Date 2015-11-02 15:33:38 +0100
|
|
# Author Andrew Cooper <andrew.cooper3@citrix.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
x86/PoD: Make p2m_pod_empty_cache() restartable
|
|
|
|
This avoids a long running operation when destroying a domain with a
|
|
large PoD cache.
|
|
|
|
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
Reviewed-by: George Dunlap <george.dunlap@citrix.com>
|
|
|
|
--- a/xen/arch/x86/mm/p2m-pod.c
|
|
+++ b/xen/arch/x86/mm/p2m-pod.c
|
|
@@ -375,11 +375,11 @@ out:
|
|
return ret;
|
|
}
|
|
|
|
-void
|
|
-p2m_pod_empty_cache(struct domain *d)
|
|
+int p2m_pod_empty_cache(struct domain *d)
|
|
{
|
|
struct p2m_domain *p2m = p2m_get_hostp2m(d);
|
|
struct page_info *page;
|
|
+ unsigned int i;
|
|
|
|
/* After this barrier no new PoD activities can happen. */
|
|
BUG_ON(!d->is_dying);
|
|
@@ -389,8 +389,6 @@ p2m_pod_empty_cache(struct domain *d)
|
|
|
|
while ( (page = page_list_remove_head(&p2m->pod.super)) )
|
|
{
|
|
- int i;
|
|
-
|
|
for ( i = 0 ; i < SUPERPAGE_PAGES ; i++ )
|
|
{
|
|
BUG_ON(page_get_owner(page + i) != d);
|
|
@@ -398,19 +396,27 @@ p2m_pod_empty_cache(struct domain *d)
|
|
}
|
|
|
|
p2m->pod.count -= SUPERPAGE_PAGES;
|
|
+
|
|
+ if ( hypercall_preempt_check() )
|
|
+ goto out;
|
|
}
|
|
|
|
- while ( (page = page_list_remove_head(&p2m->pod.single)) )
|
|
+ for ( i = 0; (page = page_list_remove_head(&p2m->pod.single)); ++i )
|
|
{
|
|
BUG_ON(page_get_owner(page) != d);
|
|
page_list_add_tail(page, &d->page_list);
|
|
|
|
p2m->pod.count -= 1;
|
|
+
|
|
+ if ( i && !(i & 511) && hypercall_preempt_check() )
|
|
+ goto out;
|
|
}
|
|
|
|
BUG_ON(p2m->pod.count != 0);
|
|
|
|
+ out:
|
|
unlock_page_alloc(p2m);
|
|
+ return p2m->pod.count ? -ERESTART : 0;
|
|
}
|
|
|
|
int
|
|
--- a/xen/arch/x86/mm/paging.c
|
|
+++ b/xen/arch/x86/mm/paging.c
|
|
@@ -815,7 +815,7 @@ int paging_teardown(struct domain *d)
|
|
return rc;
|
|
|
|
/* Move populate-on-demand cache back to domain_list for destruction */
|
|
- p2m_pod_empty_cache(d);
|
|
+ rc = p2m_pod_empty_cache(d);
|
|
|
|
return rc;
|
|
}
|
|
--- a/xen/include/asm-x86/p2m.h
|
|
+++ b/xen/include/asm-x86/p2m.h
|
|
@@ -588,7 +588,7 @@ void p2m_pod_dump_data(struct domain *d)
|
|
|
|
/* Move all pages from the populate-on-demand cache to the domain page_list
|
|
* (usually in preparation for domain destruction) */
|
|
-void p2m_pod_empty_cache(struct domain *d);
|
|
+int p2m_pod_empty_cache(struct domain *d);
|
|
|
|
/* Set populate-on-demand cache size so that the total memory allocated to a
|
|
* domain matches target */
|