|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH] x86/altp2m: Add a subop for obtaining the mem access of a page
A new function, p2m_access_to_xenmem_access(), has been added to avoid
code duplication. The existing _p2m_get_mem_access() now uses this
function as does p2m_get_mem_access().
---
tools/libxc/include/xenctrl.h | 3 ++
tools/libxc/xc_altp2m.c | 33 ++++++++++++--
xen/arch/arm/mem_access.c | 5 ++-
xen/arch/x86/hvm/hvm.c | 26 +++++++++--
xen/arch/x86/mm/mem_access.c | 80 +++++++++++++++++++++++----------
xen/common/mem_access.c | 2 +-
xen/include/public/hvm/hvm_op.h | 10 +++--
xen/include/xen/mem_access.h | 3 +-
8 files changed, 124 insertions(+), 38 deletions(-)
diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h
index 408fa1c6a4..f326bcbb4a 100644
--- a/tools/libxc/include/xenctrl.h
+++ b/tools/libxc/include/xenctrl.h
@@ -1964,6 +1964,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);
diff --git a/tools/libxc/xc_altp2m.c b/tools/libxc/xc_altp2m.c
index ce4a1e4d60..0ddb18fa2c 100644
--- a/tools/libxc/xc_altp2m.c
+++ b/tools/libxc/xc_altp2m.c
@@ -177,9 +177,9 @@ 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;
- arg->u.set_mem_access.view = view_id;
- arg->u.set_mem_access.hvmmem_access = access;
- arg->u.set_mem_access.gfn = gfn;
+ arg->u.mem_access.view = view_id;
+ arg->u.mem_access.hvmmem_access = access;
+ arg->u.mem_access.gfn = gfn;
rc = xencall2(handle->xcall, __HYPERVISOR_hvm_op, HVMOP_altp2m,
HYPERCALL_BUFFER_AS_ARG(arg));
@@ -254,3 +254,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;
+}
diff --git a/xen/arch/arm/mem_access.c b/xen/arch/arm/mem_access.c
index ae2686ffa2..ba9e50e7f6 100644
--- a/xen/arch/arm/mem_access.c
+++ b/xen/arch/arm/mem_access.c
@@ -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;
@@ -440,8 +440,9 @@ long p2m_set_mem_access_multi(struct domain *d,
return -EOPNOTSUPP;
}
+/* The altp2m_idx argument is not used on ARM. */
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);
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index c23983cdff..28e1719751 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -4509,6 +4509,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;
@@ -4625,12 +4626,12 @@ static int do_altp2m_op(
break;
case HVMOP_altp2m_set_mem_access:
- if ( a.u.set_mem_access.pad )
+ if ( a.u.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);
+ 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);
break;
case HVMOP_altp2m_set_mem_access_multi:
@@ -4666,6 +4667,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;
diff --git a/xen/arch/x86/mm/mem_access.c b/xen/arch/x86/mm/mem_access.c
index c0cd0174cf..b7b17acb4b 100644
--- a/xen/arch/x86/mm/mem_access.c
+++ b/xen/arch/x86/mm/mem_access.c
@@ -32,17 +32,10 @@
#include "mm-locks.h"
-/*
- * Get access type for a gfn.
- * If gfn == INVALID_GFN, gets the default access type.
- */
-static int _p2m_get_mem_access(struct p2m_domain *p2m, gfn_t gfn,
- xenmem_access_t *access)
+static int p2m_access_to_xenmem_access(struct p2m_domain *p2m,
+ p2m_access_t paccess,
+ xenmem_access_t *xaccess)
{
- p2m_type_t t;
- p2m_access_t a;
- mfn_t mfn;
-
static const xenmem_access_t memaccess[] = {
#define ACCESS(ac) [p2m_access_##ac] = XENMEM_access_##ac
ACCESS(n),
@@ -58,12 +51,27 @@ static int _p2m_get_mem_access(struct p2m_domain *p2m,
gfn_t gfn,
#undef ACCESS
};
+ if ( (unsigned int)paccess >= ARRAY_SIZE(memaccess) )
+ return -ERANGE;
+
+ *xaccess = memaccess[paccess];
+ return 0;
+}
+
+/*
+ * Get access type for a gfn.
+ * If gfn == INVALID_GFN, gets the default access type.
+ */
+static int _p2m_get_mem_access(struct p2m_domain *p2m, gfn_t gfn,
+ xenmem_access_t *access, unsigned int
altp2m_idx)
+{
+ p2m_type_t t;
+ p2m_access_t a;
+ mfn_t mfn;
+
/* If request to get default access. */
if ( gfn_eq(gfn, INVALID_GFN) )
- {
- *access = memaccess[p2m->default_access];
- return 0;
- }
+ return p2m_access_to_xenmem_access(p2m, p2m->default_access, access);
gfn_lock(p2m, gfn, 0);
mfn = p2m->get_entry(p2m, gfn, &t, &a, 0, NULL, NULL);
@@ -72,11 +80,7 @@ static int _p2m_get_mem_access(struct p2m_domain *p2m, gfn_t
gfn,
if ( mfn_eq(mfn, INVALID_MFN) )
return -ESRCH;
- if ( (unsigned int)a >= ARRAY_SIZE(memaccess) )
- return -ERANGE;
-
- *access = memaccess[a];
- return 0;
+ return p2m_access_to_xenmem_access(p2m, a, access);
}
bool p2m_mem_access_emulate_check(struct vcpu *v,
@@ -93,7 +97,7 @@ bool p2m_mem_access_emulate_check(struct vcpu *v,
if ( !p2m )
p2m = p2m_get_hostp2m(d);
- if ( _p2m_get_mem_access(p2m, _gfn(data->gfn), &access) == 0 )
+ if ( _p2m_get_mem_access(p2m, _gfn(data->gfn), &access, 0) == 0 )
{
switch ( access )
{
@@ -458,11 +462,41 @@ 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 *host_p2m = p2m_get_hostp2m(d);
+ struct p2m_domain *ap2m = NULL;
+ struct p2m_domain *p2m;
+ p2m_access_t a;
+ p2m_type_t t;
+ mfn_t mfn;
+
+ if ( altp2m_idx )
+ {
+ if ( altp2m_idx >= MAX_ALTP2M ||
+ d->arch.altp2m_eptp[altp2m_idx] == mfn_x(INVALID_MFN) )
+ return -EINVAL;
+
+ p2m = ap2m = d->arch.altp2m_p2m[altp2m_idx];
+ }
+ else
+ p2m = host_p2m;
+
+ p2m_read_lock(host_p2m);
+ if (ap2m)
+ p2m_read_lock(ap2m);
+
+ mfn = p2m->get_entry(p2m, gfn, &t, &a, 0, NULL, NULL);
+
+ if (ap2m)
+ p2m_read_unlock(ap2m);
+ p2m_read_unlock(host_p2m);
+
+ if ( mfn_eq(mfn, INVALID_MFN) )
+ return -ESRCH;
- return _p2m_get_mem_access(p2m, gfn, access);
+ return p2m_access_to_xenmem_access(p2m, a, access);
}
/*
diff --git a/xen/common/mem_access.c b/xen/common/mem_access.c
index 1bf6824442..010e6f8dbf 100644
--- a/xen/common/mem_access.c
+++ b/xen/common/mem_access.c
@@ -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;
diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h
index bbba99e5f5..36fd97f329 100644
--- a/xen/include/public/hvm/hvm_op.h
+++ b/xen/include/public/hvm/hvm_op.h
@@ -234,7 +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);
-struct xen_hvm_altp2m_set_mem_access {
+struct xen_hvm_altp2m_mem_access {
/* view */
uint16_t view;
/* Memory type */
@@ -243,8 +243,8 @@ struct xen_hvm_altp2m_set_mem_access {
/* gfn */
uint64_t gfn;
};
-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);
+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 +296,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 +305,7 @@ 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;
- struct xen_hvm_altp2m_set_mem_access set_mem_access;
+ 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];
diff --git a/xen/include/xen/mem_access.h b/xen/include/xen/mem_access.h
index 5ab34c1553..99fe11f6bc 100644
--- a/xen/include/xen/mem_access.h
+++ b/xen/include/xen/mem_access.h
@@ -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_HAS_MEM_ACCESS
int mem_access_memop(unsigned long cmd,
--
2.17.0
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |