x86/altp2m: move altp2m_get_effective_entry() under CONFIG_HVM

Commit Message

Razvan Cojocaru May 14, 2019, 4:13 p.m. UTC

All its callers live inside #ifdef CONFIG_HVM sections.

Signed-off-by: Razvan Cojocaru <[e-mail]>
---
 xen/arch/x86/mm/p2m.c     | 72 +++++++++++++++++++++++------------------------
 xen/include/asm-x86/p2m.h |  2 ++
 2 files changed, 38 insertions(+), 36 deletions(-)

Comments

Jan Beulich May 14, 2019, 4:27 p.m. UTC | #1

>>> On 14.05.19 at 18:13, <[e-mail]> wrote:
> All its callers live inside #ifdef CONFIG_HVM sections.
> 
> Signed-off-by: Razvan Cojocaru <[e-mail]>

Thanks!

> --- a/xen/include/asm-x86/p2m.h
> +++ b/xen/include/asm-x86/p2m.h
> @@ -514,6 +514,7 @@ static inline unsigned long mfn_to_gfn(struct domain *d, mfn_t mfn)
>          return mfn_x(mfn);
>  }
>  
> +#ifdef CONFIG_HVM
>  #define AP2MGET_prepopulate true
>  #define AP2MGET_query false
>  
> @@ -525,6 +526,7 @@ static inline unsigned long mfn_to_gfn(struct domain *d, mfn_t mfn)
>  int altp2m_get_effective_entry(struct p2m_domain *ap2m, gfn_t gfn, mfn_t *mfn,
>                                 p2m_type_t *t, p2m_access_t *a,
>                                 bool prepopulate);
> +#endif
>  
>  /* Deadlock-avoidance scheme when calling get_gfn on different gfn's */
>  struct two_gfns {

I don't think these adjustments are strictly needed, but at least for
now they of course also don't hurt.

Jan

Wei Liu May 15, 2019, 6:53 a.m. UTC | #2

On Tue, May 14, 2019 at 07:13:57PM +0300, Razvan Cojocaru wrote:
> All its callers live inside #ifdef CONFIG_HVM sections.
> 
> Signed-off-by: Razvan Cojocaru <[e-mail]>

Reviewed-by: Wei Liu <[e-mail]>

George Dunlap May 15, 2019, 8:55 a.m. UTC | #3

On 5/15/19 7:53 AM, Wei Liu wrote:
> On Tue, May 14, 2019 at 07:13:57PM +0300, Razvan Cojocaru wrote:
>> All its callers live inside #ifdef CONFIG_HVM sections.
>>
>> Signed-off-by: Razvan Cojocaru <[e-mail]>
> 
> Reviewed-by: Wei Liu <[e-mail]>

Acked-by: George Dunlap <[e-mail]>

Wei Liu May 15, 2019, 9:28 a.m. UTC | #4

On Wed, May 15, 2019 at 09:55:30AM +0100, George Dunlap wrote:
> On 5/15/19 7:53 AM, Wei Liu wrote:
> > On Tue, May 14, 2019 at 07:13:57PM +0300, Razvan Cojocaru wrote:
> >> All its callers live inside #ifdef CONFIG_HVM sections.
> >>
> >> Signed-off-by: Razvan Cojocaru <[e-mail]>
> > 
> > Reviewed-by: Wei Liu <[e-mail]>
> 
> Acked-by: George Dunlap <[e-mail]>

Applied.

Patch

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index cc6661e..57c5eed 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -478,42 +478,6 @@  void p2m_unlock_and_tlb_flush(struct p2m_domain *p2m)
         mm_write_unlock(&p2m->lock);
 }
 
-int altp2m_get_effective_entry(struct p2m_domain *ap2m, gfn_t gfn, mfn_t *mfn,
-                               p2m_type_t *t, p2m_access_t *a,
-                               bool prepopulate)
-{
-    *mfn = ap2m->get_entry(ap2m, gfn, t, a, 0, NULL, NULL);
-
-    /* Check host p2m if no valid entry in alternate */
-    if ( !mfn_valid(*mfn) && !p2m_is_hostp2m(ap2m) )
-    {
-        struct p2m_domain *hp2m = p2m_get_hostp2m(ap2m->domain);
-        unsigned int page_order;
-        int rc;
-
-        *mfn = __get_gfn_type_access(hp2m, gfn_x(gfn), t, a,
-                                     P2M_ALLOC | P2M_UNSHARE, &page_order, 0);
-
-        rc = -ESRCH;
-        if ( !mfn_valid(*mfn) || *t != p2m_ram_rw )
-            return rc;
-
-        /* If this is a superpage, copy that first */
-        if ( prepopulate && page_order != PAGE_ORDER_4K )
-        {
-            unsigned long mask = ~((1UL << page_order) - 1);
-            gfn_t gfn_aligned = _gfn(gfn_x(gfn) & mask);
-            mfn_t mfn_aligned = _mfn(mfn_x(*mfn) & mask);
-
-            rc = ap2m->set_entry(ap2m, gfn_aligned, mfn_aligned, page_order, *t, *a, 1);
-            if ( rc )
-                return rc;
-        }
-    }
-
-    return 0;
-}
-
 mfn_t __get_gfn_type_access(struct p2m_domain *p2m, unsigned long gfn_l,
                     p2m_type_t *t, p2m_access_t *a, p2m_query_t q,
                     unsigned int *page_order, bool_t locked)
@@ -2378,6 +2342,42 @@  int unmap_mmio_regions(struct domain *d,
 
 #ifdef CONFIG_HVM
 
+int altp2m_get_effective_entry(struct p2m_domain *ap2m, gfn_t gfn, mfn_t *mfn,
+                               p2m_type_t *t, p2m_access_t *a,
+                               bool prepopulate)
+{
+    *mfn = ap2m->get_entry(ap2m, gfn, t, a, 0, NULL, NULL);
+
+    /* Check host p2m if no valid entry in alternate */
+    if ( !mfn_valid(*mfn) && !p2m_is_hostp2m(ap2m) )
+    {
+        struct p2m_domain *hp2m = p2m_get_hostp2m(ap2m->domain);
+        unsigned int page_order;
+        int rc;
+
+        *mfn = __get_gfn_type_access(hp2m, gfn_x(gfn), t, a,
+                                     P2M_ALLOC | P2M_UNSHARE, &page_order, 0);
+
+        rc = -ESRCH;
+        if ( !mfn_valid(*mfn) || *t != p2m_ram_rw )
+            return rc;
+
+        /* If this is a superpage, copy that first */
+        if ( prepopulate && page_order != PAGE_ORDER_4K )
+        {
+            unsigned long mask = ~((1UL << page_order) - 1);
+            gfn_t gfn_aligned = _gfn(gfn_x(gfn) & mask);
+            mfn_t mfn_aligned = _mfn(mfn_x(*mfn) & mask);
+
+            rc = ap2m->set_entry(ap2m, gfn_aligned, mfn_aligned, page_order, *t, *a, 1);
+            if ( rc )
+                return rc;
+        }
+    }
+
+    return 0;
+}
+
 void p2m_altp2m_check(struct vcpu *v, uint16_t idx)
 {
     if ( altp2m_active(v->domain) )
diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h
index 2d0bda1..7e71bf0 100644
--- a/xen/include/asm-x86/p2m.h
+++ b/xen/include/asm-x86/p2m.h
@@ -514,6 +514,7 @@  static inline unsigned long mfn_to_gfn(struct domain *d, mfn_t mfn)
         return mfn_x(mfn);
 }
 
+#ifdef CONFIG_HVM
 #define AP2MGET_prepopulate true
 #define AP2MGET_query false
 
@@ -525,6 +526,7 @@  static inline unsigned long mfn_to_gfn(struct domain *d, mfn_t mfn)
 int altp2m_get_effective_entry(struct p2m_domain *ap2m, gfn_t gfn, mfn_t *mfn,
                                p2m_type_t *t, p2m_access_t *a,
                                bool prepopulate);
+#endif
 
 /* Deadlock-avoidance scheme when calling get_gfn on different gfn's */
 struct two_gfns {