Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP2:Update
xen.9798
5c011aaf-x86-dont-enable-shadow-with-too-small-...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 5c011aaf-x86-dont-enable-shadow-with-too-small-allocation.patch of Package xen.9798
# Commit 2634b997afabfdc5a972e07e536dfbc6febb4385 # Date 2018-11-30 12:10:39 +0100 # Author Jan Beulich <jbeulich@suse.com> # Committer Jan Beulich <jbeulich@suse.com> x86/shadow: don't enable shadow mode with too small a shadow allocation We've had more than one report of host crashes after failed migration, and in at least one case we've had a hint towards a too far shrunk shadow allocation pool. Instead of just checking the pool for being empty, check whether the pool is smaller than what shadow_set_allocation() would minimally bump it to if it was invoked in the first place. Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Tim Deegan <tim@xen.org> --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1150,7 +1150,7 @@ const u8 sh_type_to_size[] = { * allow for more than ninety allocated pages per vcpu. We round that * up to 128 pages, or half a megabyte per vcpu, and add 1 more vcpu's * worth to make sure we never return zero. */ -static unsigned int shadow_min_acceptable_pages(struct domain *d) +static unsigned int shadow_min_acceptable_pages(const struct domain *d) { u32 vcpu_count = 1; struct vcpu *v; @@ -1547,6 +1547,15 @@ shadow_free_p2m_page(struct domain *d, s paging_unlock(d); } +static unsigned int sh_min_allocation(const struct domain *d) +{ + /* + * Don't allocate less than the minimum acceptable, plus one page per + * megabyte of RAM (for the p2m table). + */ + return shadow_min_acceptable_pages(d) + (d->tot_pages / 256); +} + int shadow_set_allocation(struct domain *d, unsigned int pages, bool *preempted) { struct page_info *sp; @@ -1562,9 +1571,7 @@ int shadow_set_allocation(struct domain else pages -= d->arch.paging.shadow.p2m_pages; - /* Don't allocate less than the minimum acceptable, plus one page per - * megabyte of RAM (for the p2m table) */ - lower_bound = shadow_min_acceptable_pages(d) + (d->tot_pages / 256); + lower_bound = sh_min_allocation(d); if ( pages < lower_bound ) pages = lower_bound; } @@ -3125,7 +3132,7 @@ int shadow_enable(struct domain *d, u32 /* Init the shadow memory allocation if the user hasn't done so */ old_pages = d->arch.paging.shadow.total_pages; - if ( old_pages == 0 ) + if ( old_pages < sh_min_allocation(d) + d->arch.paging.shadow.p2m_pages ) { paging_lock(d); rv = shadow_set_allocation(d, 1024, NULL); /* Use at least 4MB */
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor