Skip to contentSkip to conversation

x86/altp2m: Add a subop for obtaining the mem access of a page

PATCH In review Adrian Pop 5 participants 7 messages Sep 3, 2018 – Sep 25, 2018

lore
Share & tools
lore

Adrian Pop

author
#0 lore raw

PATCH v4 1/1 x86/altp2m: Add a subop for obtaining the mem access of a page

Currently there is a subop for setting the memaccess of a page, but not for consulting it. The new HVMOP_altp2m_get_mem_access adds this functionality.

Both altp2m get/set mem access functions use the struct xen_hvm_altp2m_mem_access which has now dropped the `set' part and has been renamed from xen_hvm_altp2m_set_mem_access.

---
Changes in v4:
- don't break the stable interface

Changes in v3:
- remove the unrelated helper function
- simplify the locking in p2m_get_mem_access

Changes in v2:
- use the _p2m_get_mem_access helper from p2m_get_mem_access
- minor Arm adjustments
- move out the addition of a memaccess helper function to a separate patch in the attempts of making the diff clearer

---
 tools/libxc/include/xenctrl.h   |  3 +++
 tools/libxc/xc_altp2m.c         | 33 +++++++++++++++++++++++++++++++++
 xen/arch/arm/mem_access.c       |  8 ++++++--
 xen/arch/x86/hvm/hvm.c          | 27 +++++++++++++++++++++++++++
 xen/arch/x86/mm/mem_access.c    | 21 +++++++++++++++++++--
 xen/common/mem_access.c         |  2 +-
 xen/include/public/hvm/hvm_op.h | 19 +++++++++++++++++++
 xen/include/public/xen-compat.h |  2 +-
 xen/include/xen/mem_access.h    |  3 ++-
 9 files changed, 111 insertions(+), 7 deletions(-)
tools/libxc/include/xenctrl.h +3 -0
index c626984aba..ae298899fc 100644
@@ -1958,6 +1958,9 @@ int xc_altp2m_set_mem_access(xc_interface *handle, uint32_t domid,
 int xc_altp2m_set_mem_access_multi(xc_interface *handle, uint32_t domid,
                                    uint16_t view_id, uint8_t *access,
                                    uint64_t *gfns, uint32_t nr);
+int xc_altp2m_get_mem_access(xc_interface *handle, uint32_t domid,
+                             uint16_t view_id, xen_pfn_t gfn,
+                             xenmem_access_t *access);
 int xc_altp2m_change_gfn(xc_interface *handle, uint32_t domid,
                          uint16_t view_id, xen_pfn_t old_gfn,
                          xen_pfn_t new_gfn);
tools/libxc/xc_altp2m.c +33 -0
index ce4a1e4d60..53754ff6d3 100644
@@ -177,9 +177,15 @@ int xc_altp2m_set_mem_access(xc_interface *handle, uint32_t domid,
     arg->version = HVMOP_ALTP2M_INTERFACE_VERSION;
     arg->cmd = HVMOP_altp2m_set_mem_access;
     arg->domain = domid;
+#if __XEN_INTERFACE_VERSION__ < 0x00040a00
     arg->u.set_mem_access.view = view_id;
     arg->u.set_mem_access.hvmmem_access = access;
     arg->u.set_mem_access.gfn = gfn;
+#else /* __XEN_INTERFACE_VERSION__ >= 0x00040a00 */
+    arg->u.mem_access.view = view_id;
+    arg->u.mem_access.hvmmem_access = access;
+    arg->u.mem_access.gfn = gfn;
+#endif
 
     rc = xencall2(handle->xcall, __HYPERVISOR_hvm_op, HVMOP_altp2m,
 		  HYPERCALL_BUFFER_AS_ARG(arg));
@@ -254,3 +260,30 @@ int xc_altp2m_set_mem_access_multi(xc_interface *xch, uint32_t domid,
 
     return rc;
 }
+
+int xc_altp2m_get_mem_access(xc_interface *handle, uint32_t domid,
+                             uint16_t view_id, xen_pfn_t gfn,
+                             xenmem_access_t *access)
+{
+    int rc;
+    DECLARE_HYPERCALL_BUFFER(xen_hvm_altp2m_op_t, arg);
+
+    arg = xc_hypercall_buffer_alloc(handle, arg, sizeof(*arg));
+    if ( arg == NULL )
+        return -1;
+
+    arg->version = HVMOP_ALTP2M_INTERFACE_VERSION;
+    arg->cmd = HVMOP_altp2m_get_mem_access;
+    arg->domain = domid;
+    arg->u.mem_access.view = view_id;
+    arg->u.mem_access.gfn = gfn;
+
+    rc = xencall2(handle->xcall, __HYPERVISOR_hvm_op, HVMOP_altp2m,
+                 HYPERCALL_BUFFER_AS_ARG(arg));
+
+    if ( !rc )
+        *access = arg->u.mem_access.hvmmem_access;
+
+    xc_hypercall_buffer_free(handle, arg);
+    return rc;
+}
xen/arch/arm/mem_access.c +6 -2
index ba4ec780fd..178bc1a6c1 100644
@@ -236,7 +236,7 @@ bool p2m_mem_access_check(paddr_t gpa, vaddr_t gla, const struct npfec npfec)
     if ( !p2m->mem_access_enabled )
         return true;
 
-    rc = p2m_get_mem_access(v->domain, gaddr_to_gfn(gpa), &xma);
+    rc = p2m_get_mem_access(v->domain, gaddr_to_gfn(gpa), &xma, 0);
     if ( rc )
         return true;
 
@@ -441,11 +441,15 @@ long p2m_set_mem_access_multi(struct domain *d,
 }
 
 int p2m_get_mem_access(struct domain *d, gfn_t gfn,
-                       xenmem_access_t *access)
+                       xenmem_access_t *access, unsigned int altp2m_idx)
 {
     int ret;
     struct p2m_domain *p2m = p2m_get_hostp2m(d);
 
+    /* altp2m is not yet implemented on Arm. The altp2m_idx should be 0. */
+    if ( altp2m_idx )
+        return -EINVAL;
+
     p2m_read_lock(p2m);
     ret = __p2m_get_mem_access(d, gfn, access);
     p2m_read_unlock(p2m);
xen/arch/x86/hvm/hvm.c +27 -0
index 72c51faecb..460c9f7d4f 100644
@@ -4526,6 +4526,7 @@ static int do_altp2m_op(
     case HVMOP_altp2m_switch_p2m:
     case HVMOP_altp2m_set_mem_access:
     case HVMOP_altp2m_set_mem_access_multi:
+    case HVMOP_altp2m_get_mem_access:
     case HVMOP_altp2m_change_gfn:
         break;
 
@@ -4642,12 +4643,21 @@ static int do_altp2m_op(
         break;
 
     case HVMOP_altp2m_set_mem_access:
+#if __XEN_INTERFACE_VERSION__ < 0x00040a00
         if ( a.u.set_mem_access.pad )
             rc = -EINVAL;
         else
             rc = p2m_set_mem_access(d, _gfn(a.u.set_mem_access.gfn), 1, 0, 0,
                                     a.u.set_mem_access.hvmmem_access,
                                     a.u.set_mem_access.view);
+#else /* __XEN_INTERFACE_VERSION__ >= 0x00040a00 */
+        if ( a.u.mem_access.pad )
+            rc = -EINVAL;
+        else
+            rc = p2m_set_mem_access(d, _gfn(a.u.mem_access.gfn), 1, 0, 0,
+                                    a.u.mem_access.hvmmem_access,
+                                    a.u.mem_access.view);
+#endif
         break;
 
     case HVMOP_altp2m_set_mem_access_multi:
@@ -4683,6 +4693,23 @@ static int do_altp2m_op(
         }
         break;
 
+    case HVMOP_altp2m_get_mem_access:
+        if ( a.u.mem_access.pad )
+            rc = -EINVAL;
+        else
+        {
+            xenmem_access_t access;
+
+            rc = p2m_get_mem_access(d, _gfn(a.u.mem_access.gfn), &access,
+                                    a.u.mem_access.view);
+            if ( !rc )
+            {
+                a.u.mem_access.hvmmem_access = access;
+                rc = __copy_to_guest(arg, &a, 1) ? -EFAULT : 0;
+            }
+        }
+        break;
+
     case HVMOP_altp2m_change_gfn:
         if ( a.u.change_gfn.pad1 || a.u.change_gfn.pad2 )
             rc = -EINVAL;
xen/arch/x86/mm/mem_access.c +19 -2
index 84d260ebd8..78abdaed36 100644
@@ -469,9 +469,26 @@ long p2m_set_mem_access_multi(struct domain *d,
     return rc;
 }
 
-int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access)
+int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access,
+                       unsigned int altp2m_idx)
 {
-    struct p2m_domain *p2m = p2m_get_hostp2m(d);
+    struct p2m_domain *p2m;
+
+    if ( !altp2m_active(d) )
+    {
+        if ( altp2m_idx )
+            return -EINVAL;
+
+        p2m = p2m_get_hostp2m(d);
+    }
+    else
+    {
+        if ( altp2m_idx >= MAX_ALTP2M ||
+             d->arch.altp2m_eptp[altp2m_idx] == mfn_x(INVALID_MFN) )
+            return -EINVAL;
+
+        p2m = d->arch.altp2m_p2m[altp2m_idx];
+    }
 
     return _p2m_get_mem_access(p2m, gfn, access);
 }
xen/common/mem_access.c +1 -1
index 1bf6824442..010e6f8dbf 100644
@@ -99,7 +99,7 @@ int mem_access_memop(unsigned long cmd,
         if ( (mao.pfn > domain_get_maximum_gpfn(d)) && mao.pfn != ~0ull )
             break;
 
-        rc = p2m_get_mem_access(d, _gfn(mao.pfn), &access);
+        rc = p2m_get_mem_access(d, _gfn(mao.pfn), &access, 0);
         if ( rc != 0 )
             break;
 
xen/include/public/hvm/hvm_op.h +19 -0
index bbba99e5f5..bbb0aa984a 100644
@@ -234,6 +234,7 @@ struct xen_hvm_altp2m_view {
 typedef struct xen_hvm_altp2m_view xen_hvm_altp2m_view_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_view_t);
 
+#if __XEN_INTERFACE_VERSION__ < 0x00040a00
 struct xen_hvm_altp2m_set_mem_access {
     /* view */
     uint16_t view;
@@ -245,6 +246,19 @@ struct xen_hvm_altp2m_set_mem_access {
 };
 typedef struct xen_hvm_altp2m_set_mem_access xen_hvm_altp2m_set_mem_access_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_set_mem_access_t);
+#endif /* __XEN_INTERFACE_VERSION__ < 0x00040a00 */
+
+struct xen_hvm_altp2m_mem_access {
+    /* view */
+    uint16_t view;
+    /* Memory type */
+    uint16_t hvmmem_access; /* xenmem_access_t */
+    uint32_t pad;
+    /* gfn */
+    uint64_t gfn;
+};
+typedef struct xen_hvm_altp2m_mem_access xen_hvm_altp2m_mem_access_t;
+DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_mem_access_t);
 
 struct xen_hvm_altp2m_set_mem_access_multi {
     /* view */
@@ -296,6 +310,8 @@ struct xen_hvm_altp2m_op {
 #define HVMOP_altp2m_change_gfn           8
 /* Set access for an array of pages */
 #define HVMOP_altp2m_set_mem_access_multi 9
+/* Get the access of a page of memory from a certain view */
+#define HVMOP_altp2m_get_mem_access       10
     domid_t domain;
     uint16_t pad1;
     uint32_t pad2;
@@ -303,7 +319,10 @@ struct xen_hvm_altp2m_op {
         struct xen_hvm_altp2m_domain_state         domain_state;
         struct xen_hvm_altp2m_vcpu_enable_notify   enable_notify;
         struct xen_hvm_altp2m_view                 view;
+#if __XEN_INTERFACE_VERSION__ < 0x00040a00
         struct xen_hvm_altp2m_set_mem_access       set_mem_access;
+#endif /* __XEN_INTERFACE_VERSION__ < 0x00040a00 */
+        struct xen_hvm_altp2m_mem_access           mem_access;
         struct xen_hvm_altp2m_change_gfn           change_gfn;
         struct xen_hvm_altp2m_set_mem_access_multi set_mem_access_multi;
         uint8_t pad[64];
xen/include/public/xen-compat.h +1 -1
index b67365340b..fa6ffb72e8 100644
@@ -27,7 +27,7 @@
 #ifndef __XEN_PUBLIC_XEN_COMPAT_H__
 #define __XEN_PUBLIC_XEN_COMPAT_H__
 
-#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040900
+#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040a00
 
 #if defined(__XEN__) || defined(__XEN_TOOLS__)
 /* Xen is built with matching headers and implements the latest interface. */
xen/include/xen/mem_access.h +2 -1
index 7e95eab81c..7348f81233 100644
@@ -76,7 +76,8 @@ long p2m_set_mem_access_multi(struct domain *d,
  * Get access type for a gfn.
  * If gfn == INVALID_GFN, gets the default access type.
  */
-int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access);
+int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access,
+                       unsigned int altp2m_idx);
 
 #ifdef CONFIG_MEM_ACCESS
 int mem_access_memop(unsigned long cmd,
Signature · 7 lines
2.18.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#1 lore raw
Quoted 55 lines · Adrian Pop

Currently there is a subop for setting the memaccess of a page, but not for consulting it. The new HVMOP_altp2m_get_mem_access adds this functionality.

Both altp2m get/set mem access functions use the struct xen_hvm_altp2m_mem_access which has now dropped the `set' part and has been renamed from xen_hvm_altp2m_set_mem_access.

---
Changes in v4:
- don't break the stable interface

Changes in v3:
- remove the unrelated helper function
- simplify the locking in p2m_get_mem_access

Changes in v2:
- use the _p2m_get_mem_access helper from p2m_get_mem_access
- minor Arm adjustments
- move out the addition of a memaccess helper function to a separate patch in the attempts of making the diff clearer

---
 tools/libxc/include/xenctrl.h   |  3 +++
 tools/libxc/xc_altp2m.c         | 33 +++++++++++++++++++++++++++++++++
 xen/arch/arm/mem_access.c       |  8 ++++++--
 xen/arch/x86/hvm/hvm.c          | 27 +++++++++++++++++++++++++++
 xen/arch/x86/mm/mem_access.c    | 21 +++++++++++++++++++--
 xen/common/mem_access.c         |  2 +-
 xen/include/public/hvm/hvm_op.h | 19 +++++++++++++++++++
 xen/include/public/xen-compat.h |  2 +-
 xen/include/xen/mem_access.h    |  3 ++-
 9 files changed, 111 insertions(+), 7 deletions(-)
tools/libxc/include/xenctrl.h +3 -0
index c626984aba..ae298899fc 100644
@@ -1958,6 +1958,9 @@ int xc_altp2m_set_mem_access(xc_interface *handle, uint32_t domid,
 int xc_altp2m_set_mem_access_multi(xc_interface *handle, uint32_t domid,
                                    uint16_t view_id, uint8_t *access,
                                    uint64_t *gfns, uint32_t nr);
+int xc_altp2m_get_mem_access(xc_interface *handle, uint32_t domid,
+                             uint16_t view_id, xen_pfn_t gfn,
+                             xenmem_access_t *access);
 int xc_altp2m_change_gfn(xc_interface *handle, uint32_t domid,
                          uint16_t view_id, xen_pfn_t old_gfn,
                          xen_pfn_t new_gfn);
tools/libxc/xc_altp2m.c +0 -0
index ce4a1e4d60..53754ff6d3 100644
@@ -177,9 +177,15 @@ int xc_altp2m_set_mem_access(xc_interface *handle, uint32_t domid,
     arg->version = HVMOP_ALTP2M_INTERFACE_VERSION;
     arg->cmd = HVMOP_altp2m_set_mem_access;

tools/libxc/xc_altp2m.c int xc_altp2m_set_mem_access(xc_interface *handle, uint32_t domid, · line 188

Quoted 10 lines
tools/libxc/xc_altp2m.c +6 -0
     arg->domain = domid;
+#if __XEN_INTERFACE_VERSION__ < 0x00040a00
     arg->u.set_mem_access.view = view_id;
     arg->u.set_mem_access.hvmmem_access = access;
     arg->u.set_mem_access.gfn = gfn;
+#else /* __XEN_INTERFACE_VERSION__ >= 0x00040a00 */
+    arg->u.mem_access.view = view_id;
+    arg->u.mem_access.hvmmem_access = access;
+    arg->u.mem_access.gfn = gfn;
+#endif

You don't need to do this for tools and hypervisor. They are always built with the latest interface -- see xen-compat.h, which you modified.

The only relevant changes are the ones in hvm_op.h AFAICT.

Quoted 1 line

[...]

Quoted 13 lines
xen/include/public/hvm/hvm_op.h +1 -0
index bbba99e5f5..bbb0aa984a 100644
@@ -234,6 +234,7 @@ struct xen_hvm_altp2m_view {
 typedef struct xen_hvm_altp2m_view xen_hvm_altp2m_view_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_view_t);
 
+#if __XEN_INTERFACE_VERSION__ < 0x00040a00
 struct xen_hvm_altp2m_set_mem_access {
     /* view */
     uint16_t view;

xen/include/public/hvm/hvm_op.h struct xen_hvm_altp2m_set_mem_access { · line 249

Quoted 4 lines
xen/include/public/hvm/hvm_op.h +1 -0
@@ -245,6 +246,19 @@ struct xen_hvm_altp2m_set_mem_access {
 };
 typedef struct xen_hvm_altp2m_set_mem_access xen_hvm_altp2m_set_mem_access_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_set_mem_access_t);
+#endif /* __XEN_INTERFACE_VERSION__ < 0x00040a00 */

#else here please, otherwise you're adding this new interface to a set of old interfaces.

Quoted 4 lines
xen/include/public/hvm/hvm_op.h +4 -0
+
+struct xen_hvm_altp2m_mem_access {
+    /* view */
+    uint16_t view;

xen/include/public/hvm/hvm_op.h struct xen_hvm_altp2m_set_mem_access { · line 263

Quoted 10 lines
xen/include/public/hvm/hvm_op.h +8 -0
+    /* Memory type */
+    uint16_t hvmmem_access; /* xenmem_access_t */
+    uint32_t pad;
+    /* gfn */
+    uint64_t gfn;
+};
+typedef struct xen_hvm_altp2m_mem_access xen_hvm_altp2m_mem_access_t;
+DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_mem_access_t);
 
 struct xen_hvm_altp2m_set_mem_access_multi {

Why not provide xen_hvm_altp2m_mem_access_multi at the same time. That would save you adding more compatibility cruft later.

Wei.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#2 lore raw
Quoted 8 lines
Quoted 1 line
Quoted 1 line · On 19.09.18 at 16:44, <[email protected]> wrote:
Quoted 6 lines · Adrian Pop
xen/include/public/hvm/hvm_op.h +0 -0
@@ -234,6 +234,7 @@ struct xen_hvm_altp2m_view {
 typedef struct xen_hvm_altp2m_view xen_hvm_altp2m_view_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_view_t);
 
Quoted 12 lines

xen/include/public/hvm/hvm_op.h struct xen_hvm_altp2m_set_mem_access { · line 249

Quoted 9 lines
xen/include/public/hvm/hvm_op.h +2 -0
+#if __XEN_INTERFACE_VERSION__ < 0x00040a00
 struct xen_hvm_altp2m_set_mem_access {
     /* view */
     uint16_t view;
@@ -245,6 +246,19 @@ struct xen_hvm_altp2m_set_mem_access {
 };
 typedef struct xen_hvm_altp2m_set_mem_access xen_hvm_altp2m_set_mem_access_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_set_mem_access_t);
+#endif /* __XEN_INTERFACE_VERSION__ < 0x00040a00 */

#else here please, otherwise you're adding this new interface to a set of old interfaces.

I don't think we do so elsewhere, so I'd prefer if we didn't do so here either. By unconditionally exposing the new interface we allow people to morph their code in steps, rather than all in one go at the point they bump their __XEN_INTERFACE_VERSION__ setting.

Jan

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#3 lore raw
Quoted 21 lines · Jan Beulich
Quoted 8 lines
Quoted 1 line
Quoted 1 line · On 19.09.18 at 16:44, <[email protected]> wrote:
Quoted 6 lines · Adrian Pop
xen/include/public/hvm/hvm_op.h +0 -0
@@ -234,6 +234,7 @@ struct xen_hvm_altp2m_view {
 typedef struct xen_hvm_altp2m_view xen_hvm_altp2m_view_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_view_t);
 
Quoted 12 lines

xen/include/public/hvm/hvm_op.h struct xen_hvm_altp2m_set_mem_access { · line 249

Quoted 9 lines
xen/include/public/hvm/hvm_op.h +2 -0
+#if __XEN_INTERFACE_VERSION__ < 0x00040a00
 struct xen_hvm_altp2m_set_mem_access {
     /* view */
     uint16_t view;
@@ -245,6 +246,19 @@ struct xen_hvm_altp2m_set_mem_access {
 };
 typedef struct xen_hvm_altp2m_set_mem_access xen_hvm_altp2m_set_mem_access_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_set_mem_access_t);
+#endif /* __XEN_INTERFACE_VERSION__ < 0x00040a00 */

#else here please, otherwise you're adding this new interface to a set of old interfaces.

Quoted 6 lines

I don't think we do so elsewhere, so I'd prefer if we didn't do so here either. By unconditionally exposing the new interface we allow people to morph their code in steps, rather than all in one go at the point they bump their __XEN_INTERFACE_VERSION__ setting.

Okay, I'm not too fussed. Your argument sounds reasonable.

Wei.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#4 lore raw
In reply to Adrian Pop
Quoted 114 lines · Adrian Pop

Currently there is a subop for setting the memaccess of a page, but not for consulting it. The new HVMOP_altp2m_get_mem_access adds this functionality.

Both altp2m get/set mem access functions use the struct xen_hvm_altp2m_mem_access which has now dropped the `set' part and has been renamed from xen_hvm_altp2m_set_mem_access.

---
Changes in v4:
- don't break the stable interface

Changes in v3:
- remove the unrelated helper function
- simplify the locking in p2m_get_mem_access

Changes in v2:
- use the _p2m_get_mem_access helper from p2m_get_mem_access
- minor Arm adjustments
- move out the addition of a memaccess helper function to a separate patch in the attempts of making the diff clearer

---
 tools/libxc/include/xenctrl.h   |  3 +++
 tools/libxc/xc_altp2m.c         | 33 +++++++++++++++++++++++++++++++++
 xen/arch/arm/mem_access.c       |  8 ++++++--
 xen/arch/x86/hvm/hvm.c          | 27 +++++++++++++++++++++++++++
 xen/arch/x86/mm/mem_access.c    | 21 +++++++++++++++++++--
 xen/common/mem_access.c         |  2 +-
 xen/include/public/hvm/hvm_op.h | 19 +++++++++++++++++++
 xen/include/public/xen-compat.h |  2 +-
 xen/include/xen/mem_access.h    |  3 ++-
 9 files changed, 111 insertions(+), 7 deletions(-)
tools/libxc/include/xenctrl.h +3 -0
index c626984aba..ae298899fc 100644
@@ -1958,6 +1958,9 @@ int xc_altp2m_set_mem_access(xc_interface *handle, uint32_t domid,
 int xc_altp2m_set_mem_access_multi(xc_interface *handle, uint32_t domid,
                                    uint16_t view_id, uint8_t *access,
                                    uint64_t *gfns, uint32_t nr);
+int xc_altp2m_get_mem_access(xc_interface *handle, uint32_t domid,
+                             uint16_t view_id, xen_pfn_t gfn,
+                             xenmem_access_t *access);
 int xc_altp2m_change_gfn(xc_interface *handle, uint32_t domid,
                          uint16_t view_id, xen_pfn_t old_gfn,
                          xen_pfn_t new_gfn);
tools/libxc/xc_altp2m.c +33 -0
index ce4a1e4d60..53754ff6d3 100644
@@ -177,9 +177,15 @@ int xc_altp2m_set_mem_access(xc_interface *handle, uint32_t domid,
     arg->version = HVMOP_ALTP2M_INTERFACE_VERSION;
     arg->cmd = HVMOP_altp2m_set_mem_access;
     arg->domain = domid;
+#if __XEN_INTERFACE_VERSION__ < 0x00040a00
     arg->u.set_mem_access.view = view_id;
     arg->u.set_mem_access.hvmmem_access = access;
     arg->u.set_mem_access.gfn = gfn;
+#else /* __XEN_INTERFACE_VERSION__ >= 0x00040a00 */
+    arg->u.mem_access.view = view_id;
+    arg->u.mem_access.hvmmem_access = access;
+    arg->u.mem_access.gfn = gfn;
+#endif
 
     rc = xencall2(handle->xcall, __HYPERVISOR_hvm_op, HVMOP_altp2m,
                  HYPERCALL_BUFFER_AS_ARG(arg));
@@ -254,3 +260,30 @@ int xc_altp2m_set_mem_access_multi(xc_interface *xch, uint32_t domid,
 
     return rc;
 }
+
+int xc_altp2m_get_mem_access(xc_interface *handle, uint32_t domid,
+                             uint16_t view_id, xen_pfn_t gfn,
+                             xenmem_access_t *access)
+{
+    int rc;
+    DECLARE_HYPERCALL_BUFFER(xen_hvm_altp2m_op_t, arg);
+
+    arg = xc_hypercall_buffer_alloc(handle, arg, sizeof(*arg));
+    if ( arg == NULL )
+        return -1;
+
+    arg->version = HVMOP_ALTP2M_INTERFACE_VERSION;
+    arg->cmd = HVMOP_altp2m_get_mem_access;
+    arg->domain = domid;
+    arg->u.mem_access.view = view_id;
+    arg->u.mem_access.gfn = gfn;
+
+    rc = xencall2(handle->xcall, __HYPERVISOR_hvm_op, HVMOP_altp2m,
+                 HYPERCALL_BUFFER_AS_ARG(arg));
+
+    if ( !rc )
+        *access = arg->u.mem_access.hvmmem_access;
+
+    xc_hypercall_buffer_free(handle, arg);
+    return rc;
+}
xen/arch/arm/mem_access.c +1 -1
index ba4ec780fd..178bc1a6c1 100644
@@ -236,7 +236,7 @@ bool p2m_mem_access_check(paddr_t gpa, vaddr_t gla, const struct npfec npfec)
     if ( !p2m->mem_access_enabled )
         return true;
 
-    rc = p2m_get_mem_access(v->domain, gaddr_to_gfn(gpa), &xma);
+    rc = p2m_get_mem_access(v->domain, gaddr_to_gfn(gpa), &xma, 0);
     if ( rc )
         return true;
 

xen/arch/arm/mem_access.c long p2m_set_mem_access_multi(struct domain *d, · line 449

Quoted 10 lines
xen/arch/arm/mem_access.c +2 -1
@@ -441,11 +441,15 @@ long p2m_set_mem_access_multi(struct domain *d,
 }
 
 int p2m_get_mem_access(struct domain *d, gfn_t gfn,
-                       xenmem_access_t *access)
+                       xenmem_access_t *access, unsigned int altp2m_idx)
 {
     int ret;
     struct p2m_domain *p2m = p2m_get_hostp2m(d);
 
+    /* altp2m is not yet implemented on Arm. The altp2m_idx should be 0. */

Just use ASSERT here.

Quoted 123 lines
xen/arch/arm/mem_access.c +3 -0
+    if ( altp2m_idx )
+        return -EINVAL;
+
     p2m_read_lock(p2m);
     ret = __p2m_get_mem_access(d, gfn, access);
     p2m_read_unlock(p2m);
xen/arch/x86/hvm/hvm.c +27 -0
index 72c51faecb..460c9f7d4f 100644
@@ -4526,6 +4526,7 @@ static int do_altp2m_op(
     case HVMOP_altp2m_switch_p2m:
     case HVMOP_altp2m_set_mem_access:
     case HVMOP_altp2m_set_mem_access_multi:
+    case HVMOP_altp2m_get_mem_access:
     case HVMOP_altp2m_change_gfn:
         break;
 
@@ -4642,12 +4643,21 @@ static int do_altp2m_op(
         break;
 
     case HVMOP_altp2m_set_mem_access:
+#if __XEN_INTERFACE_VERSION__ < 0x00040a00
         if ( a.u.set_mem_access.pad )
             rc = -EINVAL;
         else
             rc = p2m_set_mem_access(d, _gfn(a.u.set_mem_access.gfn), 1, 0, 0,
                                     a.u.set_mem_access.hvmmem_access,
                                     a.u.set_mem_access.view);
+#else /* __XEN_INTERFACE_VERSION__ >= 0x00040a00 */
+        if ( a.u.mem_access.pad )
+            rc = -EINVAL;
+        else
+            rc = p2m_set_mem_access(d, _gfn(a.u.mem_access.gfn), 1, 0, 0,
+                                    a.u.mem_access.hvmmem_access,
+                                    a.u.mem_access.view);
+#endif
         break;
 
     case HVMOP_altp2m_set_mem_access_multi:
@@ -4683,6 +4693,23 @@ static int do_altp2m_op(
         }
         break;
 
+    case HVMOP_altp2m_get_mem_access:
+        if ( a.u.mem_access.pad )
+            rc = -EINVAL;
+        else
+        {
+            xenmem_access_t access;
+
+            rc = p2m_get_mem_access(d, _gfn(a.u.mem_access.gfn), &access,
+                                    a.u.mem_access.view);
+            if ( !rc )
+            {
+                a.u.mem_access.hvmmem_access = access;
+                rc = __copy_to_guest(arg, &a, 1) ? -EFAULT : 0;
+            }
+        }
+        break;
+
     case HVMOP_altp2m_change_gfn:
         if ( a.u.change_gfn.pad1 || a.u.change_gfn.pad2 )
             rc = -EINVAL;
xen/arch/x86/mm/mem_access.c +19 -2
index 84d260ebd8..78abdaed36 100644
@@ -469,9 +469,26 @@ long p2m_set_mem_access_multi(struct domain *d,
     return rc;
 }
 
-int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access)
+int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access,
+                       unsigned int altp2m_idx)
 {
-    struct p2m_domain *p2m = p2m_get_hostp2m(d);
+    struct p2m_domain *p2m;
+
+    if ( !altp2m_active(d) )
+    {
+        if ( altp2m_idx )
+            return -EINVAL;
+
+        p2m = p2m_get_hostp2m(d);
+    }
+    else
+    {
+        if ( altp2m_idx >= MAX_ALTP2M ||
+             d->arch.altp2m_eptp[altp2m_idx] == mfn_x(INVALID_MFN) )
+            return -EINVAL;
+
+        p2m = d->arch.altp2m_p2m[altp2m_idx];
+    }
 
     return _p2m_get_mem_access(p2m, gfn, access);
 }
xen/common/mem_access.c +1 -1
index 1bf6824442..010e6f8dbf 100644
@@ -99,7 +99,7 @@ int mem_access_memop(unsigned long cmd,
         if ( (mao.pfn > domain_get_maximum_gpfn(d)) && mao.pfn != ~0ull )
             break;
 
-        rc = p2m_get_mem_access(d, _gfn(mao.pfn), &access);
+        rc = p2m_get_mem_access(d, _gfn(mao.pfn), &access, 0);
         if ( rc != 0 )
             break;
 
xen/include/public/hvm/hvm_op.h +1 -0
index bbba99e5f5..bbb0aa984a 100644
@@ -234,6 +234,7 @@ struct xen_hvm_altp2m_view {
 typedef struct xen_hvm_altp2m_view xen_hvm_altp2m_view_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_view_t);
 
+#if __XEN_INTERFACE_VERSION__ < 0x00040a00
 struct xen_hvm_altp2m_set_mem_access {
     /* view */
     uint16_t view;

xen/include/public/hvm/hvm_op.h struct xen_hvm_altp2m_set_mem_access { · line 255

Quoted 10 lines
xen/include/public/hvm/hvm_op.h +7 -0
@@ -245,6 +246,19 @@ struct xen_hvm_altp2m_set_mem_access {
 };
 typedef struct xen_hvm_altp2m_set_mem_access xen_hvm_altp2m_set_mem_access_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_set_mem_access_t);
+#endif /* __XEN_INTERFACE_VERSION__ < 0x00040a00 */
+
+struct xen_hvm_altp2m_mem_access {
+    /* view */
+    uint16_t view;
+    /* Memory type */
+    uint16_t hvmmem_access; /* xenmem_access_t */

A structure name with "mem_access" having a variable name "hvmmem_access" and a comment saying "xenmem_access". This is confusing. I understand that you copy/pasted this from the existing op but it doesn't look good. Perhaps fix both if we are touching it? Also, in public/memory.h the width of access is uint8_t so I'm not sure why the discrepancy.

Quoted 57 lines
xen/include/public/hvm/hvm_op.h +11 -0
+    uint32_t pad;
+    /* gfn */
+    uint64_t gfn;
+};
+typedef struct xen_hvm_altp2m_mem_access xen_hvm_altp2m_mem_access_t;
+DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_mem_access_t);
 
 struct xen_hvm_altp2m_set_mem_access_multi {
     /* view */
@@ -296,6 +310,8 @@ struct xen_hvm_altp2m_op {
 #define HVMOP_altp2m_change_gfn           8
 /* Set access for an array of pages */
 #define HVMOP_altp2m_set_mem_access_multi 9
+/* Get the access of a page of memory from a certain view */
+#define HVMOP_altp2m_get_mem_access       10
     domid_t domain;
     uint16_t pad1;
     uint32_t pad2;
@@ -303,7 +319,10 @@ struct xen_hvm_altp2m_op {
         struct xen_hvm_altp2m_domain_state         domain_state;
         struct xen_hvm_altp2m_vcpu_enable_notify   enable_notify;
         struct xen_hvm_altp2m_view                 view;
+#if __XEN_INTERFACE_VERSION__ < 0x00040a00
         struct xen_hvm_altp2m_set_mem_access       set_mem_access;
+#endif /* __XEN_INTERFACE_VERSION__ < 0x00040a00 */
+        struct xen_hvm_altp2m_mem_access           mem_access;
         struct xen_hvm_altp2m_change_gfn           change_gfn;
         struct xen_hvm_altp2m_set_mem_access_multi set_mem_access_multi;
         uint8_t pad[64];
xen/include/public/xen-compat.h +1 -1
index b67365340b..fa6ffb72e8 100644
@@ -27,7 +27,7 @@
 #ifndef __XEN_PUBLIC_XEN_COMPAT_H__
 #define __XEN_PUBLIC_XEN_COMPAT_H__
 
-#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040900
+#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040a00
 
 #if defined(__XEN__) || defined(__XEN_TOOLS__)
 /* Xen is built with matching headers and implements the latest interface. */
xen/include/xen/mem_access.h +2 -2
index 7e95eab81c..7348f81233 100644
@@ -76,7 +76,8 @@ long p2m_set_mem_access_multi(struct domain *d,
  * Get access type for a gfn.
  * If gfn == INVALID_GFN, gets the default access type.
  */
-int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access);
+int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access,
+                       unsigned int altp2m_idx);
 
 #ifdef CONFIG_MEM_ACCESS
 int mem_access_memop(unsigned long cmd,
--
Quoted 1 line

2.18.0

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#5 lore raw
Quoted 23 lines · Tamas K Lengyel
Quoted 22 lines · Adrian Pop
xen/include/public/hvm/hvm_op.h +7 -0
index bbba99e5f5..bbb0aa984a 100644
@@ -234,6 +234,7 @@ struct xen_hvm_altp2m_view {
 typedef struct xen_hvm_altp2m_view xen_hvm_altp2m_view_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_view_t);
 
+#if __XEN_INTERFACE_VERSION__ < 0x00040a00
 struct xen_hvm_altp2m_set_mem_access {
     /* view */
     uint16_t view;
@@ -245,6 +246,19 @@ struct xen_hvm_altp2m_set_mem_access {
 };
 typedef struct xen_hvm_altp2m_set_mem_access xen_hvm_altp2m_set_mem_access_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_set_mem_access_t);
+#endif /* __XEN_INTERFACE_VERSION__ < 0x00040a00 */
+
+struct xen_hvm_altp2m_mem_access {
+    /* view */
+    uint16_t view;
+    /* Memory type */
Quoted 8 lines

xen/include/public/hvm/hvm_op.h struct xen_hvm_altp2m_set_mem_access { · line 255

Quoted 1 line
xen/include/public/hvm/hvm_op.h +1 -0
+    uint16_t hvmmem_access; /* xenmem_access_t */

A structure name with "mem_access" having a variable name "hvmmem_access" and a comment saying "xenmem_access". This is confusing. I understand that you copy/pasted this from the existing op but it doesn't look good. Perhaps fix both if we are touching it? Also, in public/memory.h the width of access is uint8_t so I'm not sure why the discrepancy.

The uint16_t has been probably chosen to be that because it simplifies padding. I can rename "hvmmem_access" to simply "access". Should I just remove the comment, or do you think something else is more appropriate?

Thanks,
Razvan

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#6 lore raw
Quoted 34 lines · Razvan Cojocaru
Quoted 23 lines · Tamas K Lengyel
Quoted 22 lines · Adrian Pop
xen/include/public/hvm/hvm_op.h +7 -0
index bbba99e5f5..bbb0aa984a 100644
@@ -234,6 +234,7 @@ struct xen_hvm_altp2m_view {
 typedef struct xen_hvm_altp2m_view xen_hvm_altp2m_view_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_view_t);
 
+#if __XEN_INTERFACE_VERSION__ < 0x00040a00
 struct xen_hvm_altp2m_set_mem_access {
     /* view */
     uint16_t view;
@@ -245,6 +246,19 @@ struct xen_hvm_altp2m_set_mem_access {
 };
 typedef struct xen_hvm_altp2m_set_mem_access xen_hvm_altp2m_set_mem_access_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_set_mem_access_t);
+#endif /* __XEN_INTERFACE_VERSION__ < 0x00040a00 */
+
+struct xen_hvm_altp2m_mem_access {
+    /* view */
+    uint16_t view;
+    /* Memory type */
Quoted 8 lines

xen/include/public/hvm/hvm_op.h struct xen_hvm_altp2m_set_mem_access { · line 255

Quoted 1 line
xen/include/public/hvm/hvm_op.h +1 -0
+    uint16_t hvmmem_access; /* xenmem_access_t */

A structure name with "mem_access" having a variable name "hvmmem_access" and a comment saying "xenmem_access". This is confusing. I understand that you copy/pasted this from the existing op but it doesn't look good. Perhaps fix both if we are touching it? Also, in public/memory.h the width of access is uint8_t so I'm not sure why the discrepancy.

Quoted 3 lines

The uint16_t has been probably chosen to be that because it simplifies padding. I can rename "hvmmem_access" to simply "access". Should I just remove the comment, or do you think something else is more appropriate?

Just renaming the variable should suffice, the comment is helpful to explain what values go in the field.

Thanks,
Tamas

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel