@@ -1923,9 +1923,6 @@ int xc_altp2m_destroy_view(xc_interface *handle, domid_t domid,
/* Switch all vCPUs of the domain to the specified altp2m view */
int xc_altp2m_switch_to_view(xc_interface *handle, domid_t domid,
uint16_t view_id);
-int xc_altp2m_set_mem_access(xc_interface *handle, domid_t domid,
- uint16_t view_id, xen_pfn_t gfn,
- xenmem_access_t access);
int xc_altp2m_change_gfn(xc_interface *handle, domid_t domid,
uint16_t view_id, xen_pfn_t old_gfn,
xen_pfn_t new_gfn);
@@ -1956,9 +1953,8 @@ int xc_mem_paging_load(xc_interface *xch, domid_t domain_id,
* 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 access, uint64_t first_pfn,
- uint32_t nr);
+int xc_set_mem_access(xc_interface *xch, domid_t domain_id, uint16_t view_id,
+ xenmem_access_t access, uint64_t first_pfn, uint32_t nr);
/*
* Set an array of pages to their respective access in the access array.
@@ -1966,7 +1962,7 @@ int xc_set_mem_access(xc_interface *xch, domid_t domain_id,
* The same allowed access types as for xc_set_mem_access() apply.
*/
int xc_set_mem_access_multi(xc_interface *xch, domid_t domain_id,
- uint8_t *access, uint64_t *pages,
+ uint16_t view_id, uint8_t *access, uint64_t *pages,
uint32_t nr);
/*
@@ -163,31 +163,6 @@ int xc_altp2m_switch_to_view(xc_interface *handle, domid_t domid,
return rc;
}
-int xc_altp2m_set_mem_access(xc_interface *handle, domid_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_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;
-
- rc = xencall2(handle->xcall, __HYPERVISOR_hvm_op, HVMOP_altp2m,
- HYPERCALL_BUFFER_AS_ARG(arg));
-
- xc_hypercall_buffer_free(handle, arg);
- return rc;
-}
-
int xc_altp2m_change_gfn(xc_interface *handle, domid_t domid,
uint16_t view_id, xen_pfn_t old_gfn,
xen_pfn_t new_gfn)
@@ -25,17 +25,19 @@
int xc_set_mem_access(xc_interface *xch,
domid_t domain_id,
+ uint16_t view_id,
xenmem_access_t access,
uint64_t first_pfn,
uint32_t nr)
{
xen_mem_access_op_t mao =
{
- .op = XENMEM_access_op_set_access,
- .domid = domain_id,
- .access = access,
- .pfn = first_pfn,
- .nr = nr
+ .op = XENMEM_access_op_set_access,
+ .domid = domain_id,
+ .access = access,
+ .pfn = first_pfn,
+ .nr = nr,
+ .view_id = view_id
};
return do_memory_op(xch, XENMEM_access_op, &mao, sizeof(mao));
@@ -43,6 +45,7 @@ int xc_set_mem_access(xc_interface *xch,
int xc_set_mem_access_multi(xc_interface *xch,
domid_t domain_id,
+ uint16_t view_id,
uint8_t *access,
uint64_t *pages,
uint32_t nr)
@@ -59,6 +62,7 @@ int xc_set_mem_access_multi(xc_interface *xch,
.access = XENMEM_access_default + 1, /* Invalid value */
.pfn = ~0UL, /* Invalid GFN */
.nr = nr,
+ .view_id = view_id,
};
if ( xc_hypercall_bounce_pre(xch, pages) ||
@@ -475,9 +475,6 @@ int main(int argc, char *argv[])
/* With altp2m we just create a new, restricted view of the memory */
if ( memaccess && altp2m )
{
- xen_pfn_t gfn = 0;
- unsigned long perm_set = 0;
-
rc = xc_altp2m_set_domain_state( xch, domain_id, 1 );
if ( rc < 0 )
{
@@ -495,15 +492,9 @@ int main(int argc, char *argv[])
DPRINTF("altp2m view created with id %u\n", altp2m_view_id);
DPRINTF("Setting altp2m mem_access permissions.. ");
- for(; gfn < xenaccess->max_gpfn; ++gfn)
- {
- rc = xc_altp2m_set_mem_access( xch, domain_id, altp2m_view_id, gfn,
- default_access);
- if ( !rc )
- perm_set++;
- }
-
- DPRINTF("done! Permissions set on %lu pages.\n", perm_set);
+ rc = xc_set_mem_access(xch, domain_id, altp2m_view_id, default_access,
+ 0, xenaccess->max_gpfn);
+ DPRINTF("done!");
rc = xc_altp2m_switch_to_view( xch, domain_id, altp2m_view_id );
if ( rc < 0 )
@@ -523,14 +514,14 @@ int main(int argc, char *argv[])
if ( memaccess && !altp2m )
{
/* Set the default access type and convert all pages to it */
- rc = xc_set_mem_access(xch, domain_id, default_access, ~0ull, 0);
+ rc = xc_set_mem_access(xch, domain_id, 0, default_access, ~0ull, 0);
if ( rc < 0 )
{
ERROR("Error %d setting default mem access type\n", rc);
goto exit;
}
- rc = xc_set_mem_access(xch, domain_id, default_access, START_PFN,
+ rc = xc_set_mem_access(xch, domain_id, 0, default_access, START_PFN,
(xenaccess->max_gpfn - START_PFN) );
if ( rc < 0 )
@@ -606,8 +597,8 @@ int main(int argc, char *argv[])
rc = xc_altp2m_set_domain_state(xch, domain_id, 0);
rc = xc_monitor_singlestep(xch, domain_id, 0);
} else {
- rc = xc_set_mem_access(xch, domain_id, XENMEM_access_rwx, ~0ull, 0);
- rc = xc_set_mem_access(xch, domain_id, XENMEM_access_rwx, START_PFN,
+ rc = xc_set_mem_access(xch, domain_id, 0, XENMEM_access_rwx, ~0ull, 0);
+ rc = xc_set_mem_access(xch, domain_id, 0, XENMEM_access_rwx, START_PFN,
(xenaccess->max_gpfn - START_PFN) );
}
@@ -685,7 +676,7 @@ int main(int argc, char *argv[])
}
else if ( default_access != after_first_access )
{
- rc = xc_set_mem_access(xch, domain_id, after_first_access,
+ rc = xc_set_mem_access(xch, domain_id, 0, after_first_access,
req.u.mem_access.gfn, 1);
if (rc < 0)
{
@@ -4418,7 +4418,6 @@ static int do_altp2m_op(
case HVMOP_altp2m_create_p2m:
case HVMOP_altp2m_destroy_p2m:
case HVMOP_altp2m_switch_p2m:
- case HVMOP_altp2m_set_mem_access:
case HVMOP_altp2m_change_gfn:
break;
default:
@@ -4526,15 +4525,6 @@ static int do_altp2m_op(
rc = p2m_switch_domain_altp2m_by_id(d, a.u.view.view);
break;
- case HVMOP_altp2m_set_mem_access:
- 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);
- break;
-
case HVMOP_altp2m_change_gfn:
if ( a.u.change_gfn.pad1 || a.u.change_gfn.pad2 )
rc = -EINVAL;
@@ -67,7 +67,7 @@ int mem_access_memop(unsigned long cmd,
break;
rc = p2m_set_mem_access(d, _gfn(mao.pfn), mao.nr, start_iter,
- MEMOP_CMD_MASK, mao.access, 0);
+ MEMOP_CMD_MASK, mao.access, mao.view_id);
if ( rc > 0 )
{
ASSERT(!(rc & MEMOP_CMD_MASK));
@@ -78,7 +78,7 @@ int mem_access_memop(unsigned long cmd,
case XENMEM_access_op_set_access_multi:
rc = p2m_set_mem_access_multi(d, mao.pfn_list, mao.access_list, mao.nr,
- start_iter, MEMOP_CMD_MASK, 0);
+ start_iter, MEMOP_CMD_MASK, mao.view_id);
if ( rc > 0 )
{
ASSERT(!(rc & MEMOP_CMD_MASK));
@@ -37,7 +37,7 @@
#include "hvm/save.h"
#include "memory.h"
-#define XEN_DOMCTL_INTERFACE_VERSION 0x0000000c
+#define XEN_DOMCTL_INTERFACE_VERSION 0x0000000d
/*
* NB. xen_domctl.domain is an IN/OUT parameter for this operation.
@@ -219,18 +219,6 @@ 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 {
- /* 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_set_mem_access xen_hvm_altp2m_set_mem_access_t;
-DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_set_mem_access_t);
-
struct xen_hvm_altp2m_change_gfn {
/* view */
uint16_t view;
@@ -258,7 +246,7 @@ struct xen_hvm_altp2m_op {
#define HVMOP_altp2m_destroy_p2m 5
/* Switch view for an entire domain */
#define HVMOP_altp2m_switch_p2m 6
-/* Notify that a page of memory is to have specific access types */
+/* Deprecated by XENMEM_access_op_set_access */
#define HVMOP_altp2m_set_mem_access 7
/* Change a p2m entry to have a different gfn->mfn mapping */
#define HVMOP_altp2m_change_gfn 8
@@ -269,7 +257,6 @@ 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_change_gfn change_gfn;
uint8_t pad[64];
} u;
@@ -444,6 +444,8 @@ struct xen_mem_access_op {
/* xenmem_access_t */
uint8_t access;
domid_t domid;
+ uint16_t view_id;
+ uint16_t pad;
/*
* Number of pages for set op (or size of pfn_list for
* XENMEM_access_op_set_access_multi)
xc_altp2m_set_mem_access() and xc_set_mem_access() end up doing the same thing in the hypervisor, but the former is a HVMOP and the latter a DOMCTL. Since nobody is currently using, or has stated intent to use, this functionality specifically as an HVMOP, this patch removes the HVMOP while adding an extra parameter to the more flexible DOMCTL variant, in which the altp2m view can be transmitted (0 for the default view, or when altp2m is disabled). The xen-access test has been updated in the process. Signed-off-by: Razvan Cojocaru <rcojocaru@bitdefender.com> --- tools/libxc/include/xenctrl.h | 10 +++------- tools/libxc/xc_altp2m.c | 25 ------------------------- tools/libxc/xc_mem_access.c | 14 +++++++++----- tools/tests/xen-access/xen-access.c | 25 ++++++++----------------- xen/arch/x86/hvm/hvm.c | 10 ---------- xen/common/mem_access.c | 4 ++-- xen/include/public/domctl.h | 2 +- xen/include/public/hvm/hvm_op.h | 15 +-------------- xen/include/public/memory.h | 2 ++ 9 files changed, 26 insertions(+), 81 deletions(-)