|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH RFC 2/2] tools/libxc: Make the mem_access APIs generic
This patch does the following:
1. Add new xc_[sg]et_mem_access APIs.
2. Make xc_hvm_[sg]et_mem_access call the newer xc_[sg]et_mem_access
APIs and mark them as deprecated.
3. Make the upper bound for the number of pages to UINT_MAX for
xc_set_mem_access()
Signed-off-by: Aravindh Puthiyaparambil <aravindp@xxxxxxxxx>
Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
diff --git a/tools/libxc/xc_mem_access.c b/tools/libxc/xc_mem_access.c
index a50c145..2617c0e 100644
--- a/tools/libxc/xc_mem_access.c
+++ b/tools/libxc/xc_mem_access.c
@@ -22,7 +22,7 @@
*/
#include "xc_private.h"
-
+#include <xen/memory.h>
int xc_mem_access_enable(xc_interface *xch, domid_t domain_id,
uint32_t *port)
@@ -47,12 +47,59 @@ int xc_mem_access_disable(xc_interface *xch, domid_t
domain_id)
NULL);
}
+static int xc_mem_access_memop(xc_interface *xch, domid_t domid,
+ xen_mem_access_op_t *mao)
+{
+ mao->domid = domid;
+
+ return do_memory_op(xch, XENMEM_access_op, mao, sizeof(*mao));
+}
+
int xc_mem_access_resume(xc_interface *xch, domid_t domain_id, unsigned long
gfn)
{
- return xc_mem_event_memop(xch, domain_id,
- XENMEM_access_op_resume,
- XENMEM_access_op,
- gfn, NULL);
+ xen_mem_access_op_t mao;
+
+ memset(&mao, 0, sizeof(mao));
+ mao.op = XENMEM_access_op_resume;
+
+ return xc_mem_access_memop(xch, domain_id, &mao);
+}
+
+int xc_set_mem_access(xc_interface *xch,
+ domid_t domain_id,
+ xenmem_access_t mem_access,
+ uint64_t first_pfn,
+ uint32_t nr)
+{
+ xen_mem_access_op_t mao;
+
+ mao.op = XENMEM_access_op_set_access;
+ mao.domid = domain_id;
+ mao.xenmem_access = mem_access;
+ mao.pfn = first_pfn;
+ mao.nr = nr;
+
+ return xc_mem_access_memop(xch, domain_id, &mao);
+}
+
+int xc_get_mem_access(xc_interface *xch,
+ domid_t domain_id,
+ uint64_t pfn,
+ xenmem_access_t* mem_access)
+{
+ xen_mem_access_op_t mao;
+ int rc;
+
+ mao.op = XENMEM_access_op_get_access;
+ mao.domid = domain_id;
+ mao.pfn = pfn;
+
+ rc = xc_mem_access_memop(xch, domain_id, &mao);
+
+ if ( !rc )
+ *mem_access = mao.xenmem_access;
+
+ return rc;
}
/*
diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c
index 3303454..c38fb94 100644
--- a/tools/libxc/xc_misc.c
+++ b/tools/libxc/xc_misc.c
@@ -19,7 +19,9 @@
*/
#include "xc_private.h"
+#include <limits.h>
#include <xen/hvm/hvm_op.h>
+#include <xen/memory.h>
int xc_get_max_cpus(xc_interface *xch)
{
@@ -594,64 +596,18 @@ int xc_hvm_set_mem_type(
}
int xc_hvm_set_mem_access(
- xc_interface *xch, domid_t dom, hvmmem_access_t mem_access, uint64_t
first_pfn, uint64_t nr)
+ xc_interface *xch, domid_t dom, hvmmem_access_t mem_access,
+ uint64_t first_pfn, uint64_t nr)
{
- DECLARE_HYPERCALL;
- DECLARE_HYPERCALL_BUFFER(struct xen_hvm_set_mem_access, arg);
- int rc;
-
- arg = xc_hypercall_buffer_alloc(xch, arg, sizeof(*arg));
- if ( arg == NULL )
- {
- PERROR("Could not allocate memory for xc_hvm_set_mem_access
hypercall");
- return -1;
- }
-
- arg->domid = dom;
- arg->hvmmem_access = mem_access;
- arg->first_pfn = first_pfn;
- arg->nr = nr;
-
- hypercall.op = __HYPERVISOR_hvm_op;
- hypercall.arg[0] = HVMOP_set_mem_access;
- hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(arg);
-
- rc = do_xen_hypercall(xch, &hypercall);
-
- xc_hypercall_buffer_free(xch, arg);
-
- return rc;
+ if ( nr > UINT_MAX )
+ return -EINVAL;
+ return xc_set_mem_access(xch, dom, mem_access, first_pfn, nr);
}
int xc_hvm_get_mem_access(
xc_interface *xch, domid_t dom, uint64_t pfn, hvmmem_access_t* mem_access)
{
- DECLARE_HYPERCALL;
- DECLARE_HYPERCALL_BUFFER(struct xen_hvm_get_mem_access, arg);
- int rc;
-
- arg = xc_hypercall_buffer_alloc(xch, arg, sizeof(*arg));
- if ( arg == NULL )
- {
- PERROR("Could not allocate memory for xc_hvm_get_mem_access
hypercall");
- return -1;
- }
-
- arg->domid = dom;
- arg->pfn = pfn;
-
- hypercall.op = __HYPERVISOR_hvm_op;
- hypercall.arg[0] = HVMOP_get_mem_access;
- hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(arg);
-
- rc = do_xen_hypercall(xch, &hypercall);
-
- if ( !rc )
- *mem_access = arg->hvmmem_access;
-
- xc_hypercall_buffer_free(xch, arg);
-
- return rc;
+ return xc_get_mem_access(xch, dom, pfn, (xenmem_access_t *)mem_access);
}
int xc_hvm_inject_trap(
diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h
index e3a32f2..2fc6743 100644
--- a/tools/libxc/xenctrl.h
+++ b/tools/libxc/xenctrl.h
@@ -1730,14 +1730,17 @@ int xc_hvm_set_mem_type(
/*
* Set a range of memory to a specific access.
+ * Maximum value of nr is UINT_MAX
* Allowed types are HVMMEM_access_default, HVMMEM_access_n, any combination
of
* HVM_access_ + (rwx), and HVM_access_rx2rw
+ * Please note that this API has been deprecated by xc_set_mem_access()
*/
int xc_hvm_set_mem_access(
xc_interface *xch, domid_t dom, hvmmem_access_t memaccess, uint64_t
first_pfn, uint64_t nr);
/*
* Gets the mem access for the given page (returned in memacess on success)
+ * Please note that this API has been deprecated by xc_get_mem_access()
*/
int xc_hvm_get_mem_access(
xc_interface *xch, domid_t dom, uint64_t pfn, hvmmem_access_t* memaccess);
@@ -2062,6 +2065,21 @@ int xc_mem_access_disable(xc_interface *xch, domid_t
domain_id);
int xc_mem_access_resume(xc_interface *xch, domid_t domain_id,
unsigned long gfn);
+/*
+ * Set a range of memory to a specific access.
+ * Allowed types are XENMEM_access_default, XENMEM_access_n, any combination of
+ * XENMEM_access_ + (rwx), and XENMEM_access_rx2rw
+ */
+int xc_set_mem_access(xc_interface *xch, domid_t domain_id,
+ xenmem_access_t mem_access, uint64_t first_pfn,
+ uint32_t nr);
+
+/*
+ * Gets the mem access for the given page (returned in mem_acess on success)
+ */
+int xc_get_mem_access(xc_interface *xch, domid_t domain_id,
+ uint64_t pfn, xenmem_access_t* mem_access);
+
/***
* Memory sharing operations.
*
--
1.8.3.2
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |