# HG changeset patch
# User Tim Deegan <tim@xxxxxxx>
# Date 1315491186 -3600
# Node ID ac33d68e89767d49113824e5661c49a5465a18e7
# Parent 04e2fd7379d07cc0d2da9dc9da50a2b54c198f13
x86/mm: adjust paging interface to return superpage sizes
to the caller of paging_ga_to_gfn_cr3()
Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
Signed-off-by: Tim Deegan <tim@xxxxxxx>
Committed-by: Tim Deegan <tim@xxxxxxx>
---
diff -r 04e2fd7379d0 -r ac33d68e8976 xen/arch/x86/mm/hap/guest_walk.c
--- a/xen/arch/x86/mm/hap/guest_walk.c Thu Sep 08 15:13:06 2011 +0100
+++ b/xen/arch/x86/mm/hap/guest_walk.c Thu Sep 08 15:13:06 2011 +0100
@@ -43,12 +43,12 @@
struct vcpu *v, struct p2m_domain *p2m, unsigned long gva, uint32_t *pfec)
{
unsigned long cr3 = v->arch.hvm_vcpu.guest_cr[3];
- return hap_p2m_ga_to_gfn(GUEST_PAGING_LEVELS)(v, p2m, cr3, gva, pfec);
+ return hap_p2m_ga_to_gfn(GUEST_PAGING_LEVELS)(v, p2m, cr3, gva, pfec,
NULL);
}
unsigned long hap_p2m_ga_to_gfn(GUEST_PAGING_LEVELS)(
struct vcpu *v, struct p2m_domain *p2m, unsigned long cr3,
- paddr_t ga, uint32_t *pfec)
+ paddr_t ga, uint32_t *pfec, unsigned int *page_order)
{
uint32_t missing;
mfn_t top_mfn;
@@ -107,6 +107,9 @@
return INVALID_GFN;
}
+ if ( page_order )
+ *page_order = guest_walk_to_page_order(&gw);
+
return gfn_x(gfn);
}
diff -r 04e2fd7379d0 -r ac33d68e8976 xen/arch/x86/mm/hap/hap.c
--- a/xen/arch/x86/mm/hap/hap.c Thu Sep 08 15:13:06 2011 +0100
+++ b/xen/arch/x86/mm/hap/hap.c Thu Sep 08 15:13:06 2011 +0100
@@ -897,8 +897,10 @@
static unsigned long hap_p2m_ga_to_gfn_real_mode(
struct vcpu *v, struct p2m_domain *p2m, unsigned long cr3,
- paddr_t ga, uint32_t *pfec)
+ paddr_t ga, uint32_t *pfec, unsigned int *page_order)
{
+ if ( page_order )
+ *page_order = PAGE_ORDER_4K;
return (ga >> PAGE_SHIFT);
}
diff -r 04e2fd7379d0 -r ac33d68e8976 xen/arch/x86/mm/hap/nested_hap.c
--- a/xen/arch/x86/mm/hap/nested_hap.c Thu Sep 08 15:13:06 2011 +0100
+++ b/xen/arch/x86/mm/hap/nested_hap.c Thu Sep 08 15:13:06 2011 +0100
@@ -162,7 +162,7 @@
nested_cr3 = nhvm_vcpu_hostcr3(v);
/* Walk the guest-supplied NPT table, just as if it were a pagetable */
- gfn = paging_ga_to_gfn_cr3(v, nested_cr3, L2_gpa, &pfec);
+ gfn = paging_ga_to_gfn_cr3(v, nested_cr3, L2_gpa, &pfec, NULL);
if ( gfn == INVALID_GFN )
return NESTEDHVM_PAGEFAULT_INJECT;
diff -r 04e2fd7379d0 -r ac33d68e8976 xen/arch/x86/mm/hap/private.h
--- a/xen/arch/x86/mm/hap/private.h Thu Sep 08 15:13:06 2011 +0100
+++ b/xen/arch/x86/mm/hap/private.h Thu Sep 08 15:13:06 2011 +0100
@@ -40,12 +40,12 @@
unsigned long hap_p2m_ga_to_gfn_2_levels(struct vcpu *v,
struct p2m_domain *p2m, unsigned long cr3,
- paddr_t ga, uint32_t *pfec);
+ paddr_t ga, uint32_t *pfec, unsigned int *page_order);
unsigned long hap_p2m_ga_to_gfn_3_levels(struct vcpu *v,
struct p2m_domain *p2m, unsigned long cr3,
- paddr_t ga, uint32_t *pfec);
+ paddr_t ga, uint32_t *pfec, unsigned int *page_order);
unsigned long hap_p2m_ga_to_gfn_4_levels(struct vcpu *v,
struct p2m_domain *p2m, unsigned long cr3,
- paddr_t ga, uint32_t *pfec);
+ paddr_t ga, uint32_t *pfec, unsigned int *page_order);
#endif /* __HAP_PRIVATE_H__ */
diff -r 04e2fd7379d0 -r ac33d68e8976 xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c Thu Sep 08 15:13:06 2011 +0100
+++ b/xen/arch/x86/mm/p2m.c Thu Sep 08 15:13:06 2011 +0100
@@ -1206,7 +1206,7 @@
/* translate l2 guest gfn into l1 guest gfn */
return hostmode->p2m_ga_to_gfn(v, hostp2m, ncr3,
- gfn << PAGE_SHIFT, pfec);
+ gfn << PAGE_SHIFT, pfec, NULL);
}
return hostmode->gva_to_gfn(v, hostp2m, va, pfec);
diff -r 04e2fd7379d0 -r ac33d68e8976 xen/include/asm-x86/guest_pt.h
--- a/xen/include/asm-x86/guest_pt.h Thu Sep 08 15:13:06 2011 +0100
+++ b/xen/include/asm-x86/guest_pt.h Thu Sep 08 15:13:06 2011 +0100
@@ -272,6 +272,24 @@
return guest_l1e_get_paddr(gw->l1e) + (gw->va & ~PAGE_MASK);
}
+/* Given a walk_t from a successful walk, return the page-order of the
+ * page or superpage that the virtual address is in. */
+static inline unsigned int
+guest_walk_to_page_order(walk_t *gw)
+{
+ /* This is only valid for successful walks - otherwise the
+ * PSE bits might be invalid. */
+ ASSERT(guest_l1e_get_flags(gw->l1e) & _PAGE_PRESENT);
+#if GUEST_PAGING_LEVELS >= 3
+ if ( guest_l3e_get_flags(gw->l3e) & _PAGE_PSE )
+ return GUEST_L3_PAGETABLE_SHIFT - PAGE_SHIFT;
+#endif
+ if ( guest_l2e_get_flags(gw->l2e) & _PAGE_PSE )
+ return GUEST_L2_PAGETABLE_SHIFT - PAGE_SHIFT;
+ return GUEST_L1_PAGETABLE_SHIFT - PAGE_SHIFT;
+}
+
+
/* Walk the guest pagetables, after the manner of a hardware walker.
*
* Inputs: a vcpu, a virtual address, a walk_t to fill, a
diff -r 04e2fd7379d0 -r ac33d68e8976 xen/include/asm-x86/paging.h
--- a/xen/include/asm-x86/paging.h Thu Sep 08 15:13:06 2011 +0100
+++ b/xen/include/asm-x86/paging.h Thu Sep 08 15:13:06 2011 +0100
@@ -115,7 +115,8 @@
unsigned long (*p2m_ga_to_gfn )(struct vcpu *v,
struct p2m_domain *p2m,
unsigned long cr3,
- paddr_t ga, uint32_t *pfec);
+ paddr_t ga, uint32_t *pfec,
+ unsigned int *page_order);
void (*update_cr3 )(struct vcpu *v, int do_locking);
void (*update_paging_modes )(struct vcpu *v);
void (*write_p2m_entry )(struct vcpu *v, unsigned long gfn,
@@ -270,15 +271,18 @@
* to by nested HAP code, to walk the guest-supplied NPT tables as if
* they were pagetables.
* Use 'paddr_t' for the guest address so it won't overflow when
- * guest or nested guest is in 32bit PAE mode.
- */
+ * l1 or l2 guest is in 32bit PAE mode.
+ * If the GFN returned is not INVALID_GFN, *page_order gives
+ * the size of the superpage (if any) it was found in. */
static inline unsigned long paging_ga_to_gfn_cr3(struct vcpu *v,
unsigned long cr3,
paddr_t ga,
- uint32_t *pfec)
+ uint32_t *pfec,
+ unsigned int *page_order)
{
struct p2m_domain *p2m = v->domain->arch.p2m;
- return paging_get_hostmode(v)->p2m_ga_to_gfn(v, p2m, cr3, ga, pfec);
+ return paging_get_hostmode(v)->p2m_ga_to_gfn(v, p2m, cr3, ga, pfec,
+ page_order);
}
/* Update all the things that are derived from the guest's CR3.
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home