# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1272280403 -3600
# Node ID 9a1d7caa20246f89bf7395131483f44e686bd9cd
# Parent 3ce824963dc41827bdf1617b37a40e5e5e9dce29
x86, shadow: propagate pat caching on the shadow l1
PAT caching was only propagated if has_arch_pdevs(),
causing the hvm_get_mem_pinned_cacheattr() to be ignored
in the non passthrough case.
l1_disallow_mask() needs to be relaxed.
Signed-off-by: Jean Guyader <jean.guyader@xxxxxxxxxx>
---
xen/arch/x86/mm.c | 3 ++-
xen/arch/x86/mm/shadow/multi.c | 31 +++++++++++++++++--------------
2 files changed, 19 insertions(+), 15 deletions(-)
diff -r 3ce824963dc4 -r 9a1d7caa2024 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Mon Apr 26 12:12:12 2010 +0100
+++ b/xen/arch/x86/mm.c Mon Apr 26 12:13:23 2010 +0100
@@ -158,7 +158,8 @@ boolean_param("allowhugepage", opt_allow
((d != dom_io) && \
(rangeset_is_empty((d)->iomem_caps) && \
rangeset_is_empty((d)->arch.ioport_caps) && \
- !has_arch_pdevs(d)) ? \
+ !has_arch_pdevs(d) && \
+ !is_hvm_domain(d)) ? \
L1_DISALLOW_MASK : (L1_DISALLOW_MASK & ~PAGE_CACHE_ATTRS))
#ifdef __x86_64__
diff -r 3ce824963dc4 -r 9a1d7caa2024 xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c Mon Apr 26 12:12:12 2010 +0100
+++ b/xen/arch/x86/mm/shadow/multi.c Mon Apr 26 12:13:23 2010 +0100
@@ -565,7 +565,6 @@ _sh_propagate(struct vcpu *v,
* caching attributes in the shadows to match what was asked for.
*/
if ( (level == 1) && is_hvm_domain(d) &&
- iomem_access_permitted(d, mfn_x(target_mfn), mfn_x(target_mfn) + 1) &&
!is_xen_heap_mfn(mfn_x(target_mfn)) )
{
unsigned int type;
@@ -581,20 +580,24 @@ _sh_propagate(struct vcpu *v,
sflags |= pat_type_2_pte_flags(type);
else if ( d->arch.hvm_domain.is_in_uc_mode )
sflags |= pat_type_2_pte_flags(PAT_TYPE_UNCACHABLE);
- else if ( p2mt == p2m_mmio_direct )
- sflags |= get_pat_flags(v,
- gflags,
- gfn_to_paddr(target_gfn),
- ((paddr_t)mfn_x(target_mfn)) << PAGE_SHIFT,
- MTRR_TYPE_UNCACHABLE);
- else if ( iommu_snoop )
- sflags |= pat_type_2_pte_flags(PAT_TYPE_WRBACK);
else
- sflags |= get_pat_flags(v,
- gflags,
- gfn_to_paddr(target_gfn),
- ((paddr_t)mfn_x(target_mfn)) << PAGE_SHIFT,
- NO_HARDCODE_MEM_TYPE);
+ if ( iomem_access_permitted(d, mfn_x(target_mfn),
mfn_x(target_mfn) + 1) )
+ {
+ if ( p2mt == p2m_mmio_direct )
+ sflags |= get_pat_flags(v,
+ gflags,
+ gfn_to_paddr(target_gfn),
+ ((paddr_t)mfn_x(target_mfn)) << PAGE_SHIFT,
+ MTRR_TYPE_UNCACHABLE);
+ else if ( iommu_snoop )
+ sflags |= pat_type_2_pte_flags(PAT_TYPE_WRBACK);
+ else
+ sflags |= get_pat_flags(v,
+ gflags,
+ gfn_to_paddr(target_gfn),
+ ((paddr_t)mfn_x(target_mfn)) << PAGE_SHIFT,
+ NO_HARDCODE_MEM_TYPE);
+ }
}
// Set the A&D bits for higher level shadows.
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home