[PATCH] p2m: merge ptp allocation

[PATCH] p2m: merge ptp allocation

[Christoph Egger]

[-- Attachment #1: Type: text/plain, Size: 403 bytes --]


Hi!

Attached patch merges ptp allocation in p2m.

Signed-off-by: Christoph Egger <Christop.Egger@amd.com>


-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

[-- Attachment #2: xen_allocptp.diff --]
[-- Type: text/x-diff, Size: 4350 bytes --]

diff -r 105fdf064d27 xen/arch/x86/mm/hap/p2m-ept.c
--- a/xen/arch/x86/mm/hap/p2m-ept.c	Tue Apr 13 10:35:24 2010 +0200
+++ b/xen/arch/x86/mm/hap/p2m-ept.c	Tue Apr 13 10:59:55 2010 +0200
@@ -30,6 +30,8 @@
 #include <asm/mtrr.h>
 #include <asm/hvm/cacheattr.h>
 
+#include "private.h"
+
 /* Non-ept "lock-and-check" wrapper */
 static int ept_pod_check_and_populate(struct domain *d, unsigned long gfn,
                                       ept_entry_t *entry, int order,
@@ -97,14 +99,10 @@ static int ept_set_middle_entry(struct d
 {
     struct page_info *pg;
 
-    pg = d->arch.p2m->alloc_page(d);
+    pg = p2m_alloc_ptp(d, 0);
     if ( pg == NULL )
         return 0;
 
-    pg->count_info = 1;
-    pg->u.inuse.type_info = 1 | PGT_validated;
-    page_list_add_tail(pg, &d->arch.p2m->pages);
-
     ept_entry->emt = 0;
     ept_entry->ipat = 0;
     ept_entry->sp_avail = 0;
diff -r 105fdf064d27 xen/arch/x86/mm/hap/private.h
--- a/xen/arch/x86/mm/hap/private.h	Tue Apr 13 10:35:24 2010 +0200
+++ b/xen/arch/x86/mm/hap/private.h	Tue Apr 13 10:59:55 2010 +0200
@@ -30,5 +30,6 @@ unsigned long hap_gva_to_gfn_3_levels(st
 unsigned long hap_gva_to_gfn_4_levels(struct vcpu *v, unsigned long gva,
                                      uint32_t *pfec);
 
+struct page_info *p2m_alloc_ptp(struct domain *d, unsigned long type);
 
-#endif /* __SVM_NPT_H__ */
+#endif /* __HAP_PRIVATE_H__ */
diff -r 105fdf064d27 xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c	Tue Apr 13 10:35:24 2010 +0200
+++ b/xen/arch/x86/mm/p2m.c	Tue Apr 13 10:59:55 2010 +0200
@@ -134,6 +134,22 @@ p2m_find_entry(void *table, unsigned lon
     return (l1_pgentry_t *)table + index;
 }
 
+struct page_info *
+p2m_alloc_ptp(struct domain *d, unsigned long type)
+{
+    struct page_info *pg;
+
+    pg = d->arch.p2m->alloc_page(d);
+    if (pg == NULL)
+        return NULL;
+
+    page_list_add_tail(pg, &d->arch.p2m->pages);
+    pg->u.inuse.type_info = type | 1 | PGT_validated;
+    pg->count_info |= 1;
+
+    return pg;
+}
+
 // Walk one level of the P2M table, allocating a new table if required.
 // Returns 0 on error.
 //
@@ -156,15 +172,14 @@ p2m_next_level(struct domain *d, mfn_t *
     /* PoD: Not present doesn't imply empty. */
     if ( !l1e_get_flags(*p2m_entry) )
     {
-        struct page_info *pg = d->arch.p2m->alloc_page(d);
+        struct page_info *pg;
+
+        pg = p2m_alloc_ptp(d, type);
         if ( pg == NULL )
             return 0;
-        page_list_add_tail(pg, &d->arch.p2m->pages);
-        pg->u.inuse.type_info = type | 1 | PGT_validated;
-        pg->count_info |= 1;
 
         new_entry = l1e_from_pfn(mfn_x(page_to_mfn(pg)),
-                                 __PAGE_HYPERVISOR|_PAGE_USER);
+                                 __PAGE_HYPERVISOR | _PAGE_USER);
 
         switch ( type ) {
         case PGT_l3_page_table:
@@ -195,16 +210,15 @@ p2m_next_level(struct domain *d, mfn_t *
     if ( type == PGT_l2_page_table && (l1e_get_flags(*p2m_entry) & _PAGE_PSE) )
     {
         unsigned long flags, pfn;
-        struct page_info *pg = d->arch.p2m->alloc_page(d);
+        struct page_info *pg;
+
+        pg = p2m_alloc_ptp(d, PGT_l2_page_table);
         if ( pg == NULL )
             return 0;
-        page_list_add_tail(pg, &d->arch.p2m->pages);
-        pg->u.inuse.type_info = PGT_l2_page_table | 1 | PGT_validated;
-        pg->count_info = 1;
-        
+
         flags = l1e_get_flags(*p2m_entry);
         pfn = l1e_get_pfn(*p2m_entry);
-        
+
         l1_entry = map_domain_page(mfn_x(page_to_mfn(pg)));
         for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++ )
         {
@@ -224,13 +238,12 @@ p2m_next_level(struct domain *d, mfn_t *
     if ( type == PGT_l1_page_table && (l1e_get_flags(*p2m_entry) & _PAGE_PSE) )
     {
         unsigned long flags, pfn;
-        struct page_info *pg = d->arch.p2m->alloc_page(d);
+        struct page_info *pg;
+
+        pg = p2m_alloc_ptp(d, PGT_l1_page_table);
         if ( pg == NULL )
             return 0;
-        page_list_add_tail(pg, &d->arch.p2m->pages);
-        pg->u.inuse.type_info = PGT_l1_page_table | 1 | PGT_validated;
-        pg->count_info |= 1;
-        
+
         /* New splintered mappings inherit the flags of the old superpage, 
          * with a little reorganisation for the _PAGE_PSE_PAT bit. */
         flags = l1e_get_flags(*p2m_entry);

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [PATCH] p2m: merge ptp allocation

[Tim Deegan]

Hi, 

At 10:25 +0100 on 13 Apr (1271154340), Christoph Egger wrote:
> Attached patch merges ptp allocation in p2m.
> 
> Signed-off-by: Christoph Egger <Christop.Egger@amd.com>

> diff -r 105fdf064d27 xen/arch/x86/mm/hap/private.h
> --- a/xen/arch/x86/mm/hap/private.h	Tue Apr 13 10:35:24 2010 +0200
> +++ b/xen/arch/x86/mm/hap/private.h	Tue Apr 13 10:59:55 2010 +0200
> @@ -30,5 +30,6 @@ unsigned long hap_gva_to_gfn_3_levels(st
>  unsigned long hap_gva_to_gfn_4_levels(struct vcpu *v, unsigned long gva,
>                                       uint32_t *pfec);
>  
> +struct page_info *p2m_alloc_ptp(struct domain *d, unsigned long type);

Why is this declared in hap/private.h when it's not a hap function?
Maybe asm-x86/p2m.h would be a better place. 

Otherwise, Ack.

Tim.

-- 
Tim Deegan <Tim.Deegan@citrix.com>
Principal Software Engineer, XenServer Engineering
Citrix Systems UK Ltd.  (Company #02937203, SL9 0BG)

Re: [PATCH] p2m: merge ptp allocation

[Christoph Egger]

On Tuesday 13 April 2010 12:22:21 Tim Deegan wrote:
> Hi,
>
> At 10:25 +0100 on 13 Apr (1271154340), Christoph Egger wrote:
> > Attached patch merges ptp allocation in p2m.
> >
> > Signed-off-by: Christoph Egger <Christop.Egger@amd.com>
> >
> > diff -r 105fdf064d27 xen/arch/x86/mm/hap/private.h
> > --- a/xen/arch/x86/mm/hap/private.h	Tue Apr 13 10:35:24 2010 +0200
> > +++ b/xen/arch/x86/mm/hap/private.h	Tue Apr 13 10:59:55 2010 +0200
> > @@ -30,5 +30,6 @@ unsigned long hap_gva_to_gfn_3_levels(st
> >  unsigned long hap_gva_to_gfn_4_levels(struct vcpu *v, unsigned long gva,
> >                                       uint32_t *pfec);
> >
> > +struct page_info *p2m_alloc_ptp(struct domain *d, unsigned long type);
>
> Why is this declared in hap/private.h when it's not a hap function?
> Maybe asm-x86/p2m.h would be a better place.

Ok, I'm fine with this change.
Keir: Do you want me to resend the diff or will you do that right before 
applying the patch?

>
> Otherwise, Ack.

Thanks.

> Tim.

Christoph


-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632