Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.1:Update
xen
19135-next-shadow-mfn.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 19135-next-shadow-mfn.patch of Package xen
# HG changeset patch # User Keir Fraser <keir.fraser@citrix.com> # Date 1233313784 0 # Node ID 6fe44eb28f525fc5879c43882ca089b9c636b3f6 # Parent 4a2f93fb03eb6f1ad90fa3ad1630d531c8baa714 x86-64: use MFN also for next_shadow link Signed-off-by: Jan Beulich <jbeulich@novell.com> --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1452,6 +1452,22 @@ static __init int shadow_blow_tables_key __initcall(shadow_blow_tables_keyhandler_init); #endif /* !NDEBUG */ +#ifdef __i386__ +# define next_shadow(pg) ((pg)->next_shadow) +# define set_next_shadow(pg, n) ((void)((pg)->next_shadow = (n))) +#else +static inline struct shadow_page_info * +next_shadow(const struct shadow_page_info *sp) +{ + return sp->next_shadow ? mfn_to_shadow_page(_mfn(sp->next_shadow)) : NULL; +} +static inline void +set_next_shadow(struct shadow_page_info *sp, struct shadow_page_info *next) +{ + sp->next_shadow = next ? mfn_x(shadow_page_to_mfn(next)) : 0; +} +#endif + /* Allocate another shadow's worth of (contiguous, aligned) pages, * and fill in the type and backpointer fields of their page_infos. * Never fails to allocate. */ @@ -1517,7 +1533,7 @@ mfn_t shadow_alloc(struct domain *d, sp[i].u.sh.pinned = 0; sp[i].u.sh.count = 0; sp[i].u.sh.back = backpointer; - sp[i].next_shadow = NULL; + set_next_shadow(&sp[i], NULL); perfc_incr(shadow_alloc_count); } return shadow_page_to_mfn(sp); @@ -1853,7 +1869,7 @@ static void sh_hash_audit_bucket(struct /* Wrong bucket? */ BUG_ON( sh_hash(sp->u.sh.back, sp->u.sh.type) != bucket ); /* Duplicate entry? */ - for ( x = sp->next_shadow; x; x = x->next_shadow ) + for ( x = next_shadow(sp); x; x = next_shadow(x) ) BUG_ON( x->u.sh.back == sp->u.sh.back && x->u.sh.type == sp->u.sh.type ); /* Follow the backpointer to the guest pagetable */ @@ -1897,7 +1913,7 @@ static void sh_hash_audit_bucket(struct } } /* That entry was OK; on we go */ - sp = sp->next_shadow; + sp = next_shadow(sp); } } @@ -1991,7 +2007,7 @@ mfn_t shadow_hash_lookup(struct vcpu *v, /* Delete sp from the list */ prev->next_shadow = sp->next_shadow; /* Re-insert it at the head of the list */ - sp->next_shadow = d->arch.paging.shadow.hash_table[key]; + set_next_shadow(sp, d->arch.paging.shadow.hash_table[key]); d->arch.paging.shadow.hash_table[key] = sp; } } @@ -2002,7 +2018,7 @@ mfn_t shadow_hash_lookup(struct vcpu *v, return shadow_page_to_mfn(sp); } prev = sp; - sp = sp->next_shadow; + sp = next_shadow(sp); } perfc_incr(shadow_hash_lookup_miss); @@ -2029,7 +2045,7 @@ void shadow_hash_insert(struct vcpu *v, /* Insert this shadow at the top of the bucket */ sp = mfn_to_shadow_page(smfn); - sp->next_shadow = d->arch.paging.shadow.hash_table[key]; + set_next_shadow(sp, d->arch.paging.shadow.hash_table[key]); d->arch.paging.shadow.hash_table[key] = sp; sh_hash_audit_bucket(d, key); @@ -2056,7 +2072,7 @@ void shadow_hash_delete(struct vcpu *v, sp = mfn_to_shadow_page(smfn); if ( d->arch.paging.shadow.hash_table[key] == sp ) /* Easy case: we're deleting the head item. */ - d->arch.paging.shadow.hash_table[key] = sp->next_shadow; + d->arch.paging.shadow.hash_table[key] = next_shadow(sp); else { /* Need to search for the one we want */ @@ -2065,15 +2081,15 @@ void shadow_hash_delete(struct vcpu *v, { ASSERT(x); /* We can't have hit the end, since our target is * still in the chain somehwere... */ - if ( x->next_shadow == sp ) + if ( next_shadow(x) == sp ) { x->next_shadow = sp->next_shadow; break; } - x = x->next_shadow; + x = next_shadow(x); } } - sp->next_shadow = NULL; + set_next_shadow(sp, NULL); sh_hash_audit_bucket(d, key); } @@ -2107,7 +2123,7 @@ static void hash_foreach(struct vcpu *v, /* WARNING: This is not safe against changes to the hash table. * The callback *must* return non-zero if it has inserted or * deleted anything from the hash (lookups are OK, though). */ - for ( x = d->arch.paging.shadow.hash_table[i]; x; x = x->next_shadow ) + for ( x = d->arch.paging.shadow.hash_table[i]; x; x = next_shadow(x) ) { if ( callback_mask & (1 << x->u.sh.type) ) { --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -139,7 +139,11 @@ struct page_info u32 shadow_flags; /* When in use as a shadow, next shadow in this hash chain. */ +#ifdef __i386__ struct shadow_page_info *next_shadow; +#else + __mfn_t next_shadow; +#endif }; };
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