From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tamas K Lengyel Subject: [PATCH v2 2/2] altp2m: Implement p2m_get_mem_access for altp2m views Date: Thu, 28 Jan 2016 13:58:08 -0700 Message-ID: <1454014688-25060-2-git-send-email-tlengyel@novetta.com> References: <1454014688-25060-1-git-send-email-tlengyel@novetta.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aOte0-0007TP-DH for xen-devel@lists.xenproject.org; Thu, 28 Jan 2016 20:58:20 +0000 Received: by mail-ob0-f180.google.com with SMTP id ny8so24741426obc.2 for ; Thu, 28 Jan 2016 12:58:18 -0800 (PST) In-Reply-To: <1454014688-25060-1-git-send-email-tlengyel@novetta.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Wei Liu , Ian Campbell , Razvan Cojocaru , Stefano Stabellini , George Dunlap , Andrew Cooper , Ian Jackson , Stefano Stabellini , Jan Beulich , Tamas K Lengyel , Keir Fraser List-Id: xen-devel@lists.xenproject.org Extend the existing get_mem_access memop to allow querying permissions in altp2m views as well. Signed-off-by: Tamas K Lengyel Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Cc: Razvan Cojocaru Cc: Stefano Stabellini Cc: George Dunlap Cc: Keir Fraser Cc: Jan Beulich Cc: Andrew Cooper --- v2: Use unsigned int instead of unsigned long Use a single p2m pointer --- tools/libxc/include/xenctrl.h | 3 ++- tools/libxc/xc_mem_access.c | 8 +++++--- tools/tests/xen-access/xen-access.c | 5 ++++- xen/arch/arm/p2m.c | 4 ++-- xen/arch/x86/mm/p2m.c | 17 +++++++++++++++-- xen/common/mem_access.c | 2 +- xen/include/xen/p2m-common.h | 3 ++- 7 files changed, 31 insertions(+), 11 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index b4e57d8..09d9f62 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2065,7 +2065,8 @@ int xc_set_mem_access(xc_interface *xch, domid_t domain_id, * Gets the mem access for the given page (returned in access on success) */ int xc_get_mem_access(xc_interface *xch, domid_t domain_id, - uint64_t pfn, xenmem_access_t *access); + uint64_t pfn, uint16_t altp2m_idx, + xenmem_access_t *access); /* * Instructions causing a mem_access violation can be emulated by Xen diff --git a/tools/libxc/xc_mem_access.c b/tools/libxc/xc_mem_access.c index d6fb409..a44865d 100644 --- a/tools/libxc/xc_mem_access.c +++ b/tools/libxc/xc_mem_access.c @@ -46,14 +46,16 @@ int xc_set_mem_access(xc_interface *xch, int xc_get_mem_access(xc_interface *xch, domid_t domain_id, uint64_t pfn, + uint16_t altp2m_idx, xenmem_access_t *access) { int rc; xen_mem_access_op_t mao = { - .op = XENMEM_access_op_get_access, - .domid = domain_id, - .pfn = pfn + .op = XENMEM_access_op_get_access, + .domid = domain_id, + .pfn = pfn, + .altp2m_idx = altp2m_idx }; rc = do_memory_op(xch, XENMEM_access_op, &mao, sizeof(mao)); diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c index 2300e9a..d9dda62 100644 --- a/tools/tests/xen-access/xen-access.c +++ b/tools/tests/xen-access/xen-access.c @@ -571,7 +571,10 @@ int main(int argc, char *argv[]) switch (req.reason) { case VM_EVENT_REASON_MEM_ACCESS: - rc = xc_get_mem_access(xch, domain_id, req.u.mem_access.gfn, &access); + rc = xc_get_mem_access(xch, domain_id, req.u.mem_access.gfn, + ((req.flags & VM_EVENT_FLAG_ALTERNATE_P2M) ? req.altp2m_idx : 0), + &access + ); if (rc < 0) { ERROR("Error %d getting mem_access event\n", rc); diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 8568087..957fa57 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1666,7 +1666,7 @@ bool_t 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, _gfn(paddr_to_pfn(gpa)), &xma); + rc = p2m_get_mem_access(v->domain, _gfn(paddr_to_pfn(gpa)), 0, &xma); if ( rc ) return true; @@ -1847,7 +1847,7 @@ long p2m_set_mem_access(struct domain *d, gfn_t gfn, uint32_t nr, return 0; } -int p2m_get_mem_access(struct domain *d, gfn_t gfn, +int p2m_get_mem_access(struct domain *d, gfn_t gfn, unsigned int altp2m_idx, xenmem_access_t *access) { int ret; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index a3181f3..b994564 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1572,7 +1572,9 @@ void p2m_mem_access_emulate_check(struct vcpu *v, bool_t violation = 1; const struct vm_event_mem_access *data = &rsp->u.mem_access; - if ( p2m_get_mem_access(v->domain, _gfn(data->gfn), &access) == 0 ) + if ( p2m_get_mem_access(v->domain, _gfn(data->gfn), + altp2m_active(v->domain) ? vcpu_altp2m(v).p2midx : 0, + &access) == 0 ) { switch ( access ) { @@ -1918,7 +1920,8 @@ long p2m_set_mem_access(struct domain *d, gfn_t gfn, uint32_t nr, * 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, unsigned int altp2m_idx, + xenmem_access_t *access) { struct p2m_domain *p2m = p2m_get_hostp2m(d); p2m_type_t t; @@ -1947,6 +1950,16 @@ int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access) return 0; } + /* altp2m view 0 is treated as the hostp2m */ + if ( altp2m_idx ) + { + if ( altp2m_idx >= MAX_ALTP2M || + d->arch.altp2m_eptp[altp2m_idx] == INVALID_MFN ) + return -EINVAL; + + p2m = d->arch.altp2m_p2m[altp2m_idx]; + } + gfn_lock(p2m, gfn, 0); mfn = p2m->get_entry(p2m, gfn_x(gfn), &t, &a, 0, NULL, NULL); gfn_unlock(p2m, gfn, 0); diff --git a/xen/common/mem_access.c b/xen/common/mem_access.c index 0411443..a0345a6 100644 --- a/xen/common/mem_access.c +++ b/xen/common/mem_access.c @@ -88,7 +88,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), mao.altp2m_idx, &access); if ( rc != 0 ) break; diff --git a/xen/include/xen/p2m-common.h b/xen/include/xen/p2m-common.h index 8b70459..342bc4b 100644 --- a/xen/include/xen/p2m-common.h +++ b/xen/include/xen/p2m-common.h @@ -56,6 +56,7 @@ long p2m_set_mem_access(struct domain *d, gfn_t gfn, uint32_t nr, * 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, unsigned int altp2m_idx, + xenmem_access_t *access); #endif /* _XEN_P2M_COMMON_H */ -- 2.1.4