diff options
author | Tim Deegan <Tim.Deegan@citrix.com> | 2011-02-16 09:47:37 +0000 |
---|---|---|
committer | Tim Deegan <Tim.Deegan@citrix.com> | 2011-02-16 09:47:37 +0000 |
commit | b58852fcd8b447ed5bef3a6c7c0476454ade0b16 (patch) | |
tree | 9e39dd1ec8ebf3e9759e0a57df97f35aeae39830 | |
parent | 73b16b07cac58fbadffbb5a364f591ea30a5086c (diff) | |
download | xen-b58852fcd8b447ed5bef3a6c7c0476454ade0b16.tar.gz xen-b58852fcd8b447ed5bef3a6c7c0476454ade0b16.tar.bz2 xen-b58852fcd8b447ed5bef3a6c7c0476454ade0b16.zip |
x86/mm: partially revert 21093:4a3e131f7498
p2m internals should always gate on whether HAP is enabled for the
domain, not whether a HAP paging mode is currently advertised.
This lets us revert the change to hap_enable() that advertises the
new mode before it's safe to use it.
Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
-rw-r--r-- | xen/arch/x86/mm/hap/hap.c | 9 | ||||
-rw-r--r-- | xen/arch/x86/mm/p2m.c | 9 |
2 files changed, 7 insertions, 11 deletions
diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 8d1bc70efa..2a4d09662f 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -583,13 +583,9 @@ int hap_enable(struct domain *d, u32 mode) { unsigned int old_pages; int rv = 0; - uint32_t oldmode; domain_pause(d); - oldmode = d->arch.paging.mode; - d->arch.paging.mode = mode | PG_HAP_enable; - /* error check */ if ( (d == current->domain) ) { @@ -624,9 +620,10 @@ int hap_enable(struct domain *d, u32 mode) goto out; } + /* Now let other users see the new mode */ + d->arch.paging.mode = mode | PG_HAP_enable; + out: - if (rv) - d->arch.paging.mode = oldmode; domain_unpause(d); return rv; } diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 6d9e8ac52a..ed16b1551f 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1387,7 +1387,7 @@ p2m_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, else if ( !p2m_next_level(p2m, &table_mfn, &table, &gfn_remainder, gfn, L3_PAGETABLE_SHIFT - PAGE_SHIFT, ((CONFIG_PAGING_LEVELS == 3) - ? (paging_mode_hap(p2m->domain) ? 4 : 8) + ? (hap_enabled(p2m->domain) ? 4 : 8) : L3_PAGETABLE_ENTRIES), PGT_l2_page_table) ) goto out; @@ -1848,7 +1848,7 @@ int set_p2m_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, while ( todo ) { - if ( is_hvm_domain(d) && paging_mode_hap(d) ) + if ( hap_enabled(d) ) order = ( (((gfn | mfn_x(mfn) | todo) & ((1ul << 18) - 1)) == 0) && hvm_hap_has_1gb(d) && opt_hap_1gb ) ? 18 : ((((gfn | mfn_x(mfn) | todo) & ((1ul << 9) - 1)) == 0) && @@ -1909,8 +1909,7 @@ int p2m_alloc_table(struct p2m_domain *p2m) p2m->phys_table = pagetable_from_mfn(page_to_mfn(p2m_top)); - if ( is_hvm_domain(d) && d->arch.hvm_domain.hap_enabled && - (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) ) + if ( hap_enabled(d) && (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) ) iommu_set_pgd(d); P2M_PRINTK("populating p2m table\n"); @@ -2314,7 +2313,7 @@ static int gfn_check_limit( * hardware translation limit. This limitation is checked by comparing * gfn with 0xfffffUL. */ - if ( !paging_mode_hap(d) || ((gfn + (1ul << order)) <= 0x100000UL) || + if ( !hap_enabled(d) || ((gfn + (1ul << order)) <= 0x100000UL) (boot_cpu_data.x86_vendor != X86_VENDOR_AMD) ) return 0; |