[PATCH for-4.5 v10 05/19] xen: Relocate set_access_required domctl into common

[Tamas K Lengyel <tklengyel@sec.in.tum.de>]

Signed-off-by: Tamas K Lengyel <tklengyel@sec.in.tum.de>
Acked-by: Tim Deegan <tim@xen.org>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
v9: Wrap domctl into ifdef check for HAS_MEM_ACCESS.
v8: Remove superfluous paranthesis in macro get_hostp2m.
---
 xen/arch/x86/domctl.c     | 14 --------------
 xen/common/domctl.c       | 17 +++++++++++++++++
 xen/include/asm-arm/p2m.h |  7 +++++++
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index 26a3ea1..8731e7f 100644
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -1163,20 +1163,6 @@ long arch_do_domctl(
     break;
 #endif /* P2M_AUDIT */
 
-    case XEN_DOMCTL_set_access_required:
-    {
-        struct p2m_domain* p2m;
-        
-        ret = -EPERM;
-        if ( current->domain == d )
-            break;
-
-        ret = 0;
-        p2m = p2m_get_hostp2m(d);
-        p2m->access_required = domctl->u.access_required.access_required;
-    }
-    break;
-
     case XEN_DOMCTL_set_broken_page_p2m:
     {
         p2m_type_t pt;
diff --git a/xen/common/domctl.c b/xen/common/domctl.c
index 1ad0729..a4318a0 100644
--- a/xen/common/domctl.c
+++ b/xen/common/domctl.c
@@ -27,6 +27,7 @@
 #include <asm/current.h>
 #include <asm/irq.h>
 #include <asm/page.h>
+#include <asm/p2m.h>
 #include <public/domctl.h>
 #include <xsm/xsm.h>
 
@@ -1116,6 +1117,22 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl)
     }
     break;
 
+#ifdef HAS_MEM_ACCESS
+    case XEN_DOMCTL_set_access_required:
+    {
+        struct p2m_domain* p2m;
+
+        ret = -EPERM;
+        if ( current->domain == d )
+            break;
+
+        ret = 0;
+        p2m = p2m_get_hostp2m(d);
+        p2m->access_required = op->u.access_required.access_required;
+    }
+    break;
+#endif
+
     case XEN_DOMCTL_set_virq_handler:
     {
         uint32_t virq = op->u.set_virq_handler.virq;
diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h
index 38e32e6..4d5570a 100644
--- a/xen/include/asm-arm/p2m.h
+++ b/xen/include/asm-arm/p2m.h
@@ -44,6 +44,10 @@ struct p2m_domain {
          * at each p2m tree level. */
         unsigned long shattered[4];
     } stats;
+
+    /* If true, and an access fault comes in and there is no mem_event listener,
+     * pause domain. Otherwise, remove access restrictions. */
+    bool_t access_required;
 };
 
 /* List of possible type for each page in the p2m entry.
@@ -208,6 +212,9 @@ int arch_grant_map_page_identity(struct domain *d, unsigned long frame,
                                  bool_t writeable);
 int arch_grant_unmap_page_identity(struct domain *d, unsigned long frame);
 
+/* get host p2m table */
+#define p2m_get_hostp2m(d) (&(d)->arch.p2m)
+
 #endif /* _XEN_P2M_H */
 
 /*
-- 
2.1.0